From f2e50f50bd7d10e2242149628ffa8518fd909b2b Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Sun, 13 Jan 2019 20:26:04 +0100
Subject: Visual Studio Reformat: MediaBrowser.MediaEncoding

---
 .../BdInfo/BdInfoExaminer.cs                       | 20 ++++++++---------
 .../Configuration/EncodingConfigurationFactory.cs  |  8 +++----
 MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs |  6 +++---
 MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs  | 21 ++++++++----------
 MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs  |  2 +-
 .../Encoder/EncodingJobFactory.cs                  | 16 ++++++--------
 .../Encoder/EncodingUtils.cs                       |  4 ++--
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 25 +++++++++++-----------
 MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs |  9 +++-----
 .../Probing/ProbeResultNormalizer.cs               |  4 ++--
 MediaBrowser.MediaEncoding/Subtitles/AssParser.cs  | 17 ++++++++-------
 MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs |  6 +++---
 MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs  | 13 +++++------
 MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs  |  8 +++----
 .../Subtitles/SubtitleEncoder.cs                   |  2 +-
 15 files changed, 76 insertions(+), 85 deletions(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs b/MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs
index da96f38550..ac0dd36ee8 100644
--- a/MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs
+++ b/MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs
@@ -1,10 +1,10 @@
-using BDInfo;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.MediaInfo;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using BDInfo;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Text;
 
 namespace MediaBrowser.MediaEncoding.BdInfo
@@ -44,7 +44,7 @@ namespace MediaBrowser.MediaEncoding.BdInfo
 
             var outputStream = new BlurayDiscInfo
             {
-                MediaStreams = new MediaStream[] {}
+                MediaStreams = new MediaStream[] { }
             };
 
             if (playlist == null)
@@ -190,12 +190,12 @@ namespace MediaBrowser.MediaEncoding.BdInfo
         private void AddSubtitleStream(List<MediaStream> streams, TSGraphicsStream textStream)
         {
             streams.Add(new MediaStream
-                {
-                    Language = textStream.LanguageCode,
-                    Codec = textStream.CodecShortName,
-                    Type = MediaStreamType.Subtitle,
-                    Index = streams.Count
-                });
+            {
+                Language = textStream.LanguageCode,
+                Codec = textStream.CodecShortName,
+                Type = MediaStreamType.Subtitle,
+                Index = streams.Count
+            });
         }
     }
 }
diff --git a/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs b/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
index 16c67655ad..b475c99c47 100644
--- a/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
+++ b/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
@@ -1,9 +1,7 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Model.Configuration;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
-
-using MediaBrowser.Controller.IO;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.IO;
 
 namespace MediaBrowser.MediaEncoding.Configuration
diff --git a/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
index 2a874eba16..22fc545640 100644
--- a/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
@@ -1,11 +1,11 @@
-using MediaBrowser.Controller.Configuration;
+using System;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.IO;
 using Microsoft.Extensions.Logging;
-using System;
-using MediaBrowser.Model.Diagnostics;
 
 namespace MediaBrowser.MediaEncoding.Encoder
 {
diff --git a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
index 187f350b8e..b4e623f3a9 100644
--- a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
@@ -1,23 +1,20 @@
-using MediaBrowser.Common.Configuration;
+using System;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.MediaInfo;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Diagnostics;
-using MediaBrowser.Model.Dlna;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.MediaEncoding.Encoder
 {
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
index 1edc5c2011..60289feda1 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
@@ -20,7 +20,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         public EncodingJobOptions Options
         {
-            get { return (EncodingJobOptions) BaseRequest; }
+            get { return (EncodingJobOptions)BaseRequest; }
             set { BaseRequest = value; }
         }
 
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
index 34bc8d1b93..35d26a5e28 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
@@ -1,18 +1,16 @@
-using MediaBrowser.Common.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.MediaInfo;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace MediaBrowser.MediaEncoding.Encoder
 {
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
index dc3cb5f5e1..50ba485296 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
@@ -1,6 +1,6 @@
-using MediaBrowser.Model.MediaInfo;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.MediaEncoding.Encoder
 {
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index b19271d116..7b368923c3 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -1,3 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
@@ -5,24 +15,13 @@ using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.MediaEncoding.Probing;
+using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Serialization;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Configuration;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Model.Diagnostics;
-using MediaBrowser.Model.System;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.MediaEncoding.Encoder
diff --git a/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
index 732b5bf846..3dd37b4ed9 100644
--- a/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
@@ -1,14 +1,11 @@
-using MediaBrowser.Controller.Configuration;
+using System;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.IO;
 using Microsoft.Extensions.Logging;
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Diagnostics;
 
 namespace MediaBrowser.MediaEncoding.Encoder
 {
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index 2d3352f64a..411a69ed3c 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -955,7 +955,7 @@ namespace MediaBrowser.MediaEncoding.Probing
                 var artist = FFProbeHelpers.GetDictionaryValue(tags, "artist");
                 if (string.IsNullOrWhiteSpace(artist))
                 {
-                    audio.Artists = new string[] {};
+                    audio.Artists = new string[] { };
                 }
                 else
                 {
@@ -977,7 +977,7 @@ namespace MediaBrowser.MediaEncoding.Probing
 
             if (string.IsNullOrWhiteSpace(albumArtist))
             {
-                audio.AlbumArtists = new string[] {};
+                audio.AlbumArtists = new string[] { };
             }
             else
             {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
index 73df2b1e0b..a0fa7ceb49 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
@@ -1,11 +1,11 @@
-using MediaBrowser.Model.Extensions;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
@@ -23,7 +23,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             {
                 string line;
                 while (reader.ReadLine() != "[Events]")
-                {}
+                { }
                 var headers = ParseFieldHeaders(reader.ReadLine());
 
                 while ((line = reader.ReadLine()) != null)
@@ -34,9 +34,9 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     {
                         continue;
                     }
-                    if(line.StartsWith("["))
+                    if (line.StartsWith("["))
                         break;
-                    if(string.IsNullOrEmpty(line))
+                    if (string.IsNullOrEmpty(line))
                         continue;
                     var subEvent = new SubtitleTrackEvent { Id = eventIndex.ToString(_usCulture) };
                     eventIndex++;
@@ -63,11 +63,12 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         {
             TimeSpan span;
             return TimeSpan.TryParseExact(time, @"h\:mm\:ss\.ff", _usCulture, out span)
-                ? span.Ticks: 0;
+                ? span.Ticks : 0;
         }
 
-        private Dictionary<string,int> ParseFieldHeaders(string line) {
-            var fields = line.Substring(8).Split(',').Select(x=>x.Trim()).ToList();
+        private Dictionary<string, int> ParseFieldHeaders(string line)
+        {
+            var fields = line.Substring(8).Split(',').Select(x => x.Trim()).ToList();
 
             var result = new Dictionary<string, int> {
                                                          {"Start", fields.IndexOf("Start")},
diff --git a/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
index 474f712f9e..0c791aedac 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
@@ -1,8 +1,8 @@
-using MediaBrowser.Model.MediaInfo;
-using MediaBrowser.Model.Serialization;
-using System.IO;
+using System.IO;
 using System.Text;
 using System.Threading;
+using MediaBrowser.Model.MediaInfo;
+using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
index e9f9c6f58a..943d86ee57 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
@@ -1,12 +1,12 @@
-using MediaBrowser.Model.Extensions;
-using Microsoft.Extensions.Logging;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
@@ -25,7 +25,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         {
             var trackInfo = new SubtitleTrackInfo();
             List<SubtitleTrackEvent> trackEvents = new List<SubtitleTrackEvent>();
-            using ( var reader = new StreamReader(stream))
+            using (var reader = new StreamReader(stream))
             {
                 string line;
                 while ((line = reader.ReadLine()) != null)
@@ -36,7 +36,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     {
                         continue;
                     }
-                    var subEvent = new SubtitleTrackEvent {Id = line};
+                    var subEvent = new SubtitleTrackEvent { Id = line };
                     line = reader.ReadLine();
 
                     if (string.IsNullOrWhiteSpace(line))
@@ -81,7 +81,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             return trackInfo;
         }
 
-        long GetTicks(string time) {
+        long GetTicks(string time)
+        {
             TimeSpan span;
             return TimeSpan.TryParseExact(time, @"hh\:mm\:ss\.fff", _usCulture, out span)
                 ? span.Ticks
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
index 022fca1c8f..d88fea07e8 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
@@ -1,10 +1,10 @@
-using MediaBrowser.Model.Extensions;
-using System;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Threading;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
-using System.Collections.Generic;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
@@ -132,7 +132,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 }
 
                 //if (header.Length > 0)
-                    //subtitle.Header = header.ToString();
+                //subtitle.Header = header.ToString();
 
                 //subtitle.Renumber(1);
             }
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 202623c8bd..3e6ec460fd 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -12,10 +12,10 @@ using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.IO;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Text;
-- 
cgit v1.2.3


From 742bef5b5f916861920bf7522bc44960a8b4c686 Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Sun, 13 Jan 2019 20:45:51 +0100
Subject: EditorConfig reformat: Non-CS files.

---
 BDInfo/BDInfo.csproj                               |   20 +-
 BDInfo/ReadMe.txt                                  |    2 +-
 DvdLib/DvdLib.csproj                               |   20 +-
 Emby.Dlna/Emby.Dlna.csproj                         |  106 +-
 Emby.Dlna/Profiles/Xml/Default.xml                 |  117 +-
 Emby.Dlna/Profiles/Xml/Denon AVR.xml               |  131 +-
 Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml          |  129 +-
 Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml        |  187 +--
 Emby.Dlna/Profiles/Xml/LG Smart TV.xml             |  179 +--
 Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml         |  103 +-
 Emby.Dlna/Profiles/Xml/Marantz.xml                 |  119 +-
 Emby.Dlna/Profiles/Xml/MediaMonkey.xml             |  119 +-
 Emby.Dlna/Profiles/Xml/Panasonic Viera.xml         |  169 +-
 Emby.Dlna/Profiles/Xml/Popcorn Hour.xml            |  181 +--
 Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml        |  253 +--
 Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml          |  117 +-
 .../Profiles/Xml/Sony Blu-ray Player 2013.xml      |  171 +-
 .../Profiles/Xml/Sony Blu-ray Player 2014.xml      |  171 +-
 .../Profiles/Xml/Sony Blu-ray Player 2015.xml      |  167 +-
 .../Profiles/Xml/Sony Blu-ray Player 2016.xml      |  167 +-
 Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml     |  227 +--
 Emby.Dlna/Profiles/Xml/Sony Bravia (2010).xml      |  263 ++--
 Emby.Dlna/Profiles/Xml/Sony Bravia (2011).xml      |  275 ++--
 Emby.Dlna/Profiles/Xml/Sony Bravia (2012).xml      |  227 +--
 Emby.Dlna/Profiles/Xml/Sony Bravia (2013).xml      |  225 +--
 Emby.Dlna/Profiles/Xml/Sony Bravia (2014).xml      |  225 +--
 Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml      |  207 +--
 Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml      |  213 +--
 Emby.Dlna/Profiles/Xml/WDTV Live.xml               |  185 +--
 Emby.Dlna/Profiles/Xml/Xbox One.xml                |  249 +--
 Emby.Dlna/Profiles/Xml/foobar2000.xml              |  129 +-
 Emby.Drawing.Skia/Emby.Drawing.Skia.csproj         |   32 +-
 Emby.Drawing/Emby.Drawing.csproj                   |   22 +-
 Emby.IsoMounting/IsoMounter/IsoMounter.csproj      |   24 +-
 Emby.Naming/Emby.Naming.csproj                     |   24 +-
 Emby.Notifications/Emby.Notifications.csproj       |   24 +-
 Emby.Photos/Emby.Photos.csproj                     |   24 +-
 .../Emby.Server.Implementations.csproj             |   84 +-
 .../Localization/Core/ar.json                      |  196 +--
 .../Localization/Core/bg-BG.json                   |  196 +--
 .../Localization/Core/ca.json                      |  196 +--
 .../Localization/Core/cs.json                      |  196 +--
 .../Localization/Core/da.json                      |  196 +--
 .../Localization/Core/de.json                      |  196 +--
 .../Localization/Core/el.json                      |  196 +--
 .../Localization/Core/en-GB.json                   |  196 +--
 .../Localization/Core/en-US.json                   |  194 +--
 .../Localization/Core/es-AR.json                   |  196 +--
 .../Localization/Core/es-MX.json                   |  196 +--
 .../Localization/Core/es.json                      |  196 +--
 .../Localization/Core/fa.json                      |  196 +--
 .../Localization/Core/fr-CA.json                   |  196 +--
 .../Localization/Core/fr.json                      |  196 +--
 .../Localization/Core/gsw.json                     |  196 +--
 .../Localization/Core/he.json                      |  196 +--
 .../Localization/Core/hr.json                      |  196 +--
 .../Localization/Core/hu.json                      |  196 +--
 .../Localization/Core/it.json                      |  196 +--
 .../Localization/Core/kk.json                      |  196 +--
 .../Localization/Core/ko.json                      |  196 +--
 .../Localization/Core/lt-LT.json                   |  196 +--
 .../Localization/Core/ms.json                      |  196 +--
 .../Localization/Core/nb.json                      |  196 +--
 .../Localization/Core/nl.json                      |  196 +--
 .../Localization/Core/pl.json                      |  196 +--
 .../Localization/Core/pt-BR.json                   |  196 +--
 .../Localization/Core/pt-PT.json                   |  196 +--
 .../Localization/Core/ru.json                      |  196 +--
 .../Localization/Core/sk.json                      |  196 +--
 .../Localization/Core/sl-SI.json                   |  196 +--
 .../Localization/Core/sv.json                      |  196 +--
 .../Localization/Core/tr.json                      |  196 +--
 .../Localization/Core/zh-CN.json                   |  196 +--
 .../Localization/Core/zh-HK.json                   |  196 +--
 .../Localization/Ratings/br.txt                    |    2 +-
 .../Localization/Ratings/ca.txt                    |    2 +-
 .../Localization/Ratings/co.txt                    |    2 +-
 .../Localization/Ratings/dk.txt                    |    2 +-
 .../Localization/Ratings/es.txt                    |    2 +-
 .../Localization/Ratings/fr.txt                    |    2 +-
 .../Localization/Ratings/ie.txt                    |    2 +-
 .../Localization/Ratings/jp.txt                    |    2 +-
 .../Localization/Ratings/kz.txt                    |    2 +-
 .../Localization/Ratings/mx.txt                    |    2 +-
 .../Localization/Ratings/nl.txt                    |    2 +-
 .../Localization/Ratings/nz.txt                    |    2 +-
 .../Localization/Ratings/ro.txt                    |    2 +-
 .../Localization/Ratings/uk.txt                    |    2 +-
 .../Localization/Ratings/us.txt                    |    2 +-
 .../Localization/countries.json                    | 1656 ++++++++++----------
 .../Localization/iso6392.txt                       |    2 +-
 .../Emby.XmlTv.Console/Emby.XmlTv.Console.csproj   |   38 +-
 Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj  |  227 +--
 Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj            |   17 +-
 Jellyfin.Server/Jellyfin.Server.csproj             |   70 +-
 MediaBrowser.Api/MediaBrowser.Api.csproj           |   22 +-
 MediaBrowser.Common/MediaBrowser.Common.csproj     |   32 +-
 .../MediaBrowser.Controller.csproj                 |   34 +-
 .../MediaBrowser.LocalMetadata.csproj              |   22 +-
 .../MediaBrowser.MediaEncoding.csproj              |   28 +-
 MediaBrowser.Model/MediaBrowser.Model.csproj       |   32 +-
 .../MediaBrowser.Providers.csproj                  |   30 +-
 MediaBrowser.Tests/MediaBrowser.Tests.csproj       |  261 +--
 .../MediaBrowser.WebDashboard.csproj               |   46 +-
 .../MediaBrowser.XbmcMetadata.csproj               |   22 +-
 MediaBrowser.sln.GhostDoc.xml                      |   66 +-
 OpenSubtitlesHandler/Methods Implemeted.txt        |    4 +-
 OpenSubtitlesHandler/OpenSubtitlesHandler.csproj   |   16 +-
 OpenSubtitlesHandler/Readme.txt                    |    4 +-
 OpenSubtitlesHandler/XML-RPC/Docs/XML-RPC.txt      |   22 +-
 SocketHttpListener/SocketHttpListener.csproj       |   24 +-
 debian/conf/logging.json                           |    3 +-
 jellyfin.code-workspace                            |   17 +
 113 files changed, 7556 insertions(+), 7510 deletions(-)
 create mode 100644 jellyfin.code-workspace

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/BDInfo/BDInfo.csproj b/BDInfo/BDInfo.csproj
index b64f5e7a77..5246e09cb5 100644
--- a/BDInfo/BDInfo.csproj
+++ b/BDInfo/BDInfo.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
 </Project>
diff --git a/BDInfo/ReadMe.txt b/BDInfo/ReadMe.txt
index 68326d560a..65490065de 100644
--- a/BDInfo/ReadMe.txt
+++ b/BDInfo/ReadMe.txt
@@ -2,4 +2,4 @@
 
 http://www.cinemasquid.com/blu-ray/tools/bdinfo
 
-BDInfoSettings was taken from the FormSettings class, and changed so that the settings all return defaults.
\ No newline at end of file
+BDInfoSettings was taken from the FormSettings class, and changed so that the settings all return defaults.
diff --git a/DvdLib/DvdLib.csproj b/DvdLib/DvdLib.csproj
index b64f5e7a77..5246e09cb5 100644
--- a/DvdLib/DvdLib.csproj
+++ b/DvdLib/DvdLib.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
 </Project>
diff --git a/Emby.Dlna/Emby.Dlna.csproj b/Emby.Dlna/Emby.Dlna.csproj
index f48816453b..b2ac9c2dfd 100644
--- a/Emby.Dlna/Emby.Dlna.csproj
+++ b/Emby.Dlna/Emby.Dlna.csproj
@@ -1,61 +1,61 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-    <ProjectReference Include="..\RSSDP\RSSDP.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+        <ProjectReference Include="..\RSSDP\RSSDP.csproj" />
+    </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Images\logo120.jpg" />
-    <EmbeddedResource Include="Images\logo120.png" />
-    <EmbeddedResource Include="Images\logo240.jpg" />
-    <EmbeddedResource Include="Images\logo240.png" />
-    <EmbeddedResource Include="Images\logo48.jpg" />
-    <EmbeddedResource Include="Images\logo48.png" />
-    <EmbeddedResource Include="Images\people48.jpg" />
-    <EmbeddedResource Include="Images\people48.png" />
-    <EmbeddedResource Include="Images\people480.jpg" />
-    <EmbeddedResource Include="Images\people480.png" />
-  </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Include="Images\logo120.jpg" />
+        <EmbeddedResource Include="Images\logo120.png" />
+        <EmbeddedResource Include="Images\logo240.jpg" />
+        <EmbeddedResource Include="Images\logo240.png" />
+        <EmbeddedResource Include="Images\logo48.jpg" />
+        <EmbeddedResource Include="Images\logo48.png" />
+        <EmbeddedResource Include="Images\people48.jpg" />
+        <EmbeddedResource Include="Images\people48.png" />
+        <EmbeddedResource Include="Images\people480.jpg" />
+        <EmbeddedResource Include="Images\people480.png" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Profiles\Xml\Default.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Denon AVR.xml" />
-    <EmbeddedResource Include="Profiles\Xml\DirecTV HD-DVR.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Dish Hopper-Joey.xml" />
-    <EmbeddedResource Include="Profiles\Xml\foobar2000.xml" />
-    <EmbeddedResource Include="Profiles\Xml\LG Smart TV.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Linksys DMA2100.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Marantz.xml" />
-    <EmbeddedResource Include="Profiles\Xml\MediaMonkey.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Panasonic Viera.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Popcorn Hour.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Samsung Smart TV.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player 2013.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player 2014.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player 2015.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player 2016.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282010%29.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282011%29.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282012%29.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282013%29.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282014%29.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Sony PlayStation 3.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Sony PlayStation 4.xml" />
-    <EmbeddedResource Include="Profiles\Xml\WDTV Live.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Xbox One.xml" />
-  </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Include="Profiles\Xml\Default.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Denon AVR.xml" />
+        <EmbeddedResource Include="Profiles\Xml\DirecTV HD-DVR.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Dish Hopper-Joey.xml" />
+        <EmbeddedResource Include="Profiles\Xml\foobar2000.xml" />
+        <EmbeddedResource Include="Profiles\Xml\LG Smart TV.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Linksys DMA2100.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Marantz.xml" />
+        <EmbeddedResource Include="Profiles\Xml\MediaMonkey.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Panasonic Viera.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Popcorn Hour.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Samsung Smart TV.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player 2013.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player 2014.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player 2015.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player 2016.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282010%29.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282011%29.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282012%29.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282013%29.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282014%29.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Sony PlayStation 3.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Sony PlayStation 4.xml" />
+        <EmbeddedResource Include="Profiles\Xml\WDTV Live.xml" />
+        <EmbeddedResource Include="Profiles\Xml\Xbox One.xml" />
+    </ItemGroup>
 
 </Project>
diff --git a/Emby.Dlna/Profiles/Xml/Default.xml b/Emby.Dlna/Profiles/Xml/Default.xml
index 9b862fec3a..95e057fa94 100644
--- a/Emby.Dlna/Profiles/Xml/Default.xml
+++ b/Emby.Dlna/Profiles/Xml/Default.xml
@@ -1,60 +1,61 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Generic Device</Name>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes />
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="" type="Video" />
-    <DirectPlayProfile container="" type="Audio" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles />
-  <CodecProfiles />
-  <ResponseProfiles>
-    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="External" />
-    <SubtitleProfile format="sub" method="External" />
-    <SubtitleProfile format="srt" method="Embed" />
-    <SubtitleProfile format="ass" method="Embed" />
-    <SubtitleProfile format="ssa" method="Embed" />
-    <SubtitleProfile format="smi" method="Embed" />
-    <SubtitleProfile format="dvdsub" method="Embed" />
-    <SubtitleProfile format="pgs" method="Embed" />
-    <SubtitleProfile format="pgssub" method="Embed" />
-    <SubtitleProfile format="sub" method="Embed" />
-    <SubtitleProfile format="subrip" method="Embed" />
-    <SubtitleProfile format="vtt" method="Embed" />
-  </SubtitleProfiles>
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Generic Device</Name>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes />
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="" type="Video" />
+        <DirectPlayProfile container="" type="Audio" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles />
+    <CodecProfiles />
+    <ResponseProfiles>
+        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="External" />
+        <SubtitleProfile format="sub" method="External" />
+        <SubtitleProfile format="srt" method="Embed" />
+        <SubtitleProfile format="ass" method="Embed" />
+        <SubtitleProfile format="ssa" method="Embed" />
+        <SubtitleProfile format="smi" method="Embed" />
+        <SubtitleProfile format="dvdsub" method="Embed" />
+        <SubtitleProfile format="pgs" method="Embed" />
+        <SubtitleProfile format="pgssub" method="Embed" />
+        <SubtitleProfile format="sub" method="Embed" />
+        <SubtitleProfile format="subrip" method="Embed" />
+        <SubtitleProfile format="vtt" method="Embed" />
+    </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Denon AVR.xml b/Emby.Dlna/Profiles/Xml/Denon AVR.xml
index 599726c512..a0de799d02 100644
--- a/Emby.Dlna/Profiles/Xml/Denon AVR.xml	
+++ b/Emby.Dlna/Profiles/Xml/Denon AVR.xml	
@@ -1,67 +1,68 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Denon AVR</Name>
-  <Identification>
-    <FriendlyName>Denon:\[AVR:.*</FriendlyName>
-    <Manufacturer>Denon</Manufacturer>
-    <Headers />
-  </Identification>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes />
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="mp3,flac,m4a,wma" type="Audio" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles />
-  <CodecProfiles>
-    <CodecProfile type="Audio" container="flac">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioSampleRate" value="96000" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles />
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="External" />
-    <SubtitleProfile format="sub" method="External" />
-    <SubtitleProfile format="srt" method="Embed" />
-    <SubtitleProfile format="ass" method="Embed" />
-    <SubtitleProfile format="ssa" method="Embed" />
-    <SubtitleProfile format="smi" method="Embed" />
-    <SubtitleProfile format="dvdsub" method="Embed" />
-    <SubtitleProfile format="pgs" method="Embed" />
-    <SubtitleProfile format="pgssub" method="Embed" />
-    <SubtitleProfile format="sub" method="Embed" />
-    <SubtitleProfile format="subrip" method="Embed" />
-    <SubtitleProfile format="vtt" method="Embed" />
-  </SubtitleProfiles>
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Denon AVR</Name>
+    <Identification>
+        <FriendlyName>Denon:\[AVR:.*</FriendlyName>
+        <Manufacturer>Denon</Manufacturer>
+        <Headers />
+    </Identification>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes />
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="mp3,flac,m4a,wma" type="Audio" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles />
+    <CodecProfiles>
+        <CodecProfile type="Audio" container="flac">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioSampleRate" value="96000" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles />
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="External" />
+        <SubtitleProfile format="sub" method="External" />
+        <SubtitleProfile format="srt" method="Embed" />
+        <SubtitleProfile format="ass" method="Embed" />
+        <SubtitleProfile format="ssa" method="Embed" />
+        <SubtitleProfile format="smi" method="Embed" />
+        <SubtitleProfile format="dvdsub" method="Embed" />
+        <SubtitleProfile format="pgs" method="Embed" />
+        <SubtitleProfile format="pgssub" method="Embed" />
+        <SubtitleProfile format="sub" method="Embed" />
+        <SubtitleProfile format="subrip" method="Embed" />
+        <SubtitleProfile format="vtt" method="Embed" />
+    </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml b/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml
index e640e86bfb..f7927014ad 100644
--- a/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml	
+++ b/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml	
@@ -1,66 +1,67 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>DirecTV HD-DVR</Name>
-  <Identification>
-    <FriendlyName>^DIRECTV.*$</FriendlyName>
-    <Headers>
-      <HttpHeaderInfo name="User-Agent" value="DIRECTV" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>true</RequiresPlainVideoItems>
-  <RequiresPlainFolders>true</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes />
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="mpeg" audioCodec="mp2" videoCodec="mpeg2video" type="Video" />
-    <DirectPlayProfile container="jpeg,jpg" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mpeg" type="Video" videoCodec="mpeg2video" audioCodec="mp2" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles />
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="mpeg2video">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="8192000" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Audio" codec="mp2">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles />
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>DirecTV HD-DVR</Name>
+    <Identification>
+        <FriendlyName>^DIRECTV.*$</FriendlyName>
+        <Headers>
+            <HttpHeaderInfo name="User-Agent" value="DIRECTV" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>true</RequiresPlainVideoItems>
+    <RequiresPlainFolders>true</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes />
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="mpeg" audioCodec="mp2" videoCodec="mpeg2video" type="Video" />
+        <DirectPlayProfile container="jpeg,jpg" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mpeg" type="Video" videoCodec="mpeg2video" audioCodec="mp2" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles />
+    <CodecProfiles>
+        <CodecProfile type="Video" codec="mpeg2video">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="8192000" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="Audio" codec="mp2">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles />
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml b/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml
index 615774adff..11b00f0374 100644
--- a/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml	
+++ b/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml	
@@ -1,95 +1,96 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Dish Hopper-Joey</Name>
-  <Identification>
-    <Manufacturer>Echostar Technologies LLC</Manufacturer>
-    <ManufacturerUrl>http://www.echostar.com</ManufacturerUrl>
-    <Headers>
-      <HttpHeaderInfo name="User-Agent" value="Zip_" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/mp2t:*,http-get:*:video/MP1S:*,http-get:*:video/mpeg2:*,http-get:*:video/mp4:*,http-get:*:video/x-matroska:*,http-get:*:audio/mpeg:*,http-get:*:audio/mpeg3:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/mp4a-latm:*,http-get:*:image/jpeg:*</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes />
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="mp4,mkv,mpeg,ts" audioCodec="mp3,ac3,aac,he-aac,pcm" videoCodec="h264,mpeg2video" type="Video" />
-    <DirectPlayProfile container="mp3,alac,flac" type="Audio" />
-    <DirectPlayProfile container="jpeg" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="mp4" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles />
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="h264">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Video">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="ac3,he-aac">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="aac">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio">
-      <Conditions>
-        <ProfileCondition condition="Equals" property="IsSecondaryAudio" value="false" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles>
-    <ResponseProfile container="mkv,ts,mpegts" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Dish Hopper-Joey</Name>
+    <Identification>
+        <Manufacturer>Echostar Technologies LLC</Manufacturer>
+        <ManufacturerUrl>http://www.echostar.com</ManufacturerUrl>
+        <Headers>
+            <HttpHeaderInfo name="User-Agent" value="Zip_" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/mp2t:*,http-get:*:video/MP1S:*,http-get:*:video/mpeg2:*,http-get:*:video/mp4:*,http-get:*:video/x-matroska:*,http-get:*:audio/mpeg:*,http-get:*:audio/mpeg3:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/mp4a-latm:*,http-get:*:image/jpeg:*</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes />
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="mp4,mkv,mpeg,ts" audioCodec="mp3,ac3,aac,he-aac,pcm" videoCodec="h264,mpeg2video" type="Video" />
+        <DirectPlayProfile container="mp3,alac,flac" type="Audio" />
+        <DirectPlayProfile container="jpeg" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="mp4" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles />
+    <CodecProfiles>
+        <CodecProfile type="Video" codec="h264">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="Video">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="ac3,he-aac">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="aac">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio">
+            <Conditions>
+                <ProfileCondition condition="Equals" property="IsSecondaryAudio" value="false" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles>
+        <ResponseProfile container="mkv,ts,mpegts" type="Video" mimeType="video/mp4">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/LG Smart TV.xml b/Emby.Dlna/Profiles/Xml/LG Smart TV.xml
index 21dccf5312..22a9e90c66 100644
--- a/Emby.Dlna/Profiles/Xml/LG Smart TV.xml	
+++ b/Emby.Dlna/Profiles/Xml/LG Smart TV.xml	
@@ -1,91 +1,92 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>LG Smart TV</Name>
-  <Identification>
-    <FriendlyName>LG.*</FriendlyName>
-    <Headers>
-      <HttpHeaderInfo name="User-Agent" value="LG" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes />
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="ts,mpegts,avi,mkv,m2ts" audioCodec="aac,ac3,eac3,mp3,dca,dts" videoCodec="h264" type="Video" />
-    <DirectPlayProfile container="mp4,m4v" audioCodec="aac,ac3,eac3,mp3,dca,dts" videoCodec="h264,mpeg4" type="Video" />
-    <DirectPlayProfile container="mp3" type="Audio" />
-    <DirectPlayProfile container="jpeg" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="mpeg4">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Video" codec="h264">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="ac3,eac3,aac,mp3">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles>
-    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" type="Video" mimeType="video/mpeg">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-    <SubtitleProfile format="srt" method="External" />
-  </SubtitleProfiles>
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>LG Smart TV</Name>
+    <Identification>
+        <FriendlyName>LG.*</FriendlyName>
+        <Headers>
+            <HttpHeaderInfo name="User-Agent" value="LG" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes />
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="ts,mpegts,avi,mkv,m2ts" audioCodec="aac,ac3,eac3,mp3,dca,dts" videoCodec="h264" type="Video" />
+        <DirectPlayProfile container="mp4,m4v" audioCodec="aac,ac3,eac3,mp3,dca,dts" videoCodec="h264,mpeg4" type="Video" />
+        <DirectPlayProfile container="mp3" type="Audio" />
+        <DirectPlayProfile container="jpeg" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Photo">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video" codec="mpeg4">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="Video" codec="h264">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="ac3,eac3,aac,mp3">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles>
+        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" type="Video" mimeType="video/mpeg">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+        <SubtitleProfile format="srt" method="External" />
+    </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml b/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml
index ac081bba30..94c89a2c22 100644
--- a/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml	
+++ b/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml	
@@ -1,53 +1,54 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Linksys DMA2100</Name>
-  <Identification>
-    <ModelName>DMA2100us</ModelName>
-    <Headers />
-  </Identification>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes />
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="mp3,flac,m4a,wma" type="Audio" />
-    <DirectPlayProfile container="avi,mp4,mkv,ts,mpegts,m4v" type="Video" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles />
-  <CodecProfiles />
-  <ResponseProfiles>
-    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Linksys DMA2100</Name>
+    <Identification>
+        <ModelName>DMA2100us</ModelName>
+        <Headers />
+    </Identification>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes />
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="mp3,flac,m4a,wma" type="Audio" />
+        <DirectPlayProfile container="avi,mp4,mkv,ts,mpegts,m4v" type="Video" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles />
+    <CodecProfiles />
+    <ResponseProfiles>
+        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Marantz.xml b/Emby.Dlna/Profiles/Xml/Marantz.xml
index 2bbdecde86..1a47865770 100644
--- a/Emby.Dlna/Profiles/Xml/Marantz.xml
+++ b/Emby.Dlna/Profiles/Xml/Marantz.xml
@@ -1,61 +1,62 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Marantz</Name>
-  <Identification>
-    <Manufacturer>Marantz</Manufacturer>
-    <Headers>
-      <HttpHeaderInfo name="User-Agent" value="Marantz" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes />
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="aac,mp3,wav,wma,flac" type="Audio" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles />
-  <CodecProfiles />
-  <ResponseProfiles />
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="External" />
-    <SubtitleProfile format="sub" method="External" />
-    <SubtitleProfile format="srt" method="Embed" />
-    <SubtitleProfile format="ass" method="Embed" />
-    <SubtitleProfile format="ssa" method="Embed" />
-    <SubtitleProfile format="smi" method="Embed" />
-    <SubtitleProfile format="dvdsub" method="Embed" />
-    <SubtitleProfile format="pgs" method="Embed" />
-    <SubtitleProfile format="pgssub" method="Embed" />
-    <SubtitleProfile format="sub" method="Embed" />
-    <SubtitleProfile format="subrip" method="Embed" />
-    <SubtitleProfile format="vtt" method="Embed" />
-  </SubtitleProfiles>
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Marantz</Name>
+    <Identification>
+        <Manufacturer>Marantz</Manufacturer>
+        <Headers>
+            <HttpHeaderInfo name="User-Agent" value="Marantz" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes />
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="aac,mp3,wav,wma,flac" type="Audio" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles />
+    <CodecProfiles />
+    <ResponseProfiles />
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="External" />
+        <SubtitleProfile format="sub" method="External" />
+        <SubtitleProfile format="srt" method="Embed" />
+        <SubtitleProfile format="ass" method="Embed" />
+        <SubtitleProfile format="ssa" method="Embed" />
+        <SubtitleProfile format="smi" method="Embed" />
+        <SubtitleProfile format="dvdsub" method="Embed" />
+        <SubtitleProfile format="pgs" method="Embed" />
+        <SubtitleProfile format="pgssub" method="Embed" />
+        <SubtitleProfile format="sub" method="Embed" />
+        <SubtitleProfile format="subrip" method="Embed" />
+        <SubtitleProfile format="vtt" method="Embed" />
+    </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/MediaMonkey.xml b/Emby.Dlna/Profiles/Xml/MediaMonkey.xml
index 955c30e854..ab5db70789 100644
--- a/Emby.Dlna/Profiles/Xml/MediaMonkey.xml
+++ b/Emby.Dlna/Profiles/Xml/MediaMonkey.xml
@@ -1,61 +1,62 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>MediaMonkey</Name>
-  <Identification>
-    <FriendlyName>MediaMonkey</FriendlyName>
-    <Headers>
-      <HttpHeaderInfo name="User-Agent" value="MediaMonkey" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes />
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus,flac,m4a" type="Audio" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles />
-  <CodecProfiles />
-  <ResponseProfiles />
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="External" />
-    <SubtitleProfile format="sub" method="External" />
-    <SubtitleProfile format="srt" method="Embed" />
-    <SubtitleProfile format="ass" method="Embed" />
-    <SubtitleProfile format="ssa" method="Embed" />
-    <SubtitleProfile format="smi" method="Embed" />
-    <SubtitleProfile format="dvdsub" method="Embed" />
-    <SubtitleProfile format="pgs" method="Embed" />
-    <SubtitleProfile format="pgssub" method="Embed" />
-    <SubtitleProfile format="sub" method="Embed" />
-    <SubtitleProfile format="subrip" method="Embed" />
-    <SubtitleProfile format="vtt" method="Embed" />
-  </SubtitleProfiles>
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>MediaMonkey</Name>
+    <Identification>
+        <FriendlyName>MediaMonkey</FriendlyName>
+        <Headers>
+            <HttpHeaderInfo name="User-Agent" value="MediaMonkey" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes />
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus,flac,m4a" type="Audio" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles />
+    <CodecProfiles />
+    <ResponseProfiles />
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="External" />
+        <SubtitleProfile format="sub" method="External" />
+        <SubtitleProfile format="srt" method="Embed" />
+        <SubtitleProfile format="ass" method="Embed" />
+        <SubtitleProfile format="ssa" method="Embed" />
+        <SubtitleProfile format="smi" method="Embed" />
+        <SubtitleProfile format="dvdsub" method="Embed" />
+        <SubtitleProfile format="pgs" method="Embed" />
+        <SubtitleProfile format="pgssub" method="Embed" />
+        <SubtitleProfile format="sub" method="Embed" />
+        <SubtitleProfile format="subrip" method="Embed" />
+        <SubtitleProfile format="vtt" method="Embed" />
+    </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml b/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml
index 0da0e09260..6a5abfb0e2 100644
--- a/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml	
+++ b/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml	
@@ -1,86 +1,87 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Panasonic Viera</Name>
-  <Identification>
-    <FriendlyName>VIERA</FriendlyName>
-    <Manufacturer>Panasonic</Manufacturer>
-    <Headers>
-      <HttpHeaderInfo name="User-Agent" value="Panasonic MIL DLNA" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes>
-    <XmlAttribute name="xmlns:pv" value="http://www.pv.com/pvns/" />
-  </XmlRootAttributes>
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,pcm_dvd" videoCodec="mpeg2video,mpeg4" type="Video" />
-    <DirectPlayProfile container="mkv" audioCodec="aac,ac3,dca,mp3,mp2,pcm,dts" videoCodec="h264,mpeg2video" type="Video" />
-    <DirectPlayProfile container="ts,mpegts" audioCodec="aac,mp3,mp2" videoCodec="h264,mpeg2video" type="Video" />
-    <DirectPlayProfile container="mp4,m4v" audioCodec="aac,ac3,mp3,pcm" videoCodec="h264" type="Video" />
-    <DirectPlayProfile container="mov" audioCodec="aac,pcm" videoCodec="h264" type="Video" />
-    <DirectPlayProfile container="avi" audioCodec="pcm" videoCodec="mpeg4" type="Video" />
-    <DirectPlayProfile container="flv" audioCodec="aac" videoCodec="h264" type="Video" />
-    <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
-    <DirectPlayProfile container="mp4" audioCodec="aac" type="Audio" />
-    <DirectPlayProfile container="jpeg" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles>
-    <ResponseProfile container="ts,mpegts" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-    <SubtitleProfile format="srt" method="External" />
-  </SubtitleProfiles>
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Panasonic Viera</Name>
+    <Identification>
+        <FriendlyName>VIERA</FriendlyName>
+        <Manufacturer>Panasonic</Manufacturer>
+        <Headers>
+            <HttpHeaderInfo name="User-Agent" value="Panasonic MIL DLNA" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes>
+        <XmlAttribute name="xmlns:pv" value="http://www.pv.com/pvns/" />
+    </XmlRootAttributes>
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,pcm_dvd" videoCodec="mpeg2video,mpeg4" type="Video" />
+        <DirectPlayProfile container="mkv" audioCodec="aac,ac3,dca,mp3,mp2,pcm,dts" videoCodec="h264,mpeg2video" type="Video" />
+        <DirectPlayProfile container="ts,mpegts" audioCodec="aac,mp3,mp2" videoCodec="h264,mpeg2video" type="Video" />
+        <DirectPlayProfile container="mp4,m4v" audioCodec="aac,ac3,mp3,pcm" videoCodec="h264" type="Video" />
+        <DirectPlayProfile container="mov" audioCodec="aac,pcm" videoCodec="h264" type="Video" />
+        <DirectPlayProfile container="avi" audioCodec="pcm" videoCodec="mpeg4" type="Video" />
+        <DirectPlayProfile container="flv" audioCodec="aac" videoCodec="h264" type="Video" />
+        <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
+        <DirectPlayProfile container="mp4" audioCodec="aac" type="Audio" />
+        <DirectPlayProfile container="jpeg" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Photo">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles>
+        <ResponseProfile container="ts,mpegts" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+        <SubtitleProfile format="srt" method="External" />
+    </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml b/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml
index 775d40b74d..da65c9e01b 100644
--- a/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml	
+++ b/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml	
@@ -1,91 +1,92 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Popcorn Hour</Name>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes />
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="mp4,mov,m4v" audioCodec="aac" videoCodec="h264,mpeg4" type="Video" />
-    <DirectPlayProfile container="ts,mpegts" audioCodec="aac,ac3,eac3,mp3,mp2,pcm" videoCodec="h264" type="Video" />
-    <DirectPlayProfile container="asf,wmv" audioCodec="wmav2,wmapro" videoCodec="wmv3,vc1" type="Video" />
-    <DirectPlayProfile container="avi" audioCodec="mp3,ac3,eac3,mp2,pcm" videoCodec="mpeg4,msmpeg4" type="Video" />
-    <DirectPlayProfile container="mkv" audioCodec="aac,mp3,ac3,eac3,mp2,pcm" videoCodec="h264" type="Video" />
-    <DirectPlayProfile container="aac,mp3,flac,ogg,wma,wav" type="Audio" />
-    <DirectPlayProfile container="jpeg,gif,bmp,png" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="mp4" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles />
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="h264">
-      <Conditions>
-        <ProfileCondition condition="EqualsAny" property="VideoProfile" value="baseline|constrained baseline" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Video">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="aac">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Audio" codec="aac">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Audio" codec="mp3">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="AudioBitrate" value="320000" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles>
-    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Popcorn Hour</Name>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes />
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="mp4,mov,m4v" audioCodec="aac" videoCodec="h264,mpeg4" type="Video" />
+        <DirectPlayProfile container="ts,mpegts" audioCodec="aac,ac3,eac3,mp3,mp2,pcm" videoCodec="h264" type="Video" />
+        <DirectPlayProfile container="asf,wmv" audioCodec="wmav2,wmapro" videoCodec="wmv3,vc1" type="Video" />
+        <DirectPlayProfile container="avi" audioCodec="mp3,ac3,eac3,mp2,pcm" videoCodec="mpeg4,msmpeg4" type="Video" />
+        <DirectPlayProfile container="mkv" audioCodec="aac,mp3,ac3,eac3,mp2,pcm" videoCodec="h264" type="Video" />
+        <DirectPlayProfile container="aac,mp3,flac,ogg,wma,wav" type="Audio" />
+        <DirectPlayProfile container="jpeg,gif,bmp,png" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="mp4" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles />
+    <CodecProfiles>
+        <CodecProfile type="Video" codec="h264">
+            <Conditions>
+                <ProfileCondition condition="EqualsAny" property="VideoProfile" value="baseline|constrained baseline" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="Video">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="aac">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="Audio" codec="aac">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="Audio" codec="mp3">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="AudioBitrate" value="320000" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles>
+        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml b/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml
index 1362d8c38b..6d9661201b 100644
--- a/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml	
+++ b/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml	
@@ -1,127 +1,128 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Samsung Smart TV</Name>
-  <Identification>
-    <ModelUrl>samsung.com</ModelUrl>
-    <Headers>
-      <HttpHeaderInfo name="User-Agent" value="SEC_" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes>
-    <XmlAttribute name="xmlns:sec" value="http://www.sec.co.kr/" />
-  </XmlRootAttributes>
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="asf" audioCodec="mp3,ac3,wmav2,wmapro,wmavoice" videoCodec="h264,mpeg4,mjpeg" type="Video" />
-    <DirectPlayProfile container="avi" audioCodec="mp3,ac3,dca,dts" videoCodec="h264,mpeg4,mjpeg" type="Video" />
-    <DirectPlayProfile container="mkv" audioCodec="mp3,ac3,dca,aac,dts" videoCodec="h264,mpeg4,mjpeg4" type="Video" />
-    <DirectPlayProfile container="mp4,m4v" audioCodec="mp3,aac" videoCodec="h264,mpeg4" type="Video" />
-    <DirectPlayProfile container="3gp" audioCodec="aac,he-aac" videoCodec="h264,mpeg4" type="Video" />
-    <DirectPlayProfile container="mpg,mpeg" audioCodec="ac3,mp2,mp3,aac" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
-    <DirectPlayProfile container="vro,vob" audioCodec="ac3,mp2,mp3" videoCodec="mpeg1video,mpeg2video" type="Video" />
-    <DirectPlayProfile container="ts" audioCodec="ac3,aac,mp3,eac3" videoCodec="mpeg2video,h264,vc1" type="Video" />
-    <DirectPlayProfile container="asf" audioCodec="wmav2,wmavoice" videoCodec="wmv2,wmv3" type="Video" />
-    <DirectPlayProfile container="mp3,flac" type="Audio" />
-    <DirectPlayProfile container="jpeg" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="mpeg2video">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="30720000" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Video" codec="mpeg4">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="8192000" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Video" codec="h264">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="37500000" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Video" codec="wmv2,wmv3,vc1">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="25600000" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="wmav2,dca,aac,mp3,dts">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles>
-    <ResponseProfile container="avi" type="Video" mimeType="video/x-msvideo">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="mkv" type="Video" mimeType="video/x-mkv">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="flac" type="Audio" mimeType="audio/x-flac">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-    <SubtitleProfile format="srt" method="External" didlMode="CaptionInfoEx" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Samsung Smart TV</Name>
+    <Identification>
+        <ModelUrl>samsung.com</ModelUrl>
+        <Headers>
+            <HttpHeaderInfo name="User-Agent" value="SEC_" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes>
+        <XmlAttribute name="xmlns:sec" value="http://www.sec.co.kr/" />
+    </XmlRootAttributes>
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="asf" audioCodec="mp3,ac3,wmav2,wmapro,wmavoice" videoCodec="h264,mpeg4,mjpeg" type="Video" />
+        <DirectPlayProfile container="avi" audioCodec="mp3,ac3,dca,dts" videoCodec="h264,mpeg4,mjpeg" type="Video" />
+        <DirectPlayProfile container="mkv" audioCodec="mp3,ac3,dca,aac,dts" videoCodec="h264,mpeg4,mjpeg4" type="Video" />
+        <DirectPlayProfile container="mp4,m4v" audioCodec="mp3,aac" videoCodec="h264,mpeg4" type="Video" />
+        <DirectPlayProfile container="3gp" audioCodec="aac,he-aac" videoCodec="h264,mpeg4" type="Video" />
+        <DirectPlayProfile container="mpg,mpeg" audioCodec="ac3,mp2,mp3,aac" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
+        <DirectPlayProfile container="vro,vob" audioCodec="ac3,mp2,mp3" videoCodec="mpeg1video,mpeg2video" type="Video" />
+        <DirectPlayProfile container="ts" audioCodec="ac3,aac,mp3,eac3" videoCodec="mpeg2video,h264,vc1" type="Video" />
+        <DirectPlayProfile container="asf" audioCodec="wmav2,wmavoice" videoCodec="wmv2,wmv3" type="Video" />
+        <DirectPlayProfile container="mp3,flac" type="Audio" />
+        <DirectPlayProfile container="jpeg" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Photo">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video" codec="mpeg2video">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="30720000" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="Video" codec="mpeg4">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="8192000" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="Video" codec="h264">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="37500000" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="Video" codec="wmv2,wmv3,vc1">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="25600000" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="wmav2,dca,aac,mp3,dts">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles>
+        <ResponseProfile container="avi" type="Video" mimeType="video/x-msvideo">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="mkv" type="Video" mimeType="video/x-mkv">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="flac" type="Audio" mimeType="audio/x-flac">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+        <SubtitleProfile format="srt" method="External" didlMode="CaptionInfoEx" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml b/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml
index dac2fdea44..e38987e89a 100644
--- a/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml	
@@ -1,59 +1,60 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Sharp Smart TV</Name>
-  <Identification>
-    <Manufacturer>Sharp</Manufacturer>
-    <Headers>
-      <HttpHeaderInfo name="User-Agent" value="Sharp" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>true</RequiresPlainVideoItems>
-  <RequiresPlainFolders>true</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes />
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="m4v,mkv,avi,mov,mp4" audioCodec="aac,mp3,ac3,dts,dca" videoCodec="h264,mpeg4" type="Video" />
-    <DirectPlayProfile container="asf,wmv" type="Video" />
-    <DirectPlayProfile container="mpg,mpeg" audioCodec="mp3,aac" videoCodec="mpeg2video" type="Video" />
-    <DirectPlayProfile container="flv" audioCodec="mp3,aac" videoCodec="h264" type="Video" />
-    <DirectPlayProfile container="mp3,wav" type="Audio" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3,dts,dca" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles />
-  <CodecProfiles />
-  <ResponseProfiles>
-    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-    <SubtitleProfile format="srt" method="External" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Sharp Smart TV</Name>
+    <Identification>
+        <Manufacturer>Sharp</Manufacturer>
+        <Headers>
+            <HttpHeaderInfo name="User-Agent" value="Sharp" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>true</RequiresPlainVideoItems>
+    <RequiresPlainFolders>true</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes />
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="m4v,mkv,avi,mov,mp4" audioCodec="aac,mp3,ac3,dts,dca" videoCodec="h264,mpeg4" type="Video" />
+        <DirectPlayProfile container="asf,wmv" type="Video" />
+        <DirectPlayProfile container="mpg,mpeg" audioCodec="mp3,aac" videoCodec="mpeg2video" type="Video" />
+        <DirectPlayProfile container="flv" audioCodec="mp3,aac" videoCodec="h264" type="Video" />
+        <DirectPlayProfile container="mp3,wav" type="Audio" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3,dts,dca" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles />
+    <CodecProfiles />
+    <ResponseProfiles>
+        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+        <SubtitleProfile format="srt" method="External" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml
index 0cb0c52c23..d4649d9e83 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml	
@@ -1,86 +1,87 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Sony Blu-ray Player 2013</Name>
-  <Identification>
-    <ModelNumber>BDP-2013</ModelNumber>
-    <Headers>
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S1100" match="Substring" />
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3100" match="Substring" />
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S5100" match="Substring" />
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S6100" match="Substring" />
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S7100" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>3.0</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes>
-    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-  </XmlRootAttributes>
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
-    <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
-    <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
-    <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
-    <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm,dts" videoCodec="mpeg4,h264" type="Video" />
-    <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
-    <DirectPlayProfile container="wmv,asf" type="Video" />
-    <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
-    <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="h264">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="ac3">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles />
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Sony Blu-ray Player 2013</Name>
+    <Identification>
+        <ModelNumber>BDP-2013</ModelNumber>
+        <Headers>
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S1100" match="Substring" />
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3100" match="Substring" />
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S5100" match="Substring" />
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S6100" match="Substring" />
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S7100" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Microsoft Corporation</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Windows Media Player Sharing</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>3.0</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes>
+        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+    </XmlRootAttributes>
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
+        <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
+        <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
+        <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
+        <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm,dts" videoCodec="mpeg4,h264" type="Video" />
+        <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
+        <DirectPlayProfile container="wmv,asf" type="Video" />
+        <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
+        <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Photo">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video" codec="h264">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="ac3">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles />
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2014.xml b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2014.xml
index 602c54f618..2cd4754668 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2014.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2014.xml	
@@ -1,86 +1,87 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Sony Blu-ray Player 2014</Name>
-  <Identification>
-    <ModelNumber>BDP-2014</ModelNumber>
-    <Headers>
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S1200" match="Substring" />
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3200" match="Substring" />
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S5200" match="Substring" />
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S6200" match="Substring" />
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S7200" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>3.0</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes>
-    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-  </XmlRootAttributes>
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
-    <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
-    <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
-    <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
-    <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm,dts" videoCodec="mpeg4,h264" type="Video" />
-    <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
-    <DirectPlayProfile container="wmv,asf" type="Video" />
-    <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
-    <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="h264">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="ac3">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles />
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Sony Blu-ray Player 2014</Name>
+    <Identification>
+        <ModelNumber>BDP-2014</ModelNumber>
+        <Headers>
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S1200" match="Substring" />
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3200" match="Substring" />
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S5200" match="Substring" />
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S6200" match="Substring" />
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S7200" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Microsoft Corporation</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Windows Media Player Sharing</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>3.0</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes>
+        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+    </XmlRootAttributes>
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
+        <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
+        <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
+        <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
+        <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm,dts" videoCodec="mpeg4,h264" type="Video" />
+        <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
+        <DirectPlayProfile container="wmv,asf" type="Video" />
+        <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
+        <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Photo">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video" codec="h264">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="ac3">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles />
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2015.xml b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2015.xml
index 701aba85ff..73b9998912 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2015.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2015.xml	
@@ -1,84 +1,85 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Sony Blu-ray Player 2015</Name>
-  <Identification>
-    <ModelNumber>BDP-2015</ModelNumber>
-    <Headers>
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S1500" match="Substring" />
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3500" match="Substring" />
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S6500" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>3.0</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes>
-    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-  </XmlRootAttributes>
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
-    <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
-    <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
-    <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
-    <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm,dts" videoCodec="mpeg4,h264" type="Video" />
-    <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
-    <DirectPlayProfile container="wmv,asf" type="Video" />
-    <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
-    <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="h264">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="ac3">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles />
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Sony Blu-ray Player 2015</Name>
+    <Identification>
+        <ModelNumber>BDP-2015</ModelNumber>
+        <Headers>
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S1500" match="Substring" />
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3500" match="Substring" />
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S6500" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Microsoft Corporation</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Windows Media Player Sharing</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>3.0</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes>
+        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+    </XmlRootAttributes>
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
+        <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
+        <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
+        <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
+        <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm,dts" videoCodec="mpeg4,h264" type="Video" />
+        <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
+        <DirectPlayProfile container="wmv,asf" type="Video" />
+        <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
+        <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Photo">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video" codec="h264">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="ac3">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles />
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2016.xml b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2016.xml
index 5f90126782..86c7216296 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2016.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2016.xml	
@@ -1,84 +1,85 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Sony Blu-ray Player 2016</Name>
-  <Identification>
-    <ModelNumber>BDP-2016</ModelNumber>
-    <Headers>
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S1700" match="Substring" />
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3700" match="Substring" />
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S6700" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>3.0</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes>
-    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-  </XmlRootAttributes>
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
-    <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
-    <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
-    <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
-    <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm,dts" videoCodec="mpeg4,h264" type="Video" />
-    <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
-    <DirectPlayProfile container="wmv,asf" type="Video" />
-    <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
-    <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="h264">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="ac3">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles />
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Sony Blu-ray Player 2016</Name>
+    <Identification>
+        <ModelNumber>BDP-2016</ModelNumber>
+        <Headers>
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S1700" match="Substring" />
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3700" match="Substring" />
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S6700" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Microsoft Corporation</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Windows Media Player Sharing</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>3.0</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes>
+        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+    </XmlRootAttributes>
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
+        <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
+        <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
+        <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
+        <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm,dts" videoCodec="mpeg4,h264" type="Video" />
+        <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
+        <DirectPlayProfile container="wmv,asf" type="Video" />
+        <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
+        <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Photo">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video" codec="h264">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="ac3">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles />
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml
index 765d5d5fe5..3afc5bdb8d 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml	
@@ -1,114 +1,115 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Sony Blu-ray Player</Name>
-  <Identification>
-    <FriendlyName>Blu-ray Disc Player</FriendlyName>
-    <Manufacturer>Sony</Manufacturer>
-    <Headers>
-      <HttpHeaderInfo name="X-AV-Client-Info" value="(Blu-ray Disc Player|Home Theater System|Home Theatre System|Media Player)" match="Regex" />
-      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="(Blu-ray Disc Player|Home Theater System|Home Theatre System|Media Player)" match="Regex" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>3.0</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes>
-    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-  </XmlRootAttributes>
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
-    <DirectPlayProfile container="mpeg" audioCodec="ac3,mp3,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
-    <DirectPlayProfile container="avi,mp4,m4v" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
-    <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
-    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
-    <DirectPlayProfile container="jpeg" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="mpeg2video" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="h264">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="ac3">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="aac">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles>
-    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264,mpeg4,vc1" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="avi" type="Video" mimeType="video/mpeg">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="mkv" type="Video" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" type="Video" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="mp4" type="Video" mimeType="video/mpeg">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="m4v" type="Video" mimeType="video/mpeg">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="mpeg" type="Video" mimeType="video/mpeg">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="mp3" type="Audio" mimeType="audio/mpeg">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Sony Blu-ray Player</Name>
+    <Identification>
+        <FriendlyName>Blu-ray Disc Player</FriendlyName>
+        <Manufacturer>Sony</Manufacturer>
+        <Headers>
+            <HttpHeaderInfo name="X-AV-Client-Info" value="(Blu-ray Disc Player|Home Theater System|Home Theatre System|Media Player)" match="Regex" />
+            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="(Blu-ray Disc Player|Home Theater System|Home Theatre System|Media Player)" match="Regex" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Microsoft Corporation</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Windows Media Player Sharing</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>3.0</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes>
+        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+    </XmlRootAttributes>
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
+        <DirectPlayProfile container="mpeg" audioCodec="ac3,mp3,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
+        <DirectPlayProfile container="avi,mp4,m4v" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
+        <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
+        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
+        <DirectPlayProfile container="jpeg" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="mpeg2video" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Photo">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video" codec="h264">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="ac3">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="aac">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles>
+        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264,mpeg4,vc1" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="avi" type="Video" mimeType="video/mpeg">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="mkv" type="Video" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" type="Video" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="mp4" type="Video" mimeType="video/mpeg">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="m4v" type="Video" mimeType="video/mpeg">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="mpeg" type="Video" mimeType="video/mpeg">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="mp3" type="Audio" mimeType="audio/mpeg">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Bravia (2010).xml b/Emby.Dlna/Profiles/Xml/Sony Bravia (2010).xml
index d845317581..1e9362ca31 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Bravia (2010).xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Bravia (2010).xml	
@@ -1,132 +1,133 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Sony Bravia (2010)</Name>
-  <Identification>
-    <FriendlyName>KDL-\d{2}[EHLNPB]X\d[01]\d.*</FriendlyName>
-    <Manufacturer>Sony</Manufacturer>
-    <Headers>
-      <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}[EHLNPB]X\d[01]\d.*" match="Regex" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
-  <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>3.0</ModelNumber>
-  <ModelUrl>http://www.microsoft.com/</ModelUrl>
-  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_TN</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <SonyAggregationFlags>10</SonyAggregationFlags>
-  <ProtocolInfo>http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes>
-    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-  </XmlRootAttributes>
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" />
-    <DirectPlayProfile container="ts,mpegts" audioCodec="mp3,mp2" videoCodec="mpeg1video,mpeg2video" type="Video" />
-    <DirectPlayProfile container="mpeg" audioCodec="mp3,mp2" videoCodec="mpeg2video,mpeg1video" type="Video" />
-    <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="h264">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Video" codec="mpeg2video">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Video">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="ac3">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="aac">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-        <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="mp3,mp2">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles>
-    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions>
-        <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
-        <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
-      </Conditions>
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
-      <Conditions>
-        <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
-      </Conditions>
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Sony Bravia (2010)</Name>
+    <Identification>
+        <FriendlyName>KDL-\d{2}[EHLNPB]X\d[01]\d.*</FriendlyName>
+        <Manufacturer>Sony</Manufacturer>
+        <Headers>
+            <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}[EHLNPB]X\d[01]\d.*" match="Regex" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Microsoft Corporation</Manufacturer>
+    <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
+    <ModelName>Windows Media Player Sharing</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>3.0</ModelNumber>
+    <ModelUrl>http://www.microsoft.com/</ModelUrl>
+    <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_TN</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <SonyAggregationFlags>10</SonyAggregationFlags>
+    <ProtocolInfo>http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes>
+        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+    </XmlRootAttributes>
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" />
+        <DirectPlayProfile container="ts,mpegts" audioCodec="mp3,mp2" videoCodec="mpeg1video,mpeg2video" type="Video" />
+        <DirectPlayProfile container="mpeg" audioCodec="mp3,mp2" videoCodec="mpeg2video,mpeg1video" type="Video" />
+        <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Photo">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video" codec="h264">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="Video" codec="mpeg2video">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="Video">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="ac3">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="aac">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+                <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="mp3,mp2">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles>
+        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions>
+                <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
+                <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
+            </Conditions>
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
+            <Conditions>
+                <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
+            </Conditions>
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Bravia (2011).xml b/Emby.Dlna/Profiles/Xml/Sony Bravia (2011).xml
index 8e376fbf9a..b9e8206894 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Bravia (2011).xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Bravia (2011).xml	
@@ -1,138 +1,139 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Sony Bravia (2011)</Name>
-  <Identification>
-    <FriendlyName>KDL-\d{2}([A-Z]X\d2\d|CX400).*</FriendlyName>
-    <Manufacturer>Sony</Manufacturer>
-    <Headers>
-      <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}([A-Z]X\d2\d|CX400).*" match="Regex" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
-  <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>3.0</ModelNumber>
-  <ModelUrl>http://www.microsoft.com/</ModelUrl>
-  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_TN</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <SonyAggregationFlags>10</SonyAggregationFlags>
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes>
-    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-  </XmlRootAttributes>
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" />
-    <DirectPlayProfile container="ts,mpegts" audioCodec="mp3" videoCodec="mpeg2video" type="Video" />
-    <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,mp3" videoCodec="h264,mpeg4" type="Video" />
-    <DirectPlayProfile container="mpeg" audioCodec="mp3" videoCodec="mpeg2video,mpeg1video" type="Video" />
-    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" videoCodec="wmv2,wmv3,vc1" type="Video" />
-    <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
-    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="h264">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Video" codec="mpeg2video">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Video">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="ac3">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="aac">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-        <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="mp3,mp2">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles>
-    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions>
-        <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
-        <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
-      </Conditions>
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
-      <Conditions>
-        <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
-      </Conditions>
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Sony Bravia (2011)</Name>
+    <Identification>
+        <FriendlyName>KDL-\d{2}([A-Z]X\d2\d|CX400).*</FriendlyName>
+        <Manufacturer>Sony</Manufacturer>
+        <Headers>
+            <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}([A-Z]X\d2\d|CX400).*" match="Regex" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Microsoft Corporation</Manufacturer>
+    <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
+    <ModelName>Windows Media Player Sharing</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>3.0</ModelNumber>
+    <ModelUrl>http://www.microsoft.com/</ModelUrl>
+    <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_TN</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <SonyAggregationFlags>10</SonyAggregationFlags>
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes>
+        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+    </XmlRootAttributes>
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" />
+        <DirectPlayProfile container="ts,mpegts" audioCodec="mp3" videoCodec="mpeg2video" type="Video" />
+        <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,mp3" videoCodec="h264,mpeg4" type="Video" />
+        <DirectPlayProfile container="mpeg" audioCodec="mp3" videoCodec="mpeg2video,mpeg1video" type="Video" />
+        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" videoCodec="wmv2,wmv3,vc1" type="Video" />
+        <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
+        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Photo">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video" codec="h264">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="Video" codec="mpeg2video">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="Video">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="ac3">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="aac">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+                <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="mp3,mp2">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles>
+        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions>
+                <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
+                <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
+            </Conditions>
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
+            <Conditions>
+                <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
+            </Conditions>
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Bravia (2012).xml b/Emby.Dlna/Profiles/Xml/Sony Bravia (2012).xml
index 92a04dc7a5..45319e1622 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Bravia (2012).xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Bravia (2012).xml	
@@ -1,114 +1,115 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Sony Bravia (2012)</Name>
-  <Identification>
-    <FriendlyName>KDL-\d{2}[A-Z]X\d5(\d|G).*</FriendlyName>
-    <Manufacturer>Sony</Manufacturer>
-    <Headers>
-      <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}[A-Z]X\d5(\d|G).*" match="Regex" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
-  <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>3.0</ModelNumber>
-  <ModelUrl>http://www.microsoft.com/</ModelUrl>
-  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_TN</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <SonyAggregationFlags>10</SonyAggregationFlags>
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes>
-    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-  </XmlRootAttributes>
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" />
-    <DirectPlayProfile container="ts,mpegts" audioCodec="mp3,mp2" videoCodec="mpeg2video" type="Video" />
-    <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,mp3,mp2" videoCodec="h264,mpeg4" type="Video" />
-    <DirectPlayProfile container="avi" audioCodec="ac3,mp3" videoCodec="mpeg4" type="Video" />
-    <DirectPlayProfile container="mpeg" audioCodec="mp3,mp2" videoCodec="mpeg2video,mpeg1video" type="Video" />
-    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" videoCodec="wmv2,wmv3,vc1" type="Video" />
-    <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
-    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
-    <DirectPlayProfile container="jpeg" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="ac3">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="mp3,mp2">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles>
-    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions>
-        <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
-        <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
-      </Conditions>
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
-      <Conditions>
-        <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
-      </Conditions>
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Sony Bravia (2012)</Name>
+    <Identification>
+        <FriendlyName>KDL-\d{2}[A-Z]X\d5(\d|G).*</FriendlyName>
+        <Manufacturer>Sony</Manufacturer>
+        <Headers>
+            <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}[A-Z]X\d5(\d|G).*" match="Regex" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Microsoft Corporation</Manufacturer>
+    <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
+    <ModelName>Windows Media Player Sharing</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>3.0</ModelNumber>
+    <ModelUrl>http://www.microsoft.com/</ModelUrl>
+    <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_TN</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <SonyAggregationFlags>10</SonyAggregationFlags>
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes>
+        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+    </XmlRootAttributes>
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" />
+        <DirectPlayProfile container="ts,mpegts" audioCodec="mp3,mp2" videoCodec="mpeg2video" type="Video" />
+        <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,mp3,mp2" videoCodec="h264,mpeg4" type="Video" />
+        <DirectPlayProfile container="avi" audioCodec="ac3,mp3" videoCodec="mpeg4" type="Video" />
+        <DirectPlayProfile container="mpeg" audioCodec="mp3,mp2" videoCodec="mpeg2video,mpeg1video" type="Video" />
+        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" videoCodec="wmv2,wmv3,vc1" type="Video" />
+        <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
+        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
+        <DirectPlayProfile container="jpeg" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Photo">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="ac3">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="mp3,mp2">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles>
+        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions>
+                <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
+                <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
+            </Conditions>
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
+            <Conditions>
+                <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
+            </Conditions>
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Bravia (2013).xml b/Emby.Dlna/Profiles/Xml/Sony Bravia (2013).xml
index 953ac0a43a..ca32b3492d 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Bravia (2013).xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Bravia (2013).xml	
@@ -1,113 +1,114 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Sony Bravia (2013)</Name>
-  <Identification>
-    <FriendlyName>KDL-\d{2}[WR][5689]\d{2}A.*</FriendlyName>
-    <Manufacturer>Sony</Manufacturer>
-    <Headers>
-      <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}[WR][5689]\d{2}A.*" match="Regex" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
-  <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>3.0</ModelNumber>
-  <ModelUrl>http://www.microsoft.com/</ModelUrl>
-  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_TN</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <SonyAggregationFlags>10</SonyAggregationFlags>
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes>
-    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-  </XmlRootAttributes>
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,eac3,aac,mp3" videoCodec="h264" type="Video" />
-    <DirectPlayProfile container="ts,mpegts" audioCodec="mp3,mp2" videoCodec="mpeg2video" type="Video" />
-    <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,eac3,aac,mp3,mp2" videoCodec="h264,mpeg4" type="Video" />
-    <DirectPlayProfile container="mov" audioCodec="ac3,eac3,aac,mp3,mp2" videoCodec="h264,mpeg4,mjpeg" type="Video" />
-    <DirectPlayProfile container="mkv" audioCodec="ac3,eac3,aac,mp3,mp2,pcm,vorbis" videoCodec="h264,mpeg4,vp8" type="Video" />
-    <DirectPlayProfile container="avi" audioCodec="ac3,eac3,mp3" videoCodec="mpeg4" type="Video" />
-    <DirectPlayProfile container="avi" audioCodec="pcm" videoCodec="mjpeg" type="Video" />
-    <DirectPlayProfile container="mpeg" audioCodec="mp3,mp2" videoCodec="mpeg2video,mpeg1video" type="Video" />
-    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" videoCodec="wmv2,wmv3,vc1" type="Video" />
-    <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
-    <DirectPlayProfile container="mp4" audioCodec="aac" type="Audio" />
-    <DirectPlayProfile container="wav" audioCodec="pcm" type="Audio" />
-    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
-    <DirectPlayProfile container="jpeg" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="mp3,mp2">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles>
-    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions>
-        <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
-        <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
-      </Conditions>
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
-      <Conditions>
-        <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
-      </Conditions>
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Sony Bravia (2013)</Name>
+    <Identification>
+        <FriendlyName>KDL-\d{2}[WR][5689]\d{2}A.*</FriendlyName>
+        <Manufacturer>Sony</Manufacturer>
+        <Headers>
+            <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}[WR][5689]\d{2}A.*" match="Regex" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Microsoft Corporation</Manufacturer>
+    <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
+    <ModelName>Windows Media Player Sharing</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>3.0</ModelNumber>
+    <ModelUrl>http://www.microsoft.com/</ModelUrl>
+    <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_TN</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <SonyAggregationFlags>10</SonyAggregationFlags>
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes>
+        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+    </XmlRootAttributes>
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,eac3,aac,mp3" videoCodec="h264" type="Video" />
+        <DirectPlayProfile container="ts,mpegts" audioCodec="mp3,mp2" videoCodec="mpeg2video" type="Video" />
+        <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,eac3,aac,mp3,mp2" videoCodec="h264,mpeg4" type="Video" />
+        <DirectPlayProfile container="mov" audioCodec="ac3,eac3,aac,mp3,mp2" videoCodec="h264,mpeg4,mjpeg" type="Video" />
+        <DirectPlayProfile container="mkv" audioCodec="ac3,eac3,aac,mp3,mp2,pcm,vorbis" videoCodec="h264,mpeg4,vp8" type="Video" />
+        <DirectPlayProfile container="avi" audioCodec="ac3,eac3,mp3" videoCodec="mpeg4" type="Video" />
+        <DirectPlayProfile container="avi" audioCodec="pcm" videoCodec="mjpeg" type="Video" />
+        <DirectPlayProfile container="mpeg" audioCodec="mp3,mp2" videoCodec="mpeg2video,mpeg1video" type="Video" />
+        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" videoCodec="wmv2,wmv3,vc1" type="Video" />
+        <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
+        <DirectPlayProfile container="mp4" audioCodec="aac" type="Audio" />
+        <DirectPlayProfile container="wav" audioCodec="pcm" type="Audio" />
+        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
+        <DirectPlayProfile container="jpeg" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Photo">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="mp3,mp2">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles>
+        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions>
+                <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
+                <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
+            </Conditions>
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
+            <Conditions>
+                <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
+            </Conditions>
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Bravia (2014).xml b/Emby.Dlna/Profiles/Xml/Sony Bravia (2014).xml
index 34afe7e6e1..27e54a2452 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Bravia (2014).xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Bravia (2014).xml	
@@ -1,113 +1,114 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Sony Bravia (2014)</Name>
-  <Identification>
-    <FriendlyName>(KDL-\d{2}W[5-9]\d{2}B|KDL-\d{2}R480|XBR-\d{2}X[89]\d{2}B|KD-\d{2}[SX][89]\d{3}B).*</FriendlyName>
-    <Manufacturer>Sony</Manufacturer>
-    <Headers>
-      <HttpHeaderInfo name="X-AV-Client-Info" value=".*(KDL-\d{2}W[5-9]\d{2}B|KDL-\d{2}R480|XBR-\d{2}X[89]\d{2}B|KD-\d{2}[SX][89]\d{3}B).*" match="Regex" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
-  <ModelName>Windows Media Player Sharing</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>3.0</ModelNumber>
-  <ModelUrl>http://www.microsoft.com/</ModelUrl>
-  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_TN</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <SonyAggregationFlags>10</SonyAggregationFlags>
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes>
-    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-  </XmlRootAttributes>
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,eac3,aac,mp3" videoCodec="h264" type="Video" />
-    <DirectPlayProfile container="ts,mpegts" audioCodec="mp3,mp2" videoCodec="mpeg2video" type="Video" />
-    <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,eac3,aac,mp3,mp2" videoCodec="h264,mpeg4" type="Video" />
-    <DirectPlayProfile container="mov" audioCodec="ac3,eac3,aac,mp3,mp2" videoCodec="h264,mpeg4,mjpeg" type="Video" />
-    <DirectPlayProfile container="mkv" audioCodec="ac3,eac3,aac,mp3,mp2,pcm,vorbis" videoCodec="h264,mpeg4,vp8" type="Video" />
-    <DirectPlayProfile container="avi" audioCodec="ac3,eac3,mp3" videoCodec="mpeg4" type="Video" />
-    <DirectPlayProfile container="avi" audioCodec="pcm" videoCodec="mjpeg" type="Video" />
-    <DirectPlayProfile container="mpeg" audioCodec="mp3,mp2" videoCodec="mpeg2video,mpeg1video" type="Video" />
-    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" videoCodec="wmv2,wmv3,vc1" type="Video" />
-    <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
-    <DirectPlayProfile container="mp4" audioCodec="aac" type="Audio" />
-    <DirectPlayProfile container="wav" audioCodec="pcm" type="Audio" />
-    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
-    <DirectPlayProfile container="jpeg" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="mp3,mp2">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles>
-    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions>
-        <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
-        <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
-      </Conditions>
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
-      <Conditions>
-        <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
-      </Conditions>
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Sony Bravia (2014)</Name>
+    <Identification>
+        <FriendlyName>(KDL-\d{2}W[5-9]\d{2}B|KDL-\d{2}R480|XBR-\d{2}X[89]\d{2}B|KD-\d{2}[SX][89]\d{3}B).*</FriendlyName>
+        <Manufacturer>Sony</Manufacturer>
+        <Headers>
+            <HttpHeaderInfo name="X-AV-Client-Info" value=".*(KDL-\d{2}W[5-9]\d{2}B|KDL-\d{2}R480|XBR-\d{2}X[89]\d{2}B|KD-\d{2}[SX][89]\d{3}B).*" match="Regex" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Microsoft Corporation</Manufacturer>
+    <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
+    <ModelName>Windows Media Player Sharing</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>3.0</ModelNumber>
+    <ModelUrl>http://www.microsoft.com/</ModelUrl>
+    <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_TN</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <SonyAggregationFlags>10</SonyAggregationFlags>
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes>
+        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+    </XmlRootAttributes>
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,eac3,aac,mp3" videoCodec="h264" type="Video" />
+        <DirectPlayProfile container="ts,mpegts" audioCodec="mp3,mp2" videoCodec="mpeg2video" type="Video" />
+        <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,eac3,aac,mp3,mp2" videoCodec="h264,mpeg4" type="Video" />
+        <DirectPlayProfile container="mov" audioCodec="ac3,eac3,aac,mp3,mp2" videoCodec="h264,mpeg4,mjpeg" type="Video" />
+        <DirectPlayProfile container="mkv" audioCodec="ac3,eac3,aac,mp3,mp2,pcm,vorbis" videoCodec="h264,mpeg4,vp8" type="Video" />
+        <DirectPlayProfile container="avi" audioCodec="ac3,eac3,mp3" videoCodec="mpeg4" type="Video" />
+        <DirectPlayProfile container="avi" audioCodec="pcm" videoCodec="mjpeg" type="Video" />
+        <DirectPlayProfile container="mpeg" audioCodec="mp3,mp2" videoCodec="mpeg2video,mpeg1video" type="Video" />
+        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" videoCodec="wmv2,wmv3,vc1" type="Video" />
+        <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
+        <DirectPlayProfile container="mp4" audioCodec="aac" type="Audio" />
+        <DirectPlayProfile container="wav" audioCodec="pcm" type="Audio" />
+        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
+        <DirectPlayProfile container="jpeg" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Photo">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="mp3,mp2">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles>
+        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions>
+                <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
+                <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
+            </Conditions>
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
+            <Conditions>
+                <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
+            </Conditions>
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml b/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml
index d1afc162ca..2039f123e6 100644
--- a/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml	
@@ -1,104 +1,105 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Sony PlayStation 3</Name>
-  <Identification>
-    <FriendlyName>PLAYSTATION 3</FriendlyName>
-    <Headers>
-      <HttpHeaderInfo name="User-Agent" value="PLAYSTATION 3" match="Substring" />
-      <HttpHeaderInfo name="X-AV-Client-Info" value="PLAYSTATION 3" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_TN</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <SonyAggregationFlags>10</SonyAggregationFlags>
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes />
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="avi" audioCodec="mp2,mp3" videoCodec="mpeg4" type="Video" />
-    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,mp2,mp3,aac" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
-    <DirectPlayProfile container="mpeg" audioCodec="mp2" videoCodec="mpeg1video,mpeg2video" type="Video" />
-    <DirectPlayProfile container="mp4" audioCodec="aac,ac3" videoCodec="h264,mpeg4" type="Video" />
-    <DirectPlayProfile container="aac,mp3,wav" type="Audio" />
-    <DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="h264">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="ac3">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="AudioBitrate" value="640000" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="wmapro">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="aac">
-      <Conditions>
-        <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles>
-    <ResponseProfile container="mp4,mov" audioCodec="aac" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="avi" type="Video" orgPn="AVI" mimeType="video/divx">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="wav" type="Audio" mimeType="audio/wav">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Sony PlayStation 3</Name>
+    <Identification>
+        <FriendlyName>PLAYSTATION 3</FriendlyName>
+        <Headers>
+            <HttpHeaderInfo name="User-Agent" value="PLAYSTATION 3" match="Substring" />
+            <HttpHeaderInfo name="X-AV-Client-Info" value="PLAYSTATION 3" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_TN</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <SonyAggregationFlags>10</SonyAggregationFlags>
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes />
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="avi" audioCodec="mp2,mp3" videoCodec="mpeg4" type="Video" />
+        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,mp2,mp3,aac" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
+        <DirectPlayProfile container="mpeg" audioCodec="mp2" videoCodec="mpeg1video,mpeg2video" type="Video" />
+        <DirectPlayProfile container="mp4" audioCodec="aac,ac3" videoCodec="h264,mpeg4" type="Video" />
+        <DirectPlayProfile container="aac,mp3,wav" type="Audio" />
+        <DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Photo">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video" codec="h264">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="ac3">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="AudioBitrate" value="640000" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="wmapro">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="aac">
+            <Conditions>
+                <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles>
+        <ResponseProfile container="mp4,mov" audioCodec="aac" type="Video" mimeType="video/mp4">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="avi" type="Video" orgPn="AVI" mimeType="video/divx">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="wav" type="Audio" mimeType="audio/wav">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml b/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml
index 090abe4175..d4d804dfe1 100644
--- a/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml	
@@ -1,107 +1,108 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Sony PlayStation 4</Name>
-  <Identification>
-    <FriendlyName>PLAYSTATION 4</FriendlyName>
-    <Headers>
-      <HttpHeaderInfo name="User-Agent" value="PLAYSTATION 4" match="Substring" />
-      <HttpHeaderInfo name="X-AV-Client-Info" value="PLAYSTATION 4" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_TN</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <SonyAggregationFlags>10</SonyAggregationFlags>
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes />
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="avi" audioCodec="mp2,mp3" videoCodec="mpeg4" type="Video" />
-    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,mp2,mp3,aac" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
-    <DirectPlayProfile container="mpeg" audioCodec="mp2" videoCodec="mpeg1video,mpeg2video" type="Video" />
-    <DirectPlayProfile container="mp4,mkv,m4v" audioCodec="aac,ac3" videoCodec="h264,mpeg4" type="Video" />
-    <DirectPlayProfile container="aac,mp3,wav" type="Audio" />
-    <DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Bytes" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="h264">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="ac3">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="AudioBitrate" value="640000" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="wmapro">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="aac">
-      <Conditions>
-        <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles>
-    <ResponseProfile container="mp4,mov" audioCodec="aac" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="avi" type="Video" orgPn="AVI" mimeType="video/divx">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="wav" type="Audio" mimeType="audio/wav">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Sony PlayStation 4</Name>
+    <Identification>
+        <FriendlyName>PLAYSTATION 4</FriendlyName>
+        <Headers>
+            <HttpHeaderInfo name="User-Agent" value="PLAYSTATION 4" match="Substring" />
+            <HttpHeaderInfo name="X-AV-Client-Info" value="PLAYSTATION 4" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_TN</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <SonyAggregationFlags>10</SonyAggregationFlags>
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes />
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="avi" audioCodec="mp2,mp3" videoCodec="mpeg4" type="Video" />
+        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,mp2,mp3,aac" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
+        <DirectPlayProfile container="mpeg" audioCodec="mp2" videoCodec="mpeg1video,mpeg2video" type="Video" />
+        <DirectPlayProfile container="mp4,mkv,m4v" audioCodec="aac,ac3" videoCodec="h264,mpeg4" type="Video" />
+        <DirectPlayProfile container="aac,mp3,wav" type="Audio" />
+        <DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Bytes" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Photo">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video" codec="h264">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="ac3">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="AudioBitrate" value="640000" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="wmapro">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="aac">
+            <Conditions>
+                <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles>
+        <ResponseProfile container="mp4,mov" audioCodec="aac" type="Video" mimeType="video/mp4">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="avi" type="Video" orgPn="AVI" mimeType="video/divx">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="wav" type="Audio" mimeType="audio/wav">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/WDTV Live.xml b/Emby.Dlna/Profiles/Xml/WDTV Live.xml
index db4ce4722b..147d133f41 100644
--- a/Emby.Dlna/Profiles/Xml/WDTV Live.xml	
+++ b/Emby.Dlna/Profiles/Xml/WDTV Live.xml	
@@ -1,93 +1,94 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>WDTV Live</Name>
-  <Identification>
-    <ModelName>WD TV</ModelName>
-    <Headers>
-      <HttpHeaderInfo name="User-Agent" value="alphanetworks" match="Substring" />
-      <HttpHeaderInfo name="User-Agent" value="ALPHA Networks" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>5</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>true</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes />
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="avi" audioCodec="ac3,eac3,dca,mp2,mp3,pcm,dts" videoCodec="mpeg1video,mpeg2video,mpeg4,h264,vc1" type="Video" />
-    <DirectPlayProfile container="mpeg" audioCodec="ac3,eac3,dca,mp2,mp3,pcm,dts" videoCodec="mpeg1video,mpeg2video" type="Video" />
-    <DirectPlayProfile container="mkv" audioCodec="ac3,eac3,dca,aac,mp2,mp3,pcm,dts" videoCodec="mpeg1video,mpeg2video,mpeg4,h264,vc1" type="Video" />
-    <DirectPlayProfile container="ts,m2ts,mpegts" audioCodec="ac3,eac3,dca,mp2,mp3,aac,dts" videoCodec="mpeg1video,mpeg2video,h264,vc1" type="Video" />
-    <DirectPlayProfile container="mp4,mov,m4v" audioCodec="ac3,eac3,aac,mp2,mp3,dca,dts" videoCodec="h264,mpeg4" type="Video" />
-    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro" videoCodec="vc1" type="Video" />
-    <DirectPlayProfile container="asf" audioCodec="mp2,ac3" videoCodec="mpeg2video" type="Video" />
-    <DirectPlayProfile container="mp3" audioCodec="mp2,mp3" type="Audio" />
-    <DirectPlayProfile container="mp4" audioCodec="mp4" type="Audio" />
-    <DirectPlayProfile container="flac" type="Audio" />
-    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
-    <DirectPlayProfile container="ogg" audioCodec="vorbis" type="Audio" />
-    <DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="h264">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="aac">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles>
-    <ResponseProfile container="ts,mpegts" type="Video" orgPn="MPEG_TS_SD_NA">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="External" />
-    <SubtitleProfile format="srt" method="Embed" />
-    <SubtitleProfile format="sub" method="Embed" />
-    <SubtitleProfile format="subrip" method="Embed" />
-    <SubtitleProfile format="idx" method="Embed" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>WDTV Live</Name>
+    <Identification>
+        <ModelName>WD TV</ModelName>
+        <Headers>
+            <HttpHeaderInfo name="User-Agent" value="alphanetworks" match="Substring" />
+            <HttpHeaderInfo name="User-Agent" value="ALPHA Networks" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>5</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>true</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes />
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="avi" audioCodec="ac3,eac3,dca,mp2,mp3,pcm,dts" videoCodec="mpeg1video,mpeg2video,mpeg4,h264,vc1" type="Video" />
+        <DirectPlayProfile container="mpeg" audioCodec="ac3,eac3,dca,mp2,mp3,pcm,dts" videoCodec="mpeg1video,mpeg2video" type="Video" />
+        <DirectPlayProfile container="mkv" audioCodec="ac3,eac3,dca,aac,mp2,mp3,pcm,dts" videoCodec="mpeg1video,mpeg2video,mpeg4,h264,vc1" type="Video" />
+        <DirectPlayProfile container="ts,m2ts,mpegts" audioCodec="ac3,eac3,dca,mp2,mp3,aac,dts" videoCodec="mpeg1video,mpeg2video,h264,vc1" type="Video" />
+        <DirectPlayProfile container="mp4,mov,m4v" audioCodec="ac3,eac3,aac,mp2,mp3,dca,dts" videoCodec="h264,mpeg4" type="Video" />
+        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro" videoCodec="vc1" type="Video" />
+        <DirectPlayProfile container="asf" audioCodec="mp2,ac3" videoCodec="mpeg2video" type="Video" />
+        <DirectPlayProfile container="mp3" audioCodec="mp2,mp3" type="Audio" />
+        <DirectPlayProfile container="mp4" audioCodec="mp4" type="Audio" />
+        <DirectPlayProfile container="flac" type="Audio" />
+        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
+        <DirectPlayProfile container="ogg" audioCodec="vorbis" type="Audio" />
+        <DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Photo">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video" codec="h264">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="aac">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles>
+        <ResponseProfile container="ts,mpegts" type="Video" orgPn="MPEG_TS_SD_NA">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="External" />
+        <SubtitleProfile format="srt" method="Embed" />
+        <SubtitleProfile format="sub" method="Embed" />
+        <SubtitleProfile format="subrip" method="Embed" />
+        <SubtitleProfile format="idx" method="Embed" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Xbox One.xml b/Emby.Dlna/Profiles/Xml/Xbox One.xml
index 40e05f7fca..41ccd49b91 100644
--- a/Emby.Dlna/Profiles/Xml/Xbox One.xml	
+++ b/Emby.Dlna/Profiles/Xml/Xbox One.xml	
@@ -1,125 +1,126 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>Xbox One</Name>
-  <Identification>
-    <ModelName>Xbox One</ModelName>
-    <Headers>
-      <HttpHeaderInfo name="FriendlyName.DLNA.ORG" value="XboxOne" match="Substring" />
-      <HttpHeaderInfo name="User-Agent" value="NSPlayer/12" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>40</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes />
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264,mpeg2video,hevc" type="Video" />
-    <DirectPlayProfile container="avi" audioCodec="ac3,mp3" videoCodec="mpeg4" type="Video" />
-    <DirectPlayProfile container="avi" audioCodec="aac" videoCodec="h264" type="Video" />
-    <DirectPlayProfile container="mp4,mov,mkv,m4v" audioCodec="aac,ac3" videoCodec="h264,mpeg4,mpeg2video,hevc" type="Video" />
-    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro" videoCodec="wmv2,wmv3,vc1" type="Video" />
-    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
-    <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
-    <DirectPlayProfile container="jpeg" type="Photo" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" videoCodec="jpeg" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Video" container="mp4,mov">
-      <Conditions>
-        <ProfileCondition condition="Equals" property="Has64BitOffsets" value="false" isRequired="false" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="mpeg4">
-      <Conditions>
-        <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="5120000" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Video" codec="h264">
-      <Conditions>
-        <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" />
-        <ProfileCondition condition="EqualsAny" property="VideoProfile" value="high|main|baseline|constrained baseline" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Video" codec="wmv2,wmv3,vc1">
-      <Conditions>
-        <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Video">
-      <Conditions>
-        <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
-        <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="ac3,wmav2,wmapro">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="aac">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
-        <ProfileCondition condition="Equals" property="AudioProfile" value="lc" isRequired="false" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles>
-    <ResponseProfile container="avi" type="Video" mimeType="video/avi">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-  </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>Xbox One</Name>
+    <Identification>
+        <ModelName>Xbox One</ModelName>
+        <Headers>
+            <HttpHeaderInfo name="FriendlyName.DLNA.ORG" value="XboxOne" match="Substring" />
+            <HttpHeaderInfo name="User-Agent" value="NSPlayer/12" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>40</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes />
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264,mpeg2video,hevc" type="Video" />
+        <DirectPlayProfile container="avi" audioCodec="ac3,mp3" videoCodec="mpeg4" type="Video" />
+        <DirectPlayProfile container="avi" audioCodec="aac" videoCodec="h264" type="Video" />
+        <DirectPlayProfile container="mp4,mov,mkv,m4v" audioCodec="aac,ac3" videoCodec="h264,mpeg4,mpeg2video,hevc" type="Video" />
+        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro" videoCodec="wmv2,wmv3,vc1" type="Video" />
+        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
+        <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
+        <DirectPlayProfile container="jpeg" type="Photo" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" videoCodec="jpeg" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles>
+        <ContainerProfile type="Video" container="mp4,mov">
+            <Conditions>
+                <ProfileCondition condition="Equals" property="Has64BitOffsets" value="false" isRequired="false" />
+            </Conditions>
+        </ContainerProfile>
+    </ContainerProfiles>
+    <CodecProfiles>
+        <CodecProfile type="Video" codec="mpeg4">
+            <Conditions>
+                <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="5120000" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="Video" codec="h264">
+            <Conditions>
+                <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" />
+                <ProfileCondition condition="EqualsAny" property="VideoProfile" value="high|main|baseline|constrained baseline" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="Video" codec="wmv2,wmv3,vc1">
+            <Conditions>
+                <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="Video">
+            <Conditions>
+                <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
+                <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="ac3,wmav2,wmapro">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+        <CodecProfile type="VideoAudio" codec="aac">
+            <Conditions>
+                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
+                <ProfileCondition condition="Equals" property="AudioProfile" value="lc" isRequired="false" />
+            </Conditions>
+            <ApplyConditions />
+        </CodecProfile>
+    </CodecProfiles>
+    <ResponseProfiles>
+        <ResponseProfile container="avi" type="Video" mimeType="video/avi">
+            <Conditions />
+        </ResponseProfile>
+        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+            <Conditions />
+        </ResponseProfile>
+    </ResponseProfiles>
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="Embed" />
+    </SubtitleProfiles>
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/foobar2000.xml b/Emby.Dlna/Profiles/Xml/foobar2000.xml
index 19dc10e83a..57c065e231 100644
--- a/Emby.Dlna/Profiles/Xml/foobar2000.xml
+++ b/Emby.Dlna/Profiles/Xml/foobar2000.xml
@@ -1,66 +1,67 @@
 <?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>foobar2000</Name>
-  <Identification>
-    <FriendlyName>foobar</FriendlyName>
-    <Headers>
-      <HttpHeaderInfo name="User-Agent" value="foobar" match="Substring" />
-    </Headers>
-  </Identification>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes />
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="mp3" audioCodec="mp2,mp3" type="Audio" />
-    <DirectPlayProfile container="mp4" audioCodec="mp4" type="Audio" />
-    <DirectPlayProfile container="aac,wav" type="Audio" />
-    <DirectPlayProfile container="flac" audioCodec="flac" type="Audio" />
-    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
-    <DirectPlayProfile container="ogg" audioCodec="vorbis" type="Audio" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles />
-  <CodecProfiles />
-  <ResponseProfiles />
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="External" />
-    <SubtitleProfile format="sub" method="External" />
-    <SubtitleProfile format="srt" method="Embed" />
-    <SubtitleProfile format="ass" method="Embed" />
-    <SubtitleProfile format="ssa" method="Embed" />
-    <SubtitleProfile format="smi" method="Embed" />
-    <SubtitleProfile format="dvdsub" method="Embed" />
-    <SubtitleProfile format="pgs" method="Embed" />
-    <SubtitleProfile format="pgssub" method="Embed" />
-    <SubtitleProfile format="sub" method="Embed" />
-    <SubtitleProfile format="subrip" method="Embed" />
-    <SubtitleProfile format="vtt" method="Embed" />
-  </SubtitleProfiles>
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Name>foobar2000</Name>
+    <Identification>
+        <FriendlyName>foobar</FriendlyName>
+        <Headers>
+            <HttpHeaderInfo name="User-Agent" value="foobar" match="Substring" />
+        </Headers>
+    </Identification>
+    <Manufacturer>Jellyfin</Manufacturer>
+    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+    <ModelName>Jellyfin Server</ModelName>
+    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+    <ModelNumber>01</ModelNumber>
+    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+    <SupportedMediaTypes>Audio</SupportedMediaTypes>
+    <AlbumArtPn>JPEG_SM</AlbumArtPn>
+    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+    <MaxIconWidth>48</MaxIconWidth>
+    <MaxIconHeight>48</MaxIconHeight>
+    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+    <MaxStaticBitrate>140000000</MaxStaticBitrate>
+    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+    <MaxStaticMusicBitrate xsi:nil="true" />
+    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+    <RequiresPlainFolders>false</RequiresPlainFolders>
+    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+    <XmlRootAttributes />
+    <DirectPlayProfiles>
+        <DirectPlayProfile container="mp3" audioCodec="mp2,mp3" type="Audio" />
+        <DirectPlayProfile container="mp4" audioCodec="mp4" type="Audio" />
+        <DirectPlayProfile container="aac,wav" type="Audio" />
+        <DirectPlayProfile container="flac" audioCodec="flac" type="Audio" />
+        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
+        <DirectPlayProfile container="ogg" audioCodec="vorbis" type="Audio" />
+    </DirectPlayProfiles>
+    <TranscodingProfiles>
+        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    </TranscodingProfiles>
+    <ContainerProfiles />
+    <CodecProfiles />
+    <ResponseProfiles />
+    <SubtitleProfiles>
+        <SubtitleProfile format="srt" method="External" />
+        <SubtitleProfile format="sub" method="External" />
+        <SubtitleProfile format="srt" method="Embed" />
+        <SubtitleProfile format="ass" method="Embed" />
+        <SubtitleProfile format="ssa" method="Embed" />
+        <SubtitleProfile format="smi" method="Embed" />
+        <SubtitleProfile format="dvdsub" method="Embed" />
+        <SubtitleProfile format="pgs" method="Embed" />
+        <SubtitleProfile format="pgssub" method="Embed" />
+        <SubtitleProfile format="sub" method="Embed" />
+        <SubtitleProfile format="subrip" method="Embed" />
+        <SubtitleProfile format="vtt" method="Embed" />
+    </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
index 7d6643d54f..b01bb8b087 100644
--- a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
+++ b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="1.68.0" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.0" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="SkiaSharp" Version="1.68.0" />
+        <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.0" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" />
+    </ItemGroup>
 
 </Project>
diff --git a/Emby.Drawing/Emby.Drawing.csproj b/Emby.Drawing/Emby.Drawing.csproj
index 5ffaaed276..3e19ddfe59 100644
--- a/Emby.Drawing/Emby.Drawing.csproj
+++ b/Emby.Drawing/Emby.Drawing.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" />
+    </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
 </Project>
diff --git a/Emby.IsoMounting/IsoMounter/IsoMounter.csproj b/Emby.IsoMounting/IsoMounter/IsoMounter.csproj
index 9274f9763a..f9ec57ddf3 100644
--- a/Emby.IsoMounting/IsoMounter/IsoMounter.csproj
+++ b/Emby.IsoMounting/IsoMounter/IsoMounter.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <Compile Include="..\..\SharedVersion.cs" Link="SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\..\SharedVersion.cs" Link="SharedVersion.cs" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    <ProjectReference Include="..\..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-  </ItemGroup>
-  
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+        <ProjectReference Include="..\..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+    </ItemGroup>
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
 </Project>
diff --git a/Emby.Naming/Emby.Naming.csproj b/Emby.Naming/Emby.Naming.csproj
index 360ffaabe4..7b40f905b0 100644
--- a/Emby.Naming/Emby.Naming.csproj
+++ b/Emby.Naming/Emby.Naming.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-  </ItemGroup>
-    
 </Project>
diff --git a/Emby.Notifications/Emby.Notifications.csproj b/Emby.Notifications/Emby.Notifications.csproj
index 5b5ae445e6..58bb07ebd5 100644
--- a/Emby.Notifications/Emby.Notifications.csproj
+++ b/Emby.Notifications/Emby.Notifications.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+    </ItemGroup>
 
 </Project>
diff --git a/Emby.Photos/Emby.Photos.csproj b/Emby.Photos/Emby.Photos.csproj
index 3ecab9176a..7a560f256d 100644
--- a/Emby.Photos/Emby.Photos.csproj
+++ b/Emby.Photos/Emby.Photos.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    <ProjectReference Include="..\ThirdParty\taglib-sharp\src\taglib-sharp.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+        <ProjectReference Include="..\ThirdParty\taglib-sharp\src\taglib-sharp.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" />
+    </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
 </Project>
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index da3a4da073..dab3284854 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -1,50 +1,50 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <ProjectReference Include="..\Emby.Naming\Emby.Naming.csproj" />
-    <ProjectReference Include="..\Emby.Notifications\Emby.Notifications.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Providers\MediaBrowser.Providers.csproj" />
-    <ProjectReference Include="..\MediaBrowser.WebDashboard\MediaBrowser.WebDashboard.csproj" />
-    <ProjectReference Include="..\MediaBrowser.XbmcMetadata\MediaBrowser.XbmcMetadata.csproj" />
-    <ProjectReference Include="..\SocketHttpListener\SocketHttpListener.csproj" />
-    <ProjectReference Include="..\Emby.Dlna\Emby.Dlna.csproj" />
-    <ProjectReference Include="..\Mono.Nat\Mono.Nat.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Api\MediaBrowser.Api.csproj" />
-    <ProjectReference Include="..\MediaBrowser.LocalMetadata\MediaBrowser.LocalMetadata.csproj" />
-    <ProjectReference Include="..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj" />
-    <ProjectReference Include="..\Emby.Photos\Emby.Photos.csproj" />
-    <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" />
-    <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv\Emby.XmlTv.csproj" />
-    <ProjectReference Include="..\MediaBrowser.MediaEncoding\MediaBrowser.MediaEncoding.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Emby.Naming\Emby.Naming.csproj" />
+        <ProjectReference Include="..\Emby.Notifications\Emby.Notifications.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Providers\MediaBrowser.Providers.csproj" />
+        <ProjectReference Include="..\MediaBrowser.WebDashboard\MediaBrowser.WebDashboard.csproj" />
+        <ProjectReference Include="..\MediaBrowser.XbmcMetadata\MediaBrowser.XbmcMetadata.csproj" />
+        <ProjectReference Include="..\SocketHttpListener\SocketHttpListener.csproj" />
+        <ProjectReference Include="..\Emby.Dlna\Emby.Dlna.csproj" />
+        <ProjectReference Include="..\Mono.Nat\Mono.Nat.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Api\MediaBrowser.Api.csproj" />
+        <ProjectReference Include="..\MediaBrowser.LocalMetadata\MediaBrowser.LocalMetadata.csproj" />
+        <ProjectReference Include="..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj" />
+        <ProjectReference Include="..\Emby.Photos\Emby.Photos.csproj" />
+        <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" />
+        <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv\Emby.XmlTv.csproj" />
+        <ProjectReference Include="..\MediaBrowser.MediaEncoding\MediaBrowser.MediaEncoding.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="ServiceStack.Text.Core" Version="5.4.0" />
-    <PackageReference Include="sharpcompress" Version="0.22.0" />
-    <PackageReference Include="SimpleInjector" Version="4.4.2" />
-    <PackageReference Include="SQLitePCL.pretty.core" Version="1.1.8" />
-    <PackageReference Include="SQLitePCLRaw.core" Version="1.1.11" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="ServiceStack.Text.Core" Version="5.4.0" />
+        <PackageReference Include="sharpcompress" Version="0.22.0" />
+        <PackageReference Include="SimpleInjector" Version="4.4.2" />
+        <PackageReference Include="SQLitePCL.pretty.core" Version="1.1.8" />
+        <PackageReference Include="SQLitePCLRaw.core" Version="1.1.11" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" />
+    </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Localization\iso6392.txt" />
-    <EmbeddedResource Include="Localization\countries.json" />
-    <EmbeddedResource Include="Localization\Core\*.json" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\*" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Utils\messages.properties" />
-    <EmbeddedResource Include="Localization\Ratings\*.txt" />
-  </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Include="Localization\iso6392.txt" />
+        <EmbeddedResource Include="Localization\countries.json" />
+        <EmbeddedResource Include="Localization\Core\*.json" />
+        <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\*" />
+        <EmbeddedResource Include="TextEncoding\NLangDetect\Utils\messages.properties" />
+        <EmbeddedResource Include="Localization\Ratings\*.txt" />
+    </ItemGroup>
 
 </Project>
diff --git a/Emby.Server.Implementations/Localization/Core/ar.json b/Emby.Server.Implementations/Localization/Core/ar.json
index 857f66c647..ec2c3f2370 100644
--- a/Emby.Server.Implementations/Localization/Core/ar.json
+++ b/Emby.Server.Implementations/Localization/Core/ar.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "الألبومات",
-  "AppDeviceValues": "التطبيق: {0}. الجهاز: {1}.",
-  "Application": "التطبيق",
-  "Artists": "الفنانون",
-  "AuthenticationSucceededWithUserName": "تم التأكد من {0} بنجاح",
-  "Books": "الكتب",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "القنوات",
-  "ChapterNameValue": "الباب {0}",
-  "Collections": "المجاميع",
-  "DeviceOfflineWithName": "تم قطع الاتصال بـ{0}",
-  "DeviceOnlineWithName": "{0} متصل",
-  "FailedLoginAttemptWithUserName": "عملية تسجيل الدخول فشلت من {0}",
-  "Favorites": "المفضلات",
-  "Folders": "المجلدات",
-  "Games": "الألعاب",
-  "Genres": "أنواع الأفلام",
-  "HeaderAlbumArtists": "فنانو الألبومات",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "استئناف المشاهدة",
-  "HeaderFavoriteAlbums": "الألبومات المفضلة",
-  "HeaderFavoriteArtists": "الفنانون المفضلون",
-  "HeaderFavoriteEpisodes": "الحلقات المفضلة",
-  "HeaderFavoriteShows": "المسلسلات المفضلة",
-  "HeaderFavoriteSongs": "الأغاني المفضلة",
-  "HeaderLiveTV": "التلفاز المباشر",
-  "HeaderNextUp": "التشغيل التالي",
-  "HeaderRecordingGroups": "مجموعات التسجيل",
-  "HomeVideos": "الفيديوهات المنزلية",
-  "Inherit": "توريث",
-  "ItemAddedWithName": "تم إضافة {0} للمكتبة",
-  "ItemRemovedWithName": "تم إزالة {0} من المكتبة",
-  "LabelIpAddressValue": "عنوان الآي بي: {0}",
-  "LabelRunningTimeValue": "وقت التشغيل: {0}",
-  "Latest": "الأحدث",
-  "MessageApplicationUpdated": "لقد تم تحديث خادم أمبي",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "تم تحديث إعدادات الخادم في قسم {0}",
-  "MessageServerConfigurationUpdated": "تم تحديث إعدادات الخادم",
-  "MixedContent": "محتوى مخلوط",
-  "Movies": "الأفلام",
-  "Music": "الموسيقى",
-  "MusicVideos": "الفيديوهات الموسيقية",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "الموسم {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "يوجد تحديث للتطبيق",
-  "NotificationOptionApplicationUpdateInstalled": "تم تحديث التطبيق",
-  "NotificationOptionAudioPlayback": "بدأ تشغيل المقطع الصوتي",
-  "NotificationOptionAudioPlaybackStopped": "تم إيقاف تشغيل المقطع الصوتي",
-  "NotificationOptionCameraImageUploaded": "تم رقع صورة الكاميرا",
-  "NotificationOptionGamePlayback": "تم تشغيل اللعبة",
-  "NotificationOptionGamePlaybackStopped": "تم إيقاف تشغيل اللعبة",
-  "NotificationOptionInstallationFailed": "عملية التنصيب فشلت",
-  "NotificationOptionNewLibraryContent": "تم إضافة محتوى جديد",
-  "NotificationOptionPluginError": "فشل في الملحق",
-  "NotificationOptionPluginInstalled": "تم تثبيت الملحق",
-  "NotificationOptionPluginUninstalled": "تمت إزالة الملحق",
-  "NotificationOptionPluginUpdateInstalled": "تم تحديث الملحق",
-  "NotificationOptionServerRestartRequired": "يجب إعادة تشغيل الخادم",
-  "NotificationOptionTaskFailed": "فشل في المهمة المجدولة",
-  "NotificationOptionUserLockedOut": "تم إقفال حساب المستخدم",
-  "NotificationOptionVideoPlayback": "بدأ تشغيل الفيديو",
-  "NotificationOptionVideoPlaybackStopped": "تم إيقاف تشغيل الفيديو",
-  "Photos": "الصور",
-  "Playlists": "قوائم التشغيل",
-  "Plugin": "الملحق",
-  "PluginInstalledWithName": "تم تثبيت {0}",
-  "PluginUninstalledWithName": "تمت إزالة {0}",
-  "PluginUpdatedWithName": "تم تحديث {0}",
-  "ProviderValue": "المزود: {0}",
-  "ScheduledTaskFailedWithName": "العملية {0} فشلت",
-  "ScheduledTaskStartedWithName": "تم بدء {0}",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Shows",
-  "Songs": "الأغاني",
-  "StartupEmbyServerIsLoading": "خادم أمبي قيد التحميل. الرجاء المحاوية بعد حين",
-  "SubtitleDownloadFailureForItem": "عملية إنزال الترجمة فشلت لـ{0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "تم إنزال الترجمات لـ {0}",
-  "Sync": "مزامنة",
-  "System": "النظام",
-  "TvShows": "TV Shows",
-  "User": "المستخدم",
-  "UserCreatedWithName": "تم إنشاء المستخدم {0}",
-  "UserDeletedWithName": "تم حذف المستخدم {0}",
-  "UserDownloadingItemWithValues": "{0} يقوم بإنزال {1}",
-  "UserLockedOutWithName": "المستخدم {0} تم منعه من الدخول",
-  "UserOfflineFromDevice": "تم قطع اتصال {0} من {1}",
-  "UserOnlineFromDevice": "{0} متصلة عبر {1}",
-  "UserPasswordChangedWithName": "تم تغيير كلمة السر للمستخدم {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "قام {0} ببدء تشغيل {1}",
-  "UserStoppedPlayingItemWithValues": "قام {0} بإيقاف تشغيل {1}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "خاص - {0}",
-  "VersionNumber": "الإصدار رقم {0}"
+    "Albums": "الألبومات",
+    "AppDeviceValues": "التطبيق: {0}. الجهاز: {1}.",
+    "Application": "التطبيق",
+    "Artists": "الفنانون",
+    "AuthenticationSucceededWithUserName": "تم التأكد من {0} بنجاح",
+    "Books": "الكتب",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "القنوات",
+    "ChapterNameValue": "الباب {0}",
+    "Collections": "المجاميع",
+    "DeviceOfflineWithName": "تم قطع الاتصال بـ{0}",
+    "DeviceOnlineWithName": "{0} متصل",
+    "FailedLoginAttemptWithUserName": "عملية تسجيل الدخول فشلت من {0}",
+    "Favorites": "المفضلات",
+    "Folders": "المجلدات",
+    "Games": "الألعاب",
+    "Genres": "أنواع الأفلام",
+    "HeaderAlbumArtists": "فنانو الألبومات",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "استئناف المشاهدة",
+    "HeaderFavoriteAlbums": "الألبومات المفضلة",
+    "HeaderFavoriteArtists": "الفنانون المفضلون",
+    "HeaderFavoriteEpisodes": "الحلقات المفضلة",
+    "HeaderFavoriteShows": "المسلسلات المفضلة",
+    "HeaderFavoriteSongs": "الأغاني المفضلة",
+    "HeaderLiveTV": "التلفاز المباشر",
+    "HeaderNextUp": "التشغيل التالي",
+    "HeaderRecordingGroups": "مجموعات التسجيل",
+    "HomeVideos": "الفيديوهات المنزلية",
+    "Inherit": "توريث",
+    "ItemAddedWithName": "تم إضافة {0} للمكتبة",
+    "ItemRemovedWithName": "تم إزالة {0} من المكتبة",
+    "LabelIpAddressValue": "عنوان الآي بي: {0}",
+    "LabelRunningTimeValue": "وقت التشغيل: {0}",
+    "Latest": "الأحدث",
+    "MessageApplicationUpdated": "لقد تم تحديث خادم أمبي",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "تم تحديث إعدادات الخادم في قسم {0}",
+    "MessageServerConfigurationUpdated": "تم تحديث إعدادات الخادم",
+    "MixedContent": "محتوى مخلوط",
+    "Movies": "الأفلام",
+    "Music": "الموسيقى",
+    "MusicVideos": "الفيديوهات الموسيقية",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "الموسم {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "يوجد تحديث للتطبيق",
+    "NotificationOptionApplicationUpdateInstalled": "تم تحديث التطبيق",
+    "NotificationOptionAudioPlayback": "بدأ تشغيل المقطع الصوتي",
+    "NotificationOptionAudioPlaybackStopped": "تم إيقاف تشغيل المقطع الصوتي",
+    "NotificationOptionCameraImageUploaded": "تم رقع صورة الكاميرا",
+    "NotificationOptionGamePlayback": "تم تشغيل اللعبة",
+    "NotificationOptionGamePlaybackStopped": "تم إيقاف تشغيل اللعبة",
+    "NotificationOptionInstallationFailed": "عملية التنصيب فشلت",
+    "NotificationOptionNewLibraryContent": "تم إضافة محتوى جديد",
+    "NotificationOptionPluginError": "فشل في الملحق",
+    "NotificationOptionPluginInstalled": "تم تثبيت الملحق",
+    "NotificationOptionPluginUninstalled": "تمت إزالة الملحق",
+    "NotificationOptionPluginUpdateInstalled": "تم تحديث الملحق",
+    "NotificationOptionServerRestartRequired": "يجب إعادة تشغيل الخادم",
+    "NotificationOptionTaskFailed": "فشل في المهمة المجدولة",
+    "NotificationOptionUserLockedOut": "تم إقفال حساب المستخدم",
+    "NotificationOptionVideoPlayback": "بدأ تشغيل الفيديو",
+    "NotificationOptionVideoPlaybackStopped": "تم إيقاف تشغيل الفيديو",
+    "Photos": "الصور",
+    "Playlists": "قوائم التشغيل",
+    "Plugin": "الملحق",
+    "PluginInstalledWithName": "تم تثبيت {0}",
+    "PluginUninstalledWithName": "تمت إزالة {0}",
+    "PluginUpdatedWithName": "تم تحديث {0}",
+    "ProviderValue": "المزود: {0}",
+    "ScheduledTaskFailedWithName": "العملية {0} فشلت",
+    "ScheduledTaskStartedWithName": "تم بدء {0}",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Shows",
+    "Songs": "الأغاني",
+    "StartupEmbyServerIsLoading": "خادم أمبي قيد التحميل. الرجاء المحاوية بعد حين",
+    "SubtitleDownloadFailureForItem": "عملية إنزال الترجمة فشلت لـ{0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "تم إنزال الترجمات لـ {0}",
+    "Sync": "مزامنة",
+    "System": "النظام",
+    "TvShows": "TV Shows",
+    "User": "المستخدم",
+    "UserCreatedWithName": "تم إنشاء المستخدم {0}",
+    "UserDeletedWithName": "تم حذف المستخدم {0}",
+    "UserDownloadingItemWithValues": "{0} يقوم بإنزال {1}",
+    "UserLockedOutWithName": "المستخدم {0} تم منعه من الدخول",
+    "UserOfflineFromDevice": "تم قطع اتصال {0} من {1}",
+    "UserOnlineFromDevice": "{0} متصلة عبر {1}",
+    "UserPasswordChangedWithName": "تم تغيير كلمة السر للمستخدم {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "قام {0} ببدء تشغيل {1}",
+    "UserStoppedPlayingItemWithValues": "قام {0} بإيقاف تشغيل {1}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "خاص - {0}",
+    "VersionNumber": "الإصدار رقم {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/bg-BG.json b/Emby.Server.Implementations/Localization/Core/bg-BG.json
index b768e03c6b..ba6c985550 100644
--- a/Emby.Server.Implementations/Localization/Core/bg-BG.json
+++ b/Emby.Server.Implementations/Localization/Core/bg-BG.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Албуми",
-  "AppDeviceValues": "Програма: {0}, Устройство: {1}",
-  "Application": "Програма",
-  "Artists": "Изпълнители",
-  "AuthenticationSucceededWithUserName": "{0} се удостовери успешно",
-  "Books": "Книги",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Канали",
-  "ChapterNameValue": "Глава {0}",
-  "Collections": "Колекции",
-  "DeviceOfflineWithName": "{0} се разкачи",
-  "DeviceOnlineWithName": "{0} е свързан",
-  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-  "Favorites": "Любими",
-  "Folders": "Папки",
-  "Games": "Игри",
-  "Genres": "Жанрове",
-  "HeaderAlbumArtists": "Изпълнители на албуми",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Продължаване на гледането",
-  "HeaderFavoriteAlbums": "Любими албуми",
-  "HeaderFavoriteArtists": "Любими изпълнители",
-  "HeaderFavoriteEpisodes": "Любими епизоди",
-  "HeaderFavoriteShows": "Любими сериали",
-  "HeaderFavoriteSongs": "Любими песни",
-  "HeaderLiveTV": "Телевизия на живо",
-  "HeaderNextUp": "Следва",
-  "HeaderRecordingGroups": "Recording Groups",
-  "HomeVideos": "Домашни клипове",
-  "Inherit": "Наследяване",
-  "ItemAddedWithName": "{0} е добавено към библиотеката",
-  "ItemRemovedWithName": "{0} е премахнато от библиотеката",
-  "LabelIpAddressValue": "ИП адрес: {0}",
-  "LabelRunningTimeValue": "Running time: {0}",
-  "Latest": "Последни",
-  "MessageApplicationUpdated": "Сървърът е обновен",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-  "MessageServerConfigurationUpdated": "Server configuration has been updated",
-  "MixedContent": "Смесено съдържание",
-  "Movies": "Филми",
-  "Music": "Музика",
-  "MusicVideos": "Музикални клипове",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Сезон {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Налично е обновление на програмата",
-  "NotificationOptionApplicationUpdateInstalled": "Обновлението на програмата е инсталирано",
-  "NotificationOptionAudioPlayback": "Възпроизвеждането на звук започна",
-  "NotificationOptionAudioPlaybackStopped": "Възпроизвеждането на звук е спряно",
-  "NotificationOptionCameraImageUploaded": "Изображението от фотоапарата е качено",
-  "NotificationOptionGamePlayback": "Възпроизвеждането на играта започна",
-  "NotificationOptionGamePlaybackStopped": "Възпроизвеждането на играта е спряна",
-  "NotificationOptionInstallationFailed": "Неуспешно инсталиране",
-  "NotificationOptionNewLibraryContent": "Добавено е ново съдържание",
-  "NotificationOptionPluginError": "Грешка в приставка",
-  "NotificationOptionPluginInstalled": "Приставката е инсталирана",
-  "NotificationOptionPluginUninstalled": "Приставката е деинсталирана",
-  "NotificationOptionPluginUpdateInstalled": "Обновлението на приставката е инсталирано",
-  "NotificationOptionServerRestartRequired": "Нужно е повторно пускане на сървъра",
-  "NotificationOptionTaskFailed": "Грешка в планирана задача",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionVideoPlayback": "Възпроизвеждането на видео започна",
-  "NotificationOptionVideoPlaybackStopped": "Възпроизвеждането на видео е спряно",
-  "Photos": "Снимки",
-  "Playlists": "Списъци",
-  "Plugin": "Приставка",
-  "PluginInstalledWithName": "{0} е инсталирано",
-  "PluginUninstalledWithName": "{0} е деинсталирано",
-  "PluginUpdatedWithName": "{0} е обновено",
-  "ProviderValue": "Доставчик: {0}",
-  "ScheduledTaskFailedWithName": "{0} се провали",
-  "ScheduledTaskStartedWithName": "{0} започна",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Сериали",
-  "Songs": "Песни",
-  "StartupEmbyServerIsLoading": "Сървърът зарежда. Моля, опитайте отново след малко.",
-  "SubtitleDownloadFailureForItem": "Неуспешно изтегляне на субтитри за {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Изтеглени са субтитри за {0}",
-  "Sync": "Синхронизиране",
-  "System": "Система",
-  "TvShows": "Телевизионни сериали",
-  "User": "Потребител",
-  "UserCreatedWithName": "Потребителят {0} е създаден",
-  "UserDeletedWithName": "Потребителят {0} е изтрит",
-  "UserDownloadingItemWithValues": "{0} is downloading {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} се разкачи от {1}",
-  "UserOnlineFromDevice": "{0} е на линия от {1}",
-  "UserPasswordChangedWithName": "Паролата на потребителя {0} е променена",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} пусна {1}",
-  "UserStoppedPlayingItemWithValues": "{0} спря {1}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Специални - {0}",
-  "VersionNumber": "Версия {0}"
+    "Albums": "Албуми",
+    "AppDeviceValues": "Програма: {0}, Устройство: {1}",
+    "Application": "Програма",
+    "Artists": "Изпълнители",
+    "AuthenticationSucceededWithUserName": "{0} се удостовери успешно",
+    "Books": "Книги",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Канали",
+    "ChapterNameValue": "Глава {0}",
+    "Collections": "Колекции",
+    "DeviceOfflineWithName": "{0} се разкачи",
+    "DeviceOnlineWithName": "{0} е свързан",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "Favorites": "Любими",
+    "Folders": "Папки",
+    "Games": "Игри",
+    "Genres": "Жанрове",
+    "HeaderAlbumArtists": "Изпълнители на албуми",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Продължаване на гледането",
+    "HeaderFavoriteAlbums": "Любими албуми",
+    "HeaderFavoriteArtists": "Любими изпълнители",
+    "HeaderFavoriteEpisodes": "Любими епизоди",
+    "HeaderFavoriteShows": "Любими сериали",
+    "HeaderFavoriteSongs": "Любими песни",
+    "HeaderLiveTV": "Телевизия на живо",
+    "HeaderNextUp": "Следва",
+    "HeaderRecordingGroups": "Recording Groups",
+    "HomeVideos": "Домашни клипове",
+    "Inherit": "Наследяване",
+    "ItemAddedWithName": "{0} е добавено към библиотеката",
+    "ItemRemovedWithName": "{0} е премахнато от библиотеката",
+    "LabelIpAddressValue": "ИП адрес: {0}",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "Latest": "Последни",
+    "MessageApplicationUpdated": "Сървърът е обновен",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MixedContent": "Смесено съдържание",
+    "Movies": "Филми",
+    "Music": "Музика",
+    "MusicVideos": "Музикални клипове",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Сезон {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Налично е обновление на програмата",
+    "NotificationOptionApplicationUpdateInstalled": "Обновлението на програмата е инсталирано",
+    "NotificationOptionAudioPlayback": "Възпроизвеждането на звук започна",
+    "NotificationOptionAudioPlaybackStopped": "Възпроизвеждането на звук е спряно",
+    "NotificationOptionCameraImageUploaded": "Изображението от фотоапарата е качено",
+    "NotificationOptionGamePlayback": "Възпроизвеждането на играта започна",
+    "NotificationOptionGamePlaybackStopped": "Възпроизвеждането на играта е спряна",
+    "NotificationOptionInstallationFailed": "Неуспешно инсталиране",
+    "NotificationOptionNewLibraryContent": "Добавено е ново съдържание",
+    "NotificationOptionPluginError": "Грешка в приставка",
+    "NotificationOptionPluginInstalled": "Приставката е инсталирана",
+    "NotificationOptionPluginUninstalled": "Приставката е деинсталирана",
+    "NotificationOptionPluginUpdateInstalled": "Обновлението на приставката е инсталирано",
+    "NotificationOptionServerRestartRequired": "Нужно е повторно пускане на сървъра",
+    "NotificationOptionTaskFailed": "Грешка в планирана задача",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionVideoPlayback": "Възпроизвеждането на видео започна",
+    "NotificationOptionVideoPlaybackStopped": "Възпроизвеждането на видео е спряно",
+    "Photos": "Снимки",
+    "Playlists": "Списъци",
+    "Plugin": "Приставка",
+    "PluginInstalledWithName": "{0} е инсталирано",
+    "PluginUninstalledWithName": "{0} е деинсталирано",
+    "PluginUpdatedWithName": "{0} е обновено",
+    "ProviderValue": "Доставчик: {0}",
+    "ScheduledTaskFailedWithName": "{0} се провали",
+    "ScheduledTaskStartedWithName": "{0} започна",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Сериали",
+    "Songs": "Песни",
+    "StartupEmbyServerIsLoading": "Сървърът зарежда. Моля, опитайте отново след малко.",
+    "SubtitleDownloadFailureForItem": "Неуспешно изтегляне на субтитри за {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Изтеглени са субтитри за {0}",
+    "Sync": "Синхронизиране",
+    "System": "Система",
+    "TvShows": "Телевизионни сериали",
+    "User": "Потребител",
+    "UserCreatedWithName": "Потребителят {0} е създаден",
+    "UserDeletedWithName": "Потребителят {0} е изтрит",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} се разкачи от {1}",
+    "UserOnlineFromDevice": "{0} е на линия от {1}",
+    "UserPasswordChangedWithName": "Паролата на потребителя {0} е променена",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} пусна {1}",
+    "UserStoppedPlayingItemWithValues": "{0} спря {1}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Специални - {0}",
+    "VersionNumber": "Версия {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/ca.json b/Emby.Server.Implementations/Localization/Core/ca.json
index 9a6a8e0c48..a818b78de9 100644
--- a/Emby.Server.Implementations/Localization/Core/ca.json
+++ b/Emby.Server.Implementations/Localization/Core/ca.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Àlbums",
-  "AppDeviceValues": "App: {0}, Dispositiu: {1}",
-  "Application": "Application",
-  "Artists": "Artistes",
-  "AuthenticationSucceededWithUserName": "{0} s'ha autenticat correctament",
-  "Books": "Llibres",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Canals",
-  "ChapterNameValue": "Episodi {0}",
-  "Collections": "Col·leccions",
-  "DeviceOfflineWithName": "{0} s'ha desconnectat",
-  "DeviceOnlineWithName": "{0} està connectat",
-  "FailedLoginAttemptWithUserName": "Intent de connexió fallit des de {0}",
-  "Favorites": "Preferits",
-  "Folders": "Directoris",
-  "Games": "Jocs",
-  "Genres": "Gèneres",
-  "HeaderAlbumArtists": "Album Artists",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Continua Veient",
-  "HeaderFavoriteAlbums": "Àlbums Preferits",
-  "HeaderFavoriteArtists": "Artistes Preferits",
-  "HeaderFavoriteEpisodes": "Episodis Preferits",
-  "HeaderFavoriteShows": "Programes Preferits",
-  "HeaderFavoriteSongs": "Cançons Preferides",
-  "HeaderLiveTV": "TV en Directe",
-  "HeaderNextUp": "A continuació",
-  "HeaderRecordingGroups": "Grups d'Enregistrament",
-  "HomeVideos": "Vídeos domèstics",
-  "Inherit": "Heretat",
-  "ItemAddedWithName": "{0} afegit a la biblioteca",
-  "ItemRemovedWithName": "{0} eliminat de la biblioteca",
-  "LabelIpAddressValue": "Adreça IP: {0}",
-  "LabelRunningTimeValue": "Temps en marxa: {0}",
-  "Latest": "Darreres",
-  "MessageApplicationUpdated": "El Servidor d'Jellyfin ha estat actualitzat",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "La secció de configuració {0} ha estat actualitzada",
-  "MessageServerConfigurationUpdated": "S'ha actualitzat la configuració del servidor",
-  "MixedContent": "Contingut mesclat",
-  "Movies": "Pel·lícules",
-  "Music": "Música",
-  "MusicVideos": "Vídeos musicals",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Temporada {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Actualització d'aplicació disponible",
-  "NotificationOptionApplicationUpdateInstalled": "Actualització d'aplicació instal·lada",
-  "NotificationOptionAudioPlayback": "Audio playback started",
-  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-  "NotificationOptionInstallationFailed": "Installation failure",
-  "NotificationOptionNewLibraryContent": "New content added",
-  "NotificationOptionPluginError": "Un component ha fallat",
-  "NotificationOptionPluginInstalled": "Complement instal·lat",
-  "NotificationOptionPluginUninstalled": "Complement desinstal·lat",
-  "NotificationOptionPluginUpdateInstalled": "Actualització de complement instal·lada",
-  "NotificationOptionServerRestartRequired": "Server restart required",
-  "NotificationOptionTaskFailed": "Scheduled task failure",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionVideoPlayback": "Video playback started",
-  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-  "Photos": "Fotos",
-  "Playlists": "Llistes de reproducció",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} ha estat instal·lat",
-  "PluginUninstalledWithName": "{0} ha estat desinstal·lat",
-  "PluginUpdatedWithName": "{0} ha estat actualitzat",
-  "ProviderValue": "Proveïdor: {0}",
-  "ScheduledTaskFailedWithName": "{0} ha fallat",
-  "ScheduledTaskStartedWithName": "{0} iniciat",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Espectacles",
-  "Songs": "Cançons",
-  "StartupEmbyServerIsLoading": "El Servidor d'Jellyfin est&agrave; carregant. Si et plau, prova de nou en breus.",
-  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Subtítols descarregats per a {0}",
-  "Sync": "Sync",
-  "System": "System",
-  "TvShows": "Espectacles de TV",
-  "User": "User",
-  "UserCreatedWithName": "S'ha creat l'usuari {0}",
-  "UserDeletedWithName": "L'usuari {0} ha estat eliminat",
-  "UserDownloadingItemWithValues": "{0} està descarregant {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} s'ha desconnectat de {1}",
-  "UserOnlineFromDevice": "{0} està connectat des de {1}",
-  "UserPasswordChangedWithName": "La contrasenya ha estat canviada per a l'usuari {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} ha començat a reproduir {1}",
-  "UserStoppedPlayingItemWithValues": "{0} ha parat de reproduir {1}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Especial - {0}",
-  "VersionNumber": "Versió {0}"
+    "Albums": "Àlbums",
+    "AppDeviceValues": "App: {0}, Dispositiu: {1}",
+    "Application": "Application",
+    "Artists": "Artistes",
+    "AuthenticationSucceededWithUserName": "{0} s'ha autenticat correctament",
+    "Books": "Llibres",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Canals",
+    "ChapterNameValue": "Episodi {0}",
+    "Collections": "Col·leccions",
+    "DeviceOfflineWithName": "{0} s'ha desconnectat",
+    "DeviceOnlineWithName": "{0} està connectat",
+    "FailedLoginAttemptWithUserName": "Intent de connexió fallit des de {0}",
+    "Favorites": "Preferits",
+    "Folders": "Directoris",
+    "Games": "Jocs",
+    "Genres": "Gèneres",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Continua Veient",
+    "HeaderFavoriteAlbums": "Àlbums Preferits",
+    "HeaderFavoriteArtists": "Artistes Preferits",
+    "HeaderFavoriteEpisodes": "Episodis Preferits",
+    "HeaderFavoriteShows": "Programes Preferits",
+    "HeaderFavoriteSongs": "Cançons Preferides",
+    "HeaderLiveTV": "TV en Directe",
+    "HeaderNextUp": "A continuació",
+    "HeaderRecordingGroups": "Grups d'Enregistrament",
+    "HomeVideos": "Vídeos domèstics",
+    "Inherit": "Heretat",
+    "ItemAddedWithName": "{0} afegit a la biblioteca",
+    "ItemRemovedWithName": "{0} eliminat de la biblioteca",
+    "LabelIpAddressValue": "Adreça IP: {0}",
+    "LabelRunningTimeValue": "Temps en marxa: {0}",
+    "Latest": "Darreres",
+    "MessageApplicationUpdated": "El Servidor d'Jellyfin ha estat actualitzat",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "La secció de configuració {0} ha estat actualitzada",
+    "MessageServerConfigurationUpdated": "S'ha actualitzat la configuració del servidor",
+    "MixedContent": "Contingut mesclat",
+    "Movies": "Pel·lícules",
+    "Music": "Música",
+    "MusicVideos": "Vídeos musicals",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Temporada {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Actualització d'aplicació disponible",
+    "NotificationOptionApplicationUpdateInstalled": "Actualització d'aplicació instal·lada",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionPluginError": "Un component ha fallat",
+    "NotificationOptionPluginInstalled": "Complement instal·lat",
+    "NotificationOptionPluginUninstalled": "Complement desinstal·lat",
+    "NotificationOptionPluginUpdateInstalled": "Actualització de complement instal·lada",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "Photos": "Fotos",
+    "Playlists": "Llistes de reproducció",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} ha estat instal·lat",
+    "PluginUninstalledWithName": "{0} ha estat desinstal·lat",
+    "PluginUpdatedWithName": "{0} ha estat actualitzat",
+    "ProviderValue": "Proveïdor: {0}",
+    "ScheduledTaskFailedWithName": "{0} ha fallat",
+    "ScheduledTaskStartedWithName": "{0} iniciat",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Espectacles",
+    "Songs": "Cançons",
+    "StartupEmbyServerIsLoading": "El Servidor d'Jellyfin est&agrave; carregant. Si et plau, prova de nou en breus.",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Subtítols descarregats per a {0}",
+    "Sync": "Sync",
+    "System": "System",
+    "TvShows": "Espectacles de TV",
+    "User": "User",
+    "UserCreatedWithName": "S'ha creat l'usuari {0}",
+    "UserDeletedWithName": "L'usuari {0} ha estat eliminat",
+    "UserDownloadingItemWithValues": "{0} està descarregant {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} s'ha desconnectat de {1}",
+    "UserOnlineFromDevice": "{0} està connectat des de {1}",
+    "UserPasswordChangedWithName": "La contrasenya ha estat canviada per a l'usuari {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} ha començat a reproduir {1}",
+    "UserStoppedPlayingItemWithValues": "{0} ha parat de reproduir {1}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Especial - {0}",
+    "VersionNumber": "Versió {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/cs.json b/Emby.Server.Implementations/Localization/Core/cs.json
index 51fb132a4a..e066051a84 100644
--- a/Emby.Server.Implementations/Localization/Core/cs.json
+++ b/Emby.Server.Implementations/Localization/Core/cs.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Alba",
-  "AppDeviceValues": "Aplikace: {0}, Zařízení: {1}",
-  "Application": "Aplikace",
-  "Artists": "Umělci",
-  "AuthenticationSucceededWithUserName": "{0} úspěšně ověřen",
-  "Books": "Knihy",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Kanály",
-  "ChapterNameValue": "Kapitola {0}",
-  "Collections": "Kolekce",
-  "DeviceOfflineWithName": "{0} se odpojil",
-  "DeviceOnlineWithName": "{0} je připojen",
-  "FailedLoginAttemptWithUserName": "Neúspěšný pokus o přihlášení z {0}",
-  "Favorites": "Oblíbené",
-  "Folders": "Složky",
-  "Games": "Hry",
-  "Genres": "Žánry",
-  "HeaderAlbumArtists": "Umělci alba",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Pokračovat ve sledování",
-  "HeaderFavoriteAlbums": "Oblíbená alba",
-  "HeaderFavoriteArtists": "Oblíbení umělci",
-  "HeaderFavoriteEpisodes": "Oblíbené epizody",
-  "HeaderFavoriteShows": "Oblíbené seriály",
-  "HeaderFavoriteSongs": "Oblíbené písně",
-  "HeaderLiveTV": "Živá TV",
-  "HeaderNextUp": "Nadcházející",
-  "HeaderRecordingGroups": "Skupiny nahrávek",
-  "HomeVideos": "Domáci videa",
-  "Inherit": "Zdědit",
-  "ItemAddedWithName": "{0} byl přidán do knihovny",
-  "ItemRemovedWithName": "{0} byl odstraněn z knihovny",
-  "LabelIpAddressValue": "IP adresa: {0}",
-  "LabelRunningTimeValue": "Délka média: {0}",
-  "Latest": "Nejnovější",
-  "MessageApplicationUpdated": "Jellyfin Server byl aktualizován",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Konfigurace sekce {0} na serveru byla aktualizována",
-  "MessageServerConfigurationUpdated": "Konfigurace serveru aktualizována",
-  "MixedContent": "Smíšený obsah",
-  "Movies": "Filmy",
-  "Music": "Hudba",
-  "MusicVideos": "Hudební klipy",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Sezóna {0}",
-  "NameSeasonUnknown": "Neznámá sezóna",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Dostupná aktualizace aplikace",
-  "NotificationOptionApplicationUpdateInstalled": "Aktualizace aplikace instalována",
-  "NotificationOptionAudioPlayback": "Přehrávání audia zahájeno",
-  "NotificationOptionAudioPlaybackStopped": "Přehrávání audia ukončeno",
-  "NotificationOptionCameraImageUploaded": "Kamerový záznam nahrán",
-  "NotificationOptionGamePlayback": "Spuštění hry zahájeno",
-  "NotificationOptionGamePlaybackStopped": "Hra ukončena",
-  "NotificationOptionInstallationFailed": "Chyba instalace",
-  "NotificationOptionNewLibraryContent": "Přidán nový obsah",
-  "NotificationOptionPluginError": "Chyba zásuvného modulu",
-  "NotificationOptionPluginInstalled": "Zásuvný modul instalován",
-  "NotificationOptionPluginUninstalled": "Zásuvný modul odstraněn",
-  "NotificationOptionPluginUpdateInstalled": "Aktualizace zásuvného modulu instalována",
-  "NotificationOptionServerRestartRequired": "Je vyžadován restart serveru",
-  "NotificationOptionTaskFailed": "Chyba naplánované úlohy",
-  "NotificationOptionUserLockedOut": "Uživatel uzamčen",
-  "NotificationOptionVideoPlayback": "Přehrávání videa zahájeno",
-  "NotificationOptionVideoPlaybackStopped": "Přehrávání videa ukončeno",
-  "Photos": "Fotky",
-  "Playlists": "Seznamy skladeb",
-  "Plugin": "Zásuvný modul",
-  "PluginInstalledWithName": "{0} byl nainstalován",
-  "PluginUninstalledWithName": "{0} byl odinstalován",
-  "PluginUpdatedWithName": "{0} byl aktualizován",
-  "ProviderValue": "Poskytl: {0}",
-  "ScheduledTaskFailedWithName": "{0} selhalo",
-  "ScheduledTaskStartedWithName": "{0} zahájeno",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Seriály",
-  "Songs": "Skladby",
-  "StartupEmbyServerIsLoading": "Jellyfin Server je spouštěn. Zkuste to prosím v brzké době znovu.",
-  "SubtitleDownloadFailureForItem": "Stahování titulků selhalo pro {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Staženy titulky pro {0}",
-  "Sync": "Synchronizace",
-  "System": "Systém",
-  "TvShows": "TV seriály",
-  "User": "Uživatel",
-  "UserCreatedWithName": "Uživatel {0} byl vytvořen",
-  "UserDeletedWithName": "Uživatel {0} byl smazán",
-  "UserDownloadingItemWithValues": "{0} stahuje {1}",
-  "UserLockedOutWithName": "Uživatel {0} byl odemčen",
-  "UserOfflineFromDevice": "{0} se odpojil od {1}",
-  "UserOnlineFromDevice": "{0} se připojil z {1}",
-  "UserPasswordChangedWithName": "Provedena změna hesla pro uživatele {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} spustil přehrávání {1}",
-  "UserStoppedPlayingItemWithValues": "{0} zastavil přehrávání {1}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Speciál - {0}",
-  "VersionNumber": "Verze {0}"
+    "Albums": "Alba",
+    "AppDeviceValues": "Aplikace: {0}, Zařízení: {1}",
+    "Application": "Aplikace",
+    "Artists": "Umělci",
+    "AuthenticationSucceededWithUserName": "{0} úspěšně ověřen",
+    "Books": "Knihy",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Kanály",
+    "ChapterNameValue": "Kapitola {0}",
+    "Collections": "Kolekce",
+    "DeviceOfflineWithName": "{0} se odpojil",
+    "DeviceOnlineWithName": "{0} je připojen",
+    "FailedLoginAttemptWithUserName": "Neúspěšný pokus o přihlášení z {0}",
+    "Favorites": "Oblíbené",
+    "Folders": "Složky",
+    "Games": "Hry",
+    "Genres": "Žánry",
+    "HeaderAlbumArtists": "Umělci alba",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Pokračovat ve sledování",
+    "HeaderFavoriteAlbums": "Oblíbená alba",
+    "HeaderFavoriteArtists": "Oblíbení umělci",
+    "HeaderFavoriteEpisodes": "Oblíbené epizody",
+    "HeaderFavoriteShows": "Oblíbené seriály",
+    "HeaderFavoriteSongs": "Oblíbené písně",
+    "HeaderLiveTV": "Živá TV",
+    "HeaderNextUp": "Nadcházející",
+    "HeaderRecordingGroups": "Skupiny nahrávek",
+    "HomeVideos": "Domáci videa",
+    "Inherit": "Zdědit",
+    "ItemAddedWithName": "{0} byl přidán do knihovny",
+    "ItemRemovedWithName": "{0} byl odstraněn z knihovny",
+    "LabelIpAddressValue": "IP adresa: {0}",
+    "LabelRunningTimeValue": "Délka média: {0}",
+    "Latest": "Nejnovější",
+    "MessageApplicationUpdated": "Jellyfin Server byl aktualizován",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Konfigurace sekce {0} na serveru byla aktualizována",
+    "MessageServerConfigurationUpdated": "Konfigurace serveru aktualizována",
+    "MixedContent": "Smíšený obsah",
+    "Movies": "Filmy",
+    "Music": "Hudba",
+    "MusicVideos": "Hudební klipy",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Sezóna {0}",
+    "NameSeasonUnknown": "Neznámá sezóna",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Dostupná aktualizace aplikace",
+    "NotificationOptionApplicationUpdateInstalled": "Aktualizace aplikace instalována",
+    "NotificationOptionAudioPlayback": "Přehrávání audia zahájeno",
+    "NotificationOptionAudioPlaybackStopped": "Přehrávání audia ukončeno",
+    "NotificationOptionCameraImageUploaded": "Kamerový záznam nahrán",
+    "NotificationOptionGamePlayback": "Spuštění hry zahájeno",
+    "NotificationOptionGamePlaybackStopped": "Hra ukončena",
+    "NotificationOptionInstallationFailed": "Chyba instalace",
+    "NotificationOptionNewLibraryContent": "Přidán nový obsah",
+    "NotificationOptionPluginError": "Chyba zásuvného modulu",
+    "NotificationOptionPluginInstalled": "Zásuvný modul instalován",
+    "NotificationOptionPluginUninstalled": "Zásuvný modul odstraněn",
+    "NotificationOptionPluginUpdateInstalled": "Aktualizace zásuvného modulu instalována",
+    "NotificationOptionServerRestartRequired": "Je vyžadován restart serveru",
+    "NotificationOptionTaskFailed": "Chyba naplánované úlohy",
+    "NotificationOptionUserLockedOut": "Uživatel uzamčen",
+    "NotificationOptionVideoPlayback": "Přehrávání videa zahájeno",
+    "NotificationOptionVideoPlaybackStopped": "Přehrávání videa ukončeno",
+    "Photos": "Fotky",
+    "Playlists": "Seznamy skladeb",
+    "Plugin": "Zásuvný modul",
+    "PluginInstalledWithName": "{0} byl nainstalován",
+    "PluginUninstalledWithName": "{0} byl odinstalován",
+    "PluginUpdatedWithName": "{0} byl aktualizován",
+    "ProviderValue": "Poskytl: {0}",
+    "ScheduledTaskFailedWithName": "{0} selhalo",
+    "ScheduledTaskStartedWithName": "{0} zahájeno",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Seriály",
+    "Songs": "Skladby",
+    "StartupEmbyServerIsLoading": "Jellyfin Server je spouštěn. Zkuste to prosím v brzké době znovu.",
+    "SubtitleDownloadFailureForItem": "Stahování titulků selhalo pro {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Staženy titulky pro {0}",
+    "Sync": "Synchronizace",
+    "System": "Systém",
+    "TvShows": "TV seriály",
+    "User": "Uživatel",
+    "UserCreatedWithName": "Uživatel {0} byl vytvořen",
+    "UserDeletedWithName": "Uživatel {0} byl smazán",
+    "UserDownloadingItemWithValues": "{0} stahuje {1}",
+    "UserLockedOutWithName": "Uživatel {0} byl odemčen",
+    "UserOfflineFromDevice": "{0} se odpojil od {1}",
+    "UserOnlineFromDevice": "{0} se připojil z {1}",
+    "UserPasswordChangedWithName": "Provedena změna hesla pro uživatele {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} spustil přehrávání {1}",
+    "UserStoppedPlayingItemWithValues": "{0} zastavil přehrávání {1}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Speciál - {0}",
+    "VersionNumber": "Verze {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/da.json b/Emby.Server.Implementations/Localization/Core/da.json
index c7c2a796e6..30581c389b 100644
--- a/Emby.Server.Implementations/Localization/Core/da.json
+++ b/Emby.Server.Implementations/Localization/Core/da.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Album",
-  "AppDeviceValues": "App: {0}, Enhed: {1}",
-  "Application": "Applikation",
-  "Artists": "Kunstner",
-  "AuthenticationSucceededWithUserName": "{0} bekræftet med succes",
-  "Books": "Bøger",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Kanaler",
-  "ChapterNameValue": "Kapitel {0}",
-  "Collections": "Samlinger",
-  "DeviceOfflineWithName": "{0} har afbrudt forbindelsen",
-  "DeviceOnlineWithName": "{0} er forbundet",
-  "FailedLoginAttemptWithUserName": "Fejlet loginforsøg fra {0}",
-  "Favorites": "Favoritter",
-  "Folders": "Mapper",
-  "Games": "Spil",
-  "Genres": "Genre",
-  "HeaderAlbumArtists": "Albumkunstnere",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Fortsæt Afspilning",
-  "HeaderFavoriteAlbums": "Favoritalbum",
-  "HeaderFavoriteArtists": "Favoritkunstnere",
-  "HeaderFavoriteEpisodes": "Favoritepisoder",
-  "HeaderFavoriteShows": "Favorit serier",
-  "HeaderFavoriteSongs": "Favoritsange",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "Næste",
-  "HeaderRecordingGroups": "Optagegrupper",
-  "HomeVideos": "Hjemmevideoer",
-  "Inherit": "Arv",
-  "ItemAddedWithName": "{0} blev tilføjet til biblioteket",
-  "ItemRemovedWithName": "{0} blev fjernet fra biblioteket",
-  "LabelIpAddressValue": "IP-adresse: {0}",
-  "LabelRunningTimeValue": "Spilletid: {0}",
-  "Latest": "Seneste",
-  "MessageApplicationUpdated": "Jellyfin Server er blevet opdateret",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server konfigurationssektion {0} er blevet opdateret",
-  "MessageServerConfigurationUpdated": "Serverkonfiguration er blevet opdateret",
-  "MixedContent": "Blandet indhold",
-  "Movies": "Film",
-  "Music": "Musik",
-  "MusicVideos": "Musikvideoer",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Sæson {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Opdatering til applikation tilgængelig",
-  "NotificationOptionApplicationUpdateInstalled": "Opdatering til applikation installeret",
-  "NotificationOptionAudioPlayback": "Audioafspilning påbegyndt",
-  "NotificationOptionAudioPlaybackStopped": "Audioafspilning stoppet",
-  "NotificationOptionCameraImageUploaded": "Kamerabillede uploadet",
-  "NotificationOptionGamePlayback": "Afspilning af Spil påbegyndt",
-  "NotificationOptionGamePlaybackStopped": "Afspilning af Spil stoppet",
-  "NotificationOptionInstallationFailed": "Installationsfejl",
-  "NotificationOptionNewLibraryContent": "Nyt indhold tilføjet",
-  "NotificationOptionPluginError": "Pluginfejl",
-  "NotificationOptionPluginInstalled": "Plugin installeret",
-  "NotificationOptionPluginUninstalled": "Plugin afinstalleret",
-  "NotificationOptionPluginUpdateInstalled": "Opdatering til plugin installeret",
-  "NotificationOptionServerRestartRequired": "Genstart af server påkrævet",
-  "NotificationOptionTaskFailed": "Planlagt opgave fejlet",
-  "NotificationOptionUserLockedOut": "Bruger låst ude",
-  "NotificationOptionVideoPlayback": "Videoafspilning påbegyndt",
-  "NotificationOptionVideoPlaybackStopped": "Videoafspilning stoppet",
-  "Photos": "Fotos",
-  "Playlists": "Spillelister",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} blev installeret",
-  "PluginUninstalledWithName": "{0} blev afinstalleret",
-  "PluginUpdatedWithName": "{0} blev opdateret",
-  "ProviderValue": "Udbyder: {0}",
-  "ScheduledTaskFailedWithName": "{0} fejlet",
-  "ScheduledTaskStartedWithName": "{0} påbegyndt",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Shows",
-  "Songs": "Sange",
-  "StartupEmbyServerIsLoading": "Jellyfin Server indlæser. Prøv venligst igen om kort tid.",
-  "SubtitleDownloadFailureForItem": "Fejlet i download af undertekster for {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Undertekster downloadet for {0}",
-  "Sync": "Synk",
-  "System": "System",
-  "TvShows": "TV Shows",
-  "User": "Bruger",
-  "UserCreatedWithName": "Bruger {0} er blevet oprettet",
-  "UserDeletedWithName": "Brugeren {0} er blevet slettet",
-  "UserDownloadingItemWithValues": "{0} downloader {1}",
-  "UserLockedOutWithName": "Brugeren {0} er blevet låst ude",
-  "UserOfflineFromDevice": "{0} har afbrudt fra {1}",
-  "UserOnlineFromDevice": "{0} er online fra {1}",
-  "UserPasswordChangedWithName": "Adgangskode er ændret for bruger {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} har påbegyndt afspilning af {1}",
-  "UserStoppedPlayingItemWithValues": "{0} har afsluttet afspilning af {1}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Special - {0}",
-  "VersionNumber": "Version {0}"
+    "Albums": "Album",
+    "AppDeviceValues": "App: {0}, Enhed: {1}",
+    "Application": "Applikation",
+    "Artists": "Kunstner",
+    "AuthenticationSucceededWithUserName": "{0} bekræftet med succes",
+    "Books": "Bøger",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Kanaler",
+    "ChapterNameValue": "Kapitel {0}",
+    "Collections": "Samlinger",
+    "DeviceOfflineWithName": "{0} har afbrudt forbindelsen",
+    "DeviceOnlineWithName": "{0} er forbundet",
+    "FailedLoginAttemptWithUserName": "Fejlet loginforsøg fra {0}",
+    "Favorites": "Favoritter",
+    "Folders": "Mapper",
+    "Games": "Spil",
+    "Genres": "Genre",
+    "HeaderAlbumArtists": "Albumkunstnere",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Fortsæt Afspilning",
+    "HeaderFavoriteAlbums": "Favoritalbum",
+    "HeaderFavoriteArtists": "Favoritkunstnere",
+    "HeaderFavoriteEpisodes": "Favoritepisoder",
+    "HeaderFavoriteShows": "Favorit serier",
+    "HeaderFavoriteSongs": "Favoritsange",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "Næste",
+    "HeaderRecordingGroups": "Optagegrupper",
+    "HomeVideos": "Hjemmevideoer",
+    "Inherit": "Arv",
+    "ItemAddedWithName": "{0} blev tilføjet til biblioteket",
+    "ItemRemovedWithName": "{0} blev fjernet fra biblioteket",
+    "LabelIpAddressValue": "IP-adresse: {0}",
+    "LabelRunningTimeValue": "Spilletid: {0}",
+    "Latest": "Seneste",
+    "MessageApplicationUpdated": "Jellyfin Server er blevet opdateret",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server konfigurationssektion {0} er blevet opdateret",
+    "MessageServerConfigurationUpdated": "Serverkonfiguration er blevet opdateret",
+    "MixedContent": "Blandet indhold",
+    "Movies": "Film",
+    "Music": "Musik",
+    "MusicVideos": "Musikvideoer",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Sæson {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Opdatering til applikation tilgængelig",
+    "NotificationOptionApplicationUpdateInstalled": "Opdatering til applikation installeret",
+    "NotificationOptionAudioPlayback": "Audioafspilning påbegyndt",
+    "NotificationOptionAudioPlaybackStopped": "Audioafspilning stoppet",
+    "NotificationOptionCameraImageUploaded": "Kamerabillede uploadet",
+    "NotificationOptionGamePlayback": "Afspilning af Spil påbegyndt",
+    "NotificationOptionGamePlaybackStopped": "Afspilning af Spil stoppet",
+    "NotificationOptionInstallationFailed": "Installationsfejl",
+    "NotificationOptionNewLibraryContent": "Nyt indhold tilføjet",
+    "NotificationOptionPluginError": "Pluginfejl",
+    "NotificationOptionPluginInstalled": "Plugin installeret",
+    "NotificationOptionPluginUninstalled": "Plugin afinstalleret",
+    "NotificationOptionPluginUpdateInstalled": "Opdatering til plugin installeret",
+    "NotificationOptionServerRestartRequired": "Genstart af server påkrævet",
+    "NotificationOptionTaskFailed": "Planlagt opgave fejlet",
+    "NotificationOptionUserLockedOut": "Bruger låst ude",
+    "NotificationOptionVideoPlayback": "Videoafspilning påbegyndt",
+    "NotificationOptionVideoPlaybackStopped": "Videoafspilning stoppet",
+    "Photos": "Fotos",
+    "Playlists": "Spillelister",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} blev installeret",
+    "PluginUninstalledWithName": "{0} blev afinstalleret",
+    "PluginUpdatedWithName": "{0} blev opdateret",
+    "ProviderValue": "Udbyder: {0}",
+    "ScheduledTaskFailedWithName": "{0} fejlet",
+    "ScheduledTaskStartedWithName": "{0} påbegyndt",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Shows",
+    "Songs": "Sange",
+    "StartupEmbyServerIsLoading": "Jellyfin Server indlæser. Prøv venligst igen om kort tid.",
+    "SubtitleDownloadFailureForItem": "Fejlet i download af undertekster for {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Undertekster downloadet for {0}",
+    "Sync": "Synk",
+    "System": "System",
+    "TvShows": "TV Shows",
+    "User": "Bruger",
+    "UserCreatedWithName": "Bruger {0} er blevet oprettet",
+    "UserDeletedWithName": "Brugeren {0} er blevet slettet",
+    "UserDownloadingItemWithValues": "{0} downloader {1}",
+    "UserLockedOutWithName": "Brugeren {0} er blevet låst ude",
+    "UserOfflineFromDevice": "{0} har afbrudt fra {1}",
+    "UserOnlineFromDevice": "{0} er online fra {1}",
+    "UserPasswordChangedWithName": "Adgangskode er ændret for bruger {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} har påbegyndt afspilning af {1}",
+    "UserStoppedPlayingItemWithValues": "{0} har afsluttet afspilning af {1}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "VersionNumber": "Version {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/de.json b/Emby.Server.Implementations/Localization/Core/de.json
index c5873450c4..98cb07663f 100644
--- a/Emby.Server.Implementations/Localization/Core/de.json
+++ b/Emby.Server.Implementations/Localization/Core/de.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Alben",
-  "AppDeviceValues": "App: {0}, Gerät: {1}",
-  "Application": "Anwendung",
-  "Artists": "Interpreten",
-  "AuthenticationSucceededWithUserName": "{0} erfolgreich authentifiziert",
-  "Books": "Bücher",
-  "CameraImageUploadedFrom": "Ein neues Bild wurde hochgeladen von {0}",
-  "Channels": "Kanäle",
-  "ChapterNameValue": "Kapitel {0}",
-  "Collections": "Sammlungen",
-  "DeviceOfflineWithName": "{0} wurde getrennt",
-  "DeviceOnlineWithName": "{0} ist verbunden",
-  "FailedLoginAttemptWithUserName": "Fehlgeschlagener Anmeldeversuch von {0}",
-  "Favorites": "Favoriten",
-  "Folders": "Verzeichnisse",
-  "Games": "Spiele",
-  "Genres": "Genres",
-  "HeaderAlbumArtists": "Album-Künstler",
-  "HeaderCameraUploads": "Kamera Uploads",
-  "HeaderContinueWatching": "Weiterschauen",
-  "HeaderFavoriteAlbums": "Lieblingsalben",
-  "HeaderFavoriteArtists": "Interpreten Favoriten",
-  "HeaderFavoriteEpisodes": "Lieblingsepisoden",
-  "HeaderFavoriteShows": "Lieblingsserien",
-  "HeaderFavoriteSongs": "Lieder Favoriten",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "Als Nächstes",
-  "HeaderRecordingGroups": "Aufnahme-Gruppen",
-  "HomeVideos": "Heimvideos",
-  "Inherit": "Übernehmen",
-  "ItemAddedWithName": "{0} wurde der Bibliothek hinzugefügt",
-  "ItemRemovedWithName": "{0} wurde aus der Bibliothek entfernt",
-  "LabelIpAddressValue": "IP Adresse: {0}",
-  "LabelRunningTimeValue": "Laufzeit: {0}",
-  "Latest": "Neueste",
-  "MessageApplicationUpdated": "Jellyfin Server wurde auf den neusten Stand gebracht.",
-  "MessageApplicationUpdatedTo": "Jellyfin Server wurde auf Version {0} aktualisiert",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Der Server Einstellungsbereich {0} wurde aktualisiert",
-  "MessageServerConfigurationUpdated": "Server Einstellungen wurden aktualisiert",
-  "MixedContent": "Gemischte Inhalte",
-  "Movies": "Filme",
-  "Music": "Musik",
-  "MusicVideos": "Musikvideos",
-  "NameInstallFailed": "{0} Installation fehlgeschlagen",
-  "NameSeasonNumber": "Staffel {0}",
-  "NameSeasonUnknown": "Staffel unbekannt",
-  "NewVersionIsAvailable": "Eine neue Version von Jellyfin Server steht zum Download bereit.",
-  "NotificationOptionApplicationUpdateAvailable": "Anwendungsaktualisierung verfügbar",
-  "NotificationOptionApplicationUpdateInstalled": "Anwendungsaktualisierung installiert",
-  "NotificationOptionAudioPlayback": "Audiowiedergabe gestartet",
-  "NotificationOptionAudioPlaybackStopped": "Audiowiedergabe gestoppt",
-  "NotificationOptionCameraImageUploaded": "Kamera Bild hochgeladen",
-  "NotificationOptionGamePlayback": "Spielwiedergabe gestartet",
-  "NotificationOptionGamePlaybackStopped": "Spielwiedergabe gestoppt",
-  "NotificationOptionInstallationFailed": "Installationsfehler",
-  "NotificationOptionNewLibraryContent": "Neuer Inhalt hinzugefügt",
-  "NotificationOptionPluginError": "Plugin Fehler",
-  "NotificationOptionPluginInstalled": "Plugin installiert",
-  "NotificationOptionPluginUninstalled": "Plugin deinstalliert",
-  "NotificationOptionPluginUpdateInstalled": "Pluginaktualisierung installiert",
-  "NotificationOptionServerRestartRequired": "Serverneustart notwendig",
-  "NotificationOptionTaskFailed": "Geplante Aufgaben fehlgeschlagen",
-  "NotificationOptionUserLockedOut": "Benutzer ausgeschlossen",
-  "NotificationOptionVideoPlayback": "Videowiedergabe gestartet",
-  "NotificationOptionVideoPlaybackStopped": "Videowiedergabe gestoppt",
-  "Photos": "Fotos",
-  "Playlists": "Wiedergabelisten",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} wurde installiert",
-  "PluginUninstalledWithName": "{0} wurde deinstalliert",
-  "PluginUpdatedWithName": "{0} wurde aktualisiert",
-  "ProviderValue": "Anbieter: {0}",
-  "ScheduledTaskFailedWithName": "{0} fehlgeschlagen",
-  "ScheduledTaskStartedWithName": "{0} gestartet",
-  "ServerNameNeedsToBeRestarted": "{0} muss neu gestartet werden",
-  "Shows": "Serien",
-  "Songs": "Songs",
-  "StartupEmbyServerIsLoading": "Jellyfin Server startet, bitte versuche es gleich noch einmal.",
-  "SubtitleDownloadFailureForItem": "Download der Untertitel fehlgeschlagen für {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Untertitel heruntergeladen für {0}",
-  "Sync": "Synchronisation",
-  "System": "System",
-  "TvShows": "TV Sendungen",
-  "User": "Benutzer",
-  "UserCreatedWithName": "Benutzer {0} wurde erstellt",
-  "UserDeletedWithName": "Benutzer {0} wurde gelöscht",
-  "UserDownloadingItemWithValues": "{0} lädt {1} herunter",
-  "UserLockedOutWithName": "Benutzer {0} wurde ausgeschlossen",
-  "UserOfflineFromDevice": "{0} wurde getrennt von {1}",
-  "UserOnlineFromDevice": "{0} ist online von {1}",
-  "UserPasswordChangedWithName": "Das Passwort für Benutzer {0} wurde geändert",
-  "UserPolicyUpdatedWithName": "Benutzerrichtlinie wurde für {0} aktualisiert",
-  "UserStartedPlayingItemWithValues": "{0} hat die Wiedergabe von {1} gestartet",
-  "UserStoppedPlayingItemWithValues": "{0} hat die Wiedergabe von {1} beendet",
-  "ValueHasBeenAddedToLibrary": "{0} wurde ihrer Bibliothek hinzugefügt",
-  "ValueSpecialEpisodeName": "Special - {0}",
-  "VersionNumber": "Version {0}"
+    "Albums": "Alben",
+    "AppDeviceValues": "App: {0}, Gerät: {1}",
+    "Application": "Anwendung",
+    "Artists": "Interpreten",
+    "AuthenticationSucceededWithUserName": "{0} erfolgreich authentifiziert",
+    "Books": "Bücher",
+    "CameraImageUploadedFrom": "Ein neues Bild wurde hochgeladen von {0}",
+    "Channels": "Kanäle",
+    "ChapterNameValue": "Kapitel {0}",
+    "Collections": "Sammlungen",
+    "DeviceOfflineWithName": "{0} wurde getrennt",
+    "DeviceOnlineWithName": "{0} ist verbunden",
+    "FailedLoginAttemptWithUserName": "Fehlgeschlagener Anmeldeversuch von {0}",
+    "Favorites": "Favoriten",
+    "Folders": "Verzeichnisse",
+    "Games": "Spiele",
+    "Genres": "Genres",
+    "HeaderAlbumArtists": "Album-Künstler",
+    "HeaderCameraUploads": "Kamera Uploads",
+    "HeaderContinueWatching": "Weiterschauen",
+    "HeaderFavoriteAlbums": "Lieblingsalben",
+    "HeaderFavoriteArtists": "Interpreten Favoriten",
+    "HeaderFavoriteEpisodes": "Lieblingsepisoden",
+    "HeaderFavoriteShows": "Lieblingsserien",
+    "HeaderFavoriteSongs": "Lieder Favoriten",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "Als Nächstes",
+    "HeaderRecordingGroups": "Aufnahme-Gruppen",
+    "HomeVideos": "Heimvideos",
+    "Inherit": "Übernehmen",
+    "ItemAddedWithName": "{0} wurde der Bibliothek hinzugefügt",
+    "ItemRemovedWithName": "{0} wurde aus der Bibliothek entfernt",
+    "LabelIpAddressValue": "IP Adresse: {0}",
+    "LabelRunningTimeValue": "Laufzeit: {0}",
+    "Latest": "Neueste",
+    "MessageApplicationUpdated": "Jellyfin Server wurde auf den neusten Stand gebracht.",
+    "MessageApplicationUpdatedTo": "Jellyfin Server wurde auf Version {0} aktualisiert",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Der Server Einstellungsbereich {0} wurde aktualisiert",
+    "MessageServerConfigurationUpdated": "Server Einstellungen wurden aktualisiert",
+    "MixedContent": "Gemischte Inhalte",
+    "Movies": "Filme",
+    "Music": "Musik",
+    "MusicVideos": "Musikvideos",
+    "NameInstallFailed": "{0} Installation fehlgeschlagen",
+    "NameSeasonNumber": "Staffel {0}",
+    "NameSeasonUnknown": "Staffel unbekannt",
+    "NewVersionIsAvailable": "Eine neue Version von Jellyfin Server steht zum Download bereit.",
+    "NotificationOptionApplicationUpdateAvailable": "Anwendungsaktualisierung verfügbar",
+    "NotificationOptionApplicationUpdateInstalled": "Anwendungsaktualisierung installiert",
+    "NotificationOptionAudioPlayback": "Audiowiedergabe gestartet",
+    "NotificationOptionAudioPlaybackStopped": "Audiowiedergabe gestoppt",
+    "NotificationOptionCameraImageUploaded": "Kamera Bild hochgeladen",
+    "NotificationOptionGamePlayback": "Spielwiedergabe gestartet",
+    "NotificationOptionGamePlaybackStopped": "Spielwiedergabe gestoppt",
+    "NotificationOptionInstallationFailed": "Installationsfehler",
+    "NotificationOptionNewLibraryContent": "Neuer Inhalt hinzugefügt",
+    "NotificationOptionPluginError": "Plugin Fehler",
+    "NotificationOptionPluginInstalled": "Plugin installiert",
+    "NotificationOptionPluginUninstalled": "Plugin deinstalliert",
+    "NotificationOptionPluginUpdateInstalled": "Pluginaktualisierung installiert",
+    "NotificationOptionServerRestartRequired": "Serverneustart notwendig",
+    "NotificationOptionTaskFailed": "Geplante Aufgaben fehlgeschlagen",
+    "NotificationOptionUserLockedOut": "Benutzer ausgeschlossen",
+    "NotificationOptionVideoPlayback": "Videowiedergabe gestartet",
+    "NotificationOptionVideoPlaybackStopped": "Videowiedergabe gestoppt",
+    "Photos": "Fotos",
+    "Playlists": "Wiedergabelisten",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} wurde installiert",
+    "PluginUninstalledWithName": "{0} wurde deinstalliert",
+    "PluginUpdatedWithName": "{0} wurde aktualisiert",
+    "ProviderValue": "Anbieter: {0}",
+    "ScheduledTaskFailedWithName": "{0} fehlgeschlagen",
+    "ScheduledTaskStartedWithName": "{0} gestartet",
+    "ServerNameNeedsToBeRestarted": "{0} muss neu gestartet werden",
+    "Shows": "Serien",
+    "Songs": "Songs",
+    "StartupEmbyServerIsLoading": "Jellyfin Server startet, bitte versuche es gleich noch einmal.",
+    "SubtitleDownloadFailureForItem": "Download der Untertitel fehlgeschlagen für {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Untertitel heruntergeladen für {0}",
+    "Sync": "Synchronisation",
+    "System": "System",
+    "TvShows": "TV Sendungen",
+    "User": "Benutzer",
+    "UserCreatedWithName": "Benutzer {0} wurde erstellt",
+    "UserDeletedWithName": "Benutzer {0} wurde gelöscht",
+    "UserDownloadingItemWithValues": "{0} lädt {1} herunter",
+    "UserLockedOutWithName": "Benutzer {0} wurde ausgeschlossen",
+    "UserOfflineFromDevice": "{0} wurde getrennt von {1}",
+    "UserOnlineFromDevice": "{0} ist online von {1}",
+    "UserPasswordChangedWithName": "Das Passwort für Benutzer {0} wurde geändert",
+    "UserPolicyUpdatedWithName": "Benutzerrichtlinie wurde für {0} aktualisiert",
+    "UserStartedPlayingItemWithValues": "{0} hat die Wiedergabe von {1} gestartet",
+    "UserStoppedPlayingItemWithValues": "{0} hat die Wiedergabe von {1} beendet",
+    "ValueHasBeenAddedToLibrary": "{0} wurde ihrer Bibliothek hinzugefügt",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "VersionNumber": "Version {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/el.json b/Emby.Server.Implementations/Localization/Core/el.json
index 81903db8f4..ba687a089a 100644
--- a/Emby.Server.Implementations/Localization/Core/el.json
+++ b/Emby.Server.Implementations/Localization/Core/el.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Άλμπουμ",
-  "AppDeviceValues": "Εφαρμογή: {0}, Συσκευή: {1}",
-  "Application": "Εφαρμογή",
-  "Artists": "Καλλιτέχνες",
-  "AuthenticationSucceededWithUserName": "{0} επιτυχείς σύνδεση",
-  "Books": "Βιβλία",
-  "CameraImageUploadedFrom": "Μια νέα εικόνα κάμερας έχει αποσταλεί από {0}",
-  "Channels": "Κανάλια",
-  "ChapterNameValue": "Κεφάλαιο {0}",
-  "Collections": "Συλλογές",
-  "DeviceOfflineWithName": "{0} αποσυνδέθηκε",
-  "DeviceOnlineWithName": "{0} συνδέθηκε",
-  "FailedLoginAttemptWithUserName": "Αποτυχημένη προσπάθεια σύνδεσης από {0}",
-  "Favorites": "Αγαπημένα",
-  "Folders": "Φάκελοι",
-  "Games": "Παιχνίδια",
-  "Genres": "Είδη",
-  "HeaderAlbumArtists": "Άλμπουμ Καλλιτεχνών",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Συνεχίστε να παρακολουθείτε",
-  "HeaderFavoriteAlbums": "Αγαπημένα Άλμπουμ",
-  "HeaderFavoriteArtists": "Αγαπημένοι Καλλιτέχνες",
-  "HeaderFavoriteEpisodes": "Αγαπημένα Επεισόδια",
-  "HeaderFavoriteShows": "Αγαπημένες Σειρές",
-  "HeaderFavoriteSongs": "Αγαπημένα Τραγούδια",
-  "HeaderLiveTV": "Ζωντανή Τηλεόραση",
-  "HeaderNextUp": "Επόμενο",
-  "HeaderRecordingGroups": "Γκρουπ Εγγραφών",
-  "HomeVideos": "Προσωπικά βίντεο",
-  "Inherit": "Inherit",
-  "ItemAddedWithName": "{0} προστέθηκε στη βιβλιοθήκη",
-  "ItemRemovedWithName": "{0} διαγράφηκε από τη βιβλιοθήκη",
-  "LabelIpAddressValue": "Διεύθυνση IP: {0}",
-  "LabelRunningTimeValue": "Διάρκεια: {0}",
-  "Latest": "Πρόσφατα",
-  "MessageApplicationUpdated": "Ο Jellyfin Server έχει ενημερωθεί",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Η ενότητα {0} ρύθμισης παραμέτρων του server έχει ενημερωθεί",
-  "MessageServerConfigurationUpdated": "Η ρύθμιση παραμέτρων του server έχει ενημερωθεί",
-  "MixedContent": "Ανάμεικτο Περιεχόμενο",
-  "Movies": "Ταινίες",
-  "Music": "Μουσική",
-  "MusicVideos": "Μουσικά βίντεο",
-  "NameInstallFailed": "{0} η εγκατάσταση απέτυχε",
-  "NameSeasonNumber": "Κύκλος {0}",
-  "NameSeasonUnknown": "Άγνωστος Κύκλος",
-  "NewVersionIsAvailable": "Μια νέα έκδοση του Jellyfin Server είναι διαθέσιμη για λήψη.",
-  "NotificationOptionApplicationUpdateAvailable": "Διαθέσιμη ενημερωμένη έκδοση εφαρμογής",
-  "NotificationOptionApplicationUpdateInstalled": "Η ενημέρωση εφαρμογής εγκαταστάθηκε",
-  "NotificationOptionAudioPlayback": "Η αναπαραγωγή ήχου ξεκίνησε",
-  "NotificationOptionAudioPlaybackStopped": "Η αναπαραγωγή ήχου σταμάτησε",
-  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-  "NotificationOptionGamePlayback": "Η αναπαραγωγή του παιχνιδιού ξεκίνησε",
-  "NotificationOptionGamePlaybackStopped": "Η αναπαραγωγή του παιχνιδιού σταμάτησε",
-  "NotificationOptionInstallationFailed": "Αποτυχία εγκατάστασης",
-  "NotificationOptionNewLibraryContent": "Προστέθηκε νέο περιεχόμενο",
-  "NotificationOptionPluginError": "Αποτυχία του plugin",
-  "NotificationOptionPluginInstalled": "Το plugin εγκαταστάθηκε",
-  "NotificationOptionPluginUninstalled": "Το plugin απεγκαταστάθηκε",
-  "NotificationOptionPluginUpdateInstalled": "Η αναβάθμιση του plugin εγκαταστάθηκε",
-  "NotificationOptionServerRestartRequired": "Απαιτείται επανεκκίνηση του server",
-  "NotificationOptionTaskFailed": "Αποτυχία προγραμματισμένης εργασίας",
-  "NotificationOptionUserLockedOut": "Ο χρήστης αποκλείστηκε",
-  "NotificationOptionVideoPlayback": "Η αναπαραγωγή βίντεο ξεκίνησε",
-  "NotificationOptionVideoPlaybackStopped": "Η αναπαραγωγή βίντεο σταμάτησε",
-  "Photos": "Φωτογραφίες",
-  "Playlists": "Λίστες αναπαραγωγής",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} εγκαταστήθηκε",
-  "PluginUninstalledWithName": "{0} έχει απεγκατασταθεί",
-  "PluginUpdatedWithName": "{0} έχει αναβαθμιστεί",
-  "ProviderValue": "Provider: {0}",
-  "ScheduledTaskFailedWithName": "{0} αποτυχία",
-  "ScheduledTaskStartedWithName": "{0} ξεκίνησε",
-  "ServerNameNeedsToBeRestarted": "{0} χρειάζεται επανεκκίνηση",
-  "Shows": "Σειρές",
-  "Songs": "Τραγούδια",
-  "StartupEmbyServerIsLoading": "Ο Jellyfin Server φορτώνει. Παρακαλώ δοκιμάστε σε λίγο.",
-  "SubtitleDownloadFailureForItem": "Οι υπότιτλοι απέτυχαν να κατέβουν για {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Οι υπότιτλοι κατέβηκαν για {0}",
-  "Sync": "Συγχρονισμός",
-  "System": "Σύστημα",
-  "TvShows": "Τηλεοπτικές Σειρές",
-  "User": "Χρήστης",
-  "UserCreatedWithName": "Δημιουργήθηκε ο χρήστης {0}",
-  "UserDeletedWithName": "Ο χρήστης {0} έχει διαγραφεί",
-  "UserDownloadingItemWithValues": "{0} κατεβάζει {1}",
-  "UserLockedOutWithName": "Ο χρήστης {0} αποκλείστηκε",
-  "UserOfflineFromDevice": "{0} αποσυνδέθηκε από {1}",
-  "UserOnlineFromDevice": "{0} είναι online απο {1}",
-  "UserPasswordChangedWithName": "Ο κωδικός του χρήστη {0} έχει αλλάξει",
-  "UserPolicyUpdatedWithName": "Η πολιτική χρήστη έχει ενημερωθεί για {0}",
-  "UserStartedPlayingItemWithValues": "{0} παίζει {1} σε {2}",
-  "UserStoppedPlayingItemWithValues": "{0} τελείωσε να παίζει {1} σε {2}",
-  "ValueHasBeenAddedToLibrary": "{0} προστέθηκαν στη βιβλιοθήκη πολυμέσων σας",
-  "ValueSpecialEpisodeName": "Special - {0}",
-  "VersionNumber": "Έκδοση {0}"
+    "Albums": "Άλμπουμ",
+    "AppDeviceValues": "Εφαρμογή: {0}, Συσκευή: {1}",
+    "Application": "Εφαρμογή",
+    "Artists": "Καλλιτέχνες",
+    "AuthenticationSucceededWithUserName": "{0} επιτυχείς σύνδεση",
+    "Books": "Βιβλία",
+    "CameraImageUploadedFrom": "Μια νέα εικόνα κάμερας έχει αποσταλεί από {0}",
+    "Channels": "Κανάλια",
+    "ChapterNameValue": "Κεφάλαιο {0}",
+    "Collections": "Συλλογές",
+    "DeviceOfflineWithName": "{0} αποσυνδέθηκε",
+    "DeviceOnlineWithName": "{0} συνδέθηκε",
+    "FailedLoginAttemptWithUserName": "Αποτυχημένη προσπάθεια σύνδεσης από {0}",
+    "Favorites": "Αγαπημένα",
+    "Folders": "Φάκελοι",
+    "Games": "Παιχνίδια",
+    "Genres": "Είδη",
+    "HeaderAlbumArtists": "Άλμπουμ Καλλιτεχνών",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Συνεχίστε να παρακολουθείτε",
+    "HeaderFavoriteAlbums": "Αγαπημένα Άλμπουμ",
+    "HeaderFavoriteArtists": "Αγαπημένοι Καλλιτέχνες",
+    "HeaderFavoriteEpisodes": "Αγαπημένα Επεισόδια",
+    "HeaderFavoriteShows": "Αγαπημένες Σειρές",
+    "HeaderFavoriteSongs": "Αγαπημένα Τραγούδια",
+    "HeaderLiveTV": "Ζωντανή Τηλεόραση",
+    "HeaderNextUp": "Επόμενο",
+    "HeaderRecordingGroups": "Γκρουπ Εγγραφών",
+    "HomeVideos": "Προσωπικά βίντεο",
+    "Inherit": "Inherit",
+    "ItemAddedWithName": "{0} προστέθηκε στη βιβλιοθήκη",
+    "ItemRemovedWithName": "{0} διαγράφηκε από τη βιβλιοθήκη",
+    "LabelIpAddressValue": "Διεύθυνση IP: {0}",
+    "LabelRunningTimeValue": "Διάρκεια: {0}",
+    "Latest": "Πρόσφατα",
+    "MessageApplicationUpdated": "Ο Jellyfin Server έχει ενημερωθεί",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Η ενότητα {0} ρύθμισης παραμέτρων του server έχει ενημερωθεί",
+    "MessageServerConfigurationUpdated": "Η ρύθμιση παραμέτρων του server έχει ενημερωθεί",
+    "MixedContent": "Ανάμεικτο Περιεχόμενο",
+    "Movies": "Ταινίες",
+    "Music": "Μουσική",
+    "MusicVideos": "Μουσικά βίντεο",
+    "NameInstallFailed": "{0} η εγκατάσταση απέτυχε",
+    "NameSeasonNumber": "Κύκλος {0}",
+    "NameSeasonUnknown": "Άγνωστος Κύκλος",
+    "NewVersionIsAvailable": "Μια νέα έκδοση του Jellyfin Server είναι διαθέσιμη για λήψη.",
+    "NotificationOptionApplicationUpdateAvailable": "Διαθέσιμη ενημερωμένη έκδοση εφαρμογής",
+    "NotificationOptionApplicationUpdateInstalled": "Η ενημέρωση εφαρμογής εγκαταστάθηκε",
+    "NotificationOptionAudioPlayback": "Η αναπαραγωγή ήχου ξεκίνησε",
+    "NotificationOptionAudioPlaybackStopped": "Η αναπαραγωγή ήχου σταμάτησε",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionGamePlayback": "Η αναπαραγωγή του παιχνιδιού ξεκίνησε",
+    "NotificationOptionGamePlaybackStopped": "Η αναπαραγωγή του παιχνιδιού σταμάτησε",
+    "NotificationOptionInstallationFailed": "Αποτυχία εγκατάστασης",
+    "NotificationOptionNewLibraryContent": "Προστέθηκε νέο περιεχόμενο",
+    "NotificationOptionPluginError": "Αποτυχία του plugin",
+    "NotificationOptionPluginInstalled": "Το plugin εγκαταστάθηκε",
+    "NotificationOptionPluginUninstalled": "Το plugin απεγκαταστάθηκε",
+    "NotificationOptionPluginUpdateInstalled": "Η αναβάθμιση του plugin εγκαταστάθηκε",
+    "NotificationOptionServerRestartRequired": "Απαιτείται επανεκκίνηση του server",
+    "NotificationOptionTaskFailed": "Αποτυχία προγραμματισμένης εργασίας",
+    "NotificationOptionUserLockedOut": "Ο χρήστης αποκλείστηκε",
+    "NotificationOptionVideoPlayback": "Η αναπαραγωγή βίντεο ξεκίνησε",
+    "NotificationOptionVideoPlaybackStopped": "Η αναπαραγωγή βίντεο σταμάτησε",
+    "Photos": "Φωτογραφίες",
+    "Playlists": "Λίστες αναπαραγωγής",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} εγκαταστήθηκε",
+    "PluginUninstalledWithName": "{0} έχει απεγκατασταθεί",
+    "PluginUpdatedWithName": "{0} έχει αναβαθμιστεί",
+    "ProviderValue": "Provider: {0}",
+    "ScheduledTaskFailedWithName": "{0} αποτυχία",
+    "ScheduledTaskStartedWithName": "{0} ξεκίνησε",
+    "ServerNameNeedsToBeRestarted": "{0} χρειάζεται επανεκκίνηση",
+    "Shows": "Σειρές",
+    "Songs": "Τραγούδια",
+    "StartupEmbyServerIsLoading": "Ο Jellyfin Server φορτώνει. Παρακαλώ δοκιμάστε σε λίγο.",
+    "SubtitleDownloadFailureForItem": "Οι υπότιτλοι απέτυχαν να κατέβουν για {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Οι υπότιτλοι κατέβηκαν για {0}",
+    "Sync": "Συγχρονισμός",
+    "System": "Σύστημα",
+    "TvShows": "Τηλεοπτικές Σειρές",
+    "User": "Χρήστης",
+    "UserCreatedWithName": "Δημιουργήθηκε ο χρήστης {0}",
+    "UserDeletedWithName": "Ο χρήστης {0} έχει διαγραφεί",
+    "UserDownloadingItemWithValues": "{0} κατεβάζει {1}",
+    "UserLockedOutWithName": "Ο χρήστης {0} αποκλείστηκε",
+    "UserOfflineFromDevice": "{0} αποσυνδέθηκε από {1}",
+    "UserOnlineFromDevice": "{0} είναι online απο {1}",
+    "UserPasswordChangedWithName": "Ο κωδικός του χρήστη {0} έχει αλλάξει",
+    "UserPolicyUpdatedWithName": "Η πολιτική χρήστη έχει ενημερωθεί για {0}",
+    "UserStartedPlayingItemWithValues": "{0} παίζει {1} σε {2}",
+    "UserStoppedPlayingItemWithValues": "{0} τελείωσε να παίζει {1} σε {2}",
+    "ValueHasBeenAddedToLibrary": "{0} προστέθηκαν στη βιβλιοθήκη πολυμέσων σας",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "VersionNumber": "Έκδοση {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/en-GB.json b/Emby.Server.Implementations/Localization/Core/en-GB.json
index b16afea5bc..20d397a1a0 100644
--- a/Emby.Server.Implementations/Localization/Core/en-GB.json
+++ b/Emby.Server.Implementations/Localization/Core/en-GB.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albums",
-  "AppDeviceValues": "App: {0}, Device: {1}",
-  "Application": "Application",
-  "Artists": "Artists",
-  "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-  "Books": "Books",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Channels",
-  "ChapterNameValue": "Chapter {0}",
-  "Collections": "Collections",
-  "DeviceOfflineWithName": "{0} has disconnected",
-  "DeviceOnlineWithName": "{0} is connected",
-  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-  "Favorites": "Favourites",
-  "Folders": "Folders",
-  "Games": "Games",
-  "Genres": "Genres",
-  "HeaderAlbumArtists": "Album Artists",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Continue Watching",
-  "HeaderFavoriteAlbums": "Favourite Albums",
-  "HeaderFavoriteArtists": "Favourite Artists",
-  "HeaderFavoriteEpisodes": "Favourite Episodes",
-  "HeaderFavoriteShows": "Favourite Shows",
-  "HeaderFavoriteSongs": "Favourite Songs",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "Next Up",
-  "HeaderRecordingGroups": "Recording Groups",
-  "HomeVideos": "Home videos",
-  "Inherit": "Inherit",
-  "ItemAddedWithName": "{0} was added to the library",
-  "ItemRemovedWithName": "{0} was removed from the library",
-  "LabelIpAddressValue": "IP address: {0}",
-  "LabelRunningTimeValue": "Running time: {0}",
-  "Latest": "Latest",
-  "MessageApplicationUpdated": "Jellyfin Server has been updated",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-  "MessageServerConfigurationUpdated": "Server configuration has been updated",
-  "MixedContent": "Mixed content",
-  "Movies": "Movies",
-  "Music": "Music",
-  "MusicVideos": "Music videos",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Season {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Application update available",
-  "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-  "NotificationOptionAudioPlayback": "Audio playback started",
-  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-  "NotificationOptionInstallationFailed": "Installation failure",
-  "NotificationOptionNewLibraryContent": "New content added",
-  "NotificationOptionPluginError": "Plugin failure",
-  "NotificationOptionPluginInstalled": "Plugin installed",
-  "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-  "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-  "NotificationOptionServerRestartRequired": "Server restart required",
-  "NotificationOptionTaskFailed": "Scheduled task failure",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionVideoPlayback": "Video playback started",
-  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-  "Photos": "Photos",
-  "Playlists": "Playlists",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} was installed",
-  "PluginUninstalledWithName": "{0} was uninstalled",
-  "PluginUpdatedWithName": "{0} was updated",
-  "ProviderValue": "Provider: {0}",
-  "ScheduledTaskFailedWithName": "{0} failed",
-  "ScheduledTaskStartedWithName": "{0} started",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Shows",
-  "Songs": "Songs",
-  "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
-  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-  "Sync": "Sync",
-  "System": "System",
-  "TvShows": "TV Shows",
-  "User": "User",
-  "UserCreatedWithName": "User {0} has been created",
-  "UserDeletedWithName": "User {0} has been deleted",
-  "UserDownloadingItemWithValues": "{0} is downloading {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} has disconnected from {1}",
-  "UserOnlineFromDevice": "{0} is online from {1}",
-  "UserPasswordChangedWithName": "Password has been changed for user {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-  "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Special - {0}",
-  "VersionNumber": "Version {0}"
+    "Albums": "Albums",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "Application": "Application",
+    "Artists": "Artists",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "Books": "Books",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Channels",
+    "ChapterNameValue": "Chapter {0}",
+    "Collections": "Collections",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "DeviceOnlineWithName": "{0} is connected",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "Favorites": "Favourites",
+    "Folders": "Folders",
+    "Games": "Games",
+    "Genres": "Genres",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Continue Watching",
+    "HeaderFavoriteAlbums": "Favourite Albums",
+    "HeaderFavoriteArtists": "Favourite Artists",
+    "HeaderFavoriteEpisodes": "Favourite Episodes",
+    "HeaderFavoriteShows": "Favourite Shows",
+    "HeaderFavoriteSongs": "Favourite Songs",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "Next Up",
+    "HeaderRecordingGroups": "Recording Groups",
+    "HomeVideos": "Home videos",
+    "Inherit": "Inherit",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "IP address: {0}",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "Latest": "Latest",
+    "MessageApplicationUpdated": "Jellyfin Server has been updated",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MixedContent": "Mixed content",
+    "Movies": "Movies",
+    "Music": "Music",
+    "MusicVideos": "Music videos",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Season {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "Photos": "Photos",
+    "Playlists": "Playlists",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "PluginUpdatedWithName": "{0} was updated",
+    "ProviderValue": "Provider: {0}",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Shows",
+    "Songs": "Songs",
+    "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "Sync": "Sync",
+    "System": "System",
+    "TvShows": "TV Shows",
+    "User": "User",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "VersionNumber": "Version {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/en-US.json b/Emby.Server.Implementations/Localization/Core/en-US.json
index b90e8b593f..69c8bf03c2 100644
--- a/Emby.Server.Implementations/Localization/Core/en-US.json
+++ b/Emby.Server.Implementations/Localization/Core/en-US.json
@@ -1,99 +1,99 @@
 {
-  "Albums": "Albums",
-  "AppDeviceValues": "App: {0}, Device: {1}",
-  "Application": "Application",
-  "Artists": "Artists",
-  "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-  "Books": "Books",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Channels",
-  "ChapterNameValue": "Chapter {0}",
-  "Collections": "Collections",
-  "DeviceOfflineWithName": "{0} has disconnected",
-  "DeviceOnlineWithName": "{0} is connected",
-  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-  "Favorites": "Favorites",
-  "Folders": "Folders",
-  "Games": "Games",
-  "Genres": "Genres",
-  "HeaderAlbumArtists": "Album Artists",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Continue Watching",
-  "HeaderFavoriteAlbums": "Favorite Albums",
-  "HeaderFavoriteArtists": "Favorite Artists",
-  "HeaderFavoriteEpisodes": "Favorite Episodes",
-  "HeaderFavoriteShows": "Favorite Shows",
-  "HeaderFavoriteSongs": "Favorite Songs",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "Next Up",
-  "HeaderRecordingGroups": "Recording Groups",
-  "HomeVideos": "Home videos",
-  "Inherit": "Inherit",
-  "ItemAddedWithName": "{0} was added to the library",
-  "ItemRemovedWithName": "{0} was removed from the library",
-  "LabelIpAddressValue": "Ip address: {0}",
-  "LabelRunningTimeValue": "Running time: {0}",
-  "Latest": "Latest",
-  "MessageApplicationUpdated": "Jellyfin Server has been updated",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-  "MessageServerConfigurationUpdated": "Server configuration has been updated",
-  "MixedContent": "Mixed content",
-  "Movies": "Movies",
-  "Music": "Music",
-  "MusicVideos": "Music videos",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Season {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Application update available",
-  "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-  "NotificationOptionAudioPlayback": "Audio playback started",
-  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-  "NotificationOptionInstallationFailed": "Installation failure",
-  "NotificationOptionNewLibraryContent": "New content added",
-  "NotificationOptionPluginError": "Plugin failure",
-  "NotificationOptionPluginInstalled": "Plugin installed",
-  "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-  "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-  "NotificationOptionServerRestartRequired": "Server restart required",
-  "NotificationOptionTaskFailed": "Scheduled task failure",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionVideoPlayback": "Video playback started",
-  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-  "Photos": "Photos",
-  "Playlists": "Playlists",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} was installed",
-  "PluginUninstalledWithName": "{0} was uninstalled",
-  "PluginUpdatedWithName": "{0} was updated",
-  "ProviderValue": "Provider: {0}",
-  "ScheduledTaskFailedWithName": "{0} failed",
-  "ScheduledTaskStartedWithName": "{0} started",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Shows",
-  "Songs": "Songs",
-  "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-  "Sync": "Sync",
-  "System": "System",
-  "TvShows": "TV Shows",
-  "User": "User",
-  "UserCreatedWithName": "User {0} has been created",
-  "UserDeletedWithName": "User {0} has been deleted",
-  "UserDownloadingItemWithValues": "{0} is downloading {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} has disconnected from {1}",
-  "UserOnlineFromDevice": "{0} is online from {1}",
-  "UserPasswordChangedWithName": "Password has been changed for user {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
-  "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Special - {0}",
-  "VersionNumber": "Version {0}"
+    "Albums": "Albums",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "Application": "Application",
+    "Artists": "Artists",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "Books": "Books",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Channels",
+    "ChapterNameValue": "Chapter {0}",
+    "Collections": "Collections",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "DeviceOnlineWithName": "{0} is connected",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "Favorites": "Favorites",
+    "Folders": "Folders",
+    "Games": "Games",
+    "Genres": "Genres",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Continue Watching",
+    "HeaderFavoriteAlbums": "Favorite Albums",
+    "HeaderFavoriteArtists": "Favorite Artists",
+    "HeaderFavoriteEpisodes": "Favorite Episodes",
+    "HeaderFavoriteShows": "Favorite Shows",
+    "HeaderFavoriteSongs": "Favorite Songs",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "Next Up",
+    "HeaderRecordingGroups": "Recording Groups",
+    "HomeVideos": "Home videos",
+    "Inherit": "Inherit",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "Latest": "Latest",
+    "MessageApplicationUpdated": "Jellyfin Server has been updated",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MixedContent": "Mixed content",
+    "Movies": "Movies",
+    "Music": "Music",
+    "MusicVideos": "Music videos",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Season {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "Photos": "Photos",
+    "Playlists": "Playlists",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "PluginUpdatedWithName": "{0} was updated",
+    "ProviderValue": "Provider: {0}",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Shows",
+    "Songs": "Songs",
+    "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "Sync": "Sync",
+    "System": "System",
+    "TvShows": "TV Shows",
+    "User": "User",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
+    "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "VersionNumber": "Version {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/es-AR.json b/Emby.Server.Implementations/Localization/Core/es-AR.json
index ae74d6f7eb..aaaf097882 100644
--- a/Emby.Server.Implementations/Localization/Core/es-AR.json
+++ b/Emby.Server.Implementations/Localization/Core/es-AR.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albums",
-  "AppDeviceValues": "App: {0}, Device: {1}",
-  "Application": "Application",
-  "Artists": "Artists",
-  "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-  "Books": "Books",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Channels",
-  "ChapterNameValue": "Chapter {0}",
-  "Collections": "Collections",
-  "DeviceOfflineWithName": "{0} has disconnected",
-  "DeviceOnlineWithName": "{0} is connected",
-  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-  "Favorites": "Favorites",
-  "Folders": "Folders",
-  "Games": "Games",
-  "Genres": "Genres",
-  "HeaderAlbumArtists": "Album Artists",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Continue Watching",
-  "HeaderFavoriteAlbums": "Favorite Albums",
-  "HeaderFavoriteArtists": "Favorite Artists",
-  "HeaderFavoriteEpisodes": "Favorite Episodes",
-  "HeaderFavoriteShows": "Favorite Shows",
-  "HeaderFavoriteSongs": "Favorite Songs",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "Next Up",
-  "HeaderRecordingGroups": "Recording Groups",
-  "HomeVideos": "Home videos",
-  "Inherit": "Inherit",
-  "ItemAddedWithName": "{0} was added to the library",
-  "ItemRemovedWithName": "{0} was removed from the library",
-  "LabelIpAddressValue": "Ip address: {0}",
-  "LabelRunningTimeValue": "Running time: {0}",
-  "Latest": "Latest",
-  "MessageApplicationUpdated": "Jellyfin Server has been updated",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-  "MessageServerConfigurationUpdated": "Server configuration has been updated",
-  "MixedContent": "Mixed content",
-  "Movies": "Movies",
-  "Music": "Music",
-  "MusicVideos": "Music videos",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Season {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Application update available",
-  "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-  "NotificationOptionAudioPlayback": "Audio playback started",
-  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-  "NotificationOptionInstallationFailed": "Installation failure",
-  "NotificationOptionNewLibraryContent": "New content added",
-  "NotificationOptionPluginError": "Plugin failure",
-  "NotificationOptionPluginInstalled": "Plugin installed",
-  "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-  "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-  "NotificationOptionServerRestartRequired": "Server restart required",
-  "NotificationOptionTaskFailed": "Scheduled task failure",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionVideoPlayback": "Video playback started",
-  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-  "Photos": "Photos",
-  "Playlists": "Playlists",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} was installed",
-  "PluginUninstalledWithName": "{0} was uninstalled",
-  "PluginUpdatedWithName": "{0} was updated",
-  "ProviderValue": "Provider: {0}",
-  "ScheduledTaskFailedWithName": "{0} failed",
-  "ScheduledTaskStartedWithName": "{0} started",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Series",
-  "Songs": "Songs",
-  "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
-  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-  "Sync": "Sync",
-  "System": "System",
-  "TvShows": "TV Shows",
-  "User": "User",
-  "UserCreatedWithName": "User {0} has been created",
-  "UserDeletedWithName": "User {0} has been deleted",
-  "UserDownloadingItemWithValues": "{0} is downloading {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} has disconnected from {1}",
-  "UserOnlineFromDevice": "{0} is online from {1}",
-  "UserPasswordChangedWithName": "Password has been changed for user {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
-  "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Special - {0}",
-  "VersionNumber": "Version {0}"
+    "Albums": "Albums",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "Application": "Application",
+    "Artists": "Artists",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "Books": "Books",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Channels",
+    "ChapterNameValue": "Chapter {0}",
+    "Collections": "Collections",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "DeviceOnlineWithName": "{0} is connected",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "Favorites": "Favorites",
+    "Folders": "Folders",
+    "Games": "Games",
+    "Genres": "Genres",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Continue Watching",
+    "HeaderFavoriteAlbums": "Favorite Albums",
+    "HeaderFavoriteArtists": "Favorite Artists",
+    "HeaderFavoriteEpisodes": "Favorite Episodes",
+    "HeaderFavoriteShows": "Favorite Shows",
+    "HeaderFavoriteSongs": "Favorite Songs",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "Next Up",
+    "HeaderRecordingGroups": "Recording Groups",
+    "HomeVideos": "Home videos",
+    "Inherit": "Inherit",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "Latest": "Latest",
+    "MessageApplicationUpdated": "Jellyfin Server has been updated",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MixedContent": "Mixed content",
+    "Movies": "Movies",
+    "Music": "Music",
+    "MusicVideos": "Music videos",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Season {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "Photos": "Photos",
+    "Playlists": "Playlists",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "PluginUpdatedWithName": "{0} was updated",
+    "ProviderValue": "Provider: {0}",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Series",
+    "Songs": "Songs",
+    "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "Sync": "Sync",
+    "System": "System",
+    "TvShows": "TV Shows",
+    "User": "User",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
+    "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "VersionNumber": "Version {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/es-MX.json b/Emby.Server.Implementations/Localization/Core/es-MX.json
index 4fa29a3987..2ba9c8c7ab 100644
--- a/Emby.Server.Implementations/Localization/Core/es-MX.json
+++ b/Emby.Server.Implementations/Localization/Core/es-MX.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Álbumes",
-  "AppDeviceValues": "App: {0}, Dispositivo: {1}",
-  "Application": "Aplicación",
-  "Artists": "Artistas",
-  "AuthenticationSucceededWithUserName": "{0} autenticado con éxito",
-  "Books": "Libros",
-  "CameraImageUploadedFrom": "Una nueva imagen de cámara ha sido subida desde {0}",
-  "Channels": "Canales",
-  "ChapterNameValue": "Capítulo {0}",
-  "Collections": "Colecciones",
-  "DeviceOfflineWithName": "{0} se ha desconectado",
-  "DeviceOnlineWithName": "{0} está conectado",
-  "FailedLoginAttemptWithUserName": "Intento fallido de inicio de sesión de {0}",
-  "Favorites": "Favoritos",
-  "Folders": "Carpetas",
-  "Games": "Juegos",
-  "Genres": "Géneros",
-  "HeaderAlbumArtists": "Artistas del Álbum",
-  "HeaderCameraUploads": "Subidos desde Camara",
-  "HeaderContinueWatching": "Continuar Viendo",
-  "HeaderFavoriteAlbums": "Álbumes Favoritos",
-  "HeaderFavoriteArtists": "Artistas Favoritos",
-  "HeaderFavoriteEpisodes": "Episodios Preferidos",
-  "HeaderFavoriteShows": "Programas Preferidos",
-  "HeaderFavoriteSongs": "Canciones Favoritas",
-  "HeaderLiveTV": "TV en Vivo",
-  "HeaderNextUp": "A Continuación",
-  "HeaderRecordingGroups": "Grupos de Grabaciones",
-  "HomeVideos": "Videos caseros",
-  "Inherit": "Heredar",
-  "ItemAddedWithName": "{0} fue agregado a la biblioteca",
-  "ItemRemovedWithName": "{0} fue removido de la biblioteca",
-  "LabelIpAddressValue": "Dirección IP: {0}",
-  "LabelRunningTimeValue": "Duración: {0}",
-  "Latest": "Recientes",
-  "MessageApplicationUpdated": "El servidor Jellyfin ha sido actualizado",
-  "MessageApplicationUpdatedTo": "El servidor Jellyfin ha sido actualizado a {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Se ha actualizado la sección {0} de la configuración del servidor",
-  "MessageServerConfigurationUpdated": "Se ha actualizado la configuración del servidor",
-  "MixedContent": "Contenido mezclado",
-  "Movies": "Películas",
-  "Music": "Música",
-  "MusicVideos": "Videos musicales",
-  "NameInstallFailed": "{0} instalación fallida",
-  "NameSeasonNumber": "Temporada {0}",
-  "NameSeasonUnknown": "Temporada Desconocida",
-  "NewVersionIsAvailable": "Una nueva versión del Servidor Jellyfin está disponible para descargar.",
-  "NotificationOptionApplicationUpdateAvailable": "Actualización de aplicación disponible",
-  "NotificationOptionApplicationUpdateInstalled": "Actualización de aplicación instalada",
-  "NotificationOptionAudioPlayback": "Reproducción de audio iniciada",
-  "NotificationOptionAudioPlaybackStopped": "Reproducción de audio detenida",
-  "NotificationOptionCameraImageUploaded": "Imagen de la cámara subida",
-  "NotificationOptionGamePlayback": "Ejecución de juego iniciada",
-  "NotificationOptionGamePlaybackStopped": "Ejecución de juego detenida",
-  "NotificationOptionInstallationFailed": "Falla de instalación",
-  "NotificationOptionNewLibraryContent": "Nuevo contenido agregado",
-  "NotificationOptionPluginError": "Falla de complemento",
-  "NotificationOptionPluginInstalled": "Complemento instalado",
-  "NotificationOptionPluginUninstalled": "Complemento desinstalado",
-  "NotificationOptionPluginUpdateInstalled": "Actualización de complemento instalada",
-  "NotificationOptionServerRestartRequired": "Se necesita reiniciar el Servidor",
-  "NotificationOptionTaskFailed": "Falla de tarea programada",
-  "NotificationOptionUserLockedOut": "Usuario bloqueado",
-  "NotificationOptionVideoPlayback": "Reproducción de video iniciada",
-  "NotificationOptionVideoPlaybackStopped": "Reproducción de video detenida",
-  "Photos": "Fotos",
-  "Playlists": "Listas de reproducción",
-  "Plugin": "Complemento",
-  "PluginInstalledWithName": "{0} fue instalado",
-  "PluginUninstalledWithName": "{0} fue desinstalado",
-  "PluginUpdatedWithName": "{0} fue actualizado",
-  "ProviderValue": "Proveedor: {0}",
-  "ScheduledTaskFailedWithName": "{0} falló",
-  "ScheduledTaskStartedWithName": "{0} Iniciado",
-  "ServerNameNeedsToBeRestarted": "{0} debe ser reiniciado",
-  "Shows": "Programas",
-  "Songs": "Canciones",
-  "StartupEmbyServerIsLoading": "El servidor Jellyfin esta cargando. Por favor intente de nuevo dentro de poco.",
-  "SubtitleDownloadFailureForItem": "Falló la descarga de subtítulos para {0}",
-  "SubtitleDownloadFailureFromForItem": "Falló la descarga de subtitulos desde {0} para {1}",
-  "SubtitlesDownloadedForItem": "Subtítulos descargados para {0}",
-  "Sync": "Sincronizar",
-  "System": "Sistema",
-  "TvShows": "Programas de TV",
-  "User": "Usuario",
-  "UserCreatedWithName": "Se ha creado el usuario {0}",
-  "UserDeletedWithName": "Se ha eliminado el usuario {0}",
-  "UserDownloadingItemWithValues": "{0} esta descargando {1}",
-  "UserLockedOutWithName": "El usuario {0} ha sido bloqueado",
-  "UserOfflineFromDevice": "{0} se ha desconectado desde {1}",
-  "UserOnlineFromDevice": "{0} está en línea desde {1}",
-  "UserPasswordChangedWithName": "Se ha cambiado la contraseña para el usuario {0}",
-  "UserPolicyUpdatedWithName": "Las política de usuario ha sido actualizada por {0}",
-  "UserStartedPlayingItemWithValues": "{0} está reproduciéndose {1} en {2}",
-  "UserStoppedPlayingItemWithValues": "{0} ha terminado de reproducirse {1} en {2}",
-  "ValueHasBeenAddedToLibrary": "{0} se han añadido a su biblioteca de medios",
-  "ValueSpecialEpisodeName": "Especial - {0}",
-  "VersionNumber": "Versión {0}"
+    "Albums": "Álbumes",
+    "AppDeviceValues": "App: {0}, Dispositivo: {1}",
+    "Application": "Aplicación",
+    "Artists": "Artistas",
+    "AuthenticationSucceededWithUserName": "{0} autenticado con éxito",
+    "Books": "Libros",
+    "CameraImageUploadedFrom": "Una nueva imagen de cámara ha sido subida desde {0}",
+    "Channels": "Canales",
+    "ChapterNameValue": "Capítulo {0}",
+    "Collections": "Colecciones",
+    "DeviceOfflineWithName": "{0} se ha desconectado",
+    "DeviceOnlineWithName": "{0} está conectado",
+    "FailedLoginAttemptWithUserName": "Intento fallido de inicio de sesión de {0}",
+    "Favorites": "Favoritos",
+    "Folders": "Carpetas",
+    "Games": "Juegos",
+    "Genres": "Géneros",
+    "HeaderAlbumArtists": "Artistas del Álbum",
+    "HeaderCameraUploads": "Subidos desde Camara",
+    "HeaderContinueWatching": "Continuar Viendo",
+    "HeaderFavoriteAlbums": "Álbumes Favoritos",
+    "HeaderFavoriteArtists": "Artistas Favoritos",
+    "HeaderFavoriteEpisodes": "Episodios Preferidos",
+    "HeaderFavoriteShows": "Programas Preferidos",
+    "HeaderFavoriteSongs": "Canciones Favoritas",
+    "HeaderLiveTV": "TV en Vivo",
+    "HeaderNextUp": "A Continuación",
+    "HeaderRecordingGroups": "Grupos de Grabaciones",
+    "HomeVideos": "Videos caseros",
+    "Inherit": "Heredar",
+    "ItemAddedWithName": "{0} fue agregado a la biblioteca",
+    "ItemRemovedWithName": "{0} fue removido de la biblioteca",
+    "LabelIpAddressValue": "Dirección IP: {0}",
+    "LabelRunningTimeValue": "Duración: {0}",
+    "Latest": "Recientes",
+    "MessageApplicationUpdated": "El servidor Jellyfin ha sido actualizado",
+    "MessageApplicationUpdatedTo": "El servidor Jellyfin ha sido actualizado a {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Se ha actualizado la sección {0} de la configuración del servidor",
+    "MessageServerConfigurationUpdated": "Se ha actualizado la configuración del servidor",
+    "MixedContent": "Contenido mezclado",
+    "Movies": "Películas",
+    "Music": "Música",
+    "MusicVideos": "Videos musicales",
+    "NameInstallFailed": "{0} instalación fallida",
+    "NameSeasonNumber": "Temporada {0}",
+    "NameSeasonUnknown": "Temporada Desconocida",
+    "NewVersionIsAvailable": "Una nueva versión del Servidor Jellyfin está disponible para descargar.",
+    "NotificationOptionApplicationUpdateAvailable": "Actualización de aplicación disponible",
+    "NotificationOptionApplicationUpdateInstalled": "Actualización de aplicación instalada",
+    "NotificationOptionAudioPlayback": "Reproducción de audio iniciada",
+    "NotificationOptionAudioPlaybackStopped": "Reproducción de audio detenida",
+    "NotificationOptionCameraImageUploaded": "Imagen de la cámara subida",
+    "NotificationOptionGamePlayback": "Ejecución de juego iniciada",
+    "NotificationOptionGamePlaybackStopped": "Ejecución de juego detenida",
+    "NotificationOptionInstallationFailed": "Falla de instalación",
+    "NotificationOptionNewLibraryContent": "Nuevo contenido agregado",
+    "NotificationOptionPluginError": "Falla de complemento",
+    "NotificationOptionPluginInstalled": "Complemento instalado",
+    "NotificationOptionPluginUninstalled": "Complemento desinstalado",
+    "NotificationOptionPluginUpdateInstalled": "Actualización de complemento instalada",
+    "NotificationOptionServerRestartRequired": "Se necesita reiniciar el Servidor",
+    "NotificationOptionTaskFailed": "Falla de tarea programada",
+    "NotificationOptionUserLockedOut": "Usuario bloqueado",
+    "NotificationOptionVideoPlayback": "Reproducción de video iniciada",
+    "NotificationOptionVideoPlaybackStopped": "Reproducción de video detenida",
+    "Photos": "Fotos",
+    "Playlists": "Listas de reproducción",
+    "Plugin": "Complemento",
+    "PluginInstalledWithName": "{0} fue instalado",
+    "PluginUninstalledWithName": "{0} fue desinstalado",
+    "PluginUpdatedWithName": "{0} fue actualizado",
+    "ProviderValue": "Proveedor: {0}",
+    "ScheduledTaskFailedWithName": "{0} falló",
+    "ScheduledTaskStartedWithName": "{0} Iniciado",
+    "ServerNameNeedsToBeRestarted": "{0} debe ser reiniciado",
+    "Shows": "Programas",
+    "Songs": "Canciones",
+    "StartupEmbyServerIsLoading": "El servidor Jellyfin esta cargando. Por favor intente de nuevo dentro de poco.",
+    "SubtitleDownloadFailureForItem": "Falló la descarga de subtítulos para {0}",
+    "SubtitleDownloadFailureFromForItem": "Falló la descarga de subtitulos desde {0} para {1}",
+    "SubtitlesDownloadedForItem": "Subtítulos descargados para {0}",
+    "Sync": "Sincronizar",
+    "System": "Sistema",
+    "TvShows": "Programas de TV",
+    "User": "Usuario",
+    "UserCreatedWithName": "Se ha creado el usuario {0}",
+    "UserDeletedWithName": "Se ha eliminado el usuario {0}",
+    "UserDownloadingItemWithValues": "{0} esta descargando {1}",
+    "UserLockedOutWithName": "El usuario {0} ha sido bloqueado",
+    "UserOfflineFromDevice": "{0} se ha desconectado desde {1}",
+    "UserOnlineFromDevice": "{0} está en línea desde {1}",
+    "UserPasswordChangedWithName": "Se ha cambiado la contraseña para el usuario {0}",
+    "UserPolicyUpdatedWithName": "Las política de usuario ha sido actualizada por {0}",
+    "UserStartedPlayingItemWithValues": "{0} está reproduciéndose {1} en {2}",
+    "UserStoppedPlayingItemWithValues": "{0} ha terminado de reproducirse {1} en {2}",
+    "ValueHasBeenAddedToLibrary": "{0} se han añadido a su biblioteca de medios",
+    "ValueSpecialEpisodeName": "Especial - {0}",
+    "VersionNumber": "Versión {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/es.json b/Emby.Server.Implementations/Localization/Core/es.json
index ad6a32a0e8..38a2823827 100644
--- a/Emby.Server.Implementations/Localization/Core/es.json
+++ b/Emby.Server.Implementations/Localization/Core/es.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Álbumes",
-  "AppDeviceValues": "Aplicación: {0}, Dispositivo: {1}",
-  "Application": "Aplicación",
-  "Artists": "Artistas",
-  "AuthenticationSucceededWithUserName": "{0} autenticado correctamente",
-  "Books": "Libros",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Canales",
-  "ChapterNameValue": "Capítulo {0}",
-  "Collections": "Colecciones",
-  "DeviceOfflineWithName": "{0} se ha desconectado",
-  "DeviceOnlineWithName": "{0} está conectado",
-  "FailedLoginAttemptWithUserName": "Error al intentar iniciar sesión a partir de {0}",
-  "Favorites": "Favoritos",
-  "Folders": "Carpetas",
-  "Games": "Juegos",
-  "Genres": "Géneros",
-  "HeaderAlbumArtists": "Artistas del Álbum",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Continuar viendo",
-  "HeaderFavoriteAlbums": "Álbumes favoritos",
-  "HeaderFavoriteArtists": "Artistas favoritos",
-  "HeaderFavoriteEpisodes": "Episodios favoritos",
-  "HeaderFavoriteShows": "Programas favoritos",
-  "HeaderFavoriteSongs": "Canciones favoritas",
-  "HeaderLiveTV": "TV en vivo",
-  "HeaderNextUp": "Siguiendo",
-  "HeaderRecordingGroups": "Grupos de grabación",
-  "HomeVideos": "Vídeos de inicio",
-  "Inherit": "Heredar",
-  "ItemAddedWithName": "{0} se ha añadido a la biblioteca",
-  "ItemRemovedWithName": "{0} se elimina de la biblioteca",
-  "LabelIpAddressValue": "Dirección IP: {0}",
-  "LabelRunningTimeValue": "Tiempo de funcionamiento: {0}",
-  "Latest": "Últimos",
-  "MessageApplicationUpdated": "Se ha actualizado el servidor Jellyfin",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "La sección de configuración del servidor {0} ha sido actualizado",
-  "MessageServerConfigurationUpdated": "Se ha actualizado la configuración del servidor",
-  "MixedContent": "Contenido mixto",
-  "Movies": "Peliculas",
-  "Music": "Música",
-  "MusicVideos": "Videos musicales",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Temporada {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Actualización de la aplicación disponible",
-  "NotificationOptionApplicationUpdateInstalled": "Actualización de la aplicación instalada",
-  "NotificationOptionAudioPlayback": "Se inició la reproducción de audio",
-  "NotificationOptionAudioPlaybackStopped": "Se detuvo la reproducción de audio",
-  "NotificationOptionCameraImageUploaded": "Imagen de la cámara cargada",
-  "NotificationOptionGamePlayback": "Se inició la reproducción del juego",
-  "NotificationOptionGamePlaybackStopped": "Se detuvo la reproducción del juego",
-  "NotificationOptionInstallationFailed": "Error de instalación",
-  "NotificationOptionNewLibraryContent": "Nuevo contenido añadido",
-  "NotificationOptionPluginError": "Error en plugin",
-  "NotificationOptionPluginInstalled": "Plugin instalado",
-  "NotificationOptionPluginUninstalled": "Plugin desinstalado",
-  "NotificationOptionPluginUpdateInstalled": "Actualización del complemento instalada",
-  "NotificationOptionServerRestartRequired": "Requiere reinicio del servidor",
-  "NotificationOptionTaskFailed": "Error de tarea programada",
-  "NotificationOptionUserLockedOut": "Usuario bloqueado",
-  "NotificationOptionVideoPlayback": "Se inició la reproducción de vídeo",
-  "NotificationOptionVideoPlaybackStopped": "Reproducción de vídeo detenida",
-  "Photos": "Fotos",
-  "Playlists": "Listas reproducción",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} se ha instalado",
-  "PluginUninstalledWithName": "{0} se ha desinstalado",
-  "PluginUpdatedWithName": "{0} se actualizó",
-  "ProviderValue": "Proveedor: {0}",
-  "ScheduledTaskFailedWithName": "{0} falló",
-  "ScheduledTaskStartedWithName": "{0} iniciada",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Series",
-  "Songs": "Canciones",
-  "StartupEmbyServerIsLoading": "Jellyfin Server se está cargando. Vuelve a intentarlo en breve.",
-  "SubtitleDownloadFailureForItem": "Error al descargar subtítulos para {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Descargar subtítulos para {0}",
-  "Sync": "Sincronizar",
-  "System": "Sistema",
-  "TvShows": "Series TV",
-  "User": "Usuario",
-  "UserCreatedWithName": "El usuario {0} ha sido creado",
-  "UserDeletedWithName": "El usuario {0} ha sido borrado",
-  "UserDownloadingItemWithValues": "{0} está descargando {1}",
-  "UserLockedOutWithName": "El usuario {0} ha sido bloqueado",
-  "UserOfflineFromDevice": "{0} se ha desconectado de {1}",
-  "UserOnlineFromDevice": "{0} está en línea desde {1}",
-  "UserPasswordChangedWithName": "Se ha cambiado la contraseña para el usuario {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} ha comenzado reproducir {1}",
-  "UserStoppedPlayingItemWithValues": "{0} ha parado de reproducir {1}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Especial - {0}",
-  "VersionNumber": "Versión {0}"
+    "Albums": "Álbumes",
+    "AppDeviceValues": "Aplicación: {0}, Dispositivo: {1}",
+    "Application": "Aplicación",
+    "Artists": "Artistas",
+    "AuthenticationSucceededWithUserName": "{0} autenticado correctamente",
+    "Books": "Libros",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Canales",
+    "ChapterNameValue": "Capítulo {0}",
+    "Collections": "Colecciones",
+    "DeviceOfflineWithName": "{0} se ha desconectado",
+    "DeviceOnlineWithName": "{0} está conectado",
+    "FailedLoginAttemptWithUserName": "Error al intentar iniciar sesión a partir de {0}",
+    "Favorites": "Favoritos",
+    "Folders": "Carpetas",
+    "Games": "Juegos",
+    "Genres": "Géneros",
+    "HeaderAlbumArtists": "Artistas del Álbum",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Continuar viendo",
+    "HeaderFavoriteAlbums": "Álbumes favoritos",
+    "HeaderFavoriteArtists": "Artistas favoritos",
+    "HeaderFavoriteEpisodes": "Episodios favoritos",
+    "HeaderFavoriteShows": "Programas favoritos",
+    "HeaderFavoriteSongs": "Canciones favoritas",
+    "HeaderLiveTV": "TV en vivo",
+    "HeaderNextUp": "Siguiendo",
+    "HeaderRecordingGroups": "Grupos de grabación",
+    "HomeVideos": "Vídeos de inicio",
+    "Inherit": "Heredar",
+    "ItemAddedWithName": "{0} se ha añadido a la biblioteca",
+    "ItemRemovedWithName": "{0} se elimina de la biblioteca",
+    "LabelIpAddressValue": "Dirección IP: {0}",
+    "LabelRunningTimeValue": "Tiempo de funcionamiento: {0}",
+    "Latest": "Últimos",
+    "MessageApplicationUpdated": "Se ha actualizado el servidor Jellyfin",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "La sección de configuración del servidor {0} ha sido actualizado",
+    "MessageServerConfigurationUpdated": "Se ha actualizado la configuración del servidor",
+    "MixedContent": "Contenido mixto",
+    "Movies": "Peliculas",
+    "Music": "Música",
+    "MusicVideos": "Videos musicales",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Temporada {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Actualización de la aplicación disponible",
+    "NotificationOptionApplicationUpdateInstalled": "Actualización de la aplicación instalada",
+    "NotificationOptionAudioPlayback": "Se inició la reproducción de audio",
+    "NotificationOptionAudioPlaybackStopped": "Se detuvo la reproducción de audio",
+    "NotificationOptionCameraImageUploaded": "Imagen de la cámara cargada",
+    "NotificationOptionGamePlayback": "Se inició la reproducción del juego",
+    "NotificationOptionGamePlaybackStopped": "Se detuvo la reproducción del juego",
+    "NotificationOptionInstallationFailed": "Error de instalación",
+    "NotificationOptionNewLibraryContent": "Nuevo contenido añadido",
+    "NotificationOptionPluginError": "Error en plugin",
+    "NotificationOptionPluginInstalled": "Plugin instalado",
+    "NotificationOptionPluginUninstalled": "Plugin desinstalado",
+    "NotificationOptionPluginUpdateInstalled": "Actualización del complemento instalada",
+    "NotificationOptionServerRestartRequired": "Requiere reinicio del servidor",
+    "NotificationOptionTaskFailed": "Error de tarea programada",
+    "NotificationOptionUserLockedOut": "Usuario bloqueado",
+    "NotificationOptionVideoPlayback": "Se inició la reproducción de vídeo",
+    "NotificationOptionVideoPlaybackStopped": "Reproducción de vídeo detenida",
+    "Photos": "Fotos",
+    "Playlists": "Listas reproducción",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} se ha instalado",
+    "PluginUninstalledWithName": "{0} se ha desinstalado",
+    "PluginUpdatedWithName": "{0} se actualizó",
+    "ProviderValue": "Proveedor: {0}",
+    "ScheduledTaskFailedWithName": "{0} falló",
+    "ScheduledTaskStartedWithName": "{0} iniciada",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Series",
+    "Songs": "Canciones",
+    "StartupEmbyServerIsLoading": "Jellyfin Server se está cargando. Vuelve a intentarlo en breve.",
+    "SubtitleDownloadFailureForItem": "Error al descargar subtítulos para {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Descargar subtítulos para {0}",
+    "Sync": "Sincronizar",
+    "System": "Sistema",
+    "TvShows": "Series TV",
+    "User": "Usuario",
+    "UserCreatedWithName": "El usuario {0} ha sido creado",
+    "UserDeletedWithName": "El usuario {0} ha sido borrado",
+    "UserDownloadingItemWithValues": "{0} está descargando {1}",
+    "UserLockedOutWithName": "El usuario {0} ha sido bloqueado",
+    "UserOfflineFromDevice": "{0} se ha desconectado de {1}",
+    "UserOnlineFromDevice": "{0} está en línea desde {1}",
+    "UserPasswordChangedWithName": "Se ha cambiado la contraseña para el usuario {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} ha comenzado reproducir {1}",
+    "UserStoppedPlayingItemWithValues": "{0} ha parado de reproducir {1}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Especial - {0}",
+    "VersionNumber": "Versión {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/fa.json b/Emby.Server.Implementations/Localization/Core/fa.json
index 08a5f185da..1d7bc5fe82 100644
--- a/Emby.Server.Implementations/Localization/Core/fa.json
+++ b/Emby.Server.Implementations/Localization/Core/fa.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "آلبوم ها",
-  "AppDeviceValues": "برنامه: {0} ، دستگاه: {1}",
-  "Application": "برنامه",
-  "Artists": "هنرمندان",
-  "AuthenticationSucceededWithUserName": "{0} با موفقیت تایید اعتبار شد",
-  "Books": "کتاب ها",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "کانال ها",
-  "ChapterNameValue": "فصل {0}",
-  "Collections": "کلکسیون ها",
-  "DeviceOfflineWithName": "ارتباط {0} قطع شد",
-  "DeviceOnlineWithName": "{0} متصل شده",
-  "FailedLoginAttemptWithUserName": "تلاش برای ورود از {0} ناموفق بود",
-  "Favorites": "مورد علاقه ها",
-  "Folders": "پوشه ها",
-  "Games": "بازی ها",
-  "Genres": "ژانرها",
-  "HeaderAlbumArtists": "هنرمندان آلبوم",
-  "HeaderCameraUploads": "آپلودهای دوربین",
-  "HeaderContinueWatching": "ادامه تماشا",
-  "HeaderFavoriteAlbums": "آلبوم های مورد علاقه",
-  "HeaderFavoriteArtists": "هنرمندان مورد علاقه",
-  "HeaderFavoriteEpisodes": "قسمت های مورد علاقه",
-  "HeaderFavoriteShows": "سریال های مورد علاقه",
-  "HeaderFavoriteSongs": "آهنگ های مورد علاقه",
-  "HeaderLiveTV": "پخش زنده تلویزیون",
-  "HeaderNextUp": "بعدی چیه",
-  "HeaderRecordingGroups": "گروه های ضبط",
-  "HomeVideos": "ویدیوهای خانگی",
-  "Inherit": "به ارث برده",
-  "ItemAddedWithName": "{0} به کتابخانه افزوده شد",
-  "ItemRemovedWithName": "{0} از کتابخانه حذف شد",
-  "LabelIpAddressValue": "آدرس آی پی: {0}",
-  "LabelRunningTimeValue": "زمان اجرا: {0}",
-  "Latest": "آخرین",
-  "MessageApplicationUpdated": "سرور Jellyfin بروزرسانی شد",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "پکربندی بخش {0} سرور  بروزرسانی شد",
-  "MessageServerConfigurationUpdated": "پیکربندی سرور بروزرسانی شد",
-  "MixedContent": "محتوای درهم",
-  "Movies": "فیلم های سینمایی",
-  "Music": "موسیقی",
-  "MusicVideos": "موزیک ویدیوها",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "فصل {0}",
-  "NameSeasonUnknown": "فصل های ناشناخته",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "بروزرسانی برنامه موجود است",
-  "NotificationOptionApplicationUpdateInstalled": "بروزرسانی برنامه نصب شد",
-  "NotificationOptionAudioPlayback": "پخش صدا آغاز شد",
-  "NotificationOptionAudioPlaybackStopped": "پخش صدا متوقف شد",
-  "NotificationOptionCameraImageUploaded": "تصاویر دوربین آپلود شد",
-  "NotificationOptionGamePlayback": "پخش بازی آغاز شد",
-  "NotificationOptionGamePlaybackStopped": "پخش بازی متوقف شد",
-  "NotificationOptionInstallationFailed": "شکست نصب",
-  "NotificationOptionNewLibraryContent": "محتوای جدید افزوده شد",
-  "NotificationOptionPluginError": "خرابی افزونه",
-  "NotificationOptionPluginInstalled": "افزونه نصب شد",
-  "NotificationOptionPluginUninstalled": "افزونه حذف شد",
-  "NotificationOptionPluginUpdateInstalled": "بروزرسانی افزونه نصب شد",
-  "NotificationOptionServerRestartRequired": "شروع مجدد سرور نیاز است",
-  "NotificationOptionTaskFailed": "شکست وظیفه برنامه ریزی شده",
-  "NotificationOptionUserLockedOut": "کاربر از سیستم خارج شد",
-  "NotificationOptionVideoPlayback": "پخش ویدیو آغاز شد",
-  "NotificationOptionVideoPlaybackStopped": "پخش ویدیو متوقف شد",
-  "Photos": "عکس ها",
-  "Playlists": "لیست های پخش",
-  "Plugin": "افزونه",
-  "PluginInstalledWithName": "{0} نصب شد",
-  "PluginUninstalledWithName": "{0} حذف شد",
-  "PluginUpdatedWithName": "{0} آپدیت شد",
-  "ProviderValue": "ارائه دهنده: {0}",
-  "ScheduledTaskFailedWithName": "{0} ناموفق بود",
-  "ScheduledTaskStartedWithName": "{0} شروع شد",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "سریال ها",
-  "Songs": "آهنگ ها",
-  "StartupEmbyServerIsLoading": "سرور Jellyfin در حال بارگیری است. لطفا کمی بعد دوباره تلاش کنید.",
-  "SubtitleDownloadFailureForItem": "دانلود زیرنویس برای {0} ناموفق بود",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "زیرنویس {0} دانلود شد",
-  "Sync": "همگامسازی",
-  "System": "سیستم",
-  "TvShows": "سریال های تلویزیونی",
-  "User": "کاربر",
-  "UserCreatedWithName": "کاربر {0} ایجاد شد",
-  "UserDeletedWithName": "کاربر {0} حذف شد",
-  "UserDownloadingItemWithValues": "{0} در حال دانلود است {1}",
-  "UserLockedOutWithName": "کاربر {0} از سیستم خارج شد",
-  "UserOfflineFromDevice": "ارتباط {0} از {1} قطع شد",
-  "UserOnlineFromDevice": "{0}از {1} آنلاین میباشد",
-  "UserPasswordChangedWithName": "رمز برای کاربر {0} تغییر یافت",
-  "UserPolicyUpdatedWithName": "سیاست کاربری برای {0} بروزرسانی شد",
-  "UserStartedPlayingItemWithValues": "{0} شروع به پخش {1} کرد",
-  "UserStoppedPlayingItemWithValues": "{0} پخش {1} را متوقف کرد",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "ویژه- {0}",
-  "VersionNumber": "نسخه {0}"
+    "Albums": "آلبوم ها",
+    "AppDeviceValues": "برنامه: {0} ، دستگاه: {1}",
+    "Application": "برنامه",
+    "Artists": "هنرمندان",
+    "AuthenticationSucceededWithUserName": "{0} با موفقیت تایید اعتبار شد",
+    "Books": "کتاب ها",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "کانال ها",
+    "ChapterNameValue": "فصل {0}",
+    "Collections": "کلکسیون ها",
+    "DeviceOfflineWithName": "ارتباط {0} قطع شد",
+    "DeviceOnlineWithName": "{0} متصل شده",
+    "FailedLoginAttemptWithUserName": "تلاش برای ورود از {0} ناموفق بود",
+    "Favorites": "مورد علاقه ها",
+    "Folders": "پوشه ها",
+    "Games": "بازی ها",
+    "Genres": "ژانرها",
+    "HeaderAlbumArtists": "هنرمندان آلبوم",
+    "HeaderCameraUploads": "آپلودهای دوربین",
+    "HeaderContinueWatching": "ادامه تماشا",
+    "HeaderFavoriteAlbums": "آلبوم های مورد علاقه",
+    "HeaderFavoriteArtists": "هنرمندان مورد علاقه",
+    "HeaderFavoriteEpisodes": "قسمت های مورد علاقه",
+    "HeaderFavoriteShows": "سریال های مورد علاقه",
+    "HeaderFavoriteSongs": "آهنگ های مورد علاقه",
+    "HeaderLiveTV": "پخش زنده تلویزیون",
+    "HeaderNextUp": "بعدی چیه",
+    "HeaderRecordingGroups": "گروه های ضبط",
+    "HomeVideos": "ویدیوهای خانگی",
+    "Inherit": "به ارث برده",
+    "ItemAddedWithName": "{0} به کتابخانه افزوده شد",
+    "ItemRemovedWithName": "{0} از کتابخانه حذف شد",
+    "LabelIpAddressValue": "آدرس آی پی: {0}",
+    "LabelRunningTimeValue": "زمان اجرا: {0}",
+    "Latest": "آخرین",
+    "MessageApplicationUpdated": "سرور Jellyfin بروزرسانی شد",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "پکربندی بخش {0} سرور  بروزرسانی شد",
+    "MessageServerConfigurationUpdated": "پیکربندی سرور بروزرسانی شد",
+    "MixedContent": "محتوای درهم",
+    "Movies": "فیلم های سینمایی",
+    "Music": "موسیقی",
+    "MusicVideos": "موزیک ویدیوها",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "فصل {0}",
+    "NameSeasonUnknown": "فصل های ناشناخته",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "بروزرسانی برنامه موجود است",
+    "NotificationOptionApplicationUpdateInstalled": "بروزرسانی برنامه نصب شد",
+    "NotificationOptionAudioPlayback": "پخش صدا آغاز شد",
+    "NotificationOptionAudioPlaybackStopped": "پخش صدا متوقف شد",
+    "NotificationOptionCameraImageUploaded": "تصاویر دوربین آپلود شد",
+    "NotificationOptionGamePlayback": "پخش بازی آغاز شد",
+    "NotificationOptionGamePlaybackStopped": "پخش بازی متوقف شد",
+    "NotificationOptionInstallationFailed": "شکست نصب",
+    "NotificationOptionNewLibraryContent": "محتوای جدید افزوده شد",
+    "NotificationOptionPluginError": "خرابی افزونه",
+    "NotificationOptionPluginInstalled": "افزونه نصب شد",
+    "NotificationOptionPluginUninstalled": "افزونه حذف شد",
+    "NotificationOptionPluginUpdateInstalled": "بروزرسانی افزونه نصب شد",
+    "NotificationOptionServerRestartRequired": "شروع مجدد سرور نیاز است",
+    "NotificationOptionTaskFailed": "شکست وظیفه برنامه ریزی شده",
+    "NotificationOptionUserLockedOut": "کاربر از سیستم خارج شد",
+    "NotificationOptionVideoPlayback": "پخش ویدیو آغاز شد",
+    "NotificationOptionVideoPlaybackStopped": "پخش ویدیو متوقف شد",
+    "Photos": "عکس ها",
+    "Playlists": "لیست های پخش",
+    "Plugin": "افزونه",
+    "PluginInstalledWithName": "{0} نصب شد",
+    "PluginUninstalledWithName": "{0} حذف شد",
+    "PluginUpdatedWithName": "{0} آپدیت شد",
+    "ProviderValue": "ارائه دهنده: {0}",
+    "ScheduledTaskFailedWithName": "{0} ناموفق بود",
+    "ScheduledTaskStartedWithName": "{0} شروع شد",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "سریال ها",
+    "Songs": "آهنگ ها",
+    "StartupEmbyServerIsLoading": "سرور Jellyfin در حال بارگیری است. لطفا کمی بعد دوباره تلاش کنید.",
+    "SubtitleDownloadFailureForItem": "دانلود زیرنویس برای {0} ناموفق بود",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "زیرنویس {0} دانلود شد",
+    "Sync": "همگامسازی",
+    "System": "سیستم",
+    "TvShows": "سریال های تلویزیونی",
+    "User": "کاربر",
+    "UserCreatedWithName": "کاربر {0} ایجاد شد",
+    "UserDeletedWithName": "کاربر {0} حذف شد",
+    "UserDownloadingItemWithValues": "{0} در حال دانلود است {1}",
+    "UserLockedOutWithName": "کاربر {0} از سیستم خارج شد",
+    "UserOfflineFromDevice": "ارتباط {0} از {1} قطع شد",
+    "UserOnlineFromDevice": "{0}از {1} آنلاین میباشد",
+    "UserPasswordChangedWithName": "رمز برای کاربر {0} تغییر یافت",
+    "UserPolicyUpdatedWithName": "سیاست کاربری برای {0} بروزرسانی شد",
+    "UserStartedPlayingItemWithValues": "{0} شروع به پخش {1} کرد",
+    "UserStoppedPlayingItemWithValues": "{0} پخش {1} را متوقف کرد",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "ویژه- {0}",
+    "VersionNumber": "نسخه {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/fr-CA.json b/Emby.Server.Implementations/Localization/Core/fr-CA.json
index 737fde076f..22cd4cf6df 100644
--- a/Emby.Server.Implementations/Localization/Core/fr-CA.json
+++ b/Emby.Server.Implementations/Localization/Core/fr-CA.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albums",
-  "AppDeviceValues": "App: {0}, Device: {1}",
-  "Application": "Application",
-  "Artists": "Artists",
-  "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-  "Books": "Books",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Channels",
-  "ChapterNameValue": "Chapter {0}",
-  "Collections": "Collections",
-  "DeviceOfflineWithName": "{0} has disconnected",
-  "DeviceOnlineWithName": "{0} is connected",
-  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-  "Favorites": "Favorites",
-  "Folders": "Folders",
-  "Games": "Games",
-  "Genres": "Genres",
-  "HeaderAlbumArtists": "Album Artists",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Continuer à regarder",
-  "HeaderFavoriteAlbums": "Favorite Albums",
-  "HeaderFavoriteArtists": "Favorite Artists",
-  "HeaderFavoriteEpisodes": "Favorite Episodes",
-  "HeaderFavoriteShows": "Favorite Shows",
-  "HeaderFavoriteSongs": "Favorite Songs",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "À Suivre",
-  "HeaderRecordingGroups": "Recording Groups",
-  "HomeVideos": "Home videos",
-  "Inherit": "Inherit",
-  "ItemAddedWithName": "{0} was added to the library",
-  "ItemRemovedWithName": "{0} was removed from the library",
-  "LabelIpAddressValue": "Ip address: {0}",
-  "LabelRunningTimeValue": "Running time: {0}",
-  "Latest": "Latest",
-  "MessageApplicationUpdated": "Jellyfin Server has been updated",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-  "MessageServerConfigurationUpdated": "Server configuration has been updated",
-  "MixedContent": "Mixed content",
-  "Movies": "Movies",
-  "Music": "Music",
-  "MusicVideos": "Music videos",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Season {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Application update available",
-  "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-  "NotificationOptionAudioPlayback": "Audio playback started",
-  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-  "NotificationOptionInstallationFailed": "Installation failure",
-  "NotificationOptionNewLibraryContent": "New content added",
-  "NotificationOptionPluginError": "Plugin failure",
-  "NotificationOptionPluginInstalled": "Plugin installed",
-  "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-  "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-  "NotificationOptionServerRestartRequired": "Server restart required",
-  "NotificationOptionTaskFailed": "Scheduled task failure",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionVideoPlayback": "Video playback started",
-  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-  "Photos": "Photos",
-  "Playlists": "Playlists",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} was installed",
-  "PluginUninstalledWithName": "{0} was uninstalled",
-  "PluginUpdatedWithName": "{0} was updated",
-  "ProviderValue": "Provider: {0}",
-  "ScheduledTaskFailedWithName": "{0} failed",
-  "ScheduledTaskStartedWithName": "{0} started",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Series",
-  "Songs": "Songs",
-  "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
-  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-  "Sync": "Sync",
-  "System": "System",
-  "TvShows": "TV Shows",
-  "User": "User",
-  "UserCreatedWithName": "User {0} has been created",
-  "UserDeletedWithName": "User {0} has been deleted",
-  "UserDownloadingItemWithValues": "{0} is downloading {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} has disconnected from {1}",
-  "UserOnlineFromDevice": "{0} is online from {1}",
-  "UserPasswordChangedWithName": "Password has been changed for user {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
-  "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Spécial - {0}",
-  "VersionNumber": "Version {0}"
+    "Albums": "Albums",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "Application": "Application",
+    "Artists": "Artists",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "Books": "Books",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Channels",
+    "ChapterNameValue": "Chapter {0}",
+    "Collections": "Collections",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "DeviceOnlineWithName": "{0} is connected",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "Favorites": "Favorites",
+    "Folders": "Folders",
+    "Games": "Games",
+    "Genres": "Genres",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Continuer à regarder",
+    "HeaderFavoriteAlbums": "Favorite Albums",
+    "HeaderFavoriteArtists": "Favorite Artists",
+    "HeaderFavoriteEpisodes": "Favorite Episodes",
+    "HeaderFavoriteShows": "Favorite Shows",
+    "HeaderFavoriteSongs": "Favorite Songs",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "À Suivre",
+    "HeaderRecordingGroups": "Recording Groups",
+    "HomeVideos": "Home videos",
+    "Inherit": "Inherit",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "Latest": "Latest",
+    "MessageApplicationUpdated": "Jellyfin Server has been updated",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MixedContent": "Mixed content",
+    "Movies": "Movies",
+    "Music": "Music",
+    "MusicVideos": "Music videos",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Season {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "Photos": "Photos",
+    "Playlists": "Playlists",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "PluginUpdatedWithName": "{0} was updated",
+    "ProviderValue": "Provider: {0}",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Series",
+    "Songs": "Songs",
+    "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "Sync": "Sync",
+    "System": "System",
+    "TvShows": "TV Shows",
+    "User": "User",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
+    "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Spécial - {0}",
+    "VersionNumber": "Version {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/fr.json b/Emby.Server.Implementations/Localization/Core/fr.json
index c374ec3ed2..085e22cf72 100644
--- a/Emby.Server.Implementations/Localization/Core/fr.json
+++ b/Emby.Server.Implementations/Localization/Core/fr.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albums",
-  "AppDeviceValues": "Application : {0}, Appareil : {1}",
-  "Application": "Application",
-  "Artists": "Artistes",
-  "AuthenticationSucceededWithUserName": "{0} s'est authentifié avec succès",
-  "Books": "Livres",
-  "CameraImageUploadedFrom": "Une image de caméra a été chargée depuis {0}",
-  "Channels": "Chaînes",
-  "ChapterNameValue": "Chapitre {0}",
-  "Collections": "Collections",
-  "DeviceOfflineWithName": "{0} s'est déconnecté",
-  "DeviceOnlineWithName": "{0} est connecté",
-  "FailedLoginAttemptWithUserName": "Échec d'une tentative de connexion de {0}",
-  "Favorites": "Favoris",
-  "Folders": "Dossiers",
-  "Games": "Jeux",
-  "Genres": "Genres",
-  "HeaderAlbumArtists": "Artistes de l'album",
-  "HeaderCameraUploads": "Photos transférées",
-  "HeaderContinueWatching": "Continuer à regarder",
-  "HeaderFavoriteAlbums": "Albums favoris",
-  "HeaderFavoriteArtists": "Artistes favoris",
-  "HeaderFavoriteEpisodes": "Épisodes favoris",
-  "HeaderFavoriteShows": "Séries favorites",
-  "HeaderFavoriteSongs": "Chansons favorites",
-  "HeaderLiveTV": "TV en direct",
-  "HeaderNextUp": "En Cours",
-  "HeaderRecordingGroups": "Groupes d'enregistrements",
-  "HomeVideos": "Vidéos personnelles",
-  "Inherit": "Hériter",
-  "ItemAddedWithName": "{0} a été ajouté à la médiathèque",
-  "ItemRemovedWithName": "{0} a été supprimé de la médiathèque",
-  "LabelIpAddressValue": "Adresse IP : {0}",
-  "LabelRunningTimeValue": "Durée : {0}",
-  "Latest": "Derniers",
-  "MessageApplicationUpdated": "Le serveur Jellyfin a été mis à jour",
-  "MessageApplicationUpdatedTo": "Jellyfin Serveur 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",
-  "Movies": "Films",
-  "Music": "Musique",
-  "MusicVideos": "Vidéos musicales",
-  "NameInstallFailed": "{0} échec d'installation",
-  "NameSeasonNumber": "Saison {0}",
-  "NameSeasonUnknown": "Saison Inconnue",
-  "NewVersionIsAvailable": "Une nouvelle version d'Jellyfin Serveur est disponible au téléchargement.",
-  "NotificationOptionApplicationUpdateAvailable": "Mise à jour de l'application disponible",
-  "NotificationOptionApplicationUpdateInstalled": "Mise à jour de l'application installée",
-  "NotificationOptionAudioPlayback": "Lecture audio démarrée",
-  "NotificationOptionAudioPlaybackStopped": "Lecture audio arrêtée",
-  "NotificationOptionCameraImageUploaded": "L'image de l'appareil photo a été transférée",
-  "NotificationOptionGamePlayback": "Lecture de jeu démarrée",
-  "NotificationOptionGamePlaybackStopped": "Lecture de jeu arrêtée",
-  "NotificationOptionInstallationFailed": "Échec d'installation",
-  "NotificationOptionNewLibraryContent": "Nouveau contenu ajouté",
-  "NotificationOptionPluginError": "Erreur d'extension",
-  "NotificationOptionPluginInstalled": "Extension installée",
-  "NotificationOptionPluginUninstalled": "Extension désinstallée",
-  "NotificationOptionPluginUpdateInstalled": "Mise à jour d'extension installée",
-  "NotificationOptionServerRestartRequired": "Un redémarrage du serveur est requis",
-  "NotificationOptionTaskFailed": "Échec de tâche planifiée",
-  "NotificationOptionUserLockedOut": "Utilisateur verrouillé",
-  "NotificationOptionVideoPlayback": "Lecture vidéo démarrée",
-  "NotificationOptionVideoPlaybackStopped": "Lecture vidéo arrêtée",
-  "Photos": "Photos",
-  "Playlists": "Listes de lecture",
-  "Plugin": "Extension",
-  "PluginInstalledWithName": "{0} a été installé",
-  "PluginUninstalledWithName": "{0} a été désinstallé",
-  "PluginUpdatedWithName": "{0} a été mis à jour",
-  "ProviderValue": "Fournisseur : {0}",
-  "ScheduledTaskFailedWithName": "{0} a échoué",
-  "ScheduledTaskStartedWithName": "{0} a commencé",
-  "ServerNameNeedsToBeRestarted": "{0} doit être redémarré",
-  "Shows": "Émissions",
-  "Songs": "Chansons",
-  "StartupEmbyServerIsLoading": "Le serveur Jellyfin est en cours de chargement. Veuillez réessayer dans quelques instants.",
-  "SubtitleDownloadFailureForItem": "Le téléchargement des sous-titres pour {0} a échoué.",
-  "SubtitleDownloadFailureFromForItem": "Échec du téléchargement des sous-titres depuis {0} pour {1}",
-  "SubtitlesDownloadedForItem": "Les sous-titres de {0} ont été téléchargés",
-  "Sync": "Synchroniser",
-  "System": "Système",
-  "TvShows": "Séries Télé",
-  "User": "Utilisateur",
-  "UserCreatedWithName": "L'utilisateur {0} a été créé",
-  "UserDeletedWithName": "L'utilisateur {0} a été supprimé",
-  "UserDownloadingItemWithValues": "{0} est en train de télécharger {1}",
-  "UserLockedOutWithName": "L'utilisateur {0} a été verrouillé",
-  "UserOfflineFromDevice": "{0} s'est déconnecté depuis {1}",
-  "UserOnlineFromDevice": "{0} s'est connecté depuis {1}",
-  "UserPasswordChangedWithName": "Le mot de passe pour l'utilisateur {0} a été modifié",
-  "UserPolicyUpdatedWithName": "La politique de l'utilisateur a été mise à jour pour {0}",
-  "UserStartedPlayingItemWithValues": "{0} est entrain de lire {1} sur {2}",
-  "UserStoppedPlayingItemWithValues": "{0} vient d'arrêter la lecture de {1} sur {2}",
-  "ValueHasBeenAddedToLibrary": "{0} a été ajouté à votre librairie",
-  "ValueSpecialEpisodeName": "Spécial - {0}",
-  "VersionNumber": "Version {0}"
+    "Albums": "Albums",
+    "AppDeviceValues": "Application : {0}, Appareil : {1}",
+    "Application": "Application",
+    "Artists": "Artistes",
+    "AuthenticationSucceededWithUserName": "{0} s'est authentifié avec succès",
+    "Books": "Livres",
+    "CameraImageUploadedFrom": "Une image de caméra a été chargée depuis {0}",
+    "Channels": "Chaînes",
+    "ChapterNameValue": "Chapitre {0}",
+    "Collections": "Collections",
+    "DeviceOfflineWithName": "{0} s'est déconnecté",
+    "DeviceOnlineWithName": "{0} est connecté",
+    "FailedLoginAttemptWithUserName": "Échec d'une tentative de connexion de {0}",
+    "Favorites": "Favoris",
+    "Folders": "Dossiers",
+    "Games": "Jeux",
+    "Genres": "Genres",
+    "HeaderAlbumArtists": "Artistes de l'album",
+    "HeaderCameraUploads": "Photos transférées",
+    "HeaderContinueWatching": "Continuer à regarder",
+    "HeaderFavoriteAlbums": "Albums favoris",
+    "HeaderFavoriteArtists": "Artistes favoris",
+    "HeaderFavoriteEpisodes": "Épisodes favoris",
+    "HeaderFavoriteShows": "Séries favorites",
+    "HeaderFavoriteSongs": "Chansons favorites",
+    "HeaderLiveTV": "TV en direct",
+    "HeaderNextUp": "En Cours",
+    "HeaderRecordingGroups": "Groupes d'enregistrements",
+    "HomeVideos": "Vidéos personnelles",
+    "Inherit": "Hériter",
+    "ItemAddedWithName": "{0} a été ajouté à la médiathèque",
+    "ItemRemovedWithName": "{0} a été supprimé de la médiathèque",
+    "LabelIpAddressValue": "Adresse IP : {0}",
+    "LabelRunningTimeValue": "Durée : {0}",
+    "Latest": "Derniers",
+    "MessageApplicationUpdated": "Le serveur Jellyfin a été mis à jour",
+    "MessageApplicationUpdatedTo": "Jellyfin Serveur 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",
+    "Movies": "Films",
+    "Music": "Musique",
+    "MusicVideos": "Vidéos musicales",
+    "NameInstallFailed": "{0} échec d'installation",
+    "NameSeasonNumber": "Saison {0}",
+    "NameSeasonUnknown": "Saison Inconnue",
+    "NewVersionIsAvailable": "Une nouvelle version d'Jellyfin Serveur est disponible au téléchargement.",
+    "NotificationOptionApplicationUpdateAvailable": "Mise à jour de l'application disponible",
+    "NotificationOptionApplicationUpdateInstalled": "Mise à jour de l'application installée",
+    "NotificationOptionAudioPlayback": "Lecture audio démarrée",
+    "NotificationOptionAudioPlaybackStopped": "Lecture audio arrêtée",
+    "NotificationOptionCameraImageUploaded": "L'image de l'appareil photo a été transférée",
+    "NotificationOptionGamePlayback": "Lecture de jeu démarrée",
+    "NotificationOptionGamePlaybackStopped": "Lecture de jeu arrêtée",
+    "NotificationOptionInstallationFailed": "Échec d'installation",
+    "NotificationOptionNewLibraryContent": "Nouveau contenu ajouté",
+    "NotificationOptionPluginError": "Erreur d'extension",
+    "NotificationOptionPluginInstalled": "Extension installée",
+    "NotificationOptionPluginUninstalled": "Extension désinstallée",
+    "NotificationOptionPluginUpdateInstalled": "Mise à jour d'extension installée",
+    "NotificationOptionServerRestartRequired": "Un redémarrage du serveur est requis",
+    "NotificationOptionTaskFailed": "Échec de tâche planifiée",
+    "NotificationOptionUserLockedOut": "Utilisateur verrouillé",
+    "NotificationOptionVideoPlayback": "Lecture vidéo démarrée",
+    "NotificationOptionVideoPlaybackStopped": "Lecture vidéo arrêtée",
+    "Photos": "Photos",
+    "Playlists": "Listes de lecture",
+    "Plugin": "Extension",
+    "PluginInstalledWithName": "{0} a été installé",
+    "PluginUninstalledWithName": "{0} a été désinstallé",
+    "PluginUpdatedWithName": "{0} a été mis à jour",
+    "ProviderValue": "Fournisseur : {0}",
+    "ScheduledTaskFailedWithName": "{0} a échoué",
+    "ScheduledTaskStartedWithName": "{0} a commencé",
+    "ServerNameNeedsToBeRestarted": "{0} doit être redémarré",
+    "Shows": "Émissions",
+    "Songs": "Chansons",
+    "StartupEmbyServerIsLoading": "Le serveur Jellyfin est en cours de chargement. Veuillez réessayer dans quelques instants.",
+    "SubtitleDownloadFailureForItem": "Le téléchargement des sous-titres pour {0} a échoué.",
+    "SubtitleDownloadFailureFromForItem": "Échec du téléchargement des sous-titres depuis {0} pour {1}",
+    "SubtitlesDownloadedForItem": "Les sous-titres de {0} ont été téléchargés",
+    "Sync": "Synchroniser",
+    "System": "Système",
+    "TvShows": "Séries Télé",
+    "User": "Utilisateur",
+    "UserCreatedWithName": "L'utilisateur {0} a été créé",
+    "UserDeletedWithName": "L'utilisateur {0} a été supprimé",
+    "UserDownloadingItemWithValues": "{0} est en train de télécharger {1}",
+    "UserLockedOutWithName": "L'utilisateur {0} a été verrouillé",
+    "UserOfflineFromDevice": "{0} s'est déconnecté depuis {1}",
+    "UserOnlineFromDevice": "{0} s'est connecté depuis {1}",
+    "UserPasswordChangedWithName": "Le mot de passe pour l'utilisateur {0} a été modifié",
+    "UserPolicyUpdatedWithName": "La politique de l'utilisateur a été mise à jour pour {0}",
+    "UserStartedPlayingItemWithValues": "{0} est entrain de lire {1} sur {2}",
+    "UserStoppedPlayingItemWithValues": "{0} vient d'arrêter la lecture de {1} sur {2}",
+    "ValueHasBeenAddedToLibrary": "{0} a été ajouté à votre librairie",
+    "ValueSpecialEpisodeName": "Spécial - {0}",
+    "VersionNumber": "Version {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/gsw.json b/Emby.Server.Implementations/Localization/Core/gsw.json
index 4d53418b91..537fe35d5e 100644
--- a/Emby.Server.Implementations/Localization/Core/gsw.json
+++ b/Emby.Server.Implementations/Localization/Core/gsw.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albums",
-  "AppDeviceValues": "App: {0}, Device: {1}",
-  "Application": "Application",
-  "Artists": "Artists",
-  "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-  "Books": "Büecher",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Channels",
-  "ChapterNameValue": "Chapter {0}",
-  "Collections": "Collections",
-  "DeviceOfflineWithName": "{0} has disconnected",
-  "DeviceOnlineWithName": "{0} is connected",
-  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-  "Favorites": "Favorites",
-  "Folders": "Folders",
-  "Games": "Spiel",
-  "Genres": "Genres",
-  "HeaderAlbumArtists": "Albuminterprete",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Wiiterluege",
-  "HeaderFavoriteAlbums": "Favorite Albums",
-  "HeaderFavoriteArtists": "Besti Interpret",
-  "HeaderFavoriteEpisodes": "Favorite Episodes",
-  "HeaderFavoriteShows": "Favorite Shows",
-  "HeaderFavoriteSongs": "Besti Lieder",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "Next Up",
-  "HeaderRecordingGroups": "Ufnahmegruppe",
-  "HomeVideos": "Heimfilmli",
-  "Inherit": "Hinzuefüege",
-  "ItemAddedWithName": "{0} was added to the library",
-  "ItemRemovedWithName": "{0} was removed from the library",
-  "LabelIpAddressValue": "Ip address: {0}",
-  "LabelRunningTimeValue": "Running time: {0}",
-  "Latest": "Letschte",
-  "MessageApplicationUpdated": "Jellyfin Server has been updated",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-  "MessageServerConfigurationUpdated": "Server configuration has been updated",
-  "MixedContent": "Gmischte Inhalt",
-  "Movies": "Movies",
-  "Music": "Musig",
-  "MusicVideos": "Musigfilm",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Season {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Application update available",
-  "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-  "NotificationOptionAudioPlayback": "Audio playback started",
-  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-  "NotificationOptionInstallationFailed": "Installation failure",
-  "NotificationOptionNewLibraryContent": "New content added",
-  "NotificationOptionPluginError": "Plugin failure",
-  "NotificationOptionPluginInstalled": "Plugin installed",
-  "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-  "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-  "NotificationOptionServerRestartRequired": "Server restart required",
-  "NotificationOptionTaskFailed": "Scheduled task failure",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionVideoPlayback": "Video playback started",
-  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-  "Photos": "Fotis",
-  "Playlists": "Abspielliste",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} was installed",
-  "PluginUninstalledWithName": "{0} was uninstalled",
-  "PluginUpdatedWithName": "{0} was updated",
-  "ProviderValue": "Provider: {0}",
-  "ScheduledTaskFailedWithName": "{0} failed",
-  "ScheduledTaskStartedWithName": "{0} started",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Shows",
-  "Songs": "Songs",
-  "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
-  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-  "Sync": "Sync",
-  "System": "System",
-  "TvShows": "TV Shows",
-  "User": "User",
-  "UserCreatedWithName": "User {0} has been created",
-  "UserDeletedWithName": "User {0} has been deleted",
-  "UserDownloadingItemWithValues": "{0} is downloading {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} has disconnected from {1}",
-  "UserOnlineFromDevice": "{0} is online from {1}",
-  "UserPasswordChangedWithName": "Password has been changed for user {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
-  "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Spezial - {0}",
-  "VersionNumber": "Version {0}"
+    "Albums": "Albums",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "Application": "Application",
+    "Artists": "Artists",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "Books": "Büecher",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Channels",
+    "ChapterNameValue": "Chapter {0}",
+    "Collections": "Collections",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "DeviceOnlineWithName": "{0} is connected",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "Favorites": "Favorites",
+    "Folders": "Folders",
+    "Games": "Spiel",
+    "Genres": "Genres",
+    "HeaderAlbumArtists": "Albuminterprete",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Wiiterluege",
+    "HeaderFavoriteAlbums": "Favorite Albums",
+    "HeaderFavoriteArtists": "Besti Interpret",
+    "HeaderFavoriteEpisodes": "Favorite Episodes",
+    "HeaderFavoriteShows": "Favorite Shows",
+    "HeaderFavoriteSongs": "Besti Lieder",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "Next Up",
+    "HeaderRecordingGroups": "Ufnahmegruppe",
+    "HomeVideos": "Heimfilmli",
+    "Inherit": "Hinzuefüege",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "Latest": "Letschte",
+    "MessageApplicationUpdated": "Jellyfin Server has been updated",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MixedContent": "Gmischte Inhalt",
+    "Movies": "Movies",
+    "Music": "Musig",
+    "MusicVideos": "Musigfilm",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Season {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "Photos": "Fotis",
+    "Playlists": "Abspielliste",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "PluginUpdatedWithName": "{0} was updated",
+    "ProviderValue": "Provider: {0}",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Shows",
+    "Songs": "Songs",
+    "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "Sync": "Sync",
+    "System": "System",
+    "TvShows": "TV Shows",
+    "User": "User",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
+    "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Spezial - {0}",
+    "VersionNumber": "Version {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/he.json b/Emby.Server.Implementations/Localization/Core/he.json
index 67abf1d18b..6fff9d0abc 100644
--- a/Emby.Server.Implementations/Localization/Core/he.json
+++ b/Emby.Server.Implementations/Localization/Core/he.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albums",
-  "AppDeviceValues": "App: {0}, Device: {1}",
-  "Application": "Application",
-  "Artists": "Artists",
-  "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-  "Books": "ספרים",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Channels",
-  "ChapterNameValue": "Chapter {0}",
-  "Collections": "Collections",
-  "DeviceOfflineWithName": "{0} has disconnected",
-  "DeviceOnlineWithName": "{0} is connected",
-  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-  "Favorites": "Favorites",
-  "Folders": "Folders",
-  "Games": "משחקים",
-  "Genres": "ז'אנרים",
-  "HeaderAlbumArtists": "Album Artists",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "המשך בצפייה",
-  "HeaderFavoriteAlbums": "Favorite Albums",
-  "HeaderFavoriteArtists": "Favorite Artists",
-  "HeaderFavoriteEpisodes": "Favorite Episodes",
-  "HeaderFavoriteShows": "Favorite Shows",
-  "HeaderFavoriteSongs": "Favorite Songs",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "Next Up",
-  "HeaderRecordingGroups": "קבוצות הקלטה",
-  "HomeVideos": "Home videos",
-  "Inherit": "Inherit",
-  "ItemAddedWithName": "{0} was added to the library",
-  "ItemRemovedWithName": "{0} was removed from the library",
-  "LabelIpAddressValue": "Ip address: {0}",
-  "LabelRunningTimeValue": "Running time: {0}",
-  "Latest": "אחרון",
-  "MessageApplicationUpdated": "Jellyfin Server has been updated",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-  "MessageServerConfigurationUpdated": "Server configuration has been updated",
-  "MixedContent": "תוכן מעורב",
-  "Movies": "סרטים",
-  "Music": "מוזיקה",
-  "MusicVideos": "Music videos",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Season {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Application update available",
-  "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-  "NotificationOptionAudioPlayback": "Audio playback started",
-  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-  "NotificationOptionInstallationFailed": "Installation failure",
-  "NotificationOptionNewLibraryContent": "New content added",
-  "NotificationOptionPluginError": "Plugin failure",
-  "NotificationOptionPluginInstalled": "Plugin installed",
-  "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-  "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-  "NotificationOptionServerRestartRequired": "Server restart required",
-  "NotificationOptionTaskFailed": "Scheduled task failure",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionVideoPlayback": "Video playback started",
-  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-  "Photos": "תמונות",
-  "Playlists": "רשימות ניגון",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} was installed",
-  "PluginUninstalledWithName": "{0} was uninstalled",
-  "PluginUpdatedWithName": "{0} was updated",
-  "ProviderValue": "Provider: {0}",
-  "ScheduledTaskFailedWithName": "{0} failed",
-  "ScheduledTaskStartedWithName": "{0} started",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Shows",
-  "Songs": "Songs",
-  "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
-  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-  "Sync": "סנכרן",
-  "System": "System",
-  "TvShows": "TV Shows",
-  "User": "User",
-  "UserCreatedWithName": "User {0} has been created",
-  "UserDeletedWithName": "User {0} has been deleted",
-  "UserDownloadingItemWithValues": "{0} is downloading {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} has disconnected from {1}",
-  "UserOnlineFromDevice": "{0} is online from {1}",
-  "UserPasswordChangedWithName": "Password has been changed for user {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
-  "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "מיוחד- {0}",
-  "VersionNumber": "Version {0}"
+    "Albums": "Albums",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "Application": "Application",
+    "Artists": "Artists",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "Books": "ספרים",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Channels",
+    "ChapterNameValue": "Chapter {0}",
+    "Collections": "Collections",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "DeviceOnlineWithName": "{0} is connected",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "Favorites": "Favorites",
+    "Folders": "Folders",
+    "Games": "משחקים",
+    "Genres": "ז'אנרים",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "המשך בצפייה",
+    "HeaderFavoriteAlbums": "Favorite Albums",
+    "HeaderFavoriteArtists": "Favorite Artists",
+    "HeaderFavoriteEpisodes": "Favorite Episodes",
+    "HeaderFavoriteShows": "Favorite Shows",
+    "HeaderFavoriteSongs": "Favorite Songs",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "Next Up",
+    "HeaderRecordingGroups": "קבוצות הקלטה",
+    "HomeVideos": "Home videos",
+    "Inherit": "Inherit",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "Latest": "אחרון",
+    "MessageApplicationUpdated": "Jellyfin Server has been updated",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MixedContent": "תוכן מעורב",
+    "Movies": "סרטים",
+    "Music": "מוזיקה",
+    "MusicVideos": "Music videos",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Season {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "Photos": "תמונות",
+    "Playlists": "רשימות ניגון",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "PluginUpdatedWithName": "{0} was updated",
+    "ProviderValue": "Provider: {0}",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Shows",
+    "Songs": "Songs",
+    "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "Sync": "סנכרן",
+    "System": "System",
+    "TvShows": "TV Shows",
+    "User": "User",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
+    "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "מיוחד- {0}",
+    "VersionNumber": "Version {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/hr.json b/Emby.Server.Implementations/Localization/Core/hr.json
index e0add87bf1..3232a4ff72 100644
--- a/Emby.Server.Implementations/Localization/Core/hr.json
+++ b/Emby.Server.Implementations/Localization/Core/hr.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albumi",
-  "AppDeviceValues": "Aplikacija: {0}, Uređaj: {1}",
-  "Application": "Aplikacija",
-  "Artists": "Izvođači",
-  "AuthenticationSucceededWithUserName": "{0} uspješno ovjerena",
-  "Books": "Knjige",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Kanali",
-  "ChapterNameValue": "Poglavlje {0}",
-  "Collections": "Kolekcije",
-  "DeviceOfflineWithName": "{0} se odspojilo",
-  "DeviceOnlineWithName": "{0} je spojeno",
-  "FailedLoginAttemptWithUserName": "Neuspjeli pokušaj prijave za {0}",
-  "Favorites": "Omiljeni",
-  "Folders": "Mape",
-  "Games": "Igre",
-  "Genres": "Žanrovi",
-  "HeaderAlbumArtists": "Izvođači albuma",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Continue Watching",
-  "HeaderFavoriteAlbums": "Omiljeni albumi",
-  "HeaderFavoriteArtists": "Omiljeni izvođači",
-  "HeaderFavoriteEpisodes": "Omiljene epizode",
-  "HeaderFavoriteShows": "Omiljene emisije",
-  "HeaderFavoriteSongs": "Omiljene pjesme",
-  "HeaderLiveTV": "TV uživo",
-  "HeaderNextUp": "Sljedeće je",
-  "HeaderRecordingGroups": "Grupa snimka",
-  "HomeVideos": "Kućni videi",
-  "Inherit": "Naslijedi",
-  "ItemAddedWithName": "{0} je dodano u biblioteku",
-  "ItemRemovedWithName": "{0} je uklonjen iz biblioteke",
-  "LabelIpAddressValue": "Ip adresa: {0}",
-  "LabelRunningTimeValue": "Vrijeme rada: {0}",
-  "Latest": "Najnovije",
-  "MessageApplicationUpdated": "Jellyfin Server je ažuriran",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Odjeljak postavka servera {0} je ažuriran",
-  "MessageServerConfigurationUpdated": "Postavke servera su ažurirane",
-  "MixedContent": "Miješani sadržaj",
-  "Movies": "Filmovi",
-  "Music": "Glazba",
-  "MusicVideos": "Glazbeni spotovi",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Sezona {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Dostupno ažuriranje aplikacije",
-  "NotificationOptionApplicationUpdateInstalled": "Instalirano ažuriranje aplikacije",
-  "NotificationOptionAudioPlayback": "Reprodukcija glazbe započeta",
-  "NotificationOptionAudioPlaybackStopped": "Reprodukcija audiozapisa je zaustavljena",
-  "NotificationOptionCameraImageUploaded": "Slike kamere preuzete",
-  "NotificationOptionGamePlayback": "Igrica pokrenuta",
-  "NotificationOptionGamePlaybackStopped": "Reprodukcija igre je zaustavljena",
-  "NotificationOptionInstallationFailed": "Instalacija nije izvršena",
-  "NotificationOptionNewLibraryContent": "Novi sadržaj je dodan",
-  "NotificationOptionPluginError": "Dodatak otkazao",
-  "NotificationOptionPluginInstalled": "Dodatak instaliran",
-  "NotificationOptionPluginUninstalled": "Dodatak uklonjen",
-  "NotificationOptionPluginUpdateInstalled": "Instalirano ažuriranje za dodatak",
-  "NotificationOptionServerRestartRequired": "Potrebno ponovo pokretanje servera",
-  "NotificationOptionTaskFailed": "Zakazan zadatak nije izvršen",
-  "NotificationOptionUserLockedOut": "Korisnik zaključan",
-  "NotificationOptionVideoPlayback": "Reprodukcija videa započeta",
-  "NotificationOptionVideoPlaybackStopped": "Reprodukcija videozapisa je zaustavljena",
-  "Photos": "Slike",
-  "Playlists": "Popisi",
-  "Plugin": "Dodatak",
-  "PluginInstalledWithName": "{0} je instalirano",
-  "PluginUninstalledWithName": "{0} je deinstalirano",
-  "PluginUpdatedWithName": "{0} je ažurirano",
-  "ProviderValue": "Pružitelj: {0}",
-  "ScheduledTaskFailedWithName": "{0} neuspjelo",
-  "ScheduledTaskStartedWithName": "{0} pokrenuto",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Shows",
-  "Songs": "Pjesme",
-  "StartupEmbyServerIsLoading": "Jellyfin Server se učitava. Pokušajte ponovo kasnije.",
-  "SubtitleDownloadFailureForItem": "Titlovi prijevoda nisu preuzeti za {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Titlovi prijevoda preuzeti za {0}",
-  "Sync": "Sink.",
-  "System": "Sistem",
-  "TvShows": "TV Shows",
-  "User": "Korisnik",
-  "UserCreatedWithName": "Korisnik {0} je stvoren",
-  "UserDeletedWithName": "Korisnik {0} je obrisan",
-  "UserDownloadingItemWithValues": "{0} se preuzima {1}",
-  "UserLockedOutWithName": "Korisnik {0} je zaključan",
-  "UserOfflineFromDevice": "{0} se odspojilo od {1}",
-  "UserOnlineFromDevice": "{0} je online od {1}",
-  "UserPasswordChangedWithName": "Lozinka je promijenjena za korisnika {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} je pokrenuo {1}",
-  "UserStoppedPlayingItemWithValues": "{0} je zaustavio {1}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Specijal - {0}",
-  "VersionNumber": "Verzija {0}"
+    "Albums": "Albumi",
+    "AppDeviceValues": "Aplikacija: {0}, Uređaj: {1}",
+    "Application": "Aplikacija",
+    "Artists": "Izvođači",
+    "AuthenticationSucceededWithUserName": "{0} uspješno ovjerena",
+    "Books": "Knjige",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Kanali",
+    "ChapterNameValue": "Poglavlje {0}",
+    "Collections": "Kolekcije",
+    "DeviceOfflineWithName": "{0} se odspojilo",
+    "DeviceOnlineWithName": "{0} je spojeno",
+    "FailedLoginAttemptWithUserName": "Neuspjeli pokušaj prijave za {0}",
+    "Favorites": "Omiljeni",
+    "Folders": "Mape",
+    "Games": "Igre",
+    "Genres": "Žanrovi",
+    "HeaderAlbumArtists": "Izvođači albuma",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Continue Watching",
+    "HeaderFavoriteAlbums": "Omiljeni albumi",
+    "HeaderFavoriteArtists": "Omiljeni izvođači",
+    "HeaderFavoriteEpisodes": "Omiljene epizode",
+    "HeaderFavoriteShows": "Omiljene emisije",
+    "HeaderFavoriteSongs": "Omiljene pjesme",
+    "HeaderLiveTV": "TV uživo",
+    "HeaderNextUp": "Sljedeće je",
+    "HeaderRecordingGroups": "Grupa snimka",
+    "HomeVideos": "Kućni videi",
+    "Inherit": "Naslijedi",
+    "ItemAddedWithName": "{0} je dodano u biblioteku",
+    "ItemRemovedWithName": "{0} je uklonjen iz biblioteke",
+    "LabelIpAddressValue": "Ip adresa: {0}",
+    "LabelRunningTimeValue": "Vrijeme rada: {0}",
+    "Latest": "Najnovije",
+    "MessageApplicationUpdated": "Jellyfin Server je ažuriran",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Odjeljak postavka servera {0} je ažuriran",
+    "MessageServerConfigurationUpdated": "Postavke servera su ažurirane",
+    "MixedContent": "Miješani sadržaj",
+    "Movies": "Filmovi",
+    "Music": "Glazba",
+    "MusicVideos": "Glazbeni spotovi",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Sezona {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Dostupno ažuriranje aplikacije",
+    "NotificationOptionApplicationUpdateInstalled": "Instalirano ažuriranje aplikacije",
+    "NotificationOptionAudioPlayback": "Reprodukcija glazbe započeta",
+    "NotificationOptionAudioPlaybackStopped": "Reprodukcija audiozapisa je zaustavljena",
+    "NotificationOptionCameraImageUploaded": "Slike kamere preuzete",
+    "NotificationOptionGamePlayback": "Igrica pokrenuta",
+    "NotificationOptionGamePlaybackStopped": "Reprodukcija igre je zaustavljena",
+    "NotificationOptionInstallationFailed": "Instalacija nije izvršena",
+    "NotificationOptionNewLibraryContent": "Novi sadržaj je dodan",
+    "NotificationOptionPluginError": "Dodatak otkazao",
+    "NotificationOptionPluginInstalled": "Dodatak instaliran",
+    "NotificationOptionPluginUninstalled": "Dodatak uklonjen",
+    "NotificationOptionPluginUpdateInstalled": "Instalirano ažuriranje za dodatak",
+    "NotificationOptionServerRestartRequired": "Potrebno ponovo pokretanje servera",
+    "NotificationOptionTaskFailed": "Zakazan zadatak nije izvršen",
+    "NotificationOptionUserLockedOut": "Korisnik zaključan",
+    "NotificationOptionVideoPlayback": "Reprodukcija videa započeta",
+    "NotificationOptionVideoPlaybackStopped": "Reprodukcija videozapisa je zaustavljena",
+    "Photos": "Slike",
+    "Playlists": "Popisi",
+    "Plugin": "Dodatak",
+    "PluginInstalledWithName": "{0} je instalirano",
+    "PluginUninstalledWithName": "{0} je deinstalirano",
+    "PluginUpdatedWithName": "{0} je ažurirano",
+    "ProviderValue": "Pružitelj: {0}",
+    "ScheduledTaskFailedWithName": "{0} neuspjelo",
+    "ScheduledTaskStartedWithName": "{0} pokrenuto",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Shows",
+    "Songs": "Pjesme",
+    "StartupEmbyServerIsLoading": "Jellyfin Server se učitava. Pokušajte ponovo kasnije.",
+    "SubtitleDownloadFailureForItem": "Titlovi prijevoda nisu preuzeti za {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Titlovi prijevoda preuzeti za {0}",
+    "Sync": "Sink.",
+    "System": "Sistem",
+    "TvShows": "TV Shows",
+    "User": "Korisnik",
+    "UserCreatedWithName": "Korisnik {0} je stvoren",
+    "UserDeletedWithName": "Korisnik {0} je obrisan",
+    "UserDownloadingItemWithValues": "{0} se preuzima {1}",
+    "UserLockedOutWithName": "Korisnik {0} je zaključan",
+    "UserOfflineFromDevice": "{0} se odspojilo od {1}",
+    "UserOnlineFromDevice": "{0} je online od {1}",
+    "UserPasswordChangedWithName": "Lozinka je promijenjena za korisnika {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} je pokrenuo {1}",
+    "UserStoppedPlayingItemWithValues": "{0} je zaustavio {1}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Specijal - {0}",
+    "VersionNumber": "Verzija {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/hu.json b/Emby.Server.Implementations/Localization/Core/hu.json
index ad31645880..3a0119faf9 100644
--- a/Emby.Server.Implementations/Localization/Core/hu.json
+++ b/Emby.Server.Implementations/Localization/Core/hu.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albumok",
-  "AppDeviceValues": "Program: {0}, Eszköz: {1}",
-  "Application": "Program",
-  "Artists": "Előadók",
-  "AuthenticationSucceededWithUserName": "{0} sikeresen azonosítva",
-  "Books": "Könyvek",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Csatornák",
-  "ChapterNameValue": "Jelenet {0}",
-  "Collections": "Gyűjtemények",
-  "DeviceOfflineWithName": "{0} kijelentkezett",
-  "DeviceOnlineWithName": "{0} belépett",
-  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-  "Favorites": "Kedvencek",
-  "Folders": "Könyvtárak",
-  "Games": "Játékok",
-  "Genres": "Műfajok",
-  "HeaderAlbumArtists": "Album Előadók",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Vetítés(ek) folytatása",
-  "HeaderFavoriteAlbums": "Kedvenc Albumok",
-  "HeaderFavoriteArtists": "Kedvenc Művészek",
-  "HeaderFavoriteEpisodes": "Kedvenc Epizódok",
-  "HeaderFavoriteShows": "Kedvenc Műsorok",
-  "HeaderFavoriteSongs": "Kedvenc Dalok",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "Következik",
-  "HeaderRecordingGroups": "Recording Groups",
-  "HomeVideos": "Házi videók",
-  "Inherit": "Inherit",
-  "ItemAddedWithName": "{0} was added to the library",
-  "ItemRemovedWithName": "{0} was removed from the library",
-  "LabelIpAddressValue": "Ip cím: {0}",
-  "LabelRunningTimeValue": "Running time: {0}",
-  "Latest": "Legújabb",
-  "MessageApplicationUpdated": "Jellyfin Szerver frissítve",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Szerver konfigurációs rész {0} frissítve",
-  "MessageServerConfigurationUpdated": "Szerver konfiguráció frissítve",
-  "MixedContent": "Vegyes tartalom",
-  "Movies": "Filmek",
-  "Music": "Zene",
-  "MusicVideos": "Zenei Videók",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Season {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Program frissítés elérhető",
-  "NotificationOptionApplicationUpdateInstalled": "Program frissítés telepítve",
-  "NotificationOptionAudioPlayback": "Audió lejátszás elkezdve",
-  "NotificationOptionAudioPlaybackStopped": "Audió lejátszás befejezve",
-  "NotificationOptionCameraImageUploaded": "Kamera kép feltöltve",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-  "NotificationOptionInstallationFailed": "Telepítési hiba",
-  "NotificationOptionNewLibraryContent": "Új tartalom hozzáadva",
-  "NotificationOptionPluginError": "Bővítmény hiba",
-  "NotificationOptionPluginInstalled": "Bővítmény telepítve",
-  "NotificationOptionPluginUninstalled": "Bővítmény eltávolítva",
-  "NotificationOptionPluginUpdateInstalled": "Bővítmény frissítés telepítve",
-  "NotificationOptionServerRestartRequired": "Szerver újraindítás szükséges",
-  "NotificationOptionTaskFailed": "Scheduled task failure",
-  "NotificationOptionUserLockedOut": "Felhasználó tiltva",
-  "NotificationOptionVideoPlayback": "Videó lejátszás elkezdve",
-  "NotificationOptionVideoPlaybackStopped": "Videó lejátszás befejezve",
-  "Photos": "Fényképek",
-  "Playlists": "Lejátszási listák",
-  "Plugin": "Bővítmény",
-  "PluginInstalledWithName": "{0} telepítve",
-  "PluginUninstalledWithName": "{0} eltávolítva",
-  "PluginUpdatedWithName": "{0} frissítve",
-  "ProviderValue": "Provider: {0}",
-  "ScheduledTaskFailedWithName": "{0} failed",
-  "ScheduledTaskStartedWithName": "{0} started",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Műsorok",
-  "Songs": "Dalok",
-  "StartupEmbyServerIsLoading": "Jellyfin Szerver betöltődik. Kérjük, próbáld meg újra később.",
-  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-  "Sync": "Szinkronizál",
-  "System": "Rendszer",
-  "TvShows": "TV Műsorok",
-  "User": "Felhasználó",
-  "UserCreatedWithName": "User {0} has been created",
-  "UserDeletedWithName": "User {0} has been deleted",
-  "UserDownloadingItemWithValues": "{0} letölti {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} kijelentkezett innen  {1}",
-  "UserOnlineFromDevice": "{0} is online from {1}",
-  "UserPasswordChangedWithName": "Password has been changed for user {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} elkezdte játszani a következőt {1}",
-  "UserStoppedPlayingItemWithValues": "{0} befejezte a következőt {1}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Special - {0}",
-  "VersionNumber": "Verzió {0}"
+    "Albums": "Albumok",
+    "AppDeviceValues": "Program: {0}, Eszköz: {1}",
+    "Application": "Program",
+    "Artists": "Előadók",
+    "AuthenticationSucceededWithUserName": "{0} sikeresen azonosítva",
+    "Books": "Könyvek",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Csatornák",
+    "ChapterNameValue": "Jelenet {0}",
+    "Collections": "Gyűjtemények",
+    "DeviceOfflineWithName": "{0} kijelentkezett",
+    "DeviceOnlineWithName": "{0} belépett",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "Favorites": "Kedvencek",
+    "Folders": "Könyvtárak",
+    "Games": "Játékok",
+    "Genres": "Műfajok",
+    "HeaderAlbumArtists": "Album Előadók",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Vetítés(ek) folytatása",
+    "HeaderFavoriteAlbums": "Kedvenc Albumok",
+    "HeaderFavoriteArtists": "Kedvenc Művészek",
+    "HeaderFavoriteEpisodes": "Kedvenc Epizódok",
+    "HeaderFavoriteShows": "Kedvenc Műsorok",
+    "HeaderFavoriteSongs": "Kedvenc Dalok",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "Következik",
+    "HeaderRecordingGroups": "Recording Groups",
+    "HomeVideos": "Házi videók",
+    "Inherit": "Inherit",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip cím: {0}",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "Latest": "Legújabb",
+    "MessageApplicationUpdated": "Jellyfin Szerver frissítve",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Szerver konfigurációs rész {0} frissítve",
+    "MessageServerConfigurationUpdated": "Szerver konfiguráció frissítve",
+    "MixedContent": "Vegyes tartalom",
+    "Movies": "Filmek",
+    "Music": "Zene",
+    "MusicVideos": "Zenei Videók",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Season {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Program frissítés elérhető",
+    "NotificationOptionApplicationUpdateInstalled": "Program frissítés telepítve",
+    "NotificationOptionAudioPlayback": "Audió lejátszás elkezdve",
+    "NotificationOptionAudioPlaybackStopped": "Audió lejátszás befejezve",
+    "NotificationOptionCameraImageUploaded": "Kamera kép feltöltve",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionInstallationFailed": "Telepítési hiba",
+    "NotificationOptionNewLibraryContent": "Új tartalom hozzáadva",
+    "NotificationOptionPluginError": "Bővítmény hiba",
+    "NotificationOptionPluginInstalled": "Bővítmény telepítve",
+    "NotificationOptionPluginUninstalled": "Bővítmény eltávolítva",
+    "NotificationOptionPluginUpdateInstalled": "Bővítmény frissítés telepítve",
+    "NotificationOptionServerRestartRequired": "Szerver újraindítás szükséges",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionUserLockedOut": "Felhasználó tiltva",
+    "NotificationOptionVideoPlayback": "Videó lejátszás elkezdve",
+    "NotificationOptionVideoPlaybackStopped": "Videó lejátszás befejezve",
+    "Photos": "Fényképek",
+    "Playlists": "Lejátszási listák",
+    "Plugin": "Bővítmény",
+    "PluginInstalledWithName": "{0} telepítve",
+    "PluginUninstalledWithName": "{0} eltávolítva",
+    "PluginUpdatedWithName": "{0} frissítve",
+    "ProviderValue": "Provider: {0}",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Műsorok",
+    "Songs": "Dalok",
+    "StartupEmbyServerIsLoading": "Jellyfin Szerver betöltődik. Kérjük, próbáld meg újra később.",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "Sync": "Szinkronizál",
+    "System": "Rendszer",
+    "TvShows": "TV Műsorok",
+    "User": "Felhasználó",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "UserDownloadingItemWithValues": "{0} letölti {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} kijelentkezett innen  {1}",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} elkezdte játszani a következőt {1}",
+    "UserStoppedPlayingItemWithValues": "{0} befejezte a következőt {1}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "VersionNumber": "Verzió {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/it.json b/Emby.Server.Implementations/Localization/Core/it.json
index ed980ac7af..58b7bb61a0 100644
--- a/Emby.Server.Implementations/Localization/Core/it.json
+++ b/Emby.Server.Implementations/Localization/Core/it.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Album",
-  "AppDeviceValues": "App: {0}, Dispositivo: {1}",
-  "Application": "Applicazione",
-  "Artists": "Artisti",
-  "AuthenticationSucceededWithUserName": "{0} autenticato con successo",
-  "Books": "Libri",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Canali",
-  "ChapterNameValue": "Capitolo {0}",
-  "Collections": "Collezioni",
-  "DeviceOfflineWithName": "{0} è stato disconnesso",
-  "DeviceOnlineWithName": "{0} è connesso",
-  "FailedLoginAttemptWithUserName": "Tentativo di accesso fallito da  {0}",
-  "Favorites": "Preferiti",
-  "Folders": "Cartelle",
-  "Games": "Giochi",
-  "Genres": "Generi",
-  "HeaderAlbumArtists": "Artisti Album",
-  "HeaderCameraUploads": "Caricamenti Fotocamera",
-  "HeaderContinueWatching": "Continua a guardare",
-  "HeaderFavoriteAlbums": "Album preferiti",
-  "HeaderFavoriteArtists": "Artisti preferiti",
-  "HeaderFavoriteEpisodes": "Episodi Preferiti",
-  "HeaderFavoriteShows": "Show preferiti",
-  "HeaderFavoriteSongs": "Brani Preferiti",
-  "HeaderLiveTV": "Diretta TV",
-  "HeaderNextUp": "Prossimo",
-  "HeaderRecordingGroups": "Gruppi di Registrazione",
-  "HomeVideos": "Video personali",
-  "Inherit": "Eredita",
-  "ItemAddedWithName": "{0} è stato aggiunto alla libreria",
-  "ItemRemovedWithName": "{0} è stato rimosso dalla libreria",
-  "LabelIpAddressValue": "Indirizzo IP: {0}",
-  "LabelRunningTimeValue": "Durata: {0}",
-  "Latest": "Più recenti",
-  "MessageApplicationUpdated": "Il Server Jellyfin è stato aggiornato",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "La sezione {0} della configurazione server è stata aggiornata",
-  "MessageServerConfigurationUpdated": "La configurazione del server è stata aggiornata",
-  "MixedContent": "Contenuto misto",
-  "Movies": "Film",
-  "Music": "Musica",
-  "MusicVideos": "Video musicali",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Stagione {0}",
-  "NameSeasonUnknown": "Stagione sconosciuto",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Aggiornamento dell'applicazione disponibile",
-  "NotificationOptionApplicationUpdateInstalled": "Aggiornamento dell'applicazione installato",
-  "NotificationOptionAudioPlayback": "La riproduzione audio è iniziata",
-  "NotificationOptionAudioPlaybackStopped": "La riproduzione audio è stata interrotta",
-  "NotificationOptionCameraImageUploaded": "Immagine fotocamera caricata",
-  "NotificationOptionGamePlayback": "Il gioco è stato avviato",
-  "NotificationOptionGamePlaybackStopped": "Il gioco è stato fermato",
-  "NotificationOptionInstallationFailed": "Installazione fallita",
-  "NotificationOptionNewLibraryContent": "Nuovo contenuto aggiunto",
-  "NotificationOptionPluginError": "Errore del Plug-in",
-  "NotificationOptionPluginInstalled": "Plug-in installato",
-  "NotificationOptionPluginUninstalled": "Plug-in disinstallato",
-  "NotificationOptionPluginUpdateInstalled": "Aggiornamento del plug-in installato",
-  "NotificationOptionServerRestartRequired": "Riavvio del server necessario",
-  "NotificationOptionTaskFailed": "Operazione pianificata fallita",
-  "NotificationOptionUserLockedOut": "Utente bloccato",
-  "NotificationOptionVideoPlayback": "La riproduzione video è iniziata",
-  "NotificationOptionVideoPlaybackStopped": "La riproduzione video è stata interrotta",
-  "Photos": "Foto",
-  "Playlists": "Playlist",
-  "Plugin": "Plug-in",
-  "PluginInstalledWithName": "{0} è stato Installato",
-  "PluginUninstalledWithName": "{0} è stato disinstallato",
-  "PluginUpdatedWithName": "{0} è stato aggiornato",
-  "ProviderValue": "Provider: {0}",
-  "ScheduledTaskFailedWithName": "{0} fallito",
-  "ScheduledTaskStartedWithName": "{0} avviati",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Programmi",
-  "Songs": "Canzoni",
-  "StartupEmbyServerIsLoading": "Jellyfin server si sta avviando. Per favore riprova più tardi.",
-  "SubtitleDownloadFailureForItem": "Impossibile scaricare i sottotitoli per {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Sottotitoli scaricati per {0}",
-  "Sync": "Sincronizza",
-  "System": "Sistema",
-  "TvShows": "Serie TV",
-  "User": "Utente",
-  "UserCreatedWithName": "L'utente {0} è stato creato",
-  "UserDeletedWithName": "L'utente {0} è stato rimosso",
-  "UserDownloadingItemWithValues": "{0} sta scaricando {1}",
-  "UserLockedOutWithName": "L'utente {0} è stato bloccato",
-  "UserOfflineFromDevice": "{0} è stato disconnesso da {1}",
-  "UserOnlineFromDevice": "{0} è online da {1}",
-  "UserPasswordChangedWithName": "La password è stata cambiata per l'utente {0}",
-  "UserPolicyUpdatedWithName": "La politica dell'utente è stata aggiornata per {0}",
-  "UserStartedPlayingItemWithValues": "{0} ha avviato la riproduzione di {1}",
-  "UserStoppedPlayingItemWithValues": "{0} ha interrotto la riproduzione di {1}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Speciale - {0}",
-  "VersionNumber": "Versione {0}"
+    "Albums": "Album",
+    "AppDeviceValues": "App: {0}, Dispositivo: {1}",
+    "Application": "Applicazione",
+    "Artists": "Artisti",
+    "AuthenticationSucceededWithUserName": "{0} autenticato con successo",
+    "Books": "Libri",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Canali",
+    "ChapterNameValue": "Capitolo {0}",
+    "Collections": "Collezioni",
+    "DeviceOfflineWithName": "{0} è stato disconnesso",
+    "DeviceOnlineWithName": "{0} è connesso",
+    "FailedLoginAttemptWithUserName": "Tentativo di accesso fallito da  {0}",
+    "Favorites": "Preferiti",
+    "Folders": "Cartelle",
+    "Games": "Giochi",
+    "Genres": "Generi",
+    "HeaderAlbumArtists": "Artisti Album",
+    "HeaderCameraUploads": "Caricamenti Fotocamera",
+    "HeaderContinueWatching": "Continua a guardare",
+    "HeaderFavoriteAlbums": "Album preferiti",
+    "HeaderFavoriteArtists": "Artisti preferiti",
+    "HeaderFavoriteEpisodes": "Episodi Preferiti",
+    "HeaderFavoriteShows": "Show preferiti",
+    "HeaderFavoriteSongs": "Brani Preferiti",
+    "HeaderLiveTV": "Diretta TV",
+    "HeaderNextUp": "Prossimo",
+    "HeaderRecordingGroups": "Gruppi di Registrazione",
+    "HomeVideos": "Video personali",
+    "Inherit": "Eredita",
+    "ItemAddedWithName": "{0} è stato aggiunto alla libreria",
+    "ItemRemovedWithName": "{0} è stato rimosso dalla libreria",
+    "LabelIpAddressValue": "Indirizzo IP: {0}",
+    "LabelRunningTimeValue": "Durata: {0}",
+    "Latest": "Più recenti",
+    "MessageApplicationUpdated": "Il Server Jellyfin è stato aggiornato",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "La sezione {0} della configurazione server è stata aggiornata",
+    "MessageServerConfigurationUpdated": "La configurazione del server è stata aggiornata",
+    "MixedContent": "Contenuto misto",
+    "Movies": "Film",
+    "Music": "Musica",
+    "MusicVideos": "Video musicali",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Stagione {0}",
+    "NameSeasonUnknown": "Stagione sconosciuto",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Aggiornamento dell'applicazione disponibile",
+    "NotificationOptionApplicationUpdateInstalled": "Aggiornamento dell'applicazione installato",
+    "NotificationOptionAudioPlayback": "La riproduzione audio è iniziata",
+    "NotificationOptionAudioPlaybackStopped": "La riproduzione audio è stata interrotta",
+    "NotificationOptionCameraImageUploaded": "Immagine fotocamera caricata",
+    "NotificationOptionGamePlayback": "Il gioco è stato avviato",
+    "NotificationOptionGamePlaybackStopped": "Il gioco è stato fermato",
+    "NotificationOptionInstallationFailed": "Installazione fallita",
+    "NotificationOptionNewLibraryContent": "Nuovo contenuto aggiunto",
+    "NotificationOptionPluginError": "Errore del Plug-in",
+    "NotificationOptionPluginInstalled": "Plug-in installato",
+    "NotificationOptionPluginUninstalled": "Plug-in disinstallato",
+    "NotificationOptionPluginUpdateInstalled": "Aggiornamento del plug-in installato",
+    "NotificationOptionServerRestartRequired": "Riavvio del server necessario",
+    "NotificationOptionTaskFailed": "Operazione pianificata fallita",
+    "NotificationOptionUserLockedOut": "Utente bloccato",
+    "NotificationOptionVideoPlayback": "La riproduzione video è iniziata",
+    "NotificationOptionVideoPlaybackStopped": "La riproduzione video è stata interrotta",
+    "Photos": "Foto",
+    "Playlists": "Playlist",
+    "Plugin": "Plug-in",
+    "PluginInstalledWithName": "{0} è stato Installato",
+    "PluginUninstalledWithName": "{0} è stato disinstallato",
+    "PluginUpdatedWithName": "{0} è stato aggiornato",
+    "ProviderValue": "Provider: {0}",
+    "ScheduledTaskFailedWithName": "{0} fallito",
+    "ScheduledTaskStartedWithName": "{0} avviati",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Programmi",
+    "Songs": "Canzoni",
+    "StartupEmbyServerIsLoading": "Jellyfin server si sta avviando. Per favore riprova più tardi.",
+    "SubtitleDownloadFailureForItem": "Impossibile scaricare i sottotitoli per {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Sottotitoli scaricati per {0}",
+    "Sync": "Sincronizza",
+    "System": "Sistema",
+    "TvShows": "Serie TV",
+    "User": "Utente",
+    "UserCreatedWithName": "L'utente {0} è stato creato",
+    "UserDeletedWithName": "L'utente {0} è stato rimosso",
+    "UserDownloadingItemWithValues": "{0} sta scaricando {1}",
+    "UserLockedOutWithName": "L'utente {0} è stato bloccato",
+    "UserOfflineFromDevice": "{0} è stato disconnesso da {1}",
+    "UserOnlineFromDevice": "{0} è online da {1}",
+    "UserPasswordChangedWithName": "La password è stata cambiata per l'utente {0}",
+    "UserPolicyUpdatedWithName": "La politica dell'utente è stata aggiornata per {0}",
+    "UserStartedPlayingItemWithValues": "{0} ha avviato la riproduzione di {1}",
+    "UserStoppedPlayingItemWithValues": "{0} ha interrotto la riproduzione di {1}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Speciale - {0}",
+    "VersionNumber": "Versione {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/kk.json b/Emby.Server.Implementations/Localization/Core/kk.json
index 970a5d4605..45b8617f1a 100644
--- a/Emby.Server.Implementations/Localization/Core/kk.json
+++ b/Emby.Server.Implementations/Localization/Core/kk.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Альбомдар",
-  "AppDeviceValues": "Қолданба: {0}, Құрылғы: {1}",
-  "Application": "Қолданба",
-  "Artists": "Орындаушылар",
-  "AuthenticationSucceededWithUserName": "{0} түпнұсқалығын расталуы сәтті",
-  "Books": "Кітаптар",
-  "CameraImageUploadedFrom": "Жаңа сурет {0} камерасынан жүктеп алынды",
-  "Channels": "Арналар",
-  "ChapterNameValue": "{0}-сахна",
-  "Collections": "Жиынтықтар",
-  "DeviceOfflineWithName": "{0} ажыратылған",
-  "DeviceOnlineWithName": "{0} қосылған",
-  "FailedLoginAttemptWithUserName": "{0} тарапынан кіру әрекеті сәтсіз",
-  "Favorites": "Таңдаулылар",
-  "Folders": "Қалталар",
-  "Games": "Ойындар",
-  "Genres": "Жанрлар",
-  "HeaderAlbumArtists": "Альбом орындаушылары",
-  "HeaderCameraUploads": "Камерадан жүктелгендер",
-  "HeaderContinueWatching": "Қарауды жалғастыру",
-  "HeaderFavoriteAlbums": "Таңдаулы альбомдар",
-  "HeaderFavoriteArtists": "Таңдаулы орындаушылар",
-  "HeaderFavoriteEpisodes": "Таңдаулы бөлімдер",
-  "HeaderFavoriteShows": "Таңдаулы көрсетімдер",
-  "HeaderFavoriteSongs": "Таңдаулы әуендер",
-  "HeaderLiveTV": "Эфир",
-  "HeaderNextUp": "Кезекті",
-  "HeaderRecordingGroups": "Жазба топтары",
-  "HomeVideos": "Үйлік бейнелер",
-  "Inherit": "Мұраға иелену",
-  "ItemAddedWithName": "{0} тасығышханаға үстелінді",
-  "ItemRemovedWithName": "{0} тасығышханадан аласталды",
-  "LabelIpAddressValue": "IP-мекенжайы: {0}",
-  "LabelRunningTimeValue": "Іске қосылу уақыты: {0}",
-  "Latest": "Ең кейінгі",
-  "MessageApplicationUpdated": "Jellyfin Server жаңартылды.",
-  "MessageApplicationUpdatedTo": "Jellyfin Server {0} үшін жаңартылды",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Сервер теңшелімі ({0} бөлімі) жаңартылды",
-  "MessageServerConfigurationUpdated": "Сервер теңшелімі жаңартылды",
-  "MixedContent": "Аралас мазмұн",
-  "Movies": "Фильмдер",
-  "Music": "Музыка",
-  "MusicVideos": "Музыкалық бейнелер",
-  "NameInstallFailed": "{0} орнатылуы сәтсіз",
-  "NameSeasonNumber": "{0}-маусым",
-  "NameSeasonUnknown": "Белгісіз маусым",
-  "NewVersionIsAvailable": "Жаңа Jellyfin Server нұсқасы жүктеп алуға қолжетімді.",
-  "NotificationOptionApplicationUpdateAvailable": "Қолданба жаңартуы қолжетімді",
-  "NotificationOptionApplicationUpdateInstalled": "Қолданба жаңартуы орнатылды",
-  "NotificationOptionAudioPlayback": "Дыбыс ойнатуы басталды",
-  "NotificationOptionAudioPlaybackStopped": "Дыбыс ойнатуы тоқтатылды",
-  "NotificationOptionCameraImageUploaded": "Камерадан фотосурет кері қотарылған",
-  "NotificationOptionGamePlayback": "Ойын ойнатуы басталды",
-  "NotificationOptionGamePlaybackStopped": "Ойын ойнатуы тоқтатылды",
-  "NotificationOptionInstallationFailed": "Орнату сәтсіздігі",
-  "NotificationOptionNewLibraryContent": "Жаңа мазмұн үстелген",
-  "NotificationOptionPluginError": "Плагин сәтсіздігі",
-  "NotificationOptionPluginInstalled": "Плагин орнатылды",
-  "NotificationOptionPluginUninstalled": "Плагин орнатуы болдырылмады",
-  "NotificationOptionPluginUpdateInstalled": "Плагин жаңартуы орнатылды",
-  "NotificationOptionServerRestartRequired": "Серверді қайта іске қосу қажет",
-  "NotificationOptionTaskFailed": "Жоспарлаған тапсырма сәтсіздігі",
-  "NotificationOptionUserLockedOut": "Пайдаланушы құрсаулы",
-  "NotificationOptionVideoPlayback": "Бейне ойнатуы басталды",
-  "NotificationOptionVideoPlaybackStopped": "Бейне ойнатуы тоқтатылды",
-  "Photos": "Фотосуреттер",
-  "Playlists": "Ойнату тізімдері",
-  "Plugin": "Плагин",
-  "PluginInstalledWithName": "{0} орнатылды",
-  "PluginUninstalledWithName": "{0} жойылды",
-  "PluginUpdatedWithName": "{0} жаңартылды",
-  "ProviderValue": "Жеткізуші: {0}",
-  "ScheduledTaskFailedWithName": "{0} сәтсіз",
-  "ScheduledTaskStartedWithName": "{0} іске қосылды",
-  "ServerNameNeedsToBeRestarted": "{0} қайта іске қосу қажет",
-  "Shows": "Көрсетімдер",
-  "Songs": "Әуендер",
-  "StartupEmbyServerIsLoading": "Jellyfin Server жүктелуде. Әрекетті көп ұзамай қайталаңыз.",
-  "SubtitleDownloadFailureForItem": "Субтитрлер {0} үшін жүктеліп алынуы сәтсіз",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "{0} үшін субтитрлер жүктеліп алынды",
-  "Sync": "Үндестіру",
-  "System": "Жүйе",
-  "TvShows": "ТД-көрсетімдер",
-  "User": "Пайдаланушы",
-  "UserCreatedWithName": "Пайдаланушы {0} жасалған",
-  "UserDeletedWithName": "Пайдаланушы {0} жойылған",
-  "UserDownloadingItemWithValues": "{0} мынаны жүктеп алуда: {1}",
-  "UserLockedOutWithName": "Пайдаланушы {0} құрсаулы",
-  "UserOfflineFromDevice": "{0} - {1} тарапынан ажыратылған",
-  "UserOnlineFromDevice": "{0} - {1} арқылы қосылған",
-  "UserPasswordChangedWithName": "Пайдаланушы {0} үшін құпия сөз өзгертілді",
-  "UserPolicyUpdatedWithName": "Пайдаланушы {0} үшін саясаттары жаңартылды",
-  "UserStartedPlayingItemWithValues": "{0} - {1} ойнатуын  {2} бастады",
-  "UserStoppedPlayingItemWithValues": "{0} - {1} ойнатуын  {2} тоқтатты",
-  "ValueHasBeenAddedToLibrary": "{0} (тасығышханаға үстелінді)",
-  "ValueSpecialEpisodeName": "Арнайы - {0}",
-  "VersionNumber": "Нұсқасы: {0}"
+    "Albums": "Альбомдар",
+    "AppDeviceValues": "Қолданба: {0}, Құрылғы: {1}",
+    "Application": "Қолданба",
+    "Artists": "Орындаушылар",
+    "AuthenticationSucceededWithUserName": "{0} түпнұсқалығын расталуы сәтті",
+    "Books": "Кітаптар",
+    "CameraImageUploadedFrom": "Жаңа сурет {0} камерасынан жүктеп алынды",
+    "Channels": "Арналар",
+    "ChapterNameValue": "{0}-сахна",
+    "Collections": "Жиынтықтар",
+    "DeviceOfflineWithName": "{0} ажыратылған",
+    "DeviceOnlineWithName": "{0} қосылған",
+    "FailedLoginAttemptWithUserName": "{0} тарапынан кіру әрекеті сәтсіз",
+    "Favorites": "Таңдаулылар",
+    "Folders": "Қалталар",
+    "Games": "Ойындар",
+    "Genres": "Жанрлар",
+    "HeaderAlbumArtists": "Альбом орындаушылары",
+    "HeaderCameraUploads": "Камерадан жүктелгендер",
+    "HeaderContinueWatching": "Қарауды жалғастыру",
+    "HeaderFavoriteAlbums": "Таңдаулы альбомдар",
+    "HeaderFavoriteArtists": "Таңдаулы орындаушылар",
+    "HeaderFavoriteEpisodes": "Таңдаулы бөлімдер",
+    "HeaderFavoriteShows": "Таңдаулы көрсетімдер",
+    "HeaderFavoriteSongs": "Таңдаулы әуендер",
+    "HeaderLiveTV": "Эфир",
+    "HeaderNextUp": "Кезекті",
+    "HeaderRecordingGroups": "Жазба топтары",
+    "HomeVideos": "Үйлік бейнелер",
+    "Inherit": "Мұраға иелену",
+    "ItemAddedWithName": "{0} тасығышханаға үстелінді",
+    "ItemRemovedWithName": "{0} тасығышханадан аласталды",
+    "LabelIpAddressValue": "IP-мекенжайы: {0}",
+    "LabelRunningTimeValue": "Іске қосылу уақыты: {0}",
+    "Latest": "Ең кейінгі",
+    "MessageApplicationUpdated": "Jellyfin Server жаңартылды.",
+    "MessageApplicationUpdatedTo": "Jellyfin Server {0} үшін жаңартылды",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Сервер теңшелімі ({0} бөлімі) жаңартылды",
+    "MessageServerConfigurationUpdated": "Сервер теңшелімі жаңартылды",
+    "MixedContent": "Аралас мазмұн",
+    "Movies": "Фильмдер",
+    "Music": "Музыка",
+    "MusicVideos": "Музыкалық бейнелер",
+    "NameInstallFailed": "{0} орнатылуы сәтсіз",
+    "NameSeasonNumber": "{0}-маусым",
+    "NameSeasonUnknown": "Белгісіз маусым",
+    "NewVersionIsAvailable": "Жаңа Jellyfin Server нұсқасы жүктеп алуға қолжетімді.",
+    "NotificationOptionApplicationUpdateAvailable": "Қолданба жаңартуы қолжетімді",
+    "NotificationOptionApplicationUpdateInstalled": "Қолданба жаңартуы орнатылды",
+    "NotificationOptionAudioPlayback": "Дыбыс ойнатуы басталды",
+    "NotificationOptionAudioPlaybackStopped": "Дыбыс ойнатуы тоқтатылды",
+    "NotificationOptionCameraImageUploaded": "Камерадан фотосурет кері қотарылған",
+    "NotificationOptionGamePlayback": "Ойын ойнатуы басталды",
+    "NotificationOptionGamePlaybackStopped": "Ойын ойнатуы тоқтатылды",
+    "NotificationOptionInstallationFailed": "Орнату сәтсіздігі",
+    "NotificationOptionNewLibraryContent": "Жаңа мазмұн үстелген",
+    "NotificationOptionPluginError": "Плагин сәтсіздігі",
+    "NotificationOptionPluginInstalled": "Плагин орнатылды",
+    "NotificationOptionPluginUninstalled": "Плагин орнатуы болдырылмады",
+    "NotificationOptionPluginUpdateInstalled": "Плагин жаңартуы орнатылды",
+    "NotificationOptionServerRestartRequired": "Серверді қайта іске қосу қажет",
+    "NotificationOptionTaskFailed": "Жоспарлаған тапсырма сәтсіздігі",
+    "NotificationOptionUserLockedOut": "Пайдаланушы құрсаулы",
+    "NotificationOptionVideoPlayback": "Бейне ойнатуы басталды",
+    "NotificationOptionVideoPlaybackStopped": "Бейне ойнатуы тоқтатылды",
+    "Photos": "Фотосуреттер",
+    "Playlists": "Ойнату тізімдері",
+    "Plugin": "Плагин",
+    "PluginInstalledWithName": "{0} орнатылды",
+    "PluginUninstalledWithName": "{0} жойылды",
+    "PluginUpdatedWithName": "{0} жаңартылды",
+    "ProviderValue": "Жеткізуші: {0}",
+    "ScheduledTaskFailedWithName": "{0} сәтсіз",
+    "ScheduledTaskStartedWithName": "{0} іске қосылды",
+    "ServerNameNeedsToBeRestarted": "{0} қайта іске қосу қажет",
+    "Shows": "Көрсетімдер",
+    "Songs": "Әуендер",
+    "StartupEmbyServerIsLoading": "Jellyfin Server жүктелуде. Әрекетті көп ұзамай қайталаңыз.",
+    "SubtitleDownloadFailureForItem": "Субтитрлер {0} үшін жүктеліп алынуы сәтсіз",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "{0} үшін субтитрлер жүктеліп алынды",
+    "Sync": "Үндестіру",
+    "System": "Жүйе",
+    "TvShows": "ТД-көрсетімдер",
+    "User": "Пайдаланушы",
+    "UserCreatedWithName": "Пайдаланушы {0} жасалған",
+    "UserDeletedWithName": "Пайдаланушы {0} жойылған",
+    "UserDownloadingItemWithValues": "{0} мынаны жүктеп алуда: {1}",
+    "UserLockedOutWithName": "Пайдаланушы {0} құрсаулы",
+    "UserOfflineFromDevice": "{0} - {1} тарапынан ажыратылған",
+    "UserOnlineFromDevice": "{0} - {1} арқылы қосылған",
+    "UserPasswordChangedWithName": "Пайдаланушы {0} үшін құпия сөз өзгертілді",
+    "UserPolicyUpdatedWithName": "Пайдаланушы {0} үшін саясаттары жаңартылды",
+    "UserStartedPlayingItemWithValues": "{0} - {1} ойнатуын  {2} бастады",
+    "UserStoppedPlayingItemWithValues": "{0} - {1} ойнатуын  {2} тоқтатты",
+    "ValueHasBeenAddedToLibrary": "{0} (тасығышханаға үстелінді)",
+    "ValueSpecialEpisodeName": "Арнайы - {0}",
+    "VersionNumber": "Нұсқасы: {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/ko.json b/Emby.Server.Implementations/Localization/Core/ko.json
index ec77856197..04fc52d6ee 100644
--- a/Emby.Server.Implementations/Localization/Core/ko.json
+++ b/Emby.Server.Implementations/Localization/Core/ko.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albums",
-  "AppDeviceValues": "App: {0}, Device: {1}",
-  "Application": "Application",
-  "Artists": "Artists",
-  "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-  "Books": "Books",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Channels",
-  "ChapterNameValue": "Chapter {0}",
-  "Collections": "Collections",
-  "DeviceOfflineWithName": "{0} has disconnected",
-  "DeviceOnlineWithName": "{0} is connected",
-  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-  "Favorites": "Favorites",
-  "Folders": "Folders",
-  "Games": "Games",
-  "Genres": "Genres",
-  "HeaderAlbumArtists": "앨범 아티스트",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "계속 시청하기",
-  "HeaderFavoriteAlbums": "Favorite Albums",
-  "HeaderFavoriteArtists": "Favorite Artists",
-  "HeaderFavoriteEpisodes": "Favorite Episodes",
-  "HeaderFavoriteShows": "즐겨찾는 쇼",
-  "HeaderFavoriteSongs": "Favorite Songs",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "Next Up",
-  "HeaderRecordingGroups": "Recording Groups",
-  "HomeVideos": "Home videos",
-  "Inherit": "Inherit",
-  "ItemAddedWithName": "{0} was added to the library",
-  "ItemRemovedWithName": "{0} was removed from the library",
-  "LabelIpAddressValue": "Ip address: {0}",
-  "LabelRunningTimeValue": "Running time: {0}",
-  "Latest": "Latest",
-  "MessageApplicationUpdated": "Jellyfin Server has been updated",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-  "MessageServerConfigurationUpdated": "Server configuration has been updated",
-  "MixedContent": "Mixed content",
-  "Movies": "Movies",
-  "Music": "Music",
-  "MusicVideos": "Music videos",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Season {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Application update available",
-  "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-  "NotificationOptionAudioPlayback": "Audio playback started",
-  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-  "NotificationOptionInstallationFailed": "Installation failure",
-  "NotificationOptionNewLibraryContent": "New content added",
-  "NotificationOptionPluginError": "Plugin failure",
-  "NotificationOptionPluginInstalled": "Plugin installed",
-  "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-  "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-  "NotificationOptionServerRestartRequired": "Server restart required",
-  "NotificationOptionTaskFailed": "Scheduled task failure",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionVideoPlayback": "Video playback started",
-  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-  "Photos": "Photos",
-  "Playlists": "Playlists",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} was installed",
-  "PluginUninstalledWithName": "{0} was uninstalled",
-  "PluginUpdatedWithName": "{0} was updated",
-  "ProviderValue": "Provider: {0}",
-  "ScheduledTaskFailedWithName": "{0} failed",
-  "ScheduledTaskStartedWithName": "{0} started",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Shows",
-  "Songs": "Songs",
-  "StartupEmbyServerIsLoading": "Jellyfin 서버를 불러오고 있습니다. 잠시후 다시시도 해주세요.",
-  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-  "Sync": "Sync",
-  "System": "System",
-  "TvShows": "TV Shows",
-  "User": "User",
-  "UserCreatedWithName": "User {0} has been created",
-  "UserDeletedWithName": "User {0} has been deleted",
-  "UserDownloadingItemWithValues": "{0} is downloading {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} has disconnected from {1}",
-  "UserOnlineFromDevice": "{0} is online from {1}",
-  "UserPasswordChangedWithName": "Password has been changed for user {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
-  "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Special - {0}",
-  "VersionNumber": "Version {0}"
+    "Albums": "Albums",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "Application": "Application",
+    "Artists": "Artists",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "Books": "Books",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Channels",
+    "ChapterNameValue": "Chapter {0}",
+    "Collections": "Collections",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "DeviceOnlineWithName": "{0} is connected",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "Favorites": "Favorites",
+    "Folders": "Folders",
+    "Games": "Games",
+    "Genres": "Genres",
+    "HeaderAlbumArtists": "앨범 아티스트",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "계속 시청하기",
+    "HeaderFavoriteAlbums": "Favorite Albums",
+    "HeaderFavoriteArtists": "Favorite Artists",
+    "HeaderFavoriteEpisodes": "Favorite Episodes",
+    "HeaderFavoriteShows": "즐겨찾는 쇼",
+    "HeaderFavoriteSongs": "Favorite Songs",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "Next Up",
+    "HeaderRecordingGroups": "Recording Groups",
+    "HomeVideos": "Home videos",
+    "Inherit": "Inherit",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "Latest": "Latest",
+    "MessageApplicationUpdated": "Jellyfin Server has been updated",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MixedContent": "Mixed content",
+    "Movies": "Movies",
+    "Music": "Music",
+    "MusicVideos": "Music videos",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Season {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "Photos": "Photos",
+    "Playlists": "Playlists",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "PluginUpdatedWithName": "{0} was updated",
+    "ProviderValue": "Provider: {0}",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Shows",
+    "Songs": "Songs",
+    "StartupEmbyServerIsLoading": "Jellyfin 서버를 불러오고 있습니다. 잠시후 다시시도 해주세요.",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "Sync": "Sync",
+    "System": "System",
+    "TvShows": "TV Shows",
+    "User": "User",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
+    "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "VersionNumber": "Version {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/lt-LT.json b/Emby.Server.Implementations/Localization/Core/lt-LT.json
index bd362c4935..653565db65 100644
--- a/Emby.Server.Implementations/Localization/Core/lt-LT.json
+++ b/Emby.Server.Implementations/Localization/Core/lt-LT.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albums",
-  "AppDeviceValues": "App: {0}, Device: {1}",
-  "Application": "Application",
-  "Artists": "Artists",
-  "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-  "Books": "Books",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Channels",
-  "ChapterNameValue": "Chapter {0}",
-  "Collections": "Collections",
-  "DeviceOfflineWithName": "{0} has disconnected",
-  "DeviceOnlineWithName": "{0} is connected",
-  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-  "Favorites": "Favorites",
-  "Folders": "Folders",
-  "Games": "Games",
-  "Genres": "Žanrai",
-  "HeaderAlbumArtists": "Album Artists",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Žiūrėti toliau",
-  "HeaderFavoriteAlbums": "Favorite Albums",
-  "HeaderFavoriteArtists": "Favorite Artists",
-  "HeaderFavoriteEpisodes": "Favorite Episodes",
-  "HeaderFavoriteShows": "Favorite Shows",
-  "HeaderFavoriteSongs": "Favorite Songs",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "Next Up",
-  "HeaderRecordingGroups": "Recording Groups",
-  "HomeVideos": "Home videos",
-  "Inherit": "Inherit",
-  "ItemAddedWithName": "{0} was added to the library",
-  "ItemRemovedWithName": "{0} was removed from the library",
-  "LabelIpAddressValue": "Ip address: {0}",
-  "LabelRunningTimeValue": "Running time: {0}",
-  "Latest": "Latest",
-  "MessageApplicationUpdated": "Jellyfin Server has been updated",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-  "MessageServerConfigurationUpdated": "Server configuration has been updated",
-  "MixedContent": "Mixed content",
-  "Movies": "Filmai",
-  "Music": "Music",
-  "MusicVideos": "Music videos",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Season {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Application update available",
-  "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-  "NotificationOptionAudioPlayback": "Audio playback started",
-  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-  "NotificationOptionInstallationFailed": "Installation failure",
-  "NotificationOptionNewLibraryContent": "New content added",
-  "NotificationOptionPluginError": "Plugin failure",
-  "NotificationOptionPluginInstalled": "Plugin installed",
-  "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-  "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-  "NotificationOptionServerRestartRequired": "Server restart required",
-  "NotificationOptionTaskFailed": "Scheduled task failure",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionVideoPlayback": "Video playback started",
-  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-  "Photos": "Photos",
-  "Playlists": "Playlists",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} was installed",
-  "PluginUninstalledWithName": "{0} was uninstalled",
-  "PluginUpdatedWithName": "{0} was updated",
-  "ProviderValue": "Provider: {0}",
-  "ScheduledTaskFailedWithName": "{0} failed",
-  "ScheduledTaskStartedWithName": "{0} started",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Shows",
-  "Songs": "Songs",
-  "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
-  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-  "Sync": "Sinchronizuoti",
-  "System": "System",
-  "TvShows": "TV Shows",
-  "User": "User",
-  "UserCreatedWithName": "User {0} has been created",
-  "UserDeletedWithName": "User {0} has been deleted",
-  "UserDownloadingItemWithValues": "{0} is downloading {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} has disconnected from {1}",
-  "UserOnlineFromDevice": "{0} is online from {1}",
-  "UserPasswordChangedWithName": "Password has been changed for user {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
-  "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Ypatinga - {0}",
-  "VersionNumber": "Version {0}"
+    "Albums": "Albums",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "Application": "Application",
+    "Artists": "Artists",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "Books": "Books",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Channels",
+    "ChapterNameValue": "Chapter {0}",
+    "Collections": "Collections",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "DeviceOnlineWithName": "{0} is connected",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "Favorites": "Favorites",
+    "Folders": "Folders",
+    "Games": "Games",
+    "Genres": "Žanrai",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Žiūrėti toliau",
+    "HeaderFavoriteAlbums": "Favorite Albums",
+    "HeaderFavoriteArtists": "Favorite Artists",
+    "HeaderFavoriteEpisodes": "Favorite Episodes",
+    "HeaderFavoriteShows": "Favorite Shows",
+    "HeaderFavoriteSongs": "Favorite Songs",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "Next Up",
+    "HeaderRecordingGroups": "Recording Groups",
+    "HomeVideos": "Home videos",
+    "Inherit": "Inherit",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "Latest": "Latest",
+    "MessageApplicationUpdated": "Jellyfin Server has been updated",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MixedContent": "Mixed content",
+    "Movies": "Filmai",
+    "Music": "Music",
+    "MusicVideos": "Music videos",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Season {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "Photos": "Photos",
+    "Playlists": "Playlists",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "PluginUpdatedWithName": "{0} was updated",
+    "ProviderValue": "Provider: {0}",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Shows",
+    "Songs": "Songs",
+    "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "Sync": "Sinchronizuoti",
+    "System": "System",
+    "TvShows": "TV Shows",
+    "User": "User",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
+    "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Ypatinga - {0}",
+    "VersionNumber": "Version {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/ms.json b/Emby.Server.Implementations/Localization/Core/ms.json
index ae74d6f7eb..aaaf097882 100644
--- a/Emby.Server.Implementations/Localization/Core/ms.json
+++ b/Emby.Server.Implementations/Localization/Core/ms.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albums",
-  "AppDeviceValues": "App: {0}, Device: {1}",
-  "Application": "Application",
-  "Artists": "Artists",
-  "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-  "Books": "Books",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Channels",
-  "ChapterNameValue": "Chapter {0}",
-  "Collections": "Collections",
-  "DeviceOfflineWithName": "{0} has disconnected",
-  "DeviceOnlineWithName": "{0} is connected",
-  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-  "Favorites": "Favorites",
-  "Folders": "Folders",
-  "Games": "Games",
-  "Genres": "Genres",
-  "HeaderAlbumArtists": "Album Artists",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Continue Watching",
-  "HeaderFavoriteAlbums": "Favorite Albums",
-  "HeaderFavoriteArtists": "Favorite Artists",
-  "HeaderFavoriteEpisodes": "Favorite Episodes",
-  "HeaderFavoriteShows": "Favorite Shows",
-  "HeaderFavoriteSongs": "Favorite Songs",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "Next Up",
-  "HeaderRecordingGroups": "Recording Groups",
-  "HomeVideos": "Home videos",
-  "Inherit": "Inherit",
-  "ItemAddedWithName": "{0} was added to the library",
-  "ItemRemovedWithName": "{0} was removed from the library",
-  "LabelIpAddressValue": "Ip address: {0}",
-  "LabelRunningTimeValue": "Running time: {0}",
-  "Latest": "Latest",
-  "MessageApplicationUpdated": "Jellyfin Server has been updated",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-  "MessageServerConfigurationUpdated": "Server configuration has been updated",
-  "MixedContent": "Mixed content",
-  "Movies": "Movies",
-  "Music": "Music",
-  "MusicVideos": "Music videos",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Season {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Application update available",
-  "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-  "NotificationOptionAudioPlayback": "Audio playback started",
-  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-  "NotificationOptionInstallationFailed": "Installation failure",
-  "NotificationOptionNewLibraryContent": "New content added",
-  "NotificationOptionPluginError": "Plugin failure",
-  "NotificationOptionPluginInstalled": "Plugin installed",
-  "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-  "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-  "NotificationOptionServerRestartRequired": "Server restart required",
-  "NotificationOptionTaskFailed": "Scheduled task failure",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionVideoPlayback": "Video playback started",
-  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-  "Photos": "Photos",
-  "Playlists": "Playlists",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} was installed",
-  "PluginUninstalledWithName": "{0} was uninstalled",
-  "PluginUpdatedWithName": "{0} was updated",
-  "ProviderValue": "Provider: {0}",
-  "ScheduledTaskFailedWithName": "{0} failed",
-  "ScheduledTaskStartedWithName": "{0} started",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Series",
-  "Songs": "Songs",
-  "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
-  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-  "Sync": "Sync",
-  "System": "System",
-  "TvShows": "TV Shows",
-  "User": "User",
-  "UserCreatedWithName": "User {0} has been created",
-  "UserDeletedWithName": "User {0} has been deleted",
-  "UserDownloadingItemWithValues": "{0} is downloading {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} has disconnected from {1}",
-  "UserOnlineFromDevice": "{0} is online from {1}",
-  "UserPasswordChangedWithName": "Password has been changed for user {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
-  "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Special - {0}",
-  "VersionNumber": "Version {0}"
+    "Albums": "Albums",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "Application": "Application",
+    "Artists": "Artists",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "Books": "Books",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Channels",
+    "ChapterNameValue": "Chapter {0}",
+    "Collections": "Collections",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "DeviceOnlineWithName": "{0} is connected",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "Favorites": "Favorites",
+    "Folders": "Folders",
+    "Games": "Games",
+    "Genres": "Genres",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Continue Watching",
+    "HeaderFavoriteAlbums": "Favorite Albums",
+    "HeaderFavoriteArtists": "Favorite Artists",
+    "HeaderFavoriteEpisodes": "Favorite Episodes",
+    "HeaderFavoriteShows": "Favorite Shows",
+    "HeaderFavoriteSongs": "Favorite Songs",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "Next Up",
+    "HeaderRecordingGroups": "Recording Groups",
+    "HomeVideos": "Home videos",
+    "Inherit": "Inherit",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "Latest": "Latest",
+    "MessageApplicationUpdated": "Jellyfin Server has been updated",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MixedContent": "Mixed content",
+    "Movies": "Movies",
+    "Music": "Music",
+    "MusicVideos": "Music videos",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Season {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "Photos": "Photos",
+    "Playlists": "Playlists",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "PluginUpdatedWithName": "{0} was updated",
+    "ProviderValue": "Provider: {0}",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Series",
+    "Songs": "Songs",
+    "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "Sync": "Sync",
+    "System": "System",
+    "TvShows": "TV Shows",
+    "User": "User",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
+    "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "VersionNumber": "Version {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/nb.json b/Emby.Server.Implementations/Localization/Core/nb.json
index 779b508c47..ed63aa29c5 100644
--- a/Emby.Server.Implementations/Localization/Core/nb.json
+++ b/Emby.Server.Implementations/Localization/Core/nb.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Album",
-  "AppDeviceValues": "App:{0}, Enhet {1}",
-  "Application": "Applikasjon",
-  "Artists": "Artister",
-  "AuthenticationSucceededWithUserName": "{0} vellykkede autentisert",
-  "Books": "Bøker",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Kanaler",
-  "ChapterNameValue": "Kapittel {0}",
-  "Collections": "Samlinger",
-  "DeviceOfflineWithName": "{0} har koblet fra",
-  "DeviceOnlineWithName": "{0} er tilkoblet",
-  "FailedLoginAttemptWithUserName": "Mislykket påloggingsforsøk fra {0}",
-  "Favorites": "Favoritter",
-  "Folders": "Mapper",
-  "Games": "Spill",
-  "Genres": "Sjanger",
-  "HeaderAlbumArtists": "Albumartist",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Forsett og see på",
-  "HeaderFavoriteAlbums": "Favoritt albumer",
-  "HeaderFavoriteArtists": "Favorittartister",
-  "HeaderFavoriteEpisodes": "Favoritt episode",
-  "HeaderFavoriteShows": "Favorittserier",
-  "HeaderFavoriteSongs": "Favorittsanger",
-  "HeaderLiveTV": "Direkte TV",
-  "HeaderNextUp": "Neste",
-  "HeaderRecordingGroups": "Opptak Grupper",
-  "HomeVideos": "Hjemmelaget filmer",
-  "Inherit": "Arve",
-  "ItemAddedWithName": "{0} ble lagt til i biblioteket",
-  "ItemRemovedWithName": "{0} ble fjernet fra biblioteket",
-  "LabelIpAddressValue": "IP adresse: {0}",
-  "LabelRunningTimeValue": "Løpetid {0}",
-  "Latest": "Siste",
-  "MessageApplicationUpdated": "Jellyfin server har blitt oppdatert",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server konfigurasjon seksjon {0} har blitt oppdatert",
-  "MessageServerConfigurationUpdated": "Server konfigurasjon er oppdatert",
-  "MixedContent": "Blandet innhold",
-  "Movies": "Filmer",
-  "Music": "Musikk",
-  "MusicVideos": "Musikkvideoer",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Sesong {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Applikasjon oppdatering tilgjengelig",
-  "NotificationOptionApplicationUpdateInstalled": "Applikasjon oppdatering installert.",
-  "NotificationOptionAudioPlayback": "Lyd tilbakespilling startet",
-  "NotificationOptionAudioPlaybackStopped": "Lyd avspilling stoppet",
-  "NotificationOptionCameraImageUploaded": "Kamera bilde lastet opp",
-  "NotificationOptionGamePlayback": "Spill avspillingen startet",
-  "NotificationOptionGamePlaybackStopped": "Filmer",
-  "NotificationOptionInstallationFailed": "Installasjon feil",
-  "NotificationOptionNewLibraryContent": "Ny innhold er lagt til",
-  "NotificationOptionPluginError": "Plugin feil",
-  "NotificationOptionPluginInstalled": "Plugin installert",
-  "NotificationOptionPluginUninstalled": "Plugin avinstallert",
-  "NotificationOptionPluginUpdateInstalled": "Plugin oppdatering installert",
-  "NotificationOptionServerRestartRequired": "Server omstart er nødvendig",
-  "NotificationOptionTaskFailed": "Feil under utføring av planlagt oppgaver",
-  "NotificationOptionUserLockedOut": "Bruker er utestengt",
-  "NotificationOptionVideoPlayback": "Video tilbakespilling startet",
-  "NotificationOptionVideoPlaybackStopped": "Video avspilling stoppet",
-  "Photos": "BIlder",
-  "Playlists": "Spilleliste",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} ble installert",
-  "PluginUninstalledWithName": "{0} ble avinstallert",
-  "PluginUpdatedWithName": "{0} ble oppdatert",
-  "ProviderValue": "Leverandører: {0}",
-  "ScheduledTaskFailedWithName": "{0} Mislykkes",
-  "ScheduledTaskStartedWithName": "{0} Startet",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Programmer",
-  "Songs": "Sanger",
-  "StartupEmbyServerIsLoading": "Jellyfin server laster. Prøv igjen snart.",
-  "SubtitleDownloadFailureForItem": "En feil oppstå under nedlasting av undertekster for  {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Undertekster lastet ned for {0}",
-  "Sync": "Synk",
-  "System": "System",
-  "TvShows": "TV Shows",
-  "User": "Bruker",
-  "UserCreatedWithName": "Bruker {0} er opprettet",
-  "UserDeletedWithName": "Bruker {0} har blitt slettet",
-  "UserDownloadingItemWithValues": "{0} laster ned {1}",
-  "UserLockedOutWithName": "Bruker {0} er blitt utestengt",
-  "UserOfflineFromDevice": "{0} har koblet fra {1}",
-  "UserOnlineFromDevice": "{0} er tilkoblet fra {1}",
-  "UserPasswordChangedWithName": "Passordet for {0} er oppdatert",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} har startet avspilling {1}",
-  "UserStoppedPlayingItemWithValues": "{0} har stoppet avspilling  {1}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Spesial - {0}",
-  "VersionNumber": "Versjon {0}"
+    "Albums": "Album",
+    "AppDeviceValues": "App:{0}, Enhet {1}",
+    "Application": "Applikasjon",
+    "Artists": "Artister",
+    "AuthenticationSucceededWithUserName": "{0} vellykkede autentisert",
+    "Books": "Bøker",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Kanaler",
+    "ChapterNameValue": "Kapittel {0}",
+    "Collections": "Samlinger",
+    "DeviceOfflineWithName": "{0} har koblet fra",
+    "DeviceOnlineWithName": "{0} er tilkoblet",
+    "FailedLoginAttemptWithUserName": "Mislykket påloggingsforsøk fra {0}",
+    "Favorites": "Favoritter",
+    "Folders": "Mapper",
+    "Games": "Spill",
+    "Genres": "Sjanger",
+    "HeaderAlbumArtists": "Albumartist",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Forsett og see på",
+    "HeaderFavoriteAlbums": "Favoritt albumer",
+    "HeaderFavoriteArtists": "Favorittartister",
+    "HeaderFavoriteEpisodes": "Favoritt episode",
+    "HeaderFavoriteShows": "Favorittserier",
+    "HeaderFavoriteSongs": "Favorittsanger",
+    "HeaderLiveTV": "Direkte TV",
+    "HeaderNextUp": "Neste",
+    "HeaderRecordingGroups": "Opptak Grupper",
+    "HomeVideos": "Hjemmelaget filmer",
+    "Inherit": "Arve",
+    "ItemAddedWithName": "{0} ble lagt til i biblioteket",
+    "ItemRemovedWithName": "{0} ble fjernet fra biblioteket",
+    "LabelIpAddressValue": "IP adresse: {0}",
+    "LabelRunningTimeValue": "Løpetid {0}",
+    "Latest": "Siste",
+    "MessageApplicationUpdated": "Jellyfin server har blitt oppdatert",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server konfigurasjon seksjon {0} har blitt oppdatert",
+    "MessageServerConfigurationUpdated": "Server konfigurasjon er oppdatert",
+    "MixedContent": "Blandet innhold",
+    "Movies": "Filmer",
+    "Music": "Musikk",
+    "MusicVideos": "Musikkvideoer",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Sesong {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Applikasjon oppdatering tilgjengelig",
+    "NotificationOptionApplicationUpdateInstalled": "Applikasjon oppdatering installert.",
+    "NotificationOptionAudioPlayback": "Lyd tilbakespilling startet",
+    "NotificationOptionAudioPlaybackStopped": "Lyd avspilling stoppet",
+    "NotificationOptionCameraImageUploaded": "Kamera bilde lastet opp",
+    "NotificationOptionGamePlayback": "Spill avspillingen startet",
+    "NotificationOptionGamePlaybackStopped": "Filmer",
+    "NotificationOptionInstallationFailed": "Installasjon feil",
+    "NotificationOptionNewLibraryContent": "Ny innhold er lagt til",
+    "NotificationOptionPluginError": "Plugin feil",
+    "NotificationOptionPluginInstalled": "Plugin installert",
+    "NotificationOptionPluginUninstalled": "Plugin avinstallert",
+    "NotificationOptionPluginUpdateInstalled": "Plugin oppdatering installert",
+    "NotificationOptionServerRestartRequired": "Server omstart er nødvendig",
+    "NotificationOptionTaskFailed": "Feil under utføring av planlagt oppgaver",
+    "NotificationOptionUserLockedOut": "Bruker er utestengt",
+    "NotificationOptionVideoPlayback": "Video tilbakespilling startet",
+    "NotificationOptionVideoPlaybackStopped": "Video avspilling stoppet",
+    "Photos": "BIlder",
+    "Playlists": "Spilleliste",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} ble installert",
+    "PluginUninstalledWithName": "{0} ble avinstallert",
+    "PluginUpdatedWithName": "{0} ble oppdatert",
+    "ProviderValue": "Leverandører: {0}",
+    "ScheduledTaskFailedWithName": "{0} Mislykkes",
+    "ScheduledTaskStartedWithName": "{0} Startet",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Programmer",
+    "Songs": "Sanger",
+    "StartupEmbyServerIsLoading": "Jellyfin server laster. Prøv igjen snart.",
+    "SubtitleDownloadFailureForItem": "En feil oppstå under nedlasting av undertekster for  {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Undertekster lastet ned for {0}",
+    "Sync": "Synk",
+    "System": "System",
+    "TvShows": "TV Shows",
+    "User": "Bruker",
+    "UserCreatedWithName": "Bruker {0} er opprettet",
+    "UserDeletedWithName": "Bruker {0} har blitt slettet",
+    "UserDownloadingItemWithValues": "{0} laster ned {1}",
+    "UserLockedOutWithName": "Bruker {0} er blitt utestengt",
+    "UserOfflineFromDevice": "{0} har koblet fra {1}",
+    "UserOnlineFromDevice": "{0} er tilkoblet fra {1}",
+    "UserPasswordChangedWithName": "Passordet for {0} er oppdatert",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} har startet avspilling {1}",
+    "UserStoppedPlayingItemWithValues": "{0} har stoppet avspilling  {1}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Spesial - {0}",
+    "VersionNumber": "Versjon {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/nl.json b/Emby.Server.Implementations/Localization/Core/nl.json
index 67529ccd9f..7b8c8765ed 100644
--- a/Emby.Server.Implementations/Localization/Core/nl.json
+++ b/Emby.Server.Implementations/Localization/Core/nl.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albums",
-  "AppDeviceValues": "App: {0}, Apparaat: {1}",
-  "Application": "Toepassing",
-  "Artists": "Artiesten",
-  "AuthenticationSucceededWithUserName": "{0} is succesvol geverifieerd",
-  "Books": "Boeken",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Kanalen",
-  "ChapterNameValue": "Hoofdstuk {0}",
-  "Collections": "Collecties",
-  "DeviceOfflineWithName": "{0} is losgekoppeld",
-  "DeviceOnlineWithName": "{0} is verbonden",
-  "FailedLoginAttemptWithUserName": "Mislukte aanmeld poging van {0}",
-  "Favorites": "Favorieten",
-  "Folders": "Mappen",
-  "Games": "Spellen",
-  "Genres": "Genres",
-  "HeaderAlbumArtists": "Album artiesten",
-  "HeaderCameraUploads": "Camera uploads",
-  "HeaderContinueWatching": "Kijken hervatten",
-  "HeaderFavoriteAlbums": "Favoriete albums",
-  "HeaderFavoriteArtists": "Favoriete artiesten",
-  "HeaderFavoriteEpisodes": "Favoriete afleveringen",
-  "HeaderFavoriteShows": "Favoriete shows",
-  "HeaderFavoriteSongs": "Favoriete titels",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "Volgende",
-  "HeaderRecordingGroups": "Opnamegroepen",
-  "HomeVideos": "Thuis video's",
-  "Inherit": "Overerven",
-  "ItemAddedWithName": "{0} is toegevoegd aan de bibliotheek",
-  "ItemRemovedWithName": "{0} is verwijderd uit de bibliotheek",
-  "LabelIpAddressValue": "IP adres: {0}",
-  "LabelRunningTimeValue": "Looptijd: {0}",
-  "Latest": "Nieuwste",
-  "MessageApplicationUpdated": "Jellyfin Server is bijgewerkt",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Sectie {0} van de server configuratie is bijgewerkt",
-  "MessageServerConfigurationUpdated": "Server configuratie is bijgewerkt",
-  "MixedContent": "Gemengde inhoud",
-  "Movies": "Films",
-  "Music": "Muziek",
-  "MusicVideos": "Muziekvideo's",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Seizoen {0}",
-  "NameSeasonUnknown": "Seizoen onbekend",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Programma-update beschikbaar",
-  "NotificationOptionApplicationUpdateInstalled": "Programma-update geïnstalleerd",
-  "NotificationOptionAudioPlayback": "Geluid gestart",
-  "NotificationOptionAudioPlaybackStopped": "Geluid gestopt",
-  "NotificationOptionCameraImageUploaded": "Camera afbeelding geüpload",
-  "NotificationOptionGamePlayback": "Spel gestart",
-  "NotificationOptionGamePlaybackStopped": "Spel gestopt",
-  "NotificationOptionInstallationFailed": "Installatie mislukt",
-  "NotificationOptionNewLibraryContent": "Nieuwe content toegevoegd",
-  "NotificationOptionPluginError": "Plug-in fout",
-  "NotificationOptionPluginInstalled": "Plug-in geïnstalleerd",
-  "NotificationOptionPluginUninstalled": "Plug-in verwijderd",
-  "NotificationOptionPluginUpdateInstalled": "Plug-in-update geïnstalleerd",
-  "NotificationOptionServerRestartRequired": "Server herstart nodig",
-  "NotificationOptionTaskFailed": "Geplande taak mislukt",
-  "NotificationOptionUserLockedOut": "Gebruikersaccount vergrendeld",
-  "NotificationOptionVideoPlayback": "Video gestart",
-  "NotificationOptionVideoPlaybackStopped": "Video gestopt",
-  "Photos": "Foto's",
-  "Playlists": "Afspeellijsten",
-  "Plugin": "Plug-in",
-  "PluginInstalledWithName": "{0} is geïnstalleerd",
-  "PluginUninstalledWithName": "{0} is verwijderd",
-  "PluginUpdatedWithName": "{0} is bijgewerkt",
-  "ProviderValue": "Aanbieder: {0}",
-  "ScheduledTaskFailedWithName": "{0} is mislukt",
-  "ScheduledTaskStartedWithName": "{0} is gestart",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Series",
-  "Songs": "Titels",
-  "StartupEmbyServerIsLoading": "Jellyfin Server is aan het laden, probeer het later opnieuw.",
-  "SubtitleDownloadFailureForItem": "Downloaden van ondertiteling voor {0} is mislukt",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Ondertiteling voor {0} is gedownload",
-  "Sync": "Synchronisatie",
-  "System": "Systeem",
-  "TvShows": "TV-series",
-  "User": "Gebruiker",
-  "UserCreatedWithName": "Gebruiker {0} is aangemaakt",
-  "UserDeletedWithName": "Gebruiker {0} is verwijderd",
-  "UserDownloadingItemWithValues": "{0} download {1}",
-  "UserLockedOutWithName": "Gebruikersaccount {0} is vergrendeld",
-  "UserOfflineFromDevice": "Verbinding van {0} met {1} is verbroken",
-  "UserOnlineFromDevice": "{0} heeft verbinding met {1}",
-  "UserPasswordChangedWithName": "Wachtwoord voor {0} is gewijzigd",
-  "UserPolicyUpdatedWithName": "Gebruikersbeleid gewijzigd voor {0}",
-  "UserStartedPlayingItemWithValues": "{0} heeft afspelen van {1} gestart",
-  "UserStoppedPlayingItemWithValues": "{0} heeft afspelen van {1} gestopt",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Speciaal - {0}",
-  "VersionNumber": "Versie {0}"
+    "Albums": "Albums",
+    "AppDeviceValues": "App: {0}, Apparaat: {1}",
+    "Application": "Toepassing",
+    "Artists": "Artiesten",
+    "AuthenticationSucceededWithUserName": "{0} is succesvol geverifieerd",
+    "Books": "Boeken",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Kanalen",
+    "ChapterNameValue": "Hoofdstuk {0}",
+    "Collections": "Collecties",
+    "DeviceOfflineWithName": "{0} is losgekoppeld",
+    "DeviceOnlineWithName": "{0} is verbonden",
+    "FailedLoginAttemptWithUserName": "Mislukte aanmeld poging van {0}",
+    "Favorites": "Favorieten",
+    "Folders": "Mappen",
+    "Games": "Spellen",
+    "Genres": "Genres",
+    "HeaderAlbumArtists": "Album artiesten",
+    "HeaderCameraUploads": "Camera uploads",
+    "HeaderContinueWatching": "Kijken hervatten",
+    "HeaderFavoriteAlbums": "Favoriete albums",
+    "HeaderFavoriteArtists": "Favoriete artiesten",
+    "HeaderFavoriteEpisodes": "Favoriete afleveringen",
+    "HeaderFavoriteShows": "Favoriete shows",
+    "HeaderFavoriteSongs": "Favoriete titels",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "Volgende",
+    "HeaderRecordingGroups": "Opnamegroepen",
+    "HomeVideos": "Thuis video's",
+    "Inherit": "Overerven",
+    "ItemAddedWithName": "{0} is toegevoegd aan de bibliotheek",
+    "ItemRemovedWithName": "{0} is verwijderd uit de bibliotheek",
+    "LabelIpAddressValue": "IP adres: {0}",
+    "LabelRunningTimeValue": "Looptijd: {0}",
+    "Latest": "Nieuwste",
+    "MessageApplicationUpdated": "Jellyfin Server is bijgewerkt",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Sectie {0} van de server configuratie is bijgewerkt",
+    "MessageServerConfigurationUpdated": "Server configuratie is bijgewerkt",
+    "MixedContent": "Gemengde inhoud",
+    "Movies": "Films",
+    "Music": "Muziek",
+    "MusicVideos": "Muziekvideo's",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Seizoen {0}",
+    "NameSeasonUnknown": "Seizoen onbekend",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Programma-update beschikbaar",
+    "NotificationOptionApplicationUpdateInstalled": "Programma-update geïnstalleerd",
+    "NotificationOptionAudioPlayback": "Geluid gestart",
+    "NotificationOptionAudioPlaybackStopped": "Geluid gestopt",
+    "NotificationOptionCameraImageUploaded": "Camera afbeelding geüpload",
+    "NotificationOptionGamePlayback": "Spel gestart",
+    "NotificationOptionGamePlaybackStopped": "Spel gestopt",
+    "NotificationOptionInstallationFailed": "Installatie mislukt",
+    "NotificationOptionNewLibraryContent": "Nieuwe content toegevoegd",
+    "NotificationOptionPluginError": "Plug-in fout",
+    "NotificationOptionPluginInstalled": "Plug-in geïnstalleerd",
+    "NotificationOptionPluginUninstalled": "Plug-in verwijderd",
+    "NotificationOptionPluginUpdateInstalled": "Plug-in-update geïnstalleerd",
+    "NotificationOptionServerRestartRequired": "Server herstart nodig",
+    "NotificationOptionTaskFailed": "Geplande taak mislukt",
+    "NotificationOptionUserLockedOut": "Gebruikersaccount vergrendeld",
+    "NotificationOptionVideoPlayback": "Video gestart",
+    "NotificationOptionVideoPlaybackStopped": "Video gestopt",
+    "Photos": "Foto's",
+    "Playlists": "Afspeellijsten",
+    "Plugin": "Plug-in",
+    "PluginInstalledWithName": "{0} is geïnstalleerd",
+    "PluginUninstalledWithName": "{0} is verwijderd",
+    "PluginUpdatedWithName": "{0} is bijgewerkt",
+    "ProviderValue": "Aanbieder: {0}",
+    "ScheduledTaskFailedWithName": "{0} is mislukt",
+    "ScheduledTaskStartedWithName": "{0} is gestart",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Series",
+    "Songs": "Titels",
+    "StartupEmbyServerIsLoading": "Jellyfin Server is aan het laden, probeer het later opnieuw.",
+    "SubtitleDownloadFailureForItem": "Downloaden van ondertiteling voor {0} is mislukt",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Ondertiteling voor {0} is gedownload",
+    "Sync": "Synchronisatie",
+    "System": "Systeem",
+    "TvShows": "TV-series",
+    "User": "Gebruiker",
+    "UserCreatedWithName": "Gebruiker {0} is aangemaakt",
+    "UserDeletedWithName": "Gebruiker {0} is verwijderd",
+    "UserDownloadingItemWithValues": "{0} download {1}",
+    "UserLockedOutWithName": "Gebruikersaccount {0} is vergrendeld",
+    "UserOfflineFromDevice": "Verbinding van {0} met {1} is verbroken",
+    "UserOnlineFromDevice": "{0} heeft verbinding met {1}",
+    "UserPasswordChangedWithName": "Wachtwoord voor {0} is gewijzigd",
+    "UserPolicyUpdatedWithName": "Gebruikersbeleid gewijzigd voor {0}",
+    "UserStartedPlayingItemWithValues": "{0} heeft afspelen van {1} gestart",
+    "UserStoppedPlayingItemWithValues": "{0} heeft afspelen van {1} gestopt",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Speciaal - {0}",
+    "VersionNumber": "Versie {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/pl.json b/Emby.Server.Implementations/Localization/Core/pl.json
index 82ee1becdf..5aefa740be 100644
--- a/Emby.Server.Implementations/Localization/Core/pl.json
+++ b/Emby.Server.Implementations/Localization/Core/pl.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albumy",
-  "AppDeviceValues": "Aplikacja: {0}, Urządzenie: {1}",
-  "Application": "Aplikacja",
-  "Artists": "Wykonawcy",
-  "AuthenticationSucceededWithUserName": "{0} został pomyślnie uwierzytelniony",
-  "Books": "Książki",
-  "CameraImageUploadedFrom": "Nowy obraz został przekazany z {0}",
-  "Channels": "Kanały",
-  "ChapterNameValue": "Rozdział {0}",
-  "Collections": "Kolekcje",
-  "DeviceOfflineWithName": "{0} został rozłączony",
-  "DeviceOnlineWithName": "{0} połączył się",
-  "FailedLoginAttemptWithUserName": "Próba logowania przez {0} zakończona niepowodzeniem",
-  "Favorites": "Ulubione",
-  "Folders": "Foldery",
-  "Games": "Gry",
-  "Genres": "Gatunki",
-  "HeaderAlbumArtists": "Wykonawcy albumów",
-  "HeaderCameraUploads": "Przekazane obrazy",
-  "HeaderContinueWatching": "Kontynuuj odtwarzanie",
-  "HeaderFavoriteAlbums": "Albumy ulubione",
-  "HeaderFavoriteArtists": "Wykonawcy ulubieni",
-  "HeaderFavoriteEpisodes": "Odcinki ulubione",
-  "HeaderFavoriteShows": "Seriale ulubione",
-  "HeaderFavoriteSongs": "Utwory ulubione",
-  "HeaderLiveTV": "Telewizja",
-  "HeaderNextUp": "Do obejrzenia",
-  "HeaderRecordingGroups": "Grupy nagrań",
-  "HomeVideos": "Nagrania prywatne",
-  "Inherit": "Dziedzicz",
-  "ItemAddedWithName": "{0} zostało dodane do biblioteki",
-  "ItemRemovedWithName": "{0} zostało usunięte z biblioteki",
-  "LabelIpAddressValue": "Adres IP: {0}",
-  "LabelRunningTimeValue": "Czas trwania: {0}",
-  "Latest": "Ostatnio dodane",
-  "MessageApplicationUpdated": "Serwer Jellyfin został zaktualizowany",
-  "MessageApplicationUpdatedTo": "Serwer Jellyfin został zaktualizowany do wersji {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Sekcja {0} konfiguracji serwera została zaktualizowana",
-  "MessageServerConfigurationUpdated": "Konfiguracja serwera została zaktualizowana",
-  "MixedContent": "Zawartość mieszana",
-  "Movies": "Filmy",
-  "Music": "Muzyka",
-  "MusicVideos": "Teledyski",
-  "NameInstallFailed": "Instalacja {0} nieudana.",
-  "NameSeasonNumber": "Sezon {0}",
-  "NameSeasonUnknown": "Sezon nieznany",
-  "NewVersionIsAvailable": "Nowa wersja serwera Jellyfin jest dostępna do pobrania.",
-  "NotificationOptionApplicationUpdateAvailable": "Dostępna aktualizacja aplikacji",
-  "NotificationOptionApplicationUpdateInstalled": "Zainstalowano aktualizację aplikacji",
-  "NotificationOptionAudioPlayback": "Rozpoczęto odtwarzanie muzyki",
-  "NotificationOptionAudioPlaybackStopped": "Odtwarzane dźwięku zatrzymane",
-  "NotificationOptionCameraImageUploaded": "Przekazano obraz z urządzenia mobilnego",
-  "NotificationOptionGamePlayback": "Odtwarzanie gry rozpoczęte",
-  "NotificationOptionGamePlaybackStopped": "Odtwarzanie gry zatrzymane",
-  "NotificationOptionInstallationFailed": "Niepowodzenie instalacji",
-  "NotificationOptionNewLibraryContent": "Dodano nową zawartość",
-  "NotificationOptionPluginError": "Awaria wtyczki",
-  "NotificationOptionPluginInstalled": "Zainstalowano wtyczkę",
-  "NotificationOptionPluginUninstalled": "Odinstalowano wtyczkę",
-  "NotificationOptionPluginUpdateInstalled": "Zainstalowano aktualizację wtyczki",
-  "NotificationOptionServerRestartRequired": "Wymagane ponowne uruchomienie serwera",
-  "NotificationOptionTaskFailed": "Awaria zaplanowanego zadania",
-  "NotificationOptionUserLockedOut": "Użytkownik zablokowany",
-  "NotificationOptionVideoPlayback": "Rozpoczęto odtwarzanie wideo",
-  "NotificationOptionVideoPlaybackStopped": "Odtwarzanie wideo zatrzymane",
-  "Photos": "Zdjęcia",
-  "Playlists": "Listy odtwarzania",
-  "Plugin": "Wtyczka",
-  "PluginInstalledWithName": "{0} zostało zainstalowane",
-  "PluginUninstalledWithName": "{0} odinstalowane",
-  "PluginUpdatedWithName": "{0} zaktualizowane",
-  "ProviderValue": "Dostawca: {0}",
-  "ScheduledTaskFailedWithName": "Nieudane {0}",
-  "ScheduledTaskStartedWithName": "Rozpoczęto {0}",
-  "ServerNameNeedsToBeRestarted": "{0} wymaga ponownego uruchomienia",
-  "Shows": "Seriale",
-  "Songs": "Utwory",
-  "StartupEmbyServerIsLoading": "Twa wczytywanie serwera Jellyfin. Spróbuj ponownie za chwilę.",
-  "SubtitleDownloadFailureForItem": "Pobieranie napisów dla {0} zakończone niepowodzeniem",
-  "SubtitleDownloadFailureFromForItem": "Nieudane pobieranie napisów z {0} dla {1}",
-  "SubtitlesDownloadedForItem": "Pobrano napisy dla {0}",
-  "Sync": "Synchronizacja",
-  "System": "System",
-  "TvShows": "Seriale",
-  "User": "Użytkownik",
-  "UserCreatedWithName": "Użytkownik {0} został utworzony",
-  "UserDeletedWithName": "Użytkownik {0} został usunięty",
-  "UserDownloadingItemWithValues": "{0} pobiera {1}",
-  "UserLockedOutWithName": "Użytkownik {0} został zablokowany",
-  "UserOfflineFromDevice": "{0} z {1} został rozłączony",
-  "UserOnlineFromDevice": "{0} połączył się z {1}",
-  "UserPasswordChangedWithName": "Hasło użytkownika {0} zostało zmienione",
-  "UserPolicyUpdatedWithName": "Zmieniono zasady użytkowania dla {0}",
-  "UserStartedPlayingItemWithValues": "{0} odtwarza {1} na {2}",
-  "UserStoppedPlayingItemWithValues": "{0} zakończył odtwarzanie {1} na {2}",
-  "ValueHasBeenAddedToLibrary": "{0} został dodany to biblioteki mediów",
-  "ValueSpecialEpisodeName": "Specjalne - {0}",
-  "VersionNumber": "Wersja {0}"
+    "Albums": "Albumy",
+    "AppDeviceValues": "Aplikacja: {0}, Urządzenie: {1}",
+    "Application": "Aplikacja",
+    "Artists": "Wykonawcy",
+    "AuthenticationSucceededWithUserName": "{0} został pomyślnie uwierzytelniony",
+    "Books": "Książki",
+    "CameraImageUploadedFrom": "Nowy obraz został przekazany z {0}",
+    "Channels": "Kanały",
+    "ChapterNameValue": "Rozdział {0}",
+    "Collections": "Kolekcje",
+    "DeviceOfflineWithName": "{0} został rozłączony",
+    "DeviceOnlineWithName": "{0} połączył się",
+    "FailedLoginAttemptWithUserName": "Próba logowania przez {0} zakończona niepowodzeniem",
+    "Favorites": "Ulubione",
+    "Folders": "Foldery",
+    "Games": "Gry",
+    "Genres": "Gatunki",
+    "HeaderAlbumArtists": "Wykonawcy albumów",
+    "HeaderCameraUploads": "Przekazane obrazy",
+    "HeaderContinueWatching": "Kontynuuj odtwarzanie",
+    "HeaderFavoriteAlbums": "Albumy ulubione",
+    "HeaderFavoriteArtists": "Wykonawcy ulubieni",
+    "HeaderFavoriteEpisodes": "Odcinki ulubione",
+    "HeaderFavoriteShows": "Seriale ulubione",
+    "HeaderFavoriteSongs": "Utwory ulubione",
+    "HeaderLiveTV": "Telewizja",
+    "HeaderNextUp": "Do obejrzenia",
+    "HeaderRecordingGroups": "Grupy nagrań",
+    "HomeVideos": "Nagrania prywatne",
+    "Inherit": "Dziedzicz",
+    "ItemAddedWithName": "{0} zostało dodane do biblioteki",
+    "ItemRemovedWithName": "{0} zostało usunięte z biblioteki",
+    "LabelIpAddressValue": "Adres IP: {0}",
+    "LabelRunningTimeValue": "Czas trwania: {0}",
+    "Latest": "Ostatnio dodane",
+    "MessageApplicationUpdated": "Serwer Jellyfin został zaktualizowany",
+    "MessageApplicationUpdatedTo": "Serwer Jellyfin został zaktualizowany do wersji {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Sekcja {0} konfiguracji serwera została zaktualizowana",
+    "MessageServerConfigurationUpdated": "Konfiguracja serwera została zaktualizowana",
+    "MixedContent": "Zawartość mieszana",
+    "Movies": "Filmy",
+    "Music": "Muzyka",
+    "MusicVideos": "Teledyski",
+    "NameInstallFailed": "Instalacja {0} nieudana.",
+    "NameSeasonNumber": "Sezon {0}",
+    "NameSeasonUnknown": "Sezon nieznany",
+    "NewVersionIsAvailable": "Nowa wersja serwera Jellyfin jest dostępna do pobrania.",
+    "NotificationOptionApplicationUpdateAvailable": "Dostępna aktualizacja aplikacji",
+    "NotificationOptionApplicationUpdateInstalled": "Zainstalowano aktualizację aplikacji",
+    "NotificationOptionAudioPlayback": "Rozpoczęto odtwarzanie muzyki",
+    "NotificationOptionAudioPlaybackStopped": "Odtwarzane dźwięku zatrzymane",
+    "NotificationOptionCameraImageUploaded": "Przekazano obraz z urządzenia mobilnego",
+    "NotificationOptionGamePlayback": "Odtwarzanie gry rozpoczęte",
+    "NotificationOptionGamePlaybackStopped": "Odtwarzanie gry zatrzymane",
+    "NotificationOptionInstallationFailed": "Niepowodzenie instalacji",
+    "NotificationOptionNewLibraryContent": "Dodano nową zawartość",
+    "NotificationOptionPluginError": "Awaria wtyczki",
+    "NotificationOptionPluginInstalled": "Zainstalowano wtyczkę",
+    "NotificationOptionPluginUninstalled": "Odinstalowano wtyczkę",
+    "NotificationOptionPluginUpdateInstalled": "Zainstalowano aktualizację wtyczki",
+    "NotificationOptionServerRestartRequired": "Wymagane ponowne uruchomienie serwera",
+    "NotificationOptionTaskFailed": "Awaria zaplanowanego zadania",
+    "NotificationOptionUserLockedOut": "Użytkownik zablokowany",
+    "NotificationOptionVideoPlayback": "Rozpoczęto odtwarzanie wideo",
+    "NotificationOptionVideoPlaybackStopped": "Odtwarzanie wideo zatrzymane",
+    "Photos": "Zdjęcia",
+    "Playlists": "Listy odtwarzania",
+    "Plugin": "Wtyczka",
+    "PluginInstalledWithName": "{0} zostało zainstalowane",
+    "PluginUninstalledWithName": "{0} odinstalowane",
+    "PluginUpdatedWithName": "{0} zaktualizowane",
+    "ProviderValue": "Dostawca: {0}",
+    "ScheduledTaskFailedWithName": "Nieudane {0}",
+    "ScheduledTaskStartedWithName": "Rozpoczęto {0}",
+    "ServerNameNeedsToBeRestarted": "{0} wymaga ponownego uruchomienia",
+    "Shows": "Seriale",
+    "Songs": "Utwory",
+    "StartupEmbyServerIsLoading": "Twa wczytywanie serwera Jellyfin. Spróbuj ponownie za chwilę.",
+    "SubtitleDownloadFailureForItem": "Pobieranie napisów dla {0} zakończone niepowodzeniem",
+    "SubtitleDownloadFailureFromForItem": "Nieudane pobieranie napisów z {0} dla {1}",
+    "SubtitlesDownloadedForItem": "Pobrano napisy dla {0}",
+    "Sync": "Synchronizacja",
+    "System": "System",
+    "TvShows": "Seriale",
+    "User": "Użytkownik",
+    "UserCreatedWithName": "Użytkownik {0} został utworzony",
+    "UserDeletedWithName": "Użytkownik {0} został usunięty",
+    "UserDownloadingItemWithValues": "{0} pobiera {1}",
+    "UserLockedOutWithName": "Użytkownik {0} został zablokowany",
+    "UserOfflineFromDevice": "{0} z {1} został rozłączony",
+    "UserOnlineFromDevice": "{0} połączył się z {1}",
+    "UserPasswordChangedWithName": "Hasło użytkownika {0} zostało zmienione",
+    "UserPolicyUpdatedWithName": "Zmieniono zasady użytkowania dla {0}",
+    "UserStartedPlayingItemWithValues": "{0} odtwarza {1} na {2}",
+    "UserStoppedPlayingItemWithValues": "{0} zakończył odtwarzanie {1} na {2}",
+    "ValueHasBeenAddedToLibrary": "{0} został dodany to biblioteki mediów",
+    "ValueSpecialEpisodeName": "Specjalne - {0}",
+    "VersionNumber": "Wersja {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/pt-BR.json b/Emby.Server.Implementations/Localization/Core/pt-BR.json
index 84c29174bd..9ae25d3ac9 100644
--- a/Emby.Server.Implementations/Localization/Core/pt-BR.json
+++ b/Emby.Server.Implementations/Localization/Core/pt-BR.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Álbuns",
-  "AppDeviceValues": "App: {0}, Dispositivo: {1}",
-  "Application": "Aplicativo",
-  "Artists": "Artistas",
-  "AuthenticationSucceededWithUserName": "{0} autenticado com sucesso",
-  "Books": "Livros",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Canais",
-  "ChapterNameValue": "Capítulo {0}",
-  "Collections": "Coletâneas",
-  "DeviceOfflineWithName": "{0} se desconectou",
-  "DeviceOnlineWithName": "{0} está conectado",
-  "FailedLoginAttemptWithUserName": "Falha na tentativa de login de {0}",
-  "Favorites": "Favoritos",
-  "Folders": "Pastas",
-  "Games": "Jogos",
-  "Genres": "Gêneros",
-  "HeaderAlbumArtists": "Artistas do Álbum",
-  "HeaderCameraUploads": "Uploads da Câmera",
-  "HeaderContinueWatching": "Continuar Assistindo",
-  "HeaderFavoriteAlbums": "Álbuns Favoritos",
-  "HeaderFavoriteArtists": "Artistas Favoritos",
-  "HeaderFavoriteEpisodes": "Episódios Favoritos",
-  "HeaderFavoriteShows": "Séries Favoritas",
-  "HeaderFavoriteSongs": "Músicas Favoritas",
-  "HeaderLiveTV": "TV ao Vivo",
-  "HeaderNextUp": "Próximos",
-  "HeaderRecordingGroups": "Grupos de Gravação",
-  "HomeVideos": "Vídeos caseiros",
-  "Inherit": "Herdar",
-  "ItemAddedWithName": "{0} foi adicionado à biblioteca",
-  "ItemRemovedWithName": "{0} foi removido da biblioteca",
-  "LabelIpAddressValue": "Endereço ip: {0}",
-  "LabelRunningTimeValue": "Tempo de execução: {0}",
-  "Latest": "Recente",
-  "MessageApplicationUpdated": "O servidor Jellyfin foi atualizado",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "A seção {0} da configuração do servidor foi atualizada",
-  "MessageServerConfigurationUpdated": "A configuração do servidor foi atualizada",
-  "MixedContent": "Conteúdo misto",
-  "Movies": "Filmes",
-  "Music": "Música",
-  "MusicVideos": "Vídeos musicais",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Temporada {0}",
-  "NameSeasonUnknown": "Temporada Desconhecida",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Atualização de aplicativo disponível",
-  "NotificationOptionApplicationUpdateInstalled": "Atualização de aplicativo instalada",
-  "NotificationOptionAudioPlayback": "Reprodução de áudio iniciada",
-  "NotificationOptionAudioPlaybackStopped": "Reprodução de áudio parada",
-  "NotificationOptionCameraImageUploaded": "Imagem de câmera enviada",
-  "NotificationOptionGamePlayback": "Reprodução de jogo iniciada",
-  "NotificationOptionGamePlaybackStopped": "Reprodução de jogo parada",
-  "NotificationOptionInstallationFailed": "Falha na instalação",
-  "NotificationOptionNewLibraryContent": "Novo conteúdo adicionado",
-  "NotificationOptionPluginError": "Falha de plugin",
-  "NotificationOptionPluginInstalled": "Plugin instalado",
-  "NotificationOptionPluginUninstalled": "Plugin desinstalado",
-  "NotificationOptionPluginUpdateInstalled": "Atualização de plugin instalada",
-  "NotificationOptionServerRestartRequired": "Necessário reiniciar servidor",
-  "NotificationOptionTaskFailed": "Falha na tarefa agendada",
-  "NotificationOptionUserLockedOut": "Usuário bloqueado",
-  "NotificationOptionVideoPlayback": "Reprodução de vídeo iniciada",
-  "NotificationOptionVideoPlaybackStopped": "Reprodução de vídeo parada",
-  "Photos": "Fotos",
-  "Playlists": "Listas de Reprodução",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} foi instalado",
-  "PluginUninstalledWithName": "{0} foi desinstalado",
-  "PluginUpdatedWithName": "{0} foi atualizado",
-  "ProviderValue": "Provedor: {0}",
-  "ScheduledTaskFailedWithName": "{0} falhou",
-  "ScheduledTaskStartedWithName": "{0} iniciada",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Séries",
-  "Songs": "Músicas",
-  "StartupEmbyServerIsLoading": "O Servidor Jellyfin está carregando. Por favor tente novamente em breve.",
-  "SubtitleDownloadFailureForItem": "Download de legendas falhou para {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Legendas baixadas para {0}",
-  "Sync": "Sincronizar",
-  "System": "Sistema",
-  "TvShows": "Séries de TV",
-  "User": "Usuário",
-  "UserCreatedWithName": "O usuário {0} foi criado",
-  "UserDeletedWithName": "O usuário {0} foi excluído",
-  "UserDownloadingItemWithValues": "{0} está baixando {1}",
-  "UserLockedOutWithName": "Usuário {0} foi bloqueado",
-  "UserOfflineFromDevice": "{0} se desconectou de {1}",
-  "UserOnlineFromDevice": "{0} está ativo em {1}",
-  "UserPasswordChangedWithName": "A senha foi alterada para o usuário {0}",
-  "UserPolicyUpdatedWithName": "A política de usuário foi atualizada para {0}",
-  "UserStartedPlayingItemWithValues": "{0} iniciou a reprodução de {1}",
-  "UserStoppedPlayingItemWithValues": "{0} parou de reproduzir {1}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Especial - {0}",
-  "VersionNumber": "Versão {0}"
+    "Albums": "Álbuns",
+    "AppDeviceValues": "App: {0}, Dispositivo: {1}",
+    "Application": "Aplicativo",
+    "Artists": "Artistas",
+    "AuthenticationSucceededWithUserName": "{0} autenticado com sucesso",
+    "Books": "Livros",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Canais",
+    "ChapterNameValue": "Capítulo {0}",
+    "Collections": "Coletâneas",
+    "DeviceOfflineWithName": "{0} se desconectou",
+    "DeviceOnlineWithName": "{0} está conectado",
+    "FailedLoginAttemptWithUserName": "Falha na tentativa de login de {0}",
+    "Favorites": "Favoritos",
+    "Folders": "Pastas",
+    "Games": "Jogos",
+    "Genres": "Gêneros",
+    "HeaderAlbumArtists": "Artistas do Álbum",
+    "HeaderCameraUploads": "Uploads da Câmera",
+    "HeaderContinueWatching": "Continuar Assistindo",
+    "HeaderFavoriteAlbums": "Álbuns Favoritos",
+    "HeaderFavoriteArtists": "Artistas Favoritos",
+    "HeaderFavoriteEpisodes": "Episódios Favoritos",
+    "HeaderFavoriteShows": "Séries Favoritas",
+    "HeaderFavoriteSongs": "Músicas Favoritas",
+    "HeaderLiveTV": "TV ao Vivo",
+    "HeaderNextUp": "Próximos",
+    "HeaderRecordingGroups": "Grupos de Gravação",
+    "HomeVideos": "Vídeos caseiros",
+    "Inherit": "Herdar",
+    "ItemAddedWithName": "{0} foi adicionado à biblioteca",
+    "ItemRemovedWithName": "{0} foi removido da biblioteca",
+    "LabelIpAddressValue": "Endereço ip: {0}",
+    "LabelRunningTimeValue": "Tempo de execução: {0}",
+    "Latest": "Recente",
+    "MessageApplicationUpdated": "O servidor Jellyfin foi atualizado",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "A seção {0} da configuração do servidor foi atualizada",
+    "MessageServerConfigurationUpdated": "A configuração do servidor foi atualizada",
+    "MixedContent": "Conteúdo misto",
+    "Movies": "Filmes",
+    "Music": "Música",
+    "MusicVideos": "Vídeos musicais",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Temporada {0}",
+    "NameSeasonUnknown": "Temporada Desconhecida",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Atualização de aplicativo disponível",
+    "NotificationOptionApplicationUpdateInstalled": "Atualização de aplicativo instalada",
+    "NotificationOptionAudioPlayback": "Reprodução de áudio iniciada",
+    "NotificationOptionAudioPlaybackStopped": "Reprodução de áudio parada",
+    "NotificationOptionCameraImageUploaded": "Imagem de câmera enviada",
+    "NotificationOptionGamePlayback": "Reprodução de jogo iniciada",
+    "NotificationOptionGamePlaybackStopped": "Reprodução de jogo parada",
+    "NotificationOptionInstallationFailed": "Falha na instalação",
+    "NotificationOptionNewLibraryContent": "Novo conteúdo adicionado",
+    "NotificationOptionPluginError": "Falha de plugin",
+    "NotificationOptionPluginInstalled": "Plugin instalado",
+    "NotificationOptionPluginUninstalled": "Plugin desinstalado",
+    "NotificationOptionPluginUpdateInstalled": "Atualização de plugin instalada",
+    "NotificationOptionServerRestartRequired": "Necessário reiniciar servidor",
+    "NotificationOptionTaskFailed": "Falha na tarefa agendada",
+    "NotificationOptionUserLockedOut": "Usuário bloqueado",
+    "NotificationOptionVideoPlayback": "Reprodução de vídeo iniciada",
+    "NotificationOptionVideoPlaybackStopped": "Reprodução de vídeo parada",
+    "Photos": "Fotos",
+    "Playlists": "Listas de Reprodução",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} foi instalado",
+    "PluginUninstalledWithName": "{0} foi desinstalado",
+    "PluginUpdatedWithName": "{0} foi atualizado",
+    "ProviderValue": "Provedor: {0}",
+    "ScheduledTaskFailedWithName": "{0} falhou",
+    "ScheduledTaskStartedWithName": "{0} iniciada",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Séries",
+    "Songs": "Músicas",
+    "StartupEmbyServerIsLoading": "O Servidor Jellyfin está carregando. Por favor tente novamente em breve.",
+    "SubtitleDownloadFailureForItem": "Download de legendas falhou para {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Legendas baixadas para {0}",
+    "Sync": "Sincronizar",
+    "System": "Sistema",
+    "TvShows": "Séries de TV",
+    "User": "Usuário",
+    "UserCreatedWithName": "O usuário {0} foi criado",
+    "UserDeletedWithName": "O usuário {0} foi excluído",
+    "UserDownloadingItemWithValues": "{0} está baixando {1}",
+    "UserLockedOutWithName": "Usuário {0} foi bloqueado",
+    "UserOfflineFromDevice": "{0} se desconectou de {1}",
+    "UserOnlineFromDevice": "{0} está ativo em {1}",
+    "UserPasswordChangedWithName": "A senha foi alterada para o usuário {0}",
+    "UserPolicyUpdatedWithName": "A política de usuário foi atualizada para {0}",
+    "UserStartedPlayingItemWithValues": "{0} iniciou a reprodução de {1}",
+    "UserStoppedPlayingItemWithValues": "{0} parou de reproduzir {1}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Especial - {0}",
+    "VersionNumber": "Versão {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/pt-PT.json b/Emby.Server.Implementations/Localization/Core/pt-PT.json
index 0d3acc9c15..59c25f0e3d 100644
--- a/Emby.Server.Implementations/Localization/Core/pt-PT.json
+++ b/Emby.Server.Implementations/Localization/Core/pt-PT.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albums",
-  "AppDeviceValues": "App: {0}, Device: {1}",
-  "Application": "Aplicação",
-  "Artists": "Artists",
-  "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-  "Books": "Books",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Channels",
-  "ChapterNameValue": "Chapter {0}",
-  "Collections": "Collections",
-  "DeviceOfflineWithName": "{0} has disconnected",
-  "DeviceOnlineWithName": "{0} is connected",
-  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-  "Favorites": "Favorites",
-  "Folders": "Folders",
-  "Games": "Games",
-  "Genres": "Genres",
-  "HeaderAlbumArtists": "Album Artists",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Continuar a ver",
-  "HeaderFavoriteAlbums": "Favorite Albums",
-  "HeaderFavoriteArtists": "Favorite Artists",
-  "HeaderFavoriteEpisodes": "Favorite Episodes",
-  "HeaderFavoriteShows": "Séries Favoritas",
-  "HeaderFavoriteSongs": "Favorite Songs",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "Next Up",
-  "HeaderRecordingGroups": "Recording Groups",
-  "HomeVideos": "Home videos",
-  "Inherit": "Inherit",
-  "ItemAddedWithName": "{0} was added to the library",
-  "ItemRemovedWithName": "{0} was removed from the library",
-  "LabelIpAddressValue": "Ip address: {0}",
-  "LabelRunningTimeValue": "Running time: {0}",
-  "Latest": "Latest",
-  "MessageApplicationUpdated": "Jellyfin Server has been updated",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-  "MessageServerConfigurationUpdated": "Server configuration has been updated",
-  "MixedContent": "Mixed content",
-  "Movies": "Movies",
-  "Music": "Music",
-  "MusicVideos": "Music videos",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Season {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Application update available",
-  "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-  "NotificationOptionAudioPlayback": "Audio playback started",
-  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-  "NotificationOptionInstallationFailed": "Installation failure",
-  "NotificationOptionNewLibraryContent": "New content added",
-  "NotificationOptionPluginError": "Plugin failure",
-  "NotificationOptionPluginInstalled": "Plugin installed",
-  "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-  "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-  "NotificationOptionServerRestartRequired": "Server restart required",
-  "NotificationOptionTaskFailed": "Scheduled task failure",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionVideoPlayback": "Video playback started",
-  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-  "Photos": "Photos",
-  "Playlists": "Playlists",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} was installed",
-  "PluginUninstalledWithName": "{0} was uninstalled",
-  "PluginUpdatedWithName": "{0} was updated",
-  "ProviderValue": "Provider: {0}",
-  "ScheduledTaskFailedWithName": "{0} failed",
-  "ScheduledTaskStartedWithName": "{0} started",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Shows",
-  "Songs": "Songs",
-  "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
-  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-  "Sync": "Sync",
-  "System": "System",
-  "TvShows": "TV Shows",
-  "User": "User",
-  "UserCreatedWithName": "User {0} has been created",
-  "UserDeletedWithName": "User {0} has been deleted",
-  "UserDownloadingItemWithValues": "{0} is downloading {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} has disconnected from {1}",
-  "UserOnlineFromDevice": "{0} is online from {1}",
-  "UserPasswordChangedWithName": "Password has been changed for user {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
-  "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Especial -  {0}",
-  "VersionNumber": "Version {0}"
+    "Albums": "Albums",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "Application": "Aplicação",
+    "Artists": "Artists",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "Books": "Books",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Channels",
+    "ChapterNameValue": "Chapter {0}",
+    "Collections": "Collections",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "DeviceOnlineWithName": "{0} is connected",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "Favorites": "Favorites",
+    "Folders": "Folders",
+    "Games": "Games",
+    "Genres": "Genres",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Continuar a ver",
+    "HeaderFavoriteAlbums": "Favorite Albums",
+    "HeaderFavoriteArtists": "Favorite Artists",
+    "HeaderFavoriteEpisodes": "Favorite Episodes",
+    "HeaderFavoriteShows": "Séries Favoritas",
+    "HeaderFavoriteSongs": "Favorite Songs",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "Next Up",
+    "HeaderRecordingGroups": "Recording Groups",
+    "HomeVideos": "Home videos",
+    "Inherit": "Inherit",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "Latest": "Latest",
+    "MessageApplicationUpdated": "Jellyfin Server has been updated",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MixedContent": "Mixed content",
+    "Movies": "Movies",
+    "Music": "Music",
+    "MusicVideos": "Music videos",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Season {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "Photos": "Photos",
+    "Playlists": "Playlists",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "PluginUpdatedWithName": "{0} was updated",
+    "ProviderValue": "Provider: {0}",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Shows",
+    "Songs": "Songs",
+    "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "Sync": "Sync",
+    "System": "System",
+    "TvShows": "TV Shows",
+    "User": "User",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
+    "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Especial -  {0}",
+    "VersionNumber": "Version {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/ru.json b/Emby.Server.Implementations/Localization/Core/ru.json
index 97216f2765..338141294c 100644
--- a/Emby.Server.Implementations/Localization/Core/ru.json
+++ b/Emby.Server.Implementations/Localization/Core/ru.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Альбомы",
-  "AppDeviceValues": "Прил.: {0}, Устр.: {1}",
-  "Application": "Приложение",
-  "Artists": "Исполнители",
-  "AuthenticationSucceededWithUserName": "{0} - авторизация успешна",
-  "Books": "Литература",
-  "CameraImageUploadedFrom": "Новое фото было выложено с {0}",
-  "Channels": "Каналы",
-  "ChapterNameValue": "Сцена {0}",
-  "Collections": "Коллекции",
-  "DeviceOfflineWithName": "{0} - подкл. разъ-но",
-  "DeviceOnlineWithName": "{0} - подкл. уст-но",
-  "FailedLoginAttemptWithUserName": "{0} - попытка входа неудачна",
-  "Favorites": "Избранное",
-  "Folders": "Папки",
-  "Games": "Игры",
-  "Genres": "Жанры",
-  "HeaderAlbumArtists": "Исп-ли альбома",
-  "HeaderCameraUploads": "Камеры",
-  "HeaderContinueWatching": "Продолжение просмотра",
-  "HeaderFavoriteAlbums": "Избранные альбомы",
-  "HeaderFavoriteArtists": "Избранные исполнители",
-  "HeaderFavoriteEpisodes": "Избранные эпизоды",
-  "HeaderFavoriteShows": "Избранные передачи",
-  "HeaderFavoriteSongs": "Избранные композиции",
-  "HeaderLiveTV": "Эфир",
-  "HeaderNextUp": "Очередное",
-  "HeaderRecordingGroups": "Группы записей",
-  "HomeVideos": "Дом. видео",
-  "Inherit": "Наследуемое",
-  "ItemAddedWithName": "{0} - добавлено в медиатеку",
-  "ItemRemovedWithName": "{0} - изъято из медиатеки",
-  "LabelIpAddressValue": "IP-адрес: {0}",
-  "LabelRunningTimeValue": "Время выполнения: {0}",
-  "Latest": "Новейшее",
-  "MessageApplicationUpdated": "Jellyfin Server был обновлён",
-  "MessageApplicationUpdatedTo": "Jellyfin Server был обновлён до {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Конфиг-ия сервера (раздел {0}) была обновлена",
-  "MessageServerConfigurationUpdated": "Конфиг-ия сервера была обновлена",
-  "MixedContent": "Смешанное содержание",
-  "Movies": "Кино",
-  "Music": "Музыка",
-  "MusicVideos": "Муз. видео",
-  "NameInstallFailed": "Установка {0} неудачна",
-  "NameSeasonNumber": "Сезон {0}",
-  "NameSeasonUnknown": "Сезон неопознан",
-  "NewVersionIsAvailable": "Имеется новая версия Jellyfin Server",
-  "NotificationOptionApplicationUpdateAvailable": "Имеется обновление приложения",
-  "NotificationOptionApplicationUpdateInstalled": "Обновление приложения установлено",
-  "NotificationOptionAudioPlayback": "Воспр-ие аудио зап-но",
-  "NotificationOptionAudioPlaybackStopped": "Восп-ие аудио ост-но",
-  "NotificationOptionCameraImageUploaded": "Произведена выкладка отснятого с камеры",
-  "NotificationOptionGamePlayback": "Воспр-ие игры зап-но",
-  "NotificationOptionGamePlaybackStopped": "Восп-ие игры ост-но",
-  "NotificationOptionInstallationFailed": "Сбой установки",
-  "NotificationOptionNewLibraryContent": "Новое содержание добавлено",
-  "NotificationOptionPluginError": "Сбой плагина",
-  "NotificationOptionPluginInstalled": "Плагин установлен",
-  "NotificationOptionPluginUninstalled": "Плагин удалён",
-  "NotificationOptionPluginUpdateInstalled": "Обновление плагина установлено",
-  "NotificationOptionServerRestartRequired": "Требуется перезапуск сервера",
-  "NotificationOptionTaskFailed": "Сбой назначенной задачи",
-  "NotificationOptionUserLockedOut": "Пользователь заблокирован",
-  "NotificationOptionVideoPlayback": "Воспр-ие видео зап-но",
-  "NotificationOptionVideoPlaybackStopped": "Восп-ие видео ост-но",
-  "Photos": "Фото",
-  "Playlists": "Плей-листы",
-  "Plugin": "Плагин",
-  "PluginInstalledWithName": "{0} - было установлено",
-  "PluginUninstalledWithName": "{0} - было удалено",
-  "PluginUpdatedWithName": "{0} - было обновлено",
-  "ProviderValue": "Поставщик: {0}",
-  "ScheduledTaskFailedWithName": "{0} - неудачна",
-  "ScheduledTaskStartedWithName": "{0} - запущена",
-  "ServerNameNeedsToBeRestarted": "Необходим перезапуск {0}",
-  "Shows": "Передачи",
-  "Songs": "Композиции",
-  "StartupEmbyServerIsLoading": "Jellyfin Server загружается. Повторите попытку в ближайшее время.",
-  "SubtitleDownloadFailureForItem": "Субтитры к {0} не удалось загрузить",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Субтитры к {0} загружены",
-  "Sync": "Синхро",
-  "System": "Система",
-  "TvShows": "ТВ",
-  "User": "Польз-ль",
-  "UserCreatedWithName": "Пользователь {0} был создан",
-  "UserDeletedWithName": "Пользователь {0} был удалён",
-  "UserDownloadingItemWithValues": "{0} загружает {1}",
-  "UserLockedOutWithName": "Пользователь {0} был заблокирован",
-  "UserOfflineFromDevice": "{0} - подкл. с {1} разъ-но",
-  "UserOnlineFromDevice": "{0} - подкл. с {1} уст-но",
-  "UserPasswordChangedWithName": "Пароль польз-ля {0} был изменён",
-  "UserPolicyUpdatedWithName": "Польз-ие политики {0} были обновлены",
-  "UserStartedPlayingItemWithValues": "{0} - воспр. «{1}» на {2}",
-  "UserStoppedPlayingItemWithValues": "{0} - воспр. «{1}» ост-но на {2}",
-  "ValueHasBeenAddedToLibrary": "{0} (добавлено в медиатеку)",
-  "ValueSpecialEpisodeName": "Спецэпизод - {0}",
-  "VersionNumber": "Версия {0}"
+    "Albums": "Альбомы",
+    "AppDeviceValues": "Прил.: {0}, Устр.: {1}",
+    "Application": "Приложение",
+    "Artists": "Исполнители",
+    "AuthenticationSucceededWithUserName": "{0} - авторизация успешна",
+    "Books": "Литература",
+    "CameraImageUploadedFrom": "Новое фото было выложено с {0}",
+    "Channels": "Каналы",
+    "ChapterNameValue": "Сцена {0}",
+    "Collections": "Коллекции",
+    "DeviceOfflineWithName": "{0} - подкл. разъ-но",
+    "DeviceOnlineWithName": "{0} - подкл. уст-но",
+    "FailedLoginAttemptWithUserName": "{0} - попытка входа неудачна",
+    "Favorites": "Избранное",
+    "Folders": "Папки",
+    "Games": "Игры",
+    "Genres": "Жанры",
+    "HeaderAlbumArtists": "Исп-ли альбома",
+    "HeaderCameraUploads": "Камеры",
+    "HeaderContinueWatching": "Продолжение просмотра",
+    "HeaderFavoriteAlbums": "Избранные альбомы",
+    "HeaderFavoriteArtists": "Избранные исполнители",
+    "HeaderFavoriteEpisodes": "Избранные эпизоды",
+    "HeaderFavoriteShows": "Избранные передачи",
+    "HeaderFavoriteSongs": "Избранные композиции",
+    "HeaderLiveTV": "Эфир",
+    "HeaderNextUp": "Очередное",
+    "HeaderRecordingGroups": "Группы записей",
+    "HomeVideos": "Дом. видео",
+    "Inherit": "Наследуемое",
+    "ItemAddedWithName": "{0} - добавлено в медиатеку",
+    "ItemRemovedWithName": "{0} - изъято из медиатеки",
+    "LabelIpAddressValue": "IP-адрес: {0}",
+    "LabelRunningTimeValue": "Время выполнения: {0}",
+    "Latest": "Новейшее",
+    "MessageApplicationUpdated": "Jellyfin Server был обновлён",
+    "MessageApplicationUpdatedTo": "Jellyfin Server был обновлён до {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Конфиг-ия сервера (раздел {0}) была обновлена",
+    "MessageServerConfigurationUpdated": "Конфиг-ия сервера была обновлена",
+    "MixedContent": "Смешанное содержание",
+    "Movies": "Кино",
+    "Music": "Музыка",
+    "MusicVideos": "Муз. видео",
+    "NameInstallFailed": "Установка {0} неудачна",
+    "NameSeasonNumber": "Сезон {0}",
+    "NameSeasonUnknown": "Сезон неопознан",
+    "NewVersionIsAvailable": "Имеется новая версия Jellyfin Server",
+    "NotificationOptionApplicationUpdateAvailable": "Имеется обновление приложения",
+    "NotificationOptionApplicationUpdateInstalled": "Обновление приложения установлено",
+    "NotificationOptionAudioPlayback": "Воспр-ие аудио зап-но",
+    "NotificationOptionAudioPlaybackStopped": "Восп-ие аудио ост-но",
+    "NotificationOptionCameraImageUploaded": "Произведена выкладка отснятого с камеры",
+    "NotificationOptionGamePlayback": "Воспр-ие игры зап-но",
+    "NotificationOptionGamePlaybackStopped": "Восп-ие игры ост-но",
+    "NotificationOptionInstallationFailed": "Сбой установки",
+    "NotificationOptionNewLibraryContent": "Новое содержание добавлено",
+    "NotificationOptionPluginError": "Сбой плагина",
+    "NotificationOptionPluginInstalled": "Плагин установлен",
+    "NotificationOptionPluginUninstalled": "Плагин удалён",
+    "NotificationOptionPluginUpdateInstalled": "Обновление плагина установлено",
+    "NotificationOptionServerRestartRequired": "Требуется перезапуск сервера",
+    "NotificationOptionTaskFailed": "Сбой назначенной задачи",
+    "NotificationOptionUserLockedOut": "Пользователь заблокирован",
+    "NotificationOptionVideoPlayback": "Воспр-ие видео зап-но",
+    "NotificationOptionVideoPlaybackStopped": "Восп-ие видео ост-но",
+    "Photos": "Фото",
+    "Playlists": "Плей-листы",
+    "Plugin": "Плагин",
+    "PluginInstalledWithName": "{0} - было установлено",
+    "PluginUninstalledWithName": "{0} - было удалено",
+    "PluginUpdatedWithName": "{0} - было обновлено",
+    "ProviderValue": "Поставщик: {0}",
+    "ScheduledTaskFailedWithName": "{0} - неудачна",
+    "ScheduledTaskStartedWithName": "{0} - запущена",
+    "ServerNameNeedsToBeRestarted": "Необходим перезапуск {0}",
+    "Shows": "Передачи",
+    "Songs": "Композиции",
+    "StartupEmbyServerIsLoading": "Jellyfin Server загружается. Повторите попытку в ближайшее время.",
+    "SubtitleDownloadFailureForItem": "Субтитры к {0} не удалось загрузить",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Субтитры к {0} загружены",
+    "Sync": "Синхро",
+    "System": "Система",
+    "TvShows": "ТВ",
+    "User": "Польз-ль",
+    "UserCreatedWithName": "Пользователь {0} был создан",
+    "UserDeletedWithName": "Пользователь {0} был удалён",
+    "UserDownloadingItemWithValues": "{0} загружает {1}",
+    "UserLockedOutWithName": "Пользователь {0} был заблокирован",
+    "UserOfflineFromDevice": "{0} - подкл. с {1} разъ-но",
+    "UserOnlineFromDevice": "{0} - подкл. с {1} уст-но",
+    "UserPasswordChangedWithName": "Пароль польз-ля {0} был изменён",
+    "UserPolicyUpdatedWithName": "Польз-ие политики {0} были обновлены",
+    "UserStartedPlayingItemWithValues": "{0} - воспр. «{1}» на {2}",
+    "UserStoppedPlayingItemWithValues": "{0} - воспр. «{1}» ост-но на {2}",
+    "ValueHasBeenAddedToLibrary": "{0} (добавлено в медиатеку)",
+    "ValueSpecialEpisodeName": "Спецэпизод - {0}",
+    "VersionNumber": "Версия {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/sk.json b/Emby.Server.Implementations/Localization/Core/sk.json
index ddf690a559..ed0c689522 100644
--- a/Emby.Server.Implementations/Localization/Core/sk.json
+++ b/Emby.Server.Implementations/Localization/Core/sk.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albumy",
-  "AppDeviceValues": "Aplikácia: {0}, Zariadenie: {1}",
-  "Application": "Aplikácia",
-  "Artists": "Umelci",
-  "AuthenticationSucceededWithUserName": "{0} úspešne overený",
-  "Books": "Knihy",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Kanály",
-  "ChapterNameValue": "Kapitola {0}",
-  "Collections": "Zbierky",
-  "DeviceOfflineWithName": "{0} je odpojený",
-  "DeviceOnlineWithName": "{0} je pripojený",
-  "FailedLoginAttemptWithUserName": "Neúspešný pokus o prihlásenie z {0}",
-  "Favorites": "Obľúbené",
-  "Folders": "Priečinky",
-  "Games": "Hry",
-  "Genres": "Žánre",
-  "HeaderAlbumArtists": "Album Artists",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Pokračujte v pozeraní",
-  "HeaderFavoriteAlbums": "Obľúbené albumy",
-  "HeaderFavoriteArtists": "Obľúbení umelci",
-  "HeaderFavoriteEpisodes": "Obľúbené epizódy",
-  "HeaderFavoriteShows": "Obľúbené seriály",
-  "HeaderFavoriteSongs": "Obľúbené pesničky",
-  "HeaderLiveTV": "Živá TV",
-  "HeaderNextUp": "Nasleduje",
-  "HeaderRecordingGroups": "Recording Groups",
-  "HomeVideos": "Domáce videá",
-  "Inherit": "Zdediť",
-  "ItemAddedWithName": "{0} bol pridaný do knižnice",
-  "ItemRemovedWithName": "{0} bol odstránený z knižnice",
-  "LabelIpAddressValue": "IP adresa: {0}",
-  "LabelRunningTimeValue": "Dĺžka: {0}",
-  "Latest": "Najnovšie",
-  "MessageApplicationUpdated": "Jellyfin Server bol aktualizovaný",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Sekcia {0} konfigurácie servera bola aktualizovaná",
-  "MessageServerConfigurationUpdated": "Konfigurácia servera aktualizovaná",
-  "MixedContent": "Zmiešaný obsah",
-  "Movies": "Filmy",
-  "Music": "Hudba",
-  "MusicVideos": "Hudobné videá",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Sezóna {0}",
-  "NameSeasonUnknown": "Neznáma sezóna",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Je dostupná aktualizácia aplikácie",
-  "NotificationOptionApplicationUpdateInstalled": "Aktualizácia aplikácie nainštalovaná",
-  "NotificationOptionAudioPlayback": "Spustené prehrávanie audia",
-  "NotificationOptionAudioPlaybackStopped": "Zastavené prehrávanie audia",
-  "NotificationOptionCameraImageUploaded": "Nahraný obrázok z fotoaparátu",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionGamePlaybackStopped": "Hra ukončená",
-  "NotificationOptionInstallationFailed": "Chyba inštalácie",
-  "NotificationOptionNewLibraryContent": "Pridaný nový obsah",
-  "NotificationOptionPluginError": "Chyba rozšírenia",
-  "NotificationOptionPluginInstalled": "Rozšírenie nainštalované",
-  "NotificationOptionPluginUninstalled": "Rozšírenie odinštalované",
-  "NotificationOptionPluginUpdateInstalled": "Aktualizácia rozšírenia nainštalovaná",
-  "NotificationOptionServerRestartRequired": "Vyžaduje sa reštart servera",
-  "NotificationOptionTaskFailed": "Naplánovaná úloha zlyhala",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionVideoPlayback": "Spustené prehrávanie videa",
-  "NotificationOptionVideoPlaybackStopped": "Zastavené prehrávanie videa",
-  "Photos": "Fotky",
-  "Playlists": "Zoznamy skladieb",
-  "Plugin": "Rozšírenie",
-  "PluginInstalledWithName": "{0} bol nainštalovaný",
-  "PluginUninstalledWithName": "{0} bol odinštalovaný",
-  "PluginUpdatedWithName": "{0} bol aktualizovaný",
-  "ProviderValue": "Poskytovateľ: {0}",
-  "ScheduledTaskFailedWithName": "{0} zlyhalo",
-  "ScheduledTaskStartedWithName": "{0} started",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Series",
-  "Songs": "Skladby",
-  "StartupEmbyServerIsLoading": "Jellyfin Server sa spúšťa. Skúste to prosím o chvíľu znova.",
-  "SubtitleDownloadFailureForItem": "Sťahovanie titulkov pre {0} zlyhalo",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Titulky pre {0} stiahnuté",
-  "Sync": "Sync",
-  "System": "Systém",
-  "TvShows": "TV Shows",
-  "User": "Používateľ",
-  "UserCreatedWithName": "Používateľ {0} bol vytvorený",
-  "UserDeletedWithName": "Používateľ {0} bol vymazaný",
-  "UserDownloadingItemWithValues": "{0} sťahuje {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} sa odpojil od {1}",
-  "UserOnlineFromDevice": "{0} je online z {1}",
-  "UserPasswordChangedWithName": "Heslo používateľa {0} zmenené",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} spustil prehrávanie {1}",
-  "UserStoppedPlayingItemWithValues": "{0} zastavil prehrávanie {1}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Špeciál - {0}",
-  "VersionNumber": "Verzia {0}"
+    "Albums": "Albumy",
+    "AppDeviceValues": "Aplikácia: {0}, Zariadenie: {1}",
+    "Application": "Aplikácia",
+    "Artists": "Umelci",
+    "AuthenticationSucceededWithUserName": "{0} úspešne overený",
+    "Books": "Knihy",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Kanály",
+    "ChapterNameValue": "Kapitola {0}",
+    "Collections": "Zbierky",
+    "DeviceOfflineWithName": "{0} je odpojený",
+    "DeviceOnlineWithName": "{0} je pripojený",
+    "FailedLoginAttemptWithUserName": "Neúspešný pokus o prihlásenie z {0}",
+    "Favorites": "Obľúbené",
+    "Folders": "Priečinky",
+    "Games": "Hry",
+    "Genres": "Žánre",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Pokračujte v pozeraní",
+    "HeaderFavoriteAlbums": "Obľúbené albumy",
+    "HeaderFavoriteArtists": "Obľúbení umelci",
+    "HeaderFavoriteEpisodes": "Obľúbené epizódy",
+    "HeaderFavoriteShows": "Obľúbené seriály",
+    "HeaderFavoriteSongs": "Obľúbené pesničky",
+    "HeaderLiveTV": "Živá TV",
+    "HeaderNextUp": "Nasleduje",
+    "HeaderRecordingGroups": "Recording Groups",
+    "HomeVideos": "Domáce videá",
+    "Inherit": "Zdediť",
+    "ItemAddedWithName": "{0} bol pridaný do knižnice",
+    "ItemRemovedWithName": "{0} bol odstránený z knižnice",
+    "LabelIpAddressValue": "IP adresa: {0}",
+    "LabelRunningTimeValue": "Dĺžka: {0}",
+    "Latest": "Najnovšie",
+    "MessageApplicationUpdated": "Jellyfin Server bol aktualizovaný",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Sekcia {0} konfigurácie servera bola aktualizovaná",
+    "MessageServerConfigurationUpdated": "Konfigurácia servera aktualizovaná",
+    "MixedContent": "Zmiešaný obsah",
+    "Movies": "Filmy",
+    "Music": "Hudba",
+    "MusicVideos": "Hudobné videá",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Sezóna {0}",
+    "NameSeasonUnknown": "Neznáma sezóna",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Je dostupná aktualizácia aplikácie",
+    "NotificationOptionApplicationUpdateInstalled": "Aktualizácia aplikácie nainštalovaná",
+    "NotificationOptionAudioPlayback": "Spustené prehrávanie audia",
+    "NotificationOptionAudioPlaybackStopped": "Zastavené prehrávanie audia",
+    "NotificationOptionCameraImageUploaded": "Nahraný obrázok z fotoaparátu",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlaybackStopped": "Hra ukončená",
+    "NotificationOptionInstallationFailed": "Chyba inštalácie",
+    "NotificationOptionNewLibraryContent": "Pridaný nový obsah",
+    "NotificationOptionPluginError": "Chyba rozšírenia",
+    "NotificationOptionPluginInstalled": "Rozšírenie nainštalované",
+    "NotificationOptionPluginUninstalled": "Rozšírenie odinštalované",
+    "NotificationOptionPluginUpdateInstalled": "Aktualizácia rozšírenia nainštalovaná",
+    "NotificationOptionServerRestartRequired": "Vyžaduje sa reštart servera",
+    "NotificationOptionTaskFailed": "Naplánovaná úloha zlyhala",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionVideoPlayback": "Spustené prehrávanie videa",
+    "NotificationOptionVideoPlaybackStopped": "Zastavené prehrávanie videa",
+    "Photos": "Fotky",
+    "Playlists": "Zoznamy skladieb",
+    "Plugin": "Rozšírenie",
+    "PluginInstalledWithName": "{0} bol nainštalovaný",
+    "PluginUninstalledWithName": "{0} bol odinštalovaný",
+    "PluginUpdatedWithName": "{0} bol aktualizovaný",
+    "ProviderValue": "Poskytovateľ: {0}",
+    "ScheduledTaskFailedWithName": "{0} zlyhalo",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Series",
+    "Songs": "Skladby",
+    "StartupEmbyServerIsLoading": "Jellyfin Server sa spúšťa. Skúste to prosím o chvíľu znova.",
+    "SubtitleDownloadFailureForItem": "Sťahovanie titulkov pre {0} zlyhalo",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Titulky pre {0} stiahnuté",
+    "Sync": "Sync",
+    "System": "Systém",
+    "TvShows": "TV Shows",
+    "User": "Používateľ",
+    "UserCreatedWithName": "Používateľ {0} bol vytvorený",
+    "UserDeletedWithName": "Používateľ {0} bol vymazaný",
+    "UserDownloadingItemWithValues": "{0} sťahuje {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} sa odpojil od {1}",
+    "UserOnlineFromDevice": "{0} je online z {1}",
+    "UserPasswordChangedWithName": "Heslo používateľa {0} zmenené",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} spustil prehrávanie {1}",
+    "UserStoppedPlayingItemWithValues": "{0} zastavil prehrávanie {1}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "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 cd2076c640..8fe279836b 100644
--- a/Emby.Server.Implementations/Localization/Core/sl-SI.json
+++ b/Emby.Server.Implementations/Localization/Core/sl-SI.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albums",
-  "AppDeviceValues": "App: {0}, Device: {1}",
-  "Application": "Application",
-  "Artists": "Artists",
-  "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-  "Books": "Books",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Channels",
-  "ChapterNameValue": "Chapter {0}",
-  "Collections": "Collections",
-  "DeviceOfflineWithName": "{0} has disconnected",
-  "DeviceOnlineWithName": "{0} is connected",
-  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-  "Favorites": "Favorites",
-  "Folders": "Folders",
-  "Games": "Games",
-  "Genres": "Genres",
-  "HeaderAlbumArtists": "Album Artists",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Continue Watching",
-  "HeaderFavoriteAlbums": "Favorite Albums",
-  "HeaderFavoriteArtists": "Favorite Artists",
-  "HeaderFavoriteEpisodes": "Favorite Episodes",
-  "HeaderFavoriteShows": "Favorite Shows",
-  "HeaderFavoriteSongs": "Favorite Songs",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "Next Up",
-  "HeaderRecordingGroups": "Recording Groups",
-  "HomeVideos": "Home videos",
-  "Inherit": "Inherit",
-  "ItemAddedWithName": "{0} was added to the library",
-  "ItemRemovedWithName": "{0} was removed from the library",
-  "LabelIpAddressValue": "Ip address: {0}",
-  "LabelRunningTimeValue": "Running time: {0}",
-  "Latest": "Latest",
-  "MessageApplicationUpdated": "Jellyfin Server has been updated",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-  "MessageServerConfigurationUpdated": "Server configuration has been updated",
-  "MixedContent": "Mixed content",
-  "Movies": "Movies",
-  "Music": "Music",
-  "MusicVideos": "Music videos",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Season {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Application update available",
-  "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-  "NotificationOptionAudioPlayback": "Audio playback started",
-  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-  "NotificationOptionInstallationFailed": "Installation failure",
-  "NotificationOptionNewLibraryContent": "New content added",
-  "NotificationOptionPluginError": "Plugin failure",
-  "NotificationOptionPluginInstalled": "Plugin installed",
-  "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-  "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-  "NotificationOptionServerRestartRequired": "Server restart required",
-  "NotificationOptionTaskFailed": "Scheduled task failure",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionVideoPlayback": "Video playback started",
-  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-  "Photos": "Photos",
-  "Playlists": "Playlists",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} was installed",
-  "PluginUninstalledWithName": "{0} was uninstalled",
-  "PluginUpdatedWithName": "{0} was updated",
-  "ProviderValue": "Provider: {0}",
-  "ScheduledTaskFailedWithName": "{0} failed",
-  "ScheduledTaskStartedWithName": "{0} started",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Serije",
-  "Songs": "Songs",
-  "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
-  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-  "Sync": "Sync",
-  "System": "System",
-  "TvShows": "TV Shows",
-  "User": "User",
-  "UserCreatedWithName": "User {0} has been created",
-  "UserDeletedWithName": "User {0} has been deleted",
-  "UserDownloadingItemWithValues": "{0} is downloading {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} has disconnected from {1}",
-  "UserOnlineFromDevice": "{0} is online from {1}",
-  "UserPasswordChangedWithName": "Password has been changed for user {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
-  "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Special - {0}",
-  "VersionNumber": "Version {0}"
+    "Albums": "Albums",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "Application": "Application",
+    "Artists": "Artists",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "Books": "Books",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Channels",
+    "ChapterNameValue": "Chapter {0}",
+    "Collections": "Collections",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "DeviceOnlineWithName": "{0} is connected",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "Favorites": "Favorites",
+    "Folders": "Folders",
+    "Games": "Games",
+    "Genres": "Genres",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Continue Watching",
+    "HeaderFavoriteAlbums": "Favorite Albums",
+    "HeaderFavoriteArtists": "Favorite Artists",
+    "HeaderFavoriteEpisodes": "Favorite Episodes",
+    "HeaderFavoriteShows": "Favorite Shows",
+    "HeaderFavoriteSongs": "Favorite Songs",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "Next Up",
+    "HeaderRecordingGroups": "Recording Groups",
+    "HomeVideos": "Home videos",
+    "Inherit": "Inherit",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "Latest": "Latest",
+    "MessageApplicationUpdated": "Jellyfin Server has been updated",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MixedContent": "Mixed content",
+    "Movies": "Movies",
+    "Music": "Music",
+    "MusicVideos": "Music videos",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Season {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "Photos": "Photos",
+    "Playlists": "Playlists",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "PluginUpdatedWithName": "{0} was updated",
+    "ProviderValue": "Provider: {0}",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Serije",
+    "Songs": "Songs",
+    "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "Sync": "Sync",
+    "System": "System",
+    "TvShows": "TV Shows",
+    "User": "User",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
+    "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "VersionNumber": "Version {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/sv.json b/Emby.Server.Implementations/Localization/Core/sv.json
index f5f52f6580..517d648bbe 100644
--- a/Emby.Server.Implementations/Localization/Core/sv.json
+++ b/Emby.Server.Implementations/Localization/Core/sv.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Album",
-  "AppDeviceValues": "App: {0}, Enhet: {1}",
-  "Application": "App",
-  "Artists": "Artister",
-  "AuthenticationSucceededWithUserName": "{0} har autentiserats",
-  "Books": "Böcker",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Kanaler",
-  "ChapterNameValue": "Kapitel {0}",
-  "Collections": "Samlingar",
-  "DeviceOfflineWithName": "{0} har tappat anslutningen",
-  "DeviceOnlineWithName": "{0} är ansluten",
-  "FailedLoginAttemptWithUserName": "Misslyckat inloggningsförsök från {0}",
-  "Favorites": "Favoriter",
-  "Folders": "Mappar",
-  "Games": "Spel",
-  "Genres": "Genrer",
-  "HeaderAlbumArtists": "Albumartister",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Fortsätt kolla på",
-  "HeaderFavoriteAlbums": "Favoritalbum",
-  "HeaderFavoriteArtists": "Favoritartister",
-  "HeaderFavoriteEpisodes": "Favoritavsnitt",
-  "HeaderFavoriteShows": "Favoritserier",
-  "HeaderFavoriteSongs": "Favoritlåtar",
-  "HeaderLiveTV": "Live-TV",
-  "HeaderNextUp": "Nästa på tur",
-  "HeaderRecordingGroups": "Inspelningsgrupper",
-  "HomeVideos": "Hemvideor",
-  "Inherit": "Ärv",
-  "ItemAddedWithName": "{0} lades till i biblioteket",
-  "ItemRemovedWithName": "{0} togs bort från biblioteket",
-  "LabelIpAddressValue": "IP-adress: {0}",
-  "LabelRunningTimeValue": "Speltid: {0}",
-  "Latest": "Senaste",
-  "MessageApplicationUpdated": "Jellyfin Server har uppdaterats",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Serverinställningarna {0} har uppdaterats",
-  "MessageServerConfigurationUpdated": "Server konfigurationen har uppdaterats",
-  "MixedContent": "Blandat innehåll",
-  "Movies": "Filmer",
-  "Music": "Musik",
-  "MusicVideos": "Musikvideos",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Säsong {0}",
-  "NameSeasonUnknown": "Okänd säsong",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Ny programversion tillgänglig",
-  "NotificationOptionApplicationUpdateInstalled": "Programuppdatering installerad",
-  "NotificationOptionAudioPlayback": "Ljuduppspelning har påbörjats",
-  "NotificationOptionAudioPlaybackStopped": "Ljuduppspelning stoppad",
-  "NotificationOptionCameraImageUploaded": "Kamerabild har laddats upp",
-  "NotificationOptionGamePlayback": "Spel har startats",
-  "NotificationOptionGamePlaybackStopped": "Spel stoppat",
-  "NotificationOptionInstallationFailed": "Fel vid installation",
-  "NotificationOptionNewLibraryContent": "Nytt innehåll har lagts till",
-  "NotificationOptionPluginError": "Fel uppstod med tillägget",
-  "NotificationOptionPluginInstalled": "Tillägg har installerats",
-  "NotificationOptionPluginUninstalled": "Tillägg har avinstallerats",
-  "NotificationOptionPluginUpdateInstalled": "Tillägg har uppdaterats",
-  "NotificationOptionServerRestartRequired": "Servern måste startas om",
-  "NotificationOptionTaskFailed": "Schemalagd aktivitet har misslyckats",
-  "NotificationOptionUserLockedOut": "Användare har låsts ut",
-  "NotificationOptionVideoPlayback": "Videouppspelning har påbörjats",
-  "NotificationOptionVideoPlaybackStopped": "Videouppspelning stoppad",
-  "Photos": "Bilder",
-  "Playlists": "Spellistor",
-  "Plugin": "Tillägg",
-  "PluginInstalledWithName": "{0} installerades",
-  "PluginUninstalledWithName": "{0} avinstallerades",
-  "PluginUpdatedWithName": "{0} uppdaterades",
-  "ProviderValue": "Källa: {0}",
-  "ScheduledTaskFailedWithName": "{0} misslyckades",
-  "ScheduledTaskStartedWithName": "{0} startad",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Serier",
-  "Songs": "Låtar",
-  "StartupEmbyServerIsLoading": "Jellyfin server arbetar. Pröva igen inom kort.",
-  "SubtitleDownloadFailureForItem": "Nerladdning av undertexter för {0} misslyckades",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Undertexter har laddats ner till {0}",
-  "Sync": "Synk",
-  "System": "System",
-  "TvShows": "TV-serier",
-  "User": "Användare",
-  "UserCreatedWithName": "Användaren {0} har skapats",
-  "UserDeletedWithName": "Användaren {0} har tagits bort",
-  "UserDownloadingItemWithValues": "{0} laddar ner {1}",
-  "UserLockedOutWithName": "Användare {0} har låsts ute",
-  "UserOfflineFromDevice": "{0} har avbrutit anslutningen från {1}",
-  "UserOnlineFromDevice": "{0} är uppkopplad från {1}",
-  "UserPasswordChangedWithName": "Lösenordet för {0} har ändrats",
-  "UserPolicyUpdatedWithName": "Användarpolicyn har uppdaterats för {0}",
-  "UserStartedPlayingItemWithValues": "{0} har börjat spela upp {1}",
-  "UserStoppedPlayingItemWithValues": "{0} har avslutat uppspelningen av {1}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Specialavsnitt - {0}",
-  "VersionNumber": "Version {0}"
+    "Albums": "Album",
+    "AppDeviceValues": "App: {0}, Enhet: {1}",
+    "Application": "App",
+    "Artists": "Artister",
+    "AuthenticationSucceededWithUserName": "{0} har autentiserats",
+    "Books": "Böcker",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Kanaler",
+    "ChapterNameValue": "Kapitel {0}",
+    "Collections": "Samlingar",
+    "DeviceOfflineWithName": "{0} har tappat anslutningen",
+    "DeviceOnlineWithName": "{0} är ansluten",
+    "FailedLoginAttemptWithUserName": "Misslyckat inloggningsförsök från {0}",
+    "Favorites": "Favoriter",
+    "Folders": "Mappar",
+    "Games": "Spel",
+    "Genres": "Genrer",
+    "HeaderAlbumArtists": "Albumartister",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Fortsätt kolla på",
+    "HeaderFavoriteAlbums": "Favoritalbum",
+    "HeaderFavoriteArtists": "Favoritartister",
+    "HeaderFavoriteEpisodes": "Favoritavsnitt",
+    "HeaderFavoriteShows": "Favoritserier",
+    "HeaderFavoriteSongs": "Favoritlåtar",
+    "HeaderLiveTV": "Live-TV",
+    "HeaderNextUp": "Nästa på tur",
+    "HeaderRecordingGroups": "Inspelningsgrupper",
+    "HomeVideos": "Hemvideor",
+    "Inherit": "Ärv",
+    "ItemAddedWithName": "{0} lades till i biblioteket",
+    "ItemRemovedWithName": "{0} togs bort från biblioteket",
+    "LabelIpAddressValue": "IP-adress: {0}",
+    "LabelRunningTimeValue": "Speltid: {0}",
+    "Latest": "Senaste",
+    "MessageApplicationUpdated": "Jellyfin Server har uppdaterats",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Serverinställningarna {0} har uppdaterats",
+    "MessageServerConfigurationUpdated": "Server konfigurationen har uppdaterats",
+    "MixedContent": "Blandat innehåll",
+    "Movies": "Filmer",
+    "Music": "Musik",
+    "MusicVideos": "Musikvideos",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Säsong {0}",
+    "NameSeasonUnknown": "Okänd säsong",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Ny programversion tillgänglig",
+    "NotificationOptionApplicationUpdateInstalled": "Programuppdatering installerad",
+    "NotificationOptionAudioPlayback": "Ljuduppspelning har påbörjats",
+    "NotificationOptionAudioPlaybackStopped": "Ljuduppspelning stoppad",
+    "NotificationOptionCameraImageUploaded": "Kamerabild har laddats upp",
+    "NotificationOptionGamePlayback": "Spel har startats",
+    "NotificationOptionGamePlaybackStopped": "Spel stoppat",
+    "NotificationOptionInstallationFailed": "Fel vid installation",
+    "NotificationOptionNewLibraryContent": "Nytt innehåll har lagts till",
+    "NotificationOptionPluginError": "Fel uppstod med tillägget",
+    "NotificationOptionPluginInstalled": "Tillägg har installerats",
+    "NotificationOptionPluginUninstalled": "Tillägg har avinstallerats",
+    "NotificationOptionPluginUpdateInstalled": "Tillägg har uppdaterats",
+    "NotificationOptionServerRestartRequired": "Servern måste startas om",
+    "NotificationOptionTaskFailed": "Schemalagd aktivitet har misslyckats",
+    "NotificationOptionUserLockedOut": "Användare har låsts ut",
+    "NotificationOptionVideoPlayback": "Videouppspelning har påbörjats",
+    "NotificationOptionVideoPlaybackStopped": "Videouppspelning stoppad",
+    "Photos": "Bilder",
+    "Playlists": "Spellistor",
+    "Plugin": "Tillägg",
+    "PluginInstalledWithName": "{0} installerades",
+    "PluginUninstalledWithName": "{0} avinstallerades",
+    "PluginUpdatedWithName": "{0} uppdaterades",
+    "ProviderValue": "Källa: {0}",
+    "ScheduledTaskFailedWithName": "{0} misslyckades",
+    "ScheduledTaskStartedWithName": "{0} startad",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Serier",
+    "Songs": "Låtar",
+    "StartupEmbyServerIsLoading": "Jellyfin server arbetar. Pröva igen inom kort.",
+    "SubtitleDownloadFailureForItem": "Nerladdning av undertexter för {0} misslyckades",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Undertexter har laddats ner till {0}",
+    "Sync": "Synk",
+    "System": "System",
+    "TvShows": "TV-serier",
+    "User": "Användare",
+    "UserCreatedWithName": "Användaren {0} har skapats",
+    "UserDeletedWithName": "Användaren {0} har tagits bort",
+    "UserDownloadingItemWithValues": "{0} laddar ner {1}",
+    "UserLockedOutWithName": "Användare {0} har låsts ute",
+    "UserOfflineFromDevice": "{0} har avbrutit anslutningen från {1}",
+    "UserOnlineFromDevice": "{0} är uppkopplad från {1}",
+    "UserPasswordChangedWithName": "Lösenordet för {0} har ändrats",
+    "UserPolicyUpdatedWithName": "Användarpolicyn har uppdaterats för {0}",
+    "UserStartedPlayingItemWithValues": "{0} har börjat spela upp {1}",
+    "UserStoppedPlayingItemWithValues": "{0} har avslutat uppspelningen av {1}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Specialavsnitt - {0}",
+    "VersionNumber": "Version {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/tr.json b/Emby.Server.Implementations/Localization/Core/tr.json
index b04d61c650..9e86e2125b 100644
--- a/Emby.Server.Implementations/Localization/Core/tr.json
+++ b/Emby.Server.Implementations/Localization/Core/tr.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albums",
-  "AppDeviceValues": "App: {0}, Device: {1}",
-  "Application": "Application",
-  "Artists": "Artists",
-  "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-  "Books": "Books",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Channels",
-  "ChapterNameValue": "Chapter {0}",
-  "Collections": "Collections",
-  "DeviceOfflineWithName": "{0} has disconnected",
-  "DeviceOnlineWithName": "{0} is connected",
-  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-  "Favorites": "Favorites",
-  "Folders": "Folders",
-  "Games": "Games",
-  "Genres": "Genres",
-  "HeaderAlbumArtists": "Album Artists",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Continue Watching",
-  "HeaderFavoriteAlbums": "Favorite Albums",
-  "HeaderFavoriteArtists": "Favorite Artists",
-  "HeaderFavoriteEpisodes": "Favorite Episodes",
-  "HeaderFavoriteShows": "Favori Showlar",
-  "HeaderFavoriteSongs": "Favorite Songs",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "Next Up",
-  "HeaderRecordingGroups": "Recording Groups",
-  "HomeVideos": "Home videos",
-  "Inherit": "Inherit",
-  "ItemAddedWithName": "{0} was added to the library",
-  "ItemRemovedWithName": "{0} was removed from the library",
-  "LabelIpAddressValue": "Ip address: {0}",
-  "LabelRunningTimeValue": "Running time: {0}",
-  "Latest": "Latest",
-  "MessageApplicationUpdated": "Jellyfin Server has been updated",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-  "MessageServerConfigurationUpdated": "Server configuration has been updated",
-  "MixedContent": "Mixed content",
-  "Movies": "Movies",
-  "Music": "Music",
-  "MusicVideos": "Music videos",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Season {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Application update available",
-  "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-  "NotificationOptionAudioPlayback": "Audio playback started",
-  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-  "NotificationOptionInstallationFailed": "Installation failure",
-  "NotificationOptionNewLibraryContent": "New content added",
-  "NotificationOptionPluginError": "Plugin failure",
-  "NotificationOptionPluginInstalled": "Plugin installed",
-  "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-  "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-  "NotificationOptionServerRestartRequired": "Server restart required",
-  "NotificationOptionTaskFailed": "Scheduled task failure",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionVideoPlayback": "Video playback started",
-  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-  "Photos": "Photos",
-  "Playlists": "Playlists",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} was installed",
-  "PluginUninstalledWithName": "{0} was uninstalled",
-  "PluginUpdatedWithName": "{0} was updated",
-  "ProviderValue": "Provider: {0}",
-  "ScheduledTaskFailedWithName": "{0} failed",
-  "ScheduledTaskStartedWithName": "{0} started",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Shows",
-  "Songs": "Songs",
-  "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
-  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-  "Sync": "Sync",
-  "System": "System",
-  "TvShows": "TV Shows",
-  "User": "User",
-  "UserCreatedWithName": "User {0} has been created",
-  "UserDeletedWithName": "User {0} has been deleted",
-  "UserDownloadingItemWithValues": "{0} is downloading {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} has disconnected from {1}",
-  "UserOnlineFromDevice": "{0} is online from {1}",
-  "UserPasswordChangedWithName": "Password has been changed for user {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
-  "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Special - {0}",
-  "VersionNumber": "Version {0}"
+    "Albums": "Albums",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "Application": "Application",
+    "Artists": "Artists",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "Books": "Books",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Channels",
+    "ChapterNameValue": "Chapter {0}",
+    "Collections": "Collections",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "DeviceOnlineWithName": "{0} is connected",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "Favorites": "Favorites",
+    "Folders": "Folders",
+    "Games": "Games",
+    "Genres": "Genres",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Continue Watching",
+    "HeaderFavoriteAlbums": "Favorite Albums",
+    "HeaderFavoriteArtists": "Favorite Artists",
+    "HeaderFavoriteEpisodes": "Favorite Episodes",
+    "HeaderFavoriteShows": "Favori Showlar",
+    "HeaderFavoriteSongs": "Favorite Songs",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "Next Up",
+    "HeaderRecordingGroups": "Recording Groups",
+    "HomeVideos": "Home videos",
+    "Inherit": "Inherit",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "Latest": "Latest",
+    "MessageApplicationUpdated": "Jellyfin Server has been updated",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MixedContent": "Mixed content",
+    "Movies": "Movies",
+    "Music": "Music",
+    "MusicVideos": "Music videos",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Season {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "Photos": "Photos",
+    "Playlists": "Playlists",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "PluginUpdatedWithName": "{0} was updated",
+    "ProviderValue": "Provider: {0}",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Shows",
+    "Songs": "Songs",
+    "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "Sync": "Sync",
+    "System": "System",
+    "TvShows": "TV Shows",
+    "User": "User",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
+    "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "VersionNumber": "Version {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/zh-CN.json b/Emby.Server.Implementations/Localization/Core/zh-CN.json
index fcf260e28f..6d877ec171 100644
--- a/Emby.Server.Implementations/Localization/Core/zh-CN.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-CN.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "专辑",
-  "AppDeviceValues": "应用: {0}, 设备: {1}",
-  "Application": "应用程序",
-  "Artists": "艺术家",
-  "AuthenticationSucceededWithUserName": "{0} 成功验证",
-  "Books": "书籍",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "频道",
-  "ChapterNameValue": "章节 {0}",
-  "Collections": "合集",
-  "DeviceOfflineWithName": "{0} 已断开",
-  "DeviceOnlineWithName": "{0} 已连接",
-  "FailedLoginAttemptWithUserName": "来自 {0} 的失败登入",
-  "Favorites": "最爱",
-  "Folders": "文件夹",
-  "Games": "游戏",
-  "Genres": "风格",
-  "HeaderAlbumArtists": "专辑作家",
-  "HeaderCameraUploads": "相机上传",
-  "HeaderContinueWatching": "继续观看",
-  "HeaderFavoriteAlbums": "最爱的专辑",
-  "HeaderFavoriteArtists": "最爱作家",
-  "HeaderFavoriteEpisodes": "最爱的集",
-  "HeaderFavoriteShows": "最爱的节目",
-  "HeaderFavoriteSongs": "最爱的歌曲",
-  "HeaderLiveTV": "电视直播",
-  "HeaderNextUp": "接下来",
-  "HeaderRecordingGroups": "录制组",
-  "HomeVideos": "家庭视频",
-  "Inherit": "继承",
-  "ItemAddedWithName": "{0} 已添加到媒体库",
-  "ItemRemovedWithName": "{0} 已从媒体库中移除",
-  "LabelIpAddressValue": "Ip 地址：{0}",
-  "LabelRunningTimeValue": "运行时间：{0}",
-  "Latest": "最新",
-  "MessageApplicationUpdated": "Jellyfin 服务器已更新",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "服务器配置 {0} 部分已更新",
-  "MessageServerConfigurationUpdated": "服务器配置已更新",
-  "MixedContent": "混合内容",
-  "Movies": "电影",
-  "Music": "音乐",
-  "MusicVideos": "音乐视频",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "季 {0}",
-  "NameSeasonUnknown": "未知季",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "有可用的应用程序更新",
-  "NotificationOptionApplicationUpdateInstalled": "应用程序更新已安装",
-  "NotificationOptionAudioPlayback": "音频开始播放",
-  "NotificationOptionAudioPlaybackStopped": "音频播放已停止",
-  "NotificationOptionCameraImageUploaded": "相机图片已上传",
-  "NotificationOptionGamePlayback": "游戏开始",
-  "NotificationOptionGamePlaybackStopped": "游戏停止",
-  "NotificationOptionInstallationFailed": "安装失败",
-  "NotificationOptionNewLibraryContent": "已添加新内容",
-  "NotificationOptionPluginError": "插件失败",
-  "NotificationOptionPluginInstalled": "插件已安装",
-  "NotificationOptionPluginUninstalled": "插件已卸载",
-  "NotificationOptionPluginUpdateInstalled": "插件更新已安装",
-  "NotificationOptionServerRestartRequired": "服务器需要重启",
-  "NotificationOptionTaskFailed": "计划任务失败",
-  "NotificationOptionUserLockedOut": "用户已锁定",
-  "NotificationOptionVideoPlayback": "视频开始播放",
-  "NotificationOptionVideoPlaybackStopped": "视频播放已停止",
-  "Photos": "照片",
-  "Playlists": "播放列表",
-  "Plugin": "插件",
-  "PluginInstalledWithName": "{0} 已安装",
-  "PluginUninstalledWithName": "{0} 已卸载",
-  "PluginUpdatedWithName": "{0} 已更新",
-  "ProviderValue": "提供商：{0}",
-  "ScheduledTaskFailedWithName": "{0} 已失败",
-  "ScheduledTaskStartedWithName": "{0} 已开始",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "节目",
-  "Songs": "歌曲",
-  "StartupEmbyServerIsLoading": "Jellyfin 服务器加载中。请稍后再试。",
-  "SubtitleDownloadFailureForItem": "为 {0} 下载字幕失败",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "已为 {0} 下载了字幕",
-  "Sync": "同步",
-  "System": "系统",
-  "TvShows": "电视节目",
-  "User": "用户",
-  "UserCreatedWithName": "用户 {0} 已创建",
-  "UserDeletedWithName": "用户 {0} 已删除",
-  "UserDownloadingItemWithValues": "{0} 正在下载 {1}",
-  "UserLockedOutWithName": "用户 {0} 已被锁定",
-  "UserOfflineFromDevice": "{0} 已从 {1} 断开",
-  "UserOnlineFromDevice": "{0} 在线，来自 {1}",
-  "UserPasswordChangedWithName": "已为用户 {0} 更改密码",
-  "UserPolicyUpdatedWithName": "用户协议已经被更新为 {0}",
-  "UserStartedPlayingItemWithValues": "{0} 已开始播放 {1}",
-  "UserStoppedPlayingItemWithValues": "{0} 已停止播放 {1}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "特典 - {0}",
-  "VersionNumber": "版本 {0}"
+    "Albums": "专辑",
+    "AppDeviceValues": "应用: {0}, 设备: {1}",
+    "Application": "应用程序",
+    "Artists": "艺术家",
+    "AuthenticationSucceededWithUserName": "{0} 成功验证",
+    "Books": "书籍",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "频道",
+    "ChapterNameValue": "章节 {0}",
+    "Collections": "合集",
+    "DeviceOfflineWithName": "{0} 已断开",
+    "DeviceOnlineWithName": "{0} 已连接",
+    "FailedLoginAttemptWithUserName": "来自 {0} 的失败登入",
+    "Favorites": "最爱",
+    "Folders": "文件夹",
+    "Games": "游戏",
+    "Genres": "风格",
+    "HeaderAlbumArtists": "专辑作家",
+    "HeaderCameraUploads": "相机上传",
+    "HeaderContinueWatching": "继续观看",
+    "HeaderFavoriteAlbums": "最爱的专辑",
+    "HeaderFavoriteArtists": "最爱作家",
+    "HeaderFavoriteEpisodes": "最爱的集",
+    "HeaderFavoriteShows": "最爱的节目",
+    "HeaderFavoriteSongs": "最爱的歌曲",
+    "HeaderLiveTV": "电视直播",
+    "HeaderNextUp": "接下来",
+    "HeaderRecordingGroups": "录制组",
+    "HomeVideos": "家庭视频",
+    "Inherit": "继承",
+    "ItemAddedWithName": "{0} 已添加到媒体库",
+    "ItemRemovedWithName": "{0} 已从媒体库中移除",
+    "LabelIpAddressValue": "Ip 地址：{0}",
+    "LabelRunningTimeValue": "运行时间：{0}",
+    "Latest": "最新",
+    "MessageApplicationUpdated": "Jellyfin 服务器已更新",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "服务器配置 {0} 部分已更新",
+    "MessageServerConfigurationUpdated": "服务器配置已更新",
+    "MixedContent": "混合内容",
+    "Movies": "电影",
+    "Music": "音乐",
+    "MusicVideos": "音乐视频",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "季 {0}",
+    "NameSeasonUnknown": "未知季",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "有可用的应用程序更新",
+    "NotificationOptionApplicationUpdateInstalled": "应用程序更新已安装",
+    "NotificationOptionAudioPlayback": "音频开始播放",
+    "NotificationOptionAudioPlaybackStopped": "音频播放已停止",
+    "NotificationOptionCameraImageUploaded": "相机图片已上传",
+    "NotificationOptionGamePlayback": "游戏开始",
+    "NotificationOptionGamePlaybackStopped": "游戏停止",
+    "NotificationOptionInstallationFailed": "安装失败",
+    "NotificationOptionNewLibraryContent": "已添加新内容",
+    "NotificationOptionPluginError": "插件失败",
+    "NotificationOptionPluginInstalled": "插件已安装",
+    "NotificationOptionPluginUninstalled": "插件已卸载",
+    "NotificationOptionPluginUpdateInstalled": "插件更新已安装",
+    "NotificationOptionServerRestartRequired": "服务器需要重启",
+    "NotificationOptionTaskFailed": "计划任务失败",
+    "NotificationOptionUserLockedOut": "用户已锁定",
+    "NotificationOptionVideoPlayback": "视频开始播放",
+    "NotificationOptionVideoPlaybackStopped": "视频播放已停止",
+    "Photos": "照片",
+    "Playlists": "播放列表",
+    "Plugin": "插件",
+    "PluginInstalledWithName": "{0} 已安装",
+    "PluginUninstalledWithName": "{0} 已卸载",
+    "PluginUpdatedWithName": "{0} 已更新",
+    "ProviderValue": "提供商：{0}",
+    "ScheduledTaskFailedWithName": "{0} 已失败",
+    "ScheduledTaskStartedWithName": "{0} 已开始",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "节目",
+    "Songs": "歌曲",
+    "StartupEmbyServerIsLoading": "Jellyfin 服务器加载中。请稍后再试。",
+    "SubtitleDownloadFailureForItem": "为 {0} 下载字幕失败",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "已为 {0} 下载了字幕",
+    "Sync": "同步",
+    "System": "系统",
+    "TvShows": "电视节目",
+    "User": "用户",
+    "UserCreatedWithName": "用户 {0} 已创建",
+    "UserDeletedWithName": "用户 {0} 已删除",
+    "UserDownloadingItemWithValues": "{0} 正在下载 {1}",
+    "UserLockedOutWithName": "用户 {0} 已被锁定",
+    "UserOfflineFromDevice": "{0} 已从 {1} 断开",
+    "UserOnlineFromDevice": "{0} 在线，来自 {1}",
+    "UserPasswordChangedWithName": "已为用户 {0} 更改密码",
+    "UserPolicyUpdatedWithName": "用户协议已经被更新为 {0}",
+    "UserStartedPlayingItemWithValues": "{0} 已开始播放 {1}",
+    "UserStoppedPlayingItemWithValues": "{0} 已停止播放 {1}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "特典 - {0}",
+    "VersionNumber": "版本 {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/zh-HK.json b/Emby.Server.Implementations/Localization/Core/zh-HK.json
index dc6332b03d..cad5700fde 100644
--- a/Emby.Server.Implementations/Localization/Core/zh-HK.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-HK.json
@@ -1,100 +1,100 @@
 {
-  "Albums": "Albums",
-  "AppDeviceValues": "App: {0}, Device: {1}",
-  "Application": "Application",
-  "Artists": "Artists",
-  "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-  "Books": "Books",
-  "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-  "Channels": "Channels",
-  "ChapterNameValue": "Chapter {0}",
-  "Collections": "Collections",
-  "DeviceOfflineWithName": "{0} has disconnected",
-  "DeviceOnlineWithName": "{0} is connected",
-  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-  "Favorites": "Favorites",
-  "Folders": "Folders",
-  "Games": "Games",
-  "Genres": "Genres",
-  "HeaderAlbumArtists": "Album Artists",
-  "HeaderCameraUploads": "Camera Uploads",
-  "HeaderContinueWatching": "Continue Watching",
-  "HeaderFavoriteAlbums": "Favorite Albums",
-  "HeaderFavoriteArtists": "Favorite Artists",
-  "HeaderFavoriteEpisodes": "Favorite Episodes",
-  "HeaderFavoriteShows": "Favorite Shows",
-  "HeaderFavoriteSongs": "Favorite Songs",
-  "HeaderLiveTV": "Live TV",
-  "HeaderNextUp": "Next Up",
-  "HeaderRecordingGroups": "Recording Groups",
-  "HomeVideos": "Home videos",
-  "Inherit": "Inherit",
-  "ItemAddedWithName": "{0} was added to the library",
-  "ItemRemovedWithName": "{0} was removed from the library",
-  "LabelIpAddressValue": "Ip address: {0}",
-  "LabelRunningTimeValue": "Running time: {0}",
-  "Latest": "Latest",
-  "MessageApplicationUpdated": "Jellyfin Server has been updated",
-  "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-  "MessageServerConfigurationUpdated": "Server configuration has been updated",
-  "MixedContent": "Mixed content",
-  "Movies": "Movies",
-  "Music": "Music",
-  "MusicVideos": "Music videos",
-  "NameInstallFailed": "{0} installation failed",
-  "NameSeasonNumber": "Season {0}",
-  "NameSeasonUnknown": "Season Unknown",
-  "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-  "NotificationOptionApplicationUpdateAvailable": "Application update available",
-  "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-  "NotificationOptionAudioPlayback": "Audio playback started",
-  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-  "NotificationOptionGamePlayback": "Game playback started",
-  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-  "NotificationOptionInstallationFailed": "Installation failure",
-  "NotificationOptionNewLibraryContent": "New content added",
-  "NotificationOptionPluginError": "Plugin failure",
-  "NotificationOptionPluginInstalled": "Plugin installed",
-  "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-  "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-  "NotificationOptionServerRestartRequired": "Server restart required",
-  "NotificationOptionTaskFailed": "Scheduled task failure",
-  "NotificationOptionUserLockedOut": "User locked out",
-  "NotificationOptionVideoPlayback": "Video playback started",
-  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-  "Photos": "Photos",
-  "Playlists": "Playlists",
-  "Plugin": "Plugin",
-  "PluginInstalledWithName": "{0} was installed",
-  "PluginUninstalledWithName": "{0} was uninstalled",
-  "PluginUpdatedWithName": "{0} was updated",
-  "ProviderValue": "Provider: {0}",
-  "ScheduledTaskFailedWithName": "{0} failed",
-  "ScheduledTaskStartedWithName": "{0} started",
-  "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-  "Shows": "Shows",
-  "Songs": "Songs",
-  "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
-  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-  "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-  "Sync": "Sync",
-  "System": "System",
-  "TvShows": "TV Shows",
-  "User": "User",
-  "UserCreatedWithName": "User {0} has been created",
-  "UserDeletedWithName": "User {0} has been deleted",
-  "UserDownloadingItemWithValues": "{0} is downloading {1}",
-  "UserLockedOutWithName": "User {0} has been locked out",
-  "UserOfflineFromDevice": "{0} has disconnected from {1}",
-  "UserOnlineFromDevice": "{0} is online from {1}",
-  "UserPasswordChangedWithName": "Password has been changed for user {0}",
-  "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-  "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
-  "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
-  "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-  "ValueSpecialEpisodeName": "Special - {0}",
-  "VersionNumber": "版本{0}"
+    "Albums": "Albums",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "Application": "Application",
+    "Artists": "Artists",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "Books": "Books",
+    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "Channels": "Channels",
+    "ChapterNameValue": "Chapter {0}",
+    "Collections": "Collections",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "DeviceOnlineWithName": "{0} is connected",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "Favorites": "Favorites",
+    "Folders": "Folders",
+    "Games": "Games",
+    "Genres": "Genres",
+    "HeaderAlbumArtists": "Album Artists",
+    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderContinueWatching": "Continue Watching",
+    "HeaderFavoriteAlbums": "Favorite Albums",
+    "HeaderFavoriteArtists": "Favorite Artists",
+    "HeaderFavoriteEpisodes": "Favorite Episodes",
+    "HeaderFavoriteShows": "Favorite Shows",
+    "HeaderFavoriteSongs": "Favorite Songs",
+    "HeaderLiveTV": "Live TV",
+    "HeaderNextUp": "Next Up",
+    "HeaderRecordingGroups": "Recording Groups",
+    "HomeVideos": "Home videos",
+    "Inherit": "Inherit",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "Latest": "Latest",
+    "MessageApplicationUpdated": "Jellyfin Server has been updated",
+    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MixedContent": "Mixed content",
+    "Movies": "Movies",
+    "Music": "Music",
+    "MusicVideos": "Music videos",
+    "NameInstallFailed": "{0} installation failed",
+    "NameSeasonNumber": "Season {0}",
+    "NameSeasonUnknown": "Season Unknown",
+    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionPluginError": "Plugin failure",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionUserLockedOut": "User locked out",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "Photos": "Photos",
+    "Playlists": "Playlists",
+    "Plugin": "Plugin",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "PluginUpdatedWithName": "{0} was updated",
+    "ProviderValue": "Provider: {0}",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "Shows": "Shows",
+    "Songs": "Songs",
+    "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "Sync": "Sync",
+    "System": "System",
+    "TvShows": "TV Shows",
+    "User": "User",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "UserDownloadingItemWithValues": "{0} is downloading {1}",
+    "UserLockedOutWithName": "User {0} has been locked out",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
+    "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
+    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueSpecialEpisodeName": "Special - {0}",
+    "VersionNumber": "版本{0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Ratings/br.txt b/Emby.Server.Implementations/Localization/Ratings/br.txt
index 62f00fb87e..e5edaf62cf 100644
--- a/Emby.Server.Implementations/Localization/Ratings/br.txt
+++ b/Emby.Server.Implementations/Localization/Ratings/br.txt
@@ -3,4 +3,4 @@ BR-10,5
 BR-12,7
 BR-14,8
 BR-16,8
-BR-18,9
\ No newline at end of file
+BR-18,9
diff --git a/Emby.Server.Implementations/Localization/Ratings/ca.txt b/Emby.Server.Implementations/Localization/Ratings/ca.txt
index 5a110648cd..fb8d7a27f5 100644
--- a/Emby.Server.Implementations/Localization/Ratings/ca.txt
+++ b/Emby.Server.Implementations/Localization/Ratings/ca.txt
@@ -3,4 +3,4 @@ CA-PG,5
 CA-14A,7
 CA-A,8
 CA-18A,9
-CA-R,10
\ No newline at end of file
+CA-R,10
diff --git a/Emby.Server.Implementations/Localization/Ratings/co.txt b/Emby.Server.Implementations/Localization/Ratings/co.txt
index a694a0be66..9684fa0524 100644
--- a/Emby.Server.Implementations/Localization/Ratings/co.txt
+++ b/Emby.Server.Implementations/Localization/Ratings/co.txt
@@ -5,4 +5,4 @@ CO-15,8
 CO-18,10
 CO-X,100
 CO-BANNED,15
-CO-E,15
\ No newline at end of file
+CO-E,15
diff --git a/Emby.Server.Implementations/Localization/Ratings/dk.txt b/Emby.Server.Implementations/Localization/Ratings/dk.txt
index b9a085e012..5364ae1f27 100644
--- a/Emby.Server.Implementations/Localization/Ratings/dk.txt
+++ b/Emby.Server.Implementations/Localization/Ratings/dk.txt
@@ -1,4 +1,4 @@
 DA-A,1
 DA-7,5
 DA-11,6
-DA-15,8
\ No newline at end of file
+DA-15,8
diff --git a/Emby.Server.Implementations/Localization/Ratings/es.txt b/Emby.Server.Implementations/Localization/Ratings/es.txt
index 32a1e6438d..887d91ba63 100644
--- a/Emby.Server.Implementations/Localization/Ratings/es.txt
+++ b/Emby.Server.Implementations/Localization/Ratings/es.txt
@@ -3,4 +3,4 @@ ES-APTA,1
 ES-7,3
 ES-12,6
 ES-16,8
-ES-18,11
\ No newline at end of file
+ES-18,11
diff --git a/Emby.Server.Implementations/Localization/Ratings/fr.txt b/Emby.Server.Implementations/Localization/Ratings/fr.txt
index 2bb205b0da..f586a3fa91 100644
--- a/Emby.Server.Implementations/Localization/Ratings/fr.txt
+++ b/Emby.Server.Implementations/Localization/Ratings/fr.txt
@@ -2,4 +2,4 @@ FR-U,1
 FR-10,5
 FR-12,7
 FR-16,9
-FR-18,10
\ No newline at end of file
+FR-18,10
diff --git a/Emby.Server.Implementations/Localization/Ratings/ie.txt b/Emby.Server.Implementations/Localization/Ratings/ie.txt
index 283f077672..e42be5cd49 100644
--- a/Emby.Server.Implementations/Localization/Ratings/ie.txt
+++ b/Emby.Server.Implementations/Localization/Ratings/ie.txt
@@ -3,4 +3,4 @@ IE-PG,5
 IE-12A,7
 IE-15A,8
 IE-16,9
-IE-18,10
\ No newline at end of file
+IE-18,10
diff --git a/Emby.Server.Implementations/Localization/Ratings/jp.txt b/Emby.Server.Implementations/Localization/Ratings/jp.txt
index 2e1da30d81..a8fc2d1431 100644
--- a/Emby.Server.Implementations/Localization/Ratings/jp.txt
+++ b/Emby.Server.Implementations/Localization/Ratings/jp.txt
@@ -1,4 +1,4 @@
 JP-G,1
 JP-PG12,7
 JP-15+,8
-JP-18+,10
\ No newline at end of file
+JP-18+,10
diff --git a/Emby.Server.Implementations/Localization/Ratings/kz.txt b/Emby.Server.Implementations/Localization/Ratings/kz.txt
index b31e12d969..4441c56503 100644
--- a/Emby.Server.Implementations/Localization/Ratings/kz.txt
+++ b/Emby.Server.Implementations/Localization/Ratings/kz.txt
@@ -3,4 +3,4 @@ KZ-БА,6
 KZ-Б14,7
 KZ-Е16,8
 KZ-Е18,10
-KZ-НА,15
\ No newline at end of file
+KZ-НА,15
diff --git a/Emby.Server.Implementations/Localization/Ratings/mx.txt b/Emby.Server.Implementations/Localization/Ratings/mx.txt
index 93b609c3d9..785a8ba227 100644
--- a/Emby.Server.Implementations/Localization/Ratings/mx.txt
+++ b/Emby.Server.Implementations/Localization/Ratings/mx.txt
@@ -3,4 +3,4 @@ MX-A,5
 MX-B,7
 MX-B-15,8
 MX-C,9
-MX-D,10
\ No newline at end of file
+MX-D,10
diff --git a/Emby.Server.Implementations/Localization/Ratings/nl.txt b/Emby.Server.Implementations/Localization/Ratings/nl.txt
index f69cc2bcc9..8c005092e4 100644
--- a/Emby.Server.Implementations/Localization/Ratings/nl.txt
+++ b/Emby.Server.Implementations/Localization/Ratings/nl.txt
@@ -3,4 +3,4 @@ NL-MG6,2
 NL-6,3
 NL-9,5
 NL-12,6
-NL-16,8
\ No newline at end of file
+NL-16,8
diff --git a/Emby.Server.Implementations/Localization/Ratings/nz.txt b/Emby.Server.Implementations/Localization/Ratings/nz.txt
index 46e4067ba3..bba99b764a 100644
--- a/Emby.Server.Implementations/Localization/Ratings/nz.txt
+++ b/Emby.Server.Implementations/Localization/Ratings/nz.txt
@@ -8,4 +8,4 @@ NZ-RP16,9
 NZ-R16,9
 NZ-R18,10
 NZ-R,10
-NZ-MA,10
\ No newline at end of file
+NZ-MA,10
diff --git a/Emby.Server.Implementations/Localization/Ratings/ro.txt b/Emby.Server.Implementations/Localization/Ratings/ro.txt
index 3fdaed9ccc..4089b282f0 100644
--- a/Emby.Server.Implementations/Localization/Ratings/ro.txt
+++ b/Emby.Server.Implementations/Localization/Ratings/ro.txt
@@ -1 +1 @@
-RO-AG,1
\ No newline at end of file
+RO-AG,1
diff --git a/Emby.Server.Implementations/Localization/Ratings/uk.txt b/Emby.Server.Implementations/Localization/Ratings/uk.txt
index 20440921f6..6c8005b3f3 100644
--- a/Emby.Server.Implementations/Localization/Ratings/uk.txt
+++ b/Emby.Server.Implementations/Localization/Ratings/uk.txt
@@ -4,4 +4,4 @@ UK-12,7
 UK-12A,7
 UK-15,9
 UK-18,10
-UK-R18,15
\ No newline at end of file
+UK-R18,15
diff --git a/Emby.Server.Implementations/Localization/Ratings/us.txt b/Emby.Server.Implementations/Localization/Ratings/us.txt
index eebd828c71..34c897fe3f 100644
--- a/Emby.Server.Implementations/Localization/Ratings/us.txt
+++ b/Emby.Server.Implementations/Localization/Ratings/us.txt
@@ -20,4 +20,4 @@ RP,15
 UR,15
 NR,15
 X,15
-XXX,100
\ No newline at end of file
+XXX,100
diff --git a/Emby.Server.Implementations/Localization/countries.json b/Emby.Server.Implementations/Localization/countries.json
index 2639aa2749..581e9f8357 100644
--- a/Emby.Server.Implementations/Localization/countries.json
+++ b/Emby.Server.Implementations/Localization/countries.json
@@ -1,830 +1,830 @@
 [
-  {
-    "DisplayName": "Afghanistan",
-    "Name": "AF",
-    "ThreeLetterISORegionName": "AFG",
-    "TwoLetterISORegionName": "AF"
-  },
-  {
-    "DisplayName": "Albania",
-    "Name": "AL",
-    "ThreeLetterISORegionName": "ALB",
-    "TwoLetterISORegionName": "AL"
-  },
-  {
-    "DisplayName": "Algeria",
-    "Name": "DZ",
-    "ThreeLetterISORegionName": "DZA",
-    "TwoLetterISORegionName": "DZ"
-  },
-  {
-    "DisplayName": "Argentina",
-    "Name": "AR",
-    "ThreeLetterISORegionName": "ARG",
-    "TwoLetterISORegionName": "AR"
-  },
-  {
-    "DisplayName": "Armenia",
-    "Name": "AM",
-    "ThreeLetterISORegionName": "ARM",
-    "TwoLetterISORegionName": "AM"
-  },
-  {
-    "DisplayName": "Australia",
-    "Name": "AU",
-    "ThreeLetterISORegionName": "AUS",
-    "TwoLetterISORegionName": "AU"
-  },
-  {
-    "DisplayName": "Austria",
-    "Name": "AT",
-    "ThreeLetterISORegionName": "AUT",
-    "TwoLetterISORegionName": "AT"
-  },
-  {
-    "DisplayName": "Azerbaijan",
-    "Name": "AZ",
-    "ThreeLetterISORegionName": "AZE",
-    "TwoLetterISORegionName": "AZ"
-  },
-  {
-    "DisplayName": "Bahrain",
-    "Name": "BH",
-    "ThreeLetterISORegionName": "BHR",
-    "TwoLetterISORegionName": "BH"
-  },
-  {
-    "DisplayName": "Bangladesh",
-    "Name": "BD",
-    "ThreeLetterISORegionName": "BGD",
-    "TwoLetterISORegionName": "BD"
-  },
-  {
-    "DisplayName": "Belarus",
-    "Name": "BY",
-    "ThreeLetterISORegionName": "BLR",
-    "TwoLetterISORegionName": "BY"
-  },
-  {
-    "DisplayName": "Belgium",
-    "Name": "BE",
-    "ThreeLetterISORegionName": "BEL",
-    "TwoLetterISORegionName": "BE"
-  },
-  {
-    "DisplayName": "Belize",
-    "Name": "BZ",
-    "ThreeLetterISORegionName": "BLZ",
-    "TwoLetterISORegionName": "BZ"
-  },
-  {
-    "DisplayName": "Bolivarian Republic of Venezuela",
-    "Name": "VE",
-    "ThreeLetterISORegionName": "VEN",
-    "TwoLetterISORegionName": "VE"
-  },
-  {
-    "DisplayName": "Bolivia",
-    "Name": "BO",
-    "ThreeLetterISORegionName": "BOL",
-    "TwoLetterISORegionName": "BO"
-  },
-  {
-    "DisplayName": "Bosnia and Herzegovina",
-    "Name": "BA",
-    "ThreeLetterISORegionName": "BIH",
-    "TwoLetterISORegionName": "BA"
-  },
-  {
-    "DisplayName": "Botswana",
-    "Name": "BW",
-    "ThreeLetterISORegionName": "BWA",
-    "TwoLetterISORegionName": "BW"
-  },
-  {
-    "DisplayName": "Brazil",
-    "Name": "BR",
-    "ThreeLetterISORegionName": "BRA",
-    "TwoLetterISORegionName": "BR"
-  },
-  {
-    "DisplayName": "Brunei Darussalam",
-    "Name": "BN",
-    "ThreeLetterISORegionName": "BRN",
-    "TwoLetterISORegionName": "BN"
-  },
-  {
-    "DisplayName": "Bulgaria",
-    "Name": "BG",
-    "ThreeLetterISORegionName": "BGR",
-    "TwoLetterISORegionName": "BG"
-  },
-  {
-    "DisplayName": "Cambodia",
-    "Name": "KH",
-    "ThreeLetterISORegionName": "KHM",
-    "TwoLetterISORegionName": "KH"
-  },
-  {
-    "DisplayName": "Cameroon",
-    "Name": "CM",
-    "ThreeLetterISORegionName": "CMR",
-    "TwoLetterISORegionName": "CM"
-  },
-  {
-    "DisplayName": "Canada",
-    "Name": "CA",
-    "ThreeLetterISORegionName": "CAN",
-    "TwoLetterISORegionName": "CA"
-  },
-  {
-    "DisplayName": "Caribbean",
-    "Name": "029",
-    "ThreeLetterISORegionName": "029",
-    "TwoLetterISORegionName": "029"
-  },
-  {
-    "DisplayName": "Chile",
-    "Name": "CL",
-    "ThreeLetterISORegionName": "CHL",
-    "TwoLetterISORegionName": "CL"
-  },
-  {
-    "DisplayName": "Colombia",
-    "Name": "CO",
-    "ThreeLetterISORegionName": "COL",
-    "TwoLetterISORegionName": "CO"
-  },
-  {
-    "DisplayName": "Congo [DRC]",
-    "Name": "CD",
-    "ThreeLetterISORegionName": "COD",
-    "TwoLetterISORegionName": "CD"
-  },
-  {
-    "DisplayName": "Costa Rica",
-    "Name": "CR",
-    "ThreeLetterISORegionName": "CRI",
-    "TwoLetterISORegionName": "CR"
-  },
-  {
-    "DisplayName": "Croatia",
-    "Name": "HR",
-    "ThreeLetterISORegionName": "HRV",
-    "TwoLetterISORegionName": "HR"
-  },
-  {
-    "DisplayName": "Czech Republic",
-    "Name": "CZ",
-    "ThreeLetterISORegionName": "CZE",
-    "TwoLetterISORegionName": "CZ"
-  },
-  {
-    "DisplayName": "Denmark",
-    "Name": "DK",
-    "ThreeLetterISORegionName": "DNK",
-    "TwoLetterISORegionName": "DK"
-  },
-  {
-    "DisplayName": "Dominican Republic",
-    "Name": "DO",
-    "ThreeLetterISORegionName": "DOM",
-    "TwoLetterISORegionName": "DO"
-  },
-  {
-    "DisplayName": "Ecuador",
-    "Name": "EC",
-    "ThreeLetterISORegionName": "ECU",
-    "TwoLetterISORegionName": "EC"
-  },
-  {
-    "DisplayName": "Egypt",
-    "Name": "EG",
-    "ThreeLetterISORegionName": "EGY",
-    "TwoLetterISORegionName": "EG"
-  },
-  {
-    "DisplayName": "El Salvador",
-    "Name": "SV",
-    "ThreeLetterISORegionName": "SLV",
-    "TwoLetterISORegionName": "SV"
-  },
-  {
-    "DisplayName": "Eritrea",
-    "Name": "ER",
-    "ThreeLetterISORegionName": "ERI",
-    "TwoLetterISORegionName": "ER"
-  },
-  {
-    "DisplayName": "Estonia",
-    "Name": "EE",
-    "ThreeLetterISORegionName": "EST",
-    "TwoLetterISORegionName": "EE"
-  },
-  {
-    "DisplayName": "Ethiopia",
-    "Name": "ET",
-    "ThreeLetterISORegionName": "ETH",
-    "TwoLetterISORegionName": "ET"
-  },
-  {
-    "DisplayName": "Faroe Islands",
-    "Name": "FO",
-    "ThreeLetterISORegionName": "FRO",
-    "TwoLetterISORegionName": "FO"
-  },
-  {
-    "DisplayName": "Finland",
-    "Name": "FI",
-    "ThreeLetterISORegionName": "FIN",
-    "TwoLetterISORegionName": "FI"
-  },
-  {
-    "DisplayName": "France",
-    "Name": "FR",
-    "ThreeLetterISORegionName": "FRA",
-    "TwoLetterISORegionName": "FR"
-  },
-  {
-    "DisplayName": "Georgia",
-    "Name": "GE",
-    "ThreeLetterISORegionName": "GEO",
-    "TwoLetterISORegionName": "GE"
-  },
-  {
-    "DisplayName": "Germany",
-    "Name": "DE",
-    "ThreeLetterISORegionName": "DEU",
-    "TwoLetterISORegionName": "DE"
-  },
-  {
-    "DisplayName": "Greece",
-    "Name": "GR",
-    "ThreeLetterISORegionName": "GRC",
-    "TwoLetterISORegionName": "GR"
-  },
-  {
-    "DisplayName": "Greenland",
-    "Name": "GL",
-    "ThreeLetterISORegionName": "GRL",
-    "TwoLetterISORegionName": "GL"
-  },
-  {
-    "DisplayName": "Guatemala",
-    "Name": "GT",
-    "ThreeLetterISORegionName": "GTM",
-    "TwoLetterISORegionName": "GT"
-  },
-  {
-    "DisplayName": "Haiti",
-    "Name": "HT",
-    "ThreeLetterISORegionName": "HTI",
-    "TwoLetterISORegionName": "HT"
-  },
-  {
-    "DisplayName": "Honduras",
-    "Name": "HN",
-    "ThreeLetterISORegionName": "HND",
-    "TwoLetterISORegionName": "HN"
-  },
-  {
-    "DisplayName": "Hong Kong S.A.R.",
-    "Name": "HK",
-    "ThreeLetterISORegionName": "HKG",
-    "TwoLetterISORegionName": "HK"
-  },
-  {
-    "DisplayName": "Hungary",
-    "Name": "HU",
-    "ThreeLetterISORegionName": "HUN",
-    "TwoLetterISORegionName": "HU"
-  },
-  {
-    "DisplayName": "Iceland",
-    "Name": "IS",
-    "ThreeLetterISORegionName": "ISL",
-    "TwoLetterISORegionName": "IS"
-  },
-  {
-    "DisplayName": "India",
-    "Name": "IN",
-    "ThreeLetterISORegionName": "IND",
-    "TwoLetterISORegionName": "IN"
-  },
-  {
-    "DisplayName": "Indonesia",
-    "Name": "ID",
-    "ThreeLetterISORegionName": "IDN",
-    "TwoLetterISORegionName": "ID"
-  },
-  {
-    "DisplayName": "Iran",
-    "Name": "IR",
-    "ThreeLetterISORegionName": "IRN",
-    "TwoLetterISORegionName": "IR"
-  },
-  {
-    "DisplayName": "Iraq",
-    "Name": "IQ",
-    "ThreeLetterISORegionName": "IRQ",
-    "TwoLetterISORegionName": "IQ"
-  },
-  {
-    "DisplayName": "Ireland",
-    "Name": "IE",
-    "ThreeLetterISORegionName": "IRL",
-    "TwoLetterISORegionName": "IE"
-  },
-  {
-    "DisplayName": "Islamic Republic of Pakistan",
-    "Name": "PK",
-    "ThreeLetterISORegionName": "PAK",
-    "TwoLetterISORegionName": "PK"
-  },
-  {
-    "DisplayName": "Israel",
-    "Name": "IL",
-    "ThreeLetterISORegionName": "ISR",
-    "TwoLetterISORegionName": "IL"
-  },
-  {
-    "DisplayName": "Italy",
-    "Name": "IT",
-    "ThreeLetterISORegionName": "ITA",
-    "TwoLetterISORegionName": "IT"
-  },
-  {
-    "DisplayName": "Ivory Coast",
-    "Name": "CI",
-    "ThreeLetterISORegionName": "CIV",
-    "TwoLetterISORegionName": "CI"
-  },
-  {
-    "DisplayName": "Jamaica",
-    "Name": "JM",
-    "ThreeLetterISORegionName": "JAM",
-    "TwoLetterISORegionName": "JM"
-  },
-  {
-    "DisplayName": "Japan",
-    "Name": "JP",
-    "ThreeLetterISORegionName": "JPN",
-    "TwoLetterISORegionName": "JP"
-  },
-  {
-    "DisplayName": "Jordan",
-    "Name": "JO",
-    "ThreeLetterISORegionName": "JOR",
-    "TwoLetterISORegionName": "JO"
-  },
-  {
-    "DisplayName": "Kazakhstan",
-    "Name": "KZ",
-    "ThreeLetterISORegionName": "KAZ",
-    "TwoLetterISORegionName": "KZ"
-  },
-  {
-    "DisplayName": "Kenya",
-    "Name": "KE",
-    "ThreeLetterISORegionName": "KEN",
-    "TwoLetterISORegionName": "KE"
-  },
-  {
-    "DisplayName": "Korea",
-    "Name": "KR",
-    "ThreeLetterISORegionName": "KOR",
-    "TwoLetterISORegionName": "KR"
-  },
-  {
-    "DisplayName": "Kuwait",
-    "Name": "KW",
-    "ThreeLetterISORegionName": "KWT",
-    "TwoLetterISORegionName": "KW"
-  },
-  {
-    "DisplayName": "Kyrgyzstan",
-    "Name": "KG",
-    "ThreeLetterISORegionName": "KGZ",
-    "TwoLetterISORegionName": "KG"
-  },
-  {
-    "DisplayName": "Lao P.D.R.",
-    "Name": "LA",
-    "ThreeLetterISORegionName": "LAO",
-    "TwoLetterISORegionName": "LA"
-  },
-  {
-    "DisplayName": "Latin America",
-    "Name": "419",
-    "ThreeLetterISORegionName": "419",
-    "TwoLetterISORegionName": "419"
-  },
-  {
-    "DisplayName": "Latvia",
-    "Name": "LV",
-    "ThreeLetterISORegionName": "LVA",
-    "TwoLetterISORegionName": "LV"
-  },
-  {
-    "DisplayName": "Lebanon",
-    "Name": "LB",
-    "ThreeLetterISORegionName": "LBN",
-    "TwoLetterISORegionName": "LB"
-  },
-  {
-    "DisplayName": "Libya",
-    "Name": "LY",
-    "ThreeLetterISORegionName": "LBY",
-    "TwoLetterISORegionName": "LY"
-  },
-  {
-    "DisplayName": "Liechtenstein",
-    "Name": "LI",
-    "ThreeLetterISORegionName": "LIE",
-    "TwoLetterISORegionName": "LI"
-  },
-  {
-    "DisplayName": "Lithuania",
-    "Name": "LT",
-    "ThreeLetterISORegionName": "LTU",
-    "TwoLetterISORegionName": "LT"
-  },
-  {
-    "DisplayName": "Luxembourg",
-    "Name": "LU",
-    "ThreeLetterISORegionName": "LUX",
-    "TwoLetterISORegionName": "LU"
-  },
-  {
-    "DisplayName": "Macao S.A.R.",
-    "Name": "MO",
-    "ThreeLetterISORegionName": "MAC",
-    "TwoLetterISORegionName": "MO"
-  },
-  {
-    "DisplayName": "Macedonia (FYROM)",
-    "Name": "MK",
-    "ThreeLetterISORegionName": "MKD",
-    "TwoLetterISORegionName": "MK"
-  },
-  {
-    "DisplayName": "Malaysia",
-    "Name": "MY",
-    "ThreeLetterISORegionName": "MYS",
-    "TwoLetterISORegionName": "MY"
-  },
-  {
-    "DisplayName": "Maldives",
-    "Name": "MV",
-    "ThreeLetterISORegionName": "MDV",
-    "TwoLetterISORegionName": "MV"
-  },
-  {
-    "DisplayName": "Mali",
-    "Name": "ML",
-    "ThreeLetterISORegionName": "MLI",
-    "TwoLetterISORegionName": "ML"
-  },
-  {
-    "DisplayName": "Malta",
-    "Name": "MT",
-    "ThreeLetterISORegionName": "MLT",
-    "TwoLetterISORegionName": "MT"
-  },
-  {
-    "DisplayName": "Mexico",
-    "Name": "MX",
-    "ThreeLetterISORegionName": "MEX",
-    "TwoLetterISORegionName": "MX"
-  },
-  {
-    "DisplayName": "Mongolia",
-    "Name": "MN",
-    "ThreeLetterISORegionName": "MNG",
-    "TwoLetterISORegionName": "MN"
-  },
-  {
-    "DisplayName": "Montenegro",
-    "Name": "ME",
-    "ThreeLetterISORegionName": "MNE",
-    "TwoLetterISORegionName": "ME"
-  },
-  {
-    "DisplayName": "Morocco",
-    "Name": "MA",
-    "ThreeLetterISORegionName": "MAR",
-    "TwoLetterISORegionName": "MA"
-  },
-  {
-    "DisplayName": "Nepal",
-    "Name": "NP",
-    "ThreeLetterISORegionName": "NPL",
-    "TwoLetterISORegionName": "NP"
-  },
-  {
-    "DisplayName": "Netherlands",
-    "Name": "NL",
-    "ThreeLetterISORegionName": "NLD",
-    "TwoLetterISORegionName": "NL"
-  },
-  {
-    "DisplayName": "New Zealand",
-    "Name": "NZ",
-    "ThreeLetterISORegionName": "NZL",
-    "TwoLetterISORegionName": "NZ"
-  },
-  {
-    "DisplayName": "Nicaragua",
-    "Name": "NI",
-    "ThreeLetterISORegionName": "NIC",
-    "TwoLetterISORegionName": "NI"
-  },
-  {
-    "DisplayName": "Nigeria",
-    "Name": "NG",
-    "ThreeLetterISORegionName": "NGA",
-    "TwoLetterISORegionName": "NG"
-  },
-  {
-    "DisplayName": "Norway",
-    "Name": "NO",
-    "ThreeLetterISORegionName": "NOR",
-    "TwoLetterISORegionName": "NO"
-  },
-  {
-    "DisplayName": "Oman",
-    "Name": "OM",
-    "ThreeLetterISORegionName": "OMN",
-    "TwoLetterISORegionName": "OM"
-  },
-  {
-    "DisplayName": "Panama",
-    "Name": "PA",
-    "ThreeLetterISORegionName": "PAN",
-    "TwoLetterISORegionName": "PA"
-  },
-  {
-    "DisplayName": "Paraguay",
-    "Name": "PY",
-    "ThreeLetterISORegionName": "PRY",
-    "TwoLetterISORegionName": "PY"
-  },
-  {
-    "DisplayName": "People's Republic of China",
-    "Name": "CN",
-    "ThreeLetterISORegionName": "CHN",
-    "TwoLetterISORegionName": "CN"
-  },
-  {
-    "DisplayName": "Peru",
-    "Name": "PE",
-    "ThreeLetterISORegionName": "PER",
-    "TwoLetterISORegionName": "PE"
-  },
-  {
-    "DisplayName": "Philippines",
-    "Name": "PH",
-    "ThreeLetterISORegionName": "PHL",
-    "TwoLetterISORegionName": "PH"
-  },
-  {
-    "DisplayName": "Poland",
-    "Name": "PL",
-    "ThreeLetterISORegionName": "POL",
-    "TwoLetterISORegionName": "PL"
-  },
-  {
-    "DisplayName": "Portugal",
-    "Name": "PT",
-    "ThreeLetterISORegionName": "PRT",
-    "TwoLetterISORegionName": "PT"
-  },
-  {
-    "DisplayName": "Principality of Monaco",
-    "Name": "MC",
-    "ThreeLetterISORegionName": "MCO",
-    "TwoLetterISORegionName": "MC"
-  },
-  {
-    "DisplayName": "Puerto Rico",
-    "Name": "PR",
-    "ThreeLetterISORegionName": "PRI",
-    "TwoLetterISORegionName": "PR"
-  },
-  {
-    "DisplayName": "Qatar",
-    "Name": "QA",
-    "ThreeLetterISORegionName": "QAT",
-    "TwoLetterISORegionName": "QA"
-  },
-  {
-    "DisplayName": "Republica Moldova",
-    "Name": "MD",
-    "ThreeLetterISORegionName": "MDA",
-    "TwoLetterISORegionName": "MD"
-  },
-  {
-    "DisplayName": "Réunion",
-    "Name": "RE",
-    "ThreeLetterISORegionName": "REU",
-    "TwoLetterISORegionName": "RE"
-  },
-  {
-    "DisplayName": "Romania",
-    "Name": "RO",
-    "ThreeLetterISORegionName": "ROU",
-    "TwoLetterISORegionName": "RO"
-  },
-  {
-    "DisplayName": "Russia",
-    "Name": "RU",
-    "ThreeLetterISORegionName": "RUS",
-    "TwoLetterISORegionName": "RU"
-  },
-  {
-    "DisplayName": "Rwanda",
-    "Name": "RW",
-    "ThreeLetterISORegionName": "RWA",
-    "TwoLetterISORegionName": "RW"
-  },
-  {
-    "DisplayName": "Saudi Arabia",
-    "Name": "SA",
-    "ThreeLetterISORegionName": "SAU",
-    "TwoLetterISORegionName": "SA"
-  },
-  {
-    "DisplayName": "Senegal",
-    "Name": "SN",
-    "ThreeLetterISORegionName": "SEN",
-    "TwoLetterISORegionName": "SN"
-  },
-  {
-    "DisplayName": "Serbia",
-    "Name": "RS",
-    "ThreeLetterISORegionName": "SRB",
-    "TwoLetterISORegionName": "RS"
-  },
-  {
-    "DisplayName": "Serbia and Montenegro (Former)",
-    "Name": "CS",
-    "ThreeLetterISORegionName": "SCG",
-    "TwoLetterISORegionName": "CS"
-  },
-  {
-    "DisplayName": "Singapore",
-    "Name": "SG",
-    "ThreeLetterISORegionName": "SGP",
-    "TwoLetterISORegionName": "SG"
-  },
-  {
-    "DisplayName": "Slovakia",
-    "Name": "SK",
-    "ThreeLetterISORegionName": "SVK",
-    "TwoLetterISORegionName": "SK"
-  },
-  {
-    "DisplayName": "Slovenia",
-    "Name": "SI",
-    "ThreeLetterISORegionName": "SVN",
-    "TwoLetterISORegionName": "SI"
-  },
-  {
-    "DisplayName": "Soomaaliya",
-    "Name": "SO",
-    "ThreeLetterISORegionName": "SOM",
-    "TwoLetterISORegionName": "SO"
-  },
-  {
-    "DisplayName": "South Africa",
-    "Name": "ZA",
-    "ThreeLetterISORegionName": "ZAF",
-    "TwoLetterISORegionName": "ZA"
-  },
-  {
-    "DisplayName": "Spain",
-    "Name": "ES",
-    "ThreeLetterISORegionName": "ESP",
-    "TwoLetterISORegionName": "ES"
-  },
-  {
-    "DisplayName": "Sri Lanka",
-    "Name": "LK",
-    "ThreeLetterISORegionName": "LKA",
-    "TwoLetterISORegionName": "LK"
-  },
-  {
-    "DisplayName": "Sweden",
-    "Name": "SE",
-    "ThreeLetterISORegionName": "SWE",
-    "TwoLetterISORegionName": "SE"
-  },
-  {
-    "DisplayName": "Switzerland",
-    "Name": "CH",
-    "ThreeLetterISORegionName": "CHE",
-    "TwoLetterISORegionName": "CH"
-  },
-  {
-    "DisplayName": "Syria",
-    "Name": "SY",
-    "ThreeLetterISORegionName": "SYR",
-    "TwoLetterISORegionName": "SY"
-  },
-  {
-    "DisplayName": "Taiwan",
-    "Name": "TW",
-    "ThreeLetterISORegionName": "TWN",
-    "TwoLetterISORegionName": "TW"
-  },
-  {
-    "DisplayName": "Tajikistan",
-    "Name": "TJ",
-    "ThreeLetterISORegionName": "TAJ",
-    "TwoLetterISORegionName": "TJ"
-  },
-  {
-    "DisplayName": "Thailand",
-    "Name": "TH",
-    "ThreeLetterISORegionName": "THA",
-    "TwoLetterISORegionName": "TH"
-  },
-  {
-    "DisplayName": "Trinidad and Tobago",
-    "Name": "TT",
-    "ThreeLetterISORegionName": "TTO",
-    "TwoLetterISORegionName": "TT"
-  },
-  {
-    "DisplayName": "Tunisia",
-    "Name": "TN",
-    "ThreeLetterISORegionName": "TUN",
-    "TwoLetterISORegionName": "TN"
-  },
-  {
-    "DisplayName": "Turkey",
-    "Name": "TR",
-    "ThreeLetterISORegionName": "TUR",
-    "TwoLetterISORegionName": "TR"
-  },
-  {
-    "DisplayName": "Turkmenistan",
-    "Name": "TM",
-    "ThreeLetterISORegionName": "TKM",
-    "TwoLetterISORegionName": "TM"
-  },
-  {
-    "DisplayName": "U.A.E.",
-    "Name": "AE",
-    "ThreeLetterISORegionName": "ARE",
-    "TwoLetterISORegionName": "AE"
-  },
-  {
-    "DisplayName": "Ukraine",
-    "Name": "UA",
-    "ThreeLetterISORegionName": "UKR",
-    "TwoLetterISORegionName": "UA"
-  },
-  {
-    "DisplayName": "United Kingdom",
-    "Name": "GB",
-    "ThreeLetterISORegionName": "GBR",
-    "TwoLetterISORegionName": "GB"
-  },
-  {
-    "DisplayName": "United States",
-    "Name": "US",
-    "ThreeLetterISORegionName": "USA",
-    "TwoLetterISORegionName": "US"
-  },
-  {
-    "DisplayName": "Uruguay",
-    "Name": "UY",
-    "ThreeLetterISORegionName": "URY",
-    "TwoLetterISORegionName": "UY"
-  },
-  {
-    "DisplayName": "Uzbekistan",
-    "Name": "UZ",
-    "ThreeLetterISORegionName": "UZB",
-    "TwoLetterISORegionName": "UZ"
-  },
-  {
-    "DisplayName": "Vietnam",
-    "Name": "VN",
-    "ThreeLetterISORegionName": "VNM",
-    "TwoLetterISORegionName": "VN"
-  },
-  {
-    "DisplayName": "Yemen",
-    "Name": "YE",
-    "ThreeLetterISORegionName": "YEM",
-    "TwoLetterISORegionName": "YE"
-  },
-  {
-    "DisplayName": "Zimbabwe",
-    "Name": "ZW",
-    "ThreeLetterISORegionName": "ZWE",
-    "TwoLetterISORegionName": "ZW"
-  }
+    {
+        "DisplayName": "Afghanistan",
+        "Name": "AF",
+        "ThreeLetterISORegionName": "AFG",
+        "TwoLetterISORegionName": "AF"
+    },
+    {
+        "DisplayName": "Albania",
+        "Name": "AL",
+        "ThreeLetterISORegionName": "ALB",
+        "TwoLetterISORegionName": "AL"
+    },
+    {
+        "DisplayName": "Algeria",
+        "Name": "DZ",
+        "ThreeLetterISORegionName": "DZA",
+        "TwoLetterISORegionName": "DZ"
+    },
+    {
+        "DisplayName": "Argentina",
+        "Name": "AR",
+        "ThreeLetterISORegionName": "ARG",
+        "TwoLetterISORegionName": "AR"
+    },
+    {
+        "DisplayName": "Armenia",
+        "Name": "AM",
+        "ThreeLetterISORegionName": "ARM",
+        "TwoLetterISORegionName": "AM"
+    },
+    {
+        "DisplayName": "Australia",
+        "Name": "AU",
+        "ThreeLetterISORegionName": "AUS",
+        "TwoLetterISORegionName": "AU"
+    },
+    {
+        "DisplayName": "Austria",
+        "Name": "AT",
+        "ThreeLetterISORegionName": "AUT",
+        "TwoLetterISORegionName": "AT"
+    },
+    {
+        "DisplayName": "Azerbaijan",
+        "Name": "AZ",
+        "ThreeLetterISORegionName": "AZE",
+        "TwoLetterISORegionName": "AZ"
+    },
+    {
+        "DisplayName": "Bahrain",
+        "Name": "BH",
+        "ThreeLetterISORegionName": "BHR",
+        "TwoLetterISORegionName": "BH"
+    },
+    {
+        "DisplayName": "Bangladesh",
+        "Name": "BD",
+        "ThreeLetterISORegionName": "BGD",
+        "TwoLetterISORegionName": "BD"
+    },
+    {
+        "DisplayName": "Belarus",
+        "Name": "BY",
+        "ThreeLetterISORegionName": "BLR",
+        "TwoLetterISORegionName": "BY"
+    },
+    {
+        "DisplayName": "Belgium",
+        "Name": "BE",
+        "ThreeLetterISORegionName": "BEL",
+        "TwoLetterISORegionName": "BE"
+    },
+    {
+        "DisplayName": "Belize",
+        "Name": "BZ",
+        "ThreeLetterISORegionName": "BLZ",
+        "TwoLetterISORegionName": "BZ"
+    },
+    {
+        "DisplayName": "Bolivarian Republic of Venezuela",
+        "Name": "VE",
+        "ThreeLetterISORegionName": "VEN",
+        "TwoLetterISORegionName": "VE"
+    },
+    {
+        "DisplayName": "Bolivia",
+        "Name": "BO",
+        "ThreeLetterISORegionName": "BOL",
+        "TwoLetterISORegionName": "BO"
+    },
+    {
+        "DisplayName": "Bosnia and Herzegovina",
+        "Name": "BA",
+        "ThreeLetterISORegionName": "BIH",
+        "TwoLetterISORegionName": "BA"
+    },
+    {
+        "DisplayName": "Botswana",
+        "Name": "BW",
+        "ThreeLetterISORegionName": "BWA",
+        "TwoLetterISORegionName": "BW"
+    },
+    {
+        "DisplayName": "Brazil",
+        "Name": "BR",
+        "ThreeLetterISORegionName": "BRA",
+        "TwoLetterISORegionName": "BR"
+    },
+    {
+        "DisplayName": "Brunei Darussalam",
+        "Name": "BN",
+        "ThreeLetterISORegionName": "BRN",
+        "TwoLetterISORegionName": "BN"
+    },
+    {
+        "DisplayName": "Bulgaria",
+        "Name": "BG",
+        "ThreeLetterISORegionName": "BGR",
+        "TwoLetterISORegionName": "BG"
+    },
+    {
+        "DisplayName": "Cambodia",
+        "Name": "KH",
+        "ThreeLetterISORegionName": "KHM",
+        "TwoLetterISORegionName": "KH"
+    },
+    {
+        "DisplayName": "Cameroon",
+        "Name": "CM",
+        "ThreeLetterISORegionName": "CMR",
+        "TwoLetterISORegionName": "CM"
+    },
+    {
+        "DisplayName": "Canada",
+        "Name": "CA",
+        "ThreeLetterISORegionName": "CAN",
+        "TwoLetterISORegionName": "CA"
+    },
+    {
+        "DisplayName": "Caribbean",
+        "Name": "029",
+        "ThreeLetterISORegionName": "029",
+        "TwoLetterISORegionName": "029"
+    },
+    {
+        "DisplayName": "Chile",
+        "Name": "CL",
+        "ThreeLetterISORegionName": "CHL",
+        "TwoLetterISORegionName": "CL"
+    },
+    {
+        "DisplayName": "Colombia",
+        "Name": "CO",
+        "ThreeLetterISORegionName": "COL",
+        "TwoLetterISORegionName": "CO"
+    },
+    {
+        "DisplayName": "Congo [DRC]",
+        "Name": "CD",
+        "ThreeLetterISORegionName": "COD",
+        "TwoLetterISORegionName": "CD"
+    },
+    {
+        "DisplayName": "Costa Rica",
+        "Name": "CR",
+        "ThreeLetterISORegionName": "CRI",
+        "TwoLetterISORegionName": "CR"
+    },
+    {
+        "DisplayName": "Croatia",
+        "Name": "HR",
+        "ThreeLetterISORegionName": "HRV",
+        "TwoLetterISORegionName": "HR"
+    },
+    {
+        "DisplayName": "Czech Republic",
+        "Name": "CZ",
+        "ThreeLetterISORegionName": "CZE",
+        "TwoLetterISORegionName": "CZ"
+    },
+    {
+        "DisplayName": "Denmark",
+        "Name": "DK",
+        "ThreeLetterISORegionName": "DNK",
+        "TwoLetterISORegionName": "DK"
+    },
+    {
+        "DisplayName": "Dominican Republic",
+        "Name": "DO",
+        "ThreeLetterISORegionName": "DOM",
+        "TwoLetterISORegionName": "DO"
+    },
+    {
+        "DisplayName": "Ecuador",
+        "Name": "EC",
+        "ThreeLetterISORegionName": "ECU",
+        "TwoLetterISORegionName": "EC"
+    },
+    {
+        "DisplayName": "Egypt",
+        "Name": "EG",
+        "ThreeLetterISORegionName": "EGY",
+        "TwoLetterISORegionName": "EG"
+    },
+    {
+        "DisplayName": "El Salvador",
+        "Name": "SV",
+        "ThreeLetterISORegionName": "SLV",
+        "TwoLetterISORegionName": "SV"
+    },
+    {
+        "DisplayName": "Eritrea",
+        "Name": "ER",
+        "ThreeLetterISORegionName": "ERI",
+        "TwoLetterISORegionName": "ER"
+    },
+    {
+        "DisplayName": "Estonia",
+        "Name": "EE",
+        "ThreeLetterISORegionName": "EST",
+        "TwoLetterISORegionName": "EE"
+    },
+    {
+        "DisplayName": "Ethiopia",
+        "Name": "ET",
+        "ThreeLetterISORegionName": "ETH",
+        "TwoLetterISORegionName": "ET"
+    },
+    {
+        "DisplayName": "Faroe Islands",
+        "Name": "FO",
+        "ThreeLetterISORegionName": "FRO",
+        "TwoLetterISORegionName": "FO"
+    },
+    {
+        "DisplayName": "Finland",
+        "Name": "FI",
+        "ThreeLetterISORegionName": "FIN",
+        "TwoLetterISORegionName": "FI"
+    },
+    {
+        "DisplayName": "France",
+        "Name": "FR",
+        "ThreeLetterISORegionName": "FRA",
+        "TwoLetterISORegionName": "FR"
+    },
+    {
+        "DisplayName": "Georgia",
+        "Name": "GE",
+        "ThreeLetterISORegionName": "GEO",
+        "TwoLetterISORegionName": "GE"
+    },
+    {
+        "DisplayName": "Germany",
+        "Name": "DE",
+        "ThreeLetterISORegionName": "DEU",
+        "TwoLetterISORegionName": "DE"
+    },
+    {
+        "DisplayName": "Greece",
+        "Name": "GR",
+        "ThreeLetterISORegionName": "GRC",
+        "TwoLetterISORegionName": "GR"
+    },
+    {
+        "DisplayName": "Greenland",
+        "Name": "GL",
+        "ThreeLetterISORegionName": "GRL",
+        "TwoLetterISORegionName": "GL"
+    },
+    {
+        "DisplayName": "Guatemala",
+        "Name": "GT",
+        "ThreeLetterISORegionName": "GTM",
+        "TwoLetterISORegionName": "GT"
+    },
+    {
+        "DisplayName": "Haiti",
+        "Name": "HT",
+        "ThreeLetterISORegionName": "HTI",
+        "TwoLetterISORegionName": "HT"
+    },
+    {
+        "DisplayName": "Honduras",
+        "Name": "HN",
+        "ThreeLetterISORegionName": "HND",
+        "TwoLetterISORegionName": "HN"
+    },
+    {
+        "DisplayName": "Hong Kong S.A.R.",
+        "Name": "HK",
+        "ThreeLetterISORegionName": "HKG",
+        "TwoLetterISORegionName": "HK"
+    },
+    {
+        "DisplayName": "Hungary",
+        "Name": "HU",
+        "ThreeLetterISORegionName": "HUN",
+        "TwoLetterISORegionName": "HU"
+    },
+    {
+        "DisplayName": "Iceland",
+        "Name": "IS",
+        "ThreeLetterISORegionName": "ISL",
+        "TwoLetterISORegionName": "IS"
+    },
+    {
+        "DisplayName": "India",
+        "Name": "IN",
+        "ThreeLetterISORegionName": "IND",
+        "TwoLetterISORegionName": "IN"
+    },
+    {
+        "DisplayName": "Indonesia",
+        "Name": "ID",
+        "ThreeLetterISORegionName": "IDN",
+        "TwoLetterISORegionName": "ID"
+    },
+    {
+        "DisplayName": "Iran",
+        "Name": "IR",
+        "ThreeLetterISORegionName": "IRN",
+        "TwoLetterISORegionName": "IR"
+    },
+    {
+        "DisplayName": "Iraq",
+        "Name": "IQ",
+        "ThreeLetterISORegionName": "IRQ",
+        "TwoLetterISORegionName": "IQ"
+    },
+    {
+        "DisplayName": "Ireland",
+        "Name": "IE",
+        "ThreeLetterISORegionName": "IRL",
+        "TwoLetterISORegionName": "IE"
+    },
+    {
+        "DisplayName": "Islamic Republic of Pakistan",
+        "Name": "PK",
+        "ThreeLetterISORegionName": "PAK",
+        "TwoLetterISORegionName": "PK"
+    },
+    {
+        "DisplayName": "Israel",
+        "Name": "IL",
+        "ThreeLetterISORegionName": "ISR",
+        "TwoLetterISORegionName": "IL"
+    },
+    {
+        "DisplayName": "Italy",
+        "Name": "IT",
+        "ThreeLetterISORegionName": "ITA",
+        "TwoLetterISORegionName": "IT"
+    },
+    {
+        "DisplayName": "Ivory Coast",
+        "Name": "CI",
+        "ThreeLetterISORegionName": "CIV",
+        "TwoLetterISORegionName": "CI"
+    },
+    {
+        "DisplayName": "Jamaica",
+        "Name": "JM",
+        "ThreeLetterISORegionName": "JAM",
+        "TwoLetterISORegionName": "JM"
+    },
+    {
+        "DisplayName": "Japan",
+        "Name": "JP",
+        "ThreeLetterISORegionName": "JPN",
+        "TwoLetterISORegionName": "JP"
+    },
+    {
+        "DisplayName": "Jordan",
+        "Name": "JO",
+        "ThreeLetterISORegionName": "JOR",
+        "TwoLetterISORegionName": "JO"
+    },
+    {
+        "DisplayName": "Kazakhstan",
+        "Name": "KZ",
+        "ThreeLetterISORegionName": "KAZ",
+        "TwoLetterISORegionName": "KZ"
+    },
+    {
+        "DisplayName": "Kenya",
+        "Name": "KE",
+        "ThreeLetterISORegionName": "KEN",
+        "TwoLetterISORegionName": "KE"
+    },
+    {
+        "DisplayName": "Korea",
+        "Name": "KR",
+        "ThreeLetterISORegionName": "KOR",
+        "TwoLetterISORegionName": "KR"
+    },
+    {
+        "DisplayName": "Kuwait",
+        "Name": "KW",
+        "ThreeLetterISORegionName": "KWT",
+        "TwoLetterISORegionName": "KW"
+    },
+    {
+        "DisplayName": "Kyrgyzstan",
+        "Name": "KG",
+        "ThreeLetterISORegionName": "KGZ",
+        "TwoLetterISORegionName": "KG"
+    },
+    {
+        "DisplayName": "Lao P.D.R.",
+        "Name": "LA",
+        "ThreeLetterISORegionName": "LAO",
+        "TwoLetterISORegionName": "LA"
+    },
+    {
+        "DisplayName": "Latin America",
+        "Name": "419",
+        "ThreeLetterISORegionName": "419",
+        "TwoLetterISORegionName": "419"
+    },
+    {
+        "DisplayName": "Latvia",
+        "Name": "LV",
+        "ThreeLetterISORegionName": "LVA",
+        "TwoLetterISORegionName": "LV"
+    },
+    {
+        "DisplayName": "Lebanon",
+        "Name": "LB",
+        "ThreeLetterISORegionName": "LBN",
+        "TwoLetterISORegionName": "LB"
+    },
+    {
+        "DisplayName": "Libya",
+        "Name": "LY",
+        "ThreeLetterISORegionName": "LBY",
+        "TwoLetterISORegionName": "LY"
+    },
+    {
+        "DisplayName": "Liechtenstein",
+        "Name": "LI",
+        "ThreeLetterISORegionName": "LIE",
+        "TwoLetterISORegionName": "LI"
+    },
+    {
+        "DisplayName": "Lithuania",
+        "Name": "LT",
+        "ThreeLetterISORegionName": "LTU",
+        "TwoLetterISORegionName": "LT"
+    },
+    {
+        "DisplayName": "Luxembourg",
+        "Name": "LU",
+        "ThreeLetterISORegionName": "LUX",
+        "TwoLetterISORegionName": "LU"
+    },
+    {
+        "DisplayName": "Macao S.A.R.",
+        "Name": "MO",
+        "ThreeLetterISORegionName": "MAC",
+        "TwoLetterISORegionName": "MO"
+    },
+    {
+        "DisplayName": "Macedonia (FYROM)",
+        "Name": "MK",
+        "ThreeLetterISORegionName": "MKD",
+        "TwoLetterISORegionName": "MK"
+    },
+    {
+        "DisplayName": "Malaysia",
+        "Name": "MY",
+        "ThreeLetterISORegionName": "MYS",
+        "TwoLetterISORegionName": "MY"
+    },
+    {
+        "DisplayName": "Maldives",
+        "Name": "MV",
+        "ThreeLetterISORegionName": "MDV",
+        "TwoLetterISORegionName": "MV"
+    },
+    {
+        "DisplayName": "Mali",
+        "Name": "ML",
+        "ThreeLetterISORegionName": "MLI",
+        "TwoLetterISORegionName": "ML"
+    },
+    {
+        "DisplayName": "Malta",
+        "Name": "MT",
+        "ThreeLetterISORegionName": "MLT",
+        "TwoLetterISORegionName": "MT"
+    },
+    {
+        "DisplayName": "Mexico",
+        "Name": "MX",
+        "ThreeLetterISORegionName": "MEX",
+        "TwoLetterISORegionName": "MX"
+    },
+    {
+        "DisplayName": "Mongolia",
+        "Name": "MN",
+        "ThreeLetterISORegionName": "MNG",
+        "TwoLetterISORegionName": "MN"
+    },
+    {
+        "DisplayName": "Montenegro",
+        "Name": "ME",
+        "ThreeLetterISORegionName": "MNE",
+        "TwoLetterISORegionName": "ME"
+    },
+    {
+        "DisplayName": "Morocco",
+        "Name": "MA",
+        "ThreeLetterISORegionName": "MAR",
+        "TwoLetterISORegionName": "MA"
+    },
+    {
+        "DisplayName": "Nepal",
+        "Name": "NP",
+        "ThreeLetterISORegionName": "NPL",
+        "TwoLetterISORegionName": "NP"
+    },
+    {
+        "DisplayName": "Netherlands",
+        "Name": "NL",
+        "ThreeLetterISORegionName": "NLD",
+        "TwoLetterISORegionName": "NL"
+    },
+    {
+        "DisplayName": "New Zealand",
+        "Name": "NZ",
+        "ThreeLetterISORegionName": "NZL",
+        "TwoLetterISORegionName": "NZ"
+    },
+    {
+        "DisplayName": "Nicaragua",
+        "Name": "NI",
+        "ThreeLetterISORegionName": "NIC",
+        "TwoLetterISORegionName": "NI"
+    },
+    {
+        "DisplayName": "Nigeria",
+        "Name": "NG",
+        "ThreeLetterISORegionName": "NGA",
+        "TwoLetterISORegionName": "NG"
+    },
+    {
+        "DisplayName": "Norway",
+        "Name": "NO",
+        "ThreeLetterISORegionName": "NOR",
+        "TwoLetterISORegionName": "NO"
+    },
+    {
+        "DisplayName": "Oman",
+        "Name": "OM",
+        "ThreeLetterISORegionName": "OMN",
+        "TwoLetterISORegionName": "OM"
+    },
+    {
+        "DisplayName": "Panama",
+        "Name": "PA",
+        "ThreeLetterISORegionName": "PAN",
+        "TwoLetterISORegionName": "PA"
+    },
+    {
+        "DisplayName": "Paraguay",
+        "Name": "PY",
+        "ThreeLetterISORegionName": "PRY",
+        "TwoLetterISORegionName": "PY"
+    },
+    {
+        "DisplayName": "People's Republic of China",
+        "Name": "CN",
+        "ThreeLetterISORegionName": "CHN",
+        "TwoLetterISORegionName": "CN"
+    },
+    {
+        "DisplayName": "Peru",
+        "Name": "PE",
+        "ThreeLetterISORegionName": "PER",
+        "TwoLetterISORegionName": "PE"
+    },
+    {
+        "DisplayName": "Philippines",
+        "Name": "PH",
+        "ThreeLetterISORegionName": "PHL",
+        "TwoLetterISORegionName": "PH"
+    },
+    {
+        "DisplayName": "Poland",
+        "Name": "PL",
+        "ThreeLetterISORegionName": "POL",
+        "TwoLetterISORegionName": "PL"
+    },
+    {
+        "DisplayName": "Portugal",
+        "Name": "PT",
+        "ThreeLetterISORegionName": "PRT",
+        "TwoLetterISORegionName": "PT"
+    },
+    {
+        "DisplayName": "Principality of Monaco",
+        "Name": "MC",
+        "ThreeLetterISORegionName": "MCO",
+        "TwoLetterISORegionName": "MC"
+    },
+    {
+        "DisplayName": "Puerto Rico",
+        "Name": "PR",
+        "ThreeLetterISORegionName": "PRI",
+        "TwoLetterISORegionName": "PR"
+    },
+    {
+        "DisplayName": "Qatar",
+        "Name": "QA",
+        "ThreeLetterISORegionName": "QAT",
+        "TwoLetterISORegionName": "QA"
+    },
+    {
+        "DisplayName": "Republica Moldova",
+        "Name": "MD",
+        "ThreeLetterISORegionName": "MDA",
+        "TwoLetterISORegionName": "MD"
+    },
+    {
+        "DisplayName": "Réunion",
+        "Name": "RE",
+        "ThreeLetterISORegionName": "REU",
+        "TwoLetterISORegionName": "RE"
+    },
+    {
+        "DisplayName": "Romania",
+        "Name": "RO",
+        "ThreeLetterISORegionName": "ROU",
+        "TwoLetterISORegionName": "RO"
+    },
+    {
+        "DisplayName": "Russia",
+        "Name": "RU",
+        "ThreeLetterISORegionName": "RUS",
+        "TwoLetterISORegionName": "RU"
+    },
+    {
+        "DisplayName": "Rwanda",
+        "Name": "RW",
+        "ThreeLetterISORegionName": "RWA",
+        "TwoLetterISORegionName": "RW"
+    },
+    {
+        "DisplayName": "Saudi Arabia",
+        "Name": "SA",
+        "ThreeLetterISORegionName": "SAU",
+        "TwoLetterISORegionName": "SA"
+    },
+    {
+        "DisplayName": "Senegal",
+        "Name": "SN",
+        "ThreeLetterISORegionName": "SEN",
+        "TwoLetterISORegionName": "SN"
+    },
+    {
+        "DisplayName": "Serbia",
+        "Name": "RS",
+        "ThreeLetterISORegionName": "SRB",
+        "TwoLetterISORegionName": "RS"
+    },
+    {
+        "DisplayName": "Serbia and Montenegro (Former)",
+        "Name": "CS",
+        "ThreeLetterISORegionName": "SCG",
+        "TwoLetterISORegionName": "CS"
+    },
+    {
+        "DisplayName": "Singapore",
+        "Name": "SG",
+        "ThreeLetterISORegionName": "SGP",
+        "TwoLetterISORegionName": "SG"
+    },
+    {
+        "DisplayName": "Slovakia",
+        "Name": "SK",
+        "ThreeLetterISORegionName": "SVK",
+        "TwoLetterISORegionName": "SK"
+    },
+    {
+        "DisplayName": "Slovenia",
+        "Name": "SI",
+        "ThreeLetterISORegionName": "SVN",
+        "TwoLetterISORegionName": "SI"
+    },
+    {
+        "DisplayName": "Soomaaliya",
+        "Name": "SO",
+        "ThreeLetterISORegionName": "SOM",
+        "TwoLetterISORegionName": "SO"
+    },
+    {
+        "DisplayName": "South Africa",
+        "Name": "ZA",
+        "ThreeLetterISORegionName": "ZAF",
+        "TwoLetterISORegionName": "ZA"
+    },
+    {
+        "DisplayName": "Spain",
+        "Name": "ES",
+        "ThreeLetterISORegionName": "ESP",
+        "TwoLetterISORegionName": "ES"
+    },
+    {
+        "DisplayName": "Sri Lanka",
+        "Name": "LK",
+        "ThreeLetterISORegionName": "LKA",
+        "TwoLetterISORegionName": "LK"
+    },
+    {
+        "DisplayName": "Sweden",
+        "Name": "SE",
+        "ThreeLetterISORegionName": "SWE",
+        "TwoLetterISORegionName": "SE"
+    },
+    {
+        "DisplayName": "Switzerland",
+        "Name": "CH",
+        "ThreeLetterISORegionName": "CHE",
+        "TwoLetterISORegionName": "CH"
+    },
+    {
+        "DisplayName": "Syria",
+        "Name": "SY",
+        "ThreeLetterISORegionName": "SYR",
+        "TwoLetterISORegionName": "SY"
+    },
+    {
+        "DisplayName": "Taiwan",
+        "Name": "TW",
+        "ThreeLetterISORegionName": "TWN",
+        "TwoLetterISORegionName": "TW"
+    },
+    {
+        "DisplayName": "Tajikistan",
+        "Name": "TJ",
+        "ThreeLetterISORegionName": "TAJ",
+        "TwoLetterISORegionName": "TJ"
+    },
+    {
+        "DisplayName": "Thailand",
+        "Name": "TH",
+        "ThreeLetterISORegionName": "THA",
+        "TwoLetterISORegionName": "TH"
+    },
+    {
+        "DisplayName": "Trinidad and Tobago",
+        "Name": "TT",
+        "ThreeLetterISORegionName": "TTO",
+        "TwoLetterISORegionName": "TT"
+    },
+    {
+        "DisplayName": "Tunisia",
+        "Name": "TN",
+        "ThreeLetterISORegionName": "TUN",
+        "TwoLetterISORegionName": "TN"
+    },
+    {
+        "DisplayName": "Turkey",
+        "Name": "TR",
+        "ThreeLetterISORegionName": "TUR",
+        "TwoLetterISORegionName": "TR"
+    },
+    {
+        "DisplayName": "Turkmenistan",
+        "Name": "TM",
+        "ThreeLetterISORegionName": "TKM",
+        "TwoLetterISORegionName": "TM"
+    },
+    {
+        "DisplayName": "U.A.E.",
+        "Name": "AE",
+        "ThreeLetterISORegionName": "ARE",
+        "TwoLetterISORegionName": "AE"
+    },
+    {
+        "DisplayName": "Ukraine",
+        "Name": "UA",
+        "ThreeLetterISORegionName": "UKR",
+        "TwoLetterISORegionName": "UA"
+    },
+    {
+        "DisplayName": "United Kingdom",
+        "Name": "GB",
+        "ThreeLetterISORegionName": "GBR",
+        "TwoLetterISORegionName": "GB"
+    },
+    {
+        "DisplayName": "United States",
+        "Name": "US",
+        "ThreeLetterISORegionName": "USA",
+        "TwoLetterISORegionName": "US"
+    },
+    {
+        "DisplayName": "Uruguay",
+        "Name": "UY",
+        "ThreeLetterISORegionName": "URY",
+        "TwoLetterISORegionName": "UY"
+    },
+    {
+        "DisplayName": "Uzbekistan",
+        "Name": "UZ",
+        "ThreeLetterISORegionName": "UZB",
+        "TwoLetterISORegionName": "UZ"
+    },
+    {
+        "DisplayName": "Vietnam",
+        "Name": "VN",
+        "ThreeLetterISORegionName": "VNM",
+        "TwoLetterISORegionName": "VN"
+    },
+    {
+        "DisplayName": "Yemen",
+        "Name": "YE",
+        "ThreeLetterISORegionName": "YEM",
+        "TwoLetterISORegionName": "YE"
+    },
+    {
+        "DisplayName": "Zimbabwe",
+        "Name": "ZW",
+        "ThreeLetterISORegionName": "ZWE",
+        "TwoLetterISORegionName": "ZW"
+    }
 ]
diff --git a/Emby.Server.Implementations/Localization/iso6392.txt b/Emby.Server.Implementations/Localization/iso6392.txt
index a7e7cfc208..05a17f5942 100644
--- a/Emby.Server.Implementations/Localization/iso6392.txt
+++ b/Emby.Server.Implementations/Localization/iso6392.txt
@@ -485,4 +485,4 @@ znd|||Zande languages|zandé, langues
 zul||zu|Zulu|zoulou
 zun|||Zuni|zuni
 zxx|||No linguistic content; Not applicable|pas de contenu linguistique; non applicable
-zza|||Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki|zaza; dimili; dimli; kirdki; kirmanjki; zazaki
\ No newline at end of file
+zza|||Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki|zaza; dimili; dimli; kirdki; kirmanjki; zazaki
diff --git a/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj b/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj
index 6ce4cff2ce..cf6fe76dec 100644
--- a/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj
+++ b/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj
@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv.csproj">
-      <Project>{0d023565-5942-4d79-9098-a1b4b6665a40}</Project>
-      <Name>Emby.XmlTv</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <ItemGroup>
+        <Reference Include="System" />
+        <Reference Include="System.Core" />
+        <Reference Include="System.Xml.Linq" />
+        <Reference Include="Microsoft.CSharp" />
+        <Reference Include="System.Data" />
+        <Reference Include="System.Net.Http" />
+        <Reference Include="System.Xml" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv.csproj">
+            <Project>{0d023565-5942-4d79-9098-a1b4b6665a40}</Project>
+            <Name>Emby.XmlTv</Name>
+        </ProjectReference>
+    </ItemGroup>
+    <PropertyGroup>
+        <TargetFramework>netcoreapp2.1</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
 </Project>
diff --git a/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj b/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj
index 7ffb30b93d..64fa8f090f 100644
--- a/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj
+++ b/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj
@@ -1,123 +1,124 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C8298223-2468-466C-9B06-FBF61926CECB}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Emby.XmlTv.Test</RootNamespace>
-    <AssemblyName>Emby.XmlTv.Test</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
-  <ItemGroup>
-    <Compile Include="XmlTvReaderDateTimeTests.cs" />
-    <Compile Include="XmlTvReaderLanguageTests.cs" />
-    <Compile Include="XmlTvReaderTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Xml Files\epg.xml" />
-    <Content Include="Xml Files\ES_MultiLanguageData.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Xml Files\honeybee.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Xml Files\MultilanguageData.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Xml Files\UK_Data.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv.csproj">
-      <Project>{0D023565-5942-4D79-9098-A1B4B6665A40}</Project>
-      <Name>Emby.XmlTv</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+<Project ToolsVersion="14.0" DefaultTargets="Build"
+    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+        <ProjectGuid>{C8298223-2468-466C-9B06-FBF61926CECB}</ProjectGuid>
+        <OutputType>Library</OutputType>
+        <AppDesignerFolder>Properties</AppDesignerFolder>
+        <RootNamespace>Emby.XmlTv.Test</RootNamespace>
+        <AssemblyName>Emby.XmlTv.Test</AssemblyName>
+        <FileAlignment>512</FileAlignment>
+        <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+        <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+        <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+        <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+        <IsCodedUITest>False</IsCodedUITest>
+        <TestProjectType>UnitTest</TestProjectType>
+        <TargetFrameworkProfile />
+        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+        <RestorePackages>true</RestorePackages>
     </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+        <DebugSymbols>true</DebugSymbols>
+        <DebugType>full</DebugType>
+        <Optimize>false</Optimize>
+        <OutputPath>bin\Debug\</OutputPath>
+        <DefineConstants>DEBUG;TRACE</DefineConstants>
+        <ErrorReport>prompt</ErrorReport>
+        <WarningLevel>4</WarningLevel>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+        <DebugType>pdbonly</DebugType>
+        <Optimize>true</Optimize>
+        <OutputPath>bin\Release\</OutputPath>
+        <DefineConstants>TRACE</DefineConstants>
+        <ErrorReport>prompt</ErrorReport>
+        <WarningLevel>4</WarningLevel>
+    </PropertyGroup>
+    <ItemGroup>
+        <Reference Include="System" />
+        <Reference Include="System.Xml" />
+    </ItemGroup>
+    <Choose>
+        <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
+            <ItemGroup>
+                <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+            </ItemGroup>
+        </When>
+        <Otherwise>
+            <ItemGroup>
+                <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
+                    <Private>False</Private>
+                </Reference>
+            </ItemGroup>
+        </Otherwise>
+    </Choose>
+    <ItemGroup>
+        <Compile Include="XmlTvReaderDateTimeTests.cs" />
+        <Compile Include="XmlTvReaderLanguageTests.cs" />
+        <Compile Include="XmlTvReaderTests.cs" />
+        <Compile Include="Properties\AssemblyInfo.cs" />
+    </ItemGroup>
+    <ItemGroup>
+        <Content Include="Xml Files\epg.xml" />
+        <Content Include="Xml Files\ES_MultiLanguageData.xml">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Xml Files\honeybee.xml">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Xml Files\MultilanguageData.xml">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <Content Include="Xml Files\UK_Data.xml">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <SubType>Designer</SubType>
+        </Content>
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv.csproj">
+            <Project>{0D023565-5942-4D79-9098-A1B4B6665A40}</Project>
+            <Name>Emby.XmlTv</Name>
+        </ProjectReference>
+    </ItemGroup>
+    <Choose>
+        <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
+            <ItemGroup>
+                <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+                    <Private>False</Private>
+                </Reference>
+                <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+                    <Private>False</Private>
+                </Reference>
+                <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+                    <Private>False</Private>
+                </Reference>
+                <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+                    <Private>False</Private>
+                </Reference>
+            </ItemGroup>
+        </When>
+    </Choose>
+    <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+    <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+    <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+        <PropertyGroup>
+            <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+        </PropertyGroup>
+        <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+    </Target>
+    <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
-	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-	</PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 </Project>
diff --git a/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj b/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj
index 41dd9dd977..a43c92318e 100644
--- a/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj
+++ b/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj
@@ -1,13 +1,12 @@
-
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\..\SharedVersion.cs" Link="SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\..\SharedVersion.cs" Link="SharedVersion.cs" />
+    </ItemGroup>
 
 </Project>
diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj
index 98c578e830..ea7ca84fab 100644
--- a/Jellyfin.Server/Jellyfin.Server.csproj
+++ b/Jellyfin.Server/Jellyfin.Server.csproj
@@ -1,44 +1,44 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <AssemblyName>jellyfin</AssemblyName>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <AssemblyName>jellyfin</AssemblyName>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>netcoreapp2.1</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- We need C# 7.1 for async main-->
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
+    <PropertyGroup>
+        <!-- We need C# 7.1 for async main-->
+        <LangVersion>latest</LangVersion>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Resources/Configuration/*" />
-  </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Include="Resources/Configuration/*" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="3.0.1" />
-    <PackageReference Include="Serilog.Sinks.Async" Version="1.3.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
-    <PackageReference Include="SkiaSharp" Version="1.68.0" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="1.1.12" />
-    <PackageReference Include="SQLitePCLRaw.core" Version="1.1.12" />
-    <PackageReference Include="SQLitePCLRaw.provider.sqlite3.netstandard11" Version="1.1.12" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
+        <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
+        <PackageReference Include="Serilog.Settings.Configuration" Version="3.0.1" />
+        <PackageReference Include="Serilog.Sinks.Async" Version="1.3.0" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
+        <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+        <PackageReference Include="SkiaSharp" Version="1.68.0" />
+        <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="1.1.12" />
+        <PackageReference Include="SQLitePCLRaw.core" Version="1.1.12" />
+        <PackageReference Include="SQLitePCLRaw.provider.sqlite3.netstandard11" Version="1.1.12" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" />
-    <ProjectReference Include="..\Emby.Drawing.Skia\Emby.Drawing.Skia.csproj" />
-    <ProjectReference Include="..\Emby.IsoMounting\IsoMounter\IsoMounter.csproj" />
-    <ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" />
+        <ProjectReference Include="..\Emby.Drawing.Skia\Emby.Drawing.Skia.csproj" />
+        <ProjectReference Include="..\Emby.IsoMounting\IsoMounter\IsoMounter.csproj" />
+        <ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" />
+    </ItemGroup>
 
 </Project>
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index 5ffaaed276..3e19ddfe59 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" />
+    </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
 </Project>
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index af5536b366..51e7568af6 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <Authors>Jellyfin Contributors</Authors>
-    <PackageId>Jellyfin.Common</PackageId>
-    <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl>
-    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
-  </PropertyGroup>
+    <PropertyGroup>
+        <Authors>Jellyfin Contributors</Authors>
+        <PackageId>Jellyfin.Common</PackageId>
+        <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl>
+        <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" />
+    </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
 </Project>
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 5898d8f984..fa76d25556 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -1,24 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <Authors>Jellyfin Contributors</Authors>
-    <PackageId>Jellyfin.Controller</PackageId>
-    <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl>
-    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
-  </PropertyGroup>
+    <PropertyGroup>
+        <Authors>Jellyfin Contributors</Authors>
+        <PackageId>Jellyfin.Controller</PackageId>
+        <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl>
+        <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" />
+    </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
 </Project>
diff --git a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
index b5eb9c2eed..b5a2610e12 100644
--- a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
+++ b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" />
+    </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
 </Project>
diff --git a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
index d93394957a..28de11e404 100644
--- a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
+++ b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\BDInfo\BDInfo.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    <ProjectReference Include="..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\BDInfo\BDInfo.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+        <ProjectReference Include="..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj" />
+    </ItemGroup>
 
 </Project>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 4aacc4a497..48b62fd819 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <Authors>Jellyfin Contributors</Authors>
-    <PackageId>Jellyfin.Model</PackageId>
-    <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl>
-    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
-  </PropertyGroup>
+    <PropertyGroup>
+        <Authors>Jellyfin Contributors</Authors>
+        <PackageId>Jellyfin.Model</PackageId>
+        <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl>
+        <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
+    </PropertyGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" />
+    </ItemGroup>
 
 </Project>
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index a318cf38a4..c7717915d5 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    <ProjectReference Include="..\DvdLib\DvdLib.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+        <ProjectReference Include="..\DvdLib\DvdLib.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="PlaylistsNET" Version="1.0.2" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="PlaylistsNET" Version="1.0.2" />
+    </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
 </Project>
diff --git a/MediaBrowser.Tests/MediaBrowser.Tests.csproj b/MediaBrowser.Tests/MediaBrowser.Tests.csproj
index 62bcad000b..666ae94fb0 100644
--- a/MediaBrowser.Tests/MediaBrowser.Tests.csproj
+++ b/MediaBrowser.Tests/MediaBrowser.Tests.csproj
@@ -1,138 +1,139 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E22BFD35-0FCD-4A85-978A-C22DCD73A081}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MediaBrowser.Tests</RootNamespace>
-    <AssemblyName>MediaBrowser.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\MediaBrowser.Tests.XML</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Emby.Server.MediaEncoding">
-      <HintPath>..\ThirdParty\emby\Emby.Server.MediaEncoding.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.XML" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
-  <ItemGroup>
-    <Compile Include="ConsistencyTests\StringUsageReporter.cs" />
-    <Compile Include="ConsistencyTests\TextIndexing\IndexBuilder.cs" />
-    <Compile Include="ConsistencyTests\TextIndexing\WordIndex.cs" />
-    <Compile Include="ConsistencyTests\TextIndexing\WordOccurrence.cs" />
-    <Compile Include="ConsistencyTests\TextIndexing\WordOccurrences.cs" />
-    <Compile Include="M3uParserTest.cs" />
-    <Compile Include="MediaEncoding\Subtitles\AssParserTests.cs" />
-    <Compile Include="MediaEncoding\Subtitles\SrtParserTests.cs" />
-    <Compile Include="MediaEncoding\Subtitles\VttWriterTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj">
-      <Project>{e383961b-9356-4d5d-8233-9a1079d03055}</Project>
-      <Name>Emby.Server.Implementations</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
-      <Project>{9142eefa-7570-41e1-bfcc-468bb571af2f}</Project>
-      <Name>MediaBrowser.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj">
-      <Project>{17e1f4e6-8abd-4fe5-9ecf-43d4b6087ba2}</Project>
-      <Name>MediaBrowser.Controller</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
-      <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
-      <Name>MediaBrowser.Model</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\MediaBrowser.Providers\MediaBrowser.Providers.csproj">
-      <Project>{442B5058-DCAF-4263-BB6A-F21E31120A1B}</Project>
-      <Name>MediaBrowser.Providers</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\MediaBrowser.XbmcMetadata\MediaBrowser.XbmcMetadata.csproj">
-      <Project>{23499896-b135-4527-8574-c26e926ea99e}</Project>
-      <Name>MediaBrowser.XbmcMetadata</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="MediaEncoding\Subtitles\TestSubtitles\data.ass" />
-    <None Include="MediaEncoding\Subtitles\TestSubtitles\data2.ass" />
-    <None Include="MediaEncoding\Subtitles\TestSubtitles\expected.vtt" />
-    <None Include="MediaEncoding\Subtitles\TestSubtitles\unit.srt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ContentWithTargetPath Include="ConsistencyTests\Resources\StringCheck.xslt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <TargetPath>StringCheck.xslt</TargetPath>
-    </ContentWithTargetPath>
-    <None Include="ConsistencyTests\Resources\SampleTransformed.htm" />
-    <None Include="ConsistencyTests\Resources\StringCheckSample.xml" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
+<Project ToolsVersion="12.0" DefaultTargets="Build"
+    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+        <ProjectGuid>{E22BFD35-0FCD-4A85-978A-C22DCD73A081}</ProjectGuid>
+        <OutputType>Library</OutputType>
+        <AppDesignerFolder>Properties</AppDesignerFolder>
+        <RootNamespace>MediaBrowser.Tests</RootNamespace>
+        <AssemblyName>MediaBrowser.Tests</AssemblyName>
+        <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+        <FileAlignment>512</FileAlignment>
+        <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+        <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+        <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+        <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+        <IsCodedUITest>False</IsCodedUITest>
+        <TestProjectType>UnitTest</TestProjectType>
+        <TargetFrameworkProfile />
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+        <DebugSymbols>true</DebugSymbols>
+        <DebugType>full</DebugType>
+        <Optimize>false</Optimize>
+        <OutputPath>bin\Debug\</OutputPath>
+        <DefineConstants>DEBUG;TRACE</DefineConstants>
+        <ErrorReport>prompt</ErrorReport>
+        <WarningLevel>4</WarningLevel>
+        <DocumentationFile>bin\Debug\MediaBrowser.Tests.XML</DocumentationFile>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+        <DebugType>none</DebugType>
+        <Optimize>true</Optimize>
+        <OutputPath>bin\Release\</OutputPath>
+        <DefineConstants>TRACE</DefineConstants>
+        <ErrorReport>prompt</ErrorReport>
+        <WarningLevel>4</WarningLevel>
+    </PropertyGroup>
+    <ItemGroup>
+        <Reference Include="Emby.Server.MediaEncoding">
+            <HintPath>..\ThirdParty\emby\Emby.Server.MediaEncoding.dll</HintPath>
         </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+        <Reference Include="System" />
+        <Reference Include="System.XML" />
+    </ItemGroup>
+    <Choose>
+        <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
+            <ItemGroup>
+                <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+            </ItemGroup>
+        </When>
+        <Otherwise>
+            <ItemGroup>
+                <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
+            </ItemGroup>
+        </Otherwise>
+    </Choose>
+    <ItemGroup>
+        <Compile Include="ConsistencyTests\StringUsageReporter.cs" />
+        <Compile Include="ConsistencyTests\TextIndexing\IndexBuilder.cs" />
+        <Compile Include="ConsistencyTests\TextIndexing\WordIndex.cs" />
+        <Compile Include="ConsistencyTests\TextIndexing\WordOccurrence.cs" />
+        <Compile Include="ConsistencyTests\TextIndexing\WordOccurrences.cs" />
+        <Compile Include="M3uParserTest.cs" />
+        <Compile Include="MediaEncoding\Subtitles\AssParserTests.cs" />
+        <Compile Include="MediaEncoding\Subtitles\SrtParserTests.cs" />
+        <Compile Include="MediaEncoding\Subtitles\VttWriterTest.cs" />
+        <Compile Include="Properties\AssemblyInfo.cs" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj">
+            <Project>{e383961b-9356-4d5d-8233-9a1079d03055}</Project>
+            <Name>Emby.Server.Implementations</Name>
+        </ProjectReference>
+        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
+            <Project>{9142eefa-7570-41e1-bfcc-468bb571af2f}</Project>
+            <Name>MediaBrowser.Common</Name>
+        </ProjectReference>
+        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj">
+            <Project>{17e1f4e6-8abd-4fe5-9ecf-43d4b6087ba2}</Project>
+            <Name>MediaBrowser.Controller</Name>
+        </ProjectReference>
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
+            <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
+            <Name>MediaBrowser.Model</Name>
+        </ProjectReference>
+        <ProjectReference Include="..\MediaBrowser.Providers\MediaBrowser.Providers.csproj">
+            <Project>{442B5058-DCAF-4263-BB6A-F21E31120A1B}</Project>
+            <Name>MediaBrowser.Providers</Name>
+        </ProjectReference>
+        <ProjectReference Include="..\MediaBrowser.XbmcMetadata\MediaBrowser.XbmcMetadata.csproj">
+            <Project>{23499896-b135-4527-8574-c26e926ea99e}</Project>
+            <Name>MediaBrowser.XbmcMetadata</Name>
+        </ProjectReference>
+    </ItemGroup>
+    <ItemGroup>
+        <None Include="app.config" />
+        <None Include="MediaEncoding\Subtitles\TestSubtitles\data.ass" />
+        <None Include="MediaEncoding\Subtitles\TestSubtitles\data2.ass" />
+        <None Include="MediaEncoding\Subtitles\TestSubtitles\expected.vtt" />
+        <None Include="MediaEncoding\Subtitles\TestSubtitles\unit.srt" />
+    </ItemGroup>
+    <ItemGroup>
+        <ContentWithTargetPath Include="ConsistencyTests\Resources\StringCheck.xslt">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+            <TargetPath>StringCheck.xslt</TargetPath>
+        </ContentWithTargetPath>
+        <None Include="ConsistencyTests\Resources\SampleTransformed.htm" />
+        <None Include="ConsistencyTests\Resources\StringCheckSample.xml" />
+    </ItemGroup>
+    <Choose>
+        <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
+            <ItemGroup>
+                <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+                    <Private>False</Private>
+                </Reference>
+                <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+                    <Private>False</Private>
+                </Reference>
+                <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+                    <Private>False</Private>
+                </Reference>
+                <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+                    <Private>False</Private>
+                </Reference>
+            </ItemGroup>
+        </When>
+    </Choose>
+    <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+    <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index c5367ba753..db7c102e09 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -1,23 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="jellyfin-web\src\**\*.*">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Include="jellyfin-web\src\**\*.*">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
+
+</Project>
diff --git a/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj b/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj
index 5ffaaed276..3e19ddfe59 100644
--- a/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj
+++ b/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" />
+    </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
 </Project>
diff --git a/MediaBrowser.sln.GhostDoc.xml b/MediaBrowser.sln.GhostDoc.xml
index 73f7a08ba7..256c41e6c5 100644
--- a/MediaBrowser.sln.GhostDoc.xml
+++ b/MediaBrowser.sln.GhostDoc.xml
@@ -1,35 +1,35 @@
 <GhostDoc>
-  <SpellChecker>
-    <IncludeExtensions>
-    </IncludeExtensions>
-    <IgnoreExtensions>
-    </IgnoreExtensions>
-    <IgnoreFiles>
-    </IgnoreFiles>
-  </SpellChecker>
-<HelpConfigurations selected="HelpFile">
-  <HelpConfiguration name="HelpFile">
-    <OutputPath>D:\Development\MediaBrowser\Help</OutputPath>
-    <ImageFolderPath />
-    <HtmlFormats>
-      <HtmlHelp>true</HtmlHelp>
-      <MSHelpViewer>false</MSHelpViewer>
-      <MSHelp2>false</MSHelp2>
-      <Website>false</Website>
-    </HtmlFormats>
-    <IncludeScopes>
-      <Public>true</Public>
-      <Internal>false</Internal>
-      <Protected>false</Protected>
-      <Private>false</Private>
-      <Inherited>true</Inherited>
-      <EnableTags>false</EnableTags>
-      <TagList />
-    </IncludeScopes>
-    <ResolveCrefLinks>true</ResolveCrefLinks>
-    <HeaderText />
-    <FooterText />
-    <SelectedProjects />
-  </HelpConfiguration>
-</HelpConfigurations>
+    <SpellChecker>
+        <IncludeExtensions>
+        </IncludeExtensions>
+        <IgnoreExtensions>
+        </IgnoreExtensions>
+        <IgnoreFiles>
+        </IgnoreFiles>
+    </SpellChecker>
+    <HelpConfigurations selected="HelpFile">
+        <HelpConfiguration name="HelpFile">
+            <OutputPath>D:\Development\MediaBrowser\Help</OutputPath>
+            <ImageFolderPath />
+            <HtmlFormats>
+                <HtmlHelp>true</HtmlHelp>
+                <MSHelpViewer>false</MSHelpViewer>
+                <MSHelp2>false</MSHelp2>
+                <Website>false</Website>
+            </HtmlFormats>
+            <IncludeScopes>
+                <Public>true</Public>
+                <Internal>false</Internal>
+                <Protected>false</Protected>
+                <Private>false</Private>
+                <Inherited>true</Inherited>
+                <EnableTags>false</EnableTags>
+                <TagList />
+            </IncludeScopes>
+            <ResolveCrefLinks>true</ResolveCrefLinks>
+            <HeaderText />
+            <FooterText />
+            <SelectedProjects />
+        </HelpConfiguration>
+    </HelpConfigurations>
 </GhostDoc>
diff --git a/OpenSubtitlesHandler/Methods Implemeted.txt b/OpenSubtitlesHandler/Methods Implemeted.txt
index 5d7ae0d493..3e5bc02900 100644
--- a/OpenSubtitlesHandler/Methods Implemeted.txt	
+++ b/OpenSubtitlesHandler/Methods Implemeted.txt	
@@ -3,7 +3,7 @@
 Legends:
 * OK: this method is fully implemented, tested and works fine.
 * TODO: this method is in the plan to be added.
-* NOT TESTED: this method added and expected to work fine but never tested. 
+* NOT TESTED: this method added and expected to work fine but never tested.
 * NOT WORK (x): this method added but not work. x= Description of the error.
 
 --------------------------------------------
@@ -36,4 +36,4 @@ AutoUpdate               | NOT WORK (Returns status: 'parse error. not well form
 CheckMovieHash           | OK
 CheckMovieHash2          | OK
 CheckSubHash             | OK
---------------------------------------------
\ No newline at end of file
+--------------------------------------------
diff --git a/OpenSubtitlesHandler/OpenSubtitlesHandler.csproj b/OpenSubtitlesHandler/OpenSubtitlesHandler.csproj
index ba8bcbc231..2f7adbbd0c 100644
--- a/OpenSubtitlesHandler/OpenSubtitlesHandler.csproj
+++ b/OpenSubtitlesHandler/OpenSubtitlesHandler.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
 </Project>
diff --git a/OpenSubtitlesHandler/Readme.txt b/OpenSubtitlesHandler/Readme.txt
index 42b4fdab3c..01943cc30f 100644
--- a/OpenSubtitlesHandler/Readme.txt
+++ b/OpenSubtitlesHandler/Readme.txt
@@ -12,9 +12,9 @@ mailto:ahdsoftwares@hotmail.com
 
 Resources:
 ==========
-* GetHash.dll: this dll is used to compute hash for movie. 
+* GetHash.dll: this dll is used to compute hash for movie.
   For more information please visit http://trac.opensubtitles.org/projects/opensubtitles/wiki/HashSourceCodes#C2
 
 XML_RPC:
 ========
-This class is created to generate XML-RPC requests as XML String. All you need is to call XML_RPC.Generate() method.
\ No newline at end of file
+This class is created to generate XML-RPC requests as XML String. All you need is to call XML_RPC.Generate() method.
diff --git a/OpenSubtitlesHandler/XML-RPC/Docs/XML-RPC.txt b/OpenSubtitlesHandler/XML-RPC/Docs/XML-RPC.txt
index 8c84444a99..fe90f24620 100644
--- a/OpenSubtitlesHandler/XML-RPC/Docs/XML-RPC.txt
+++ b/OpenSubtitlesHandler/XML-RPC/Docs/XML-RPC.txt
@@ -32,16 +32,16 @@ Host: betty.userland.com
 Content-Type: text/xml
 Content-length: 181
 
-<?xml version="1.0"?> 
- <methodCall> 
-  <methodName>examples.getStateName</methodName> 
-    <params> 
-	  <param> 
+<?xml version="1.0"?>
+ <methodCall>
+  <methodName>examples.getStateName</methodName>
+    <params>
+	  <param>
 	    <value>
 		  <i4>41</i4>
-		</value> 
-	  </param> 
-	</params> 
+		</value>
+	  </param>
+	</params>
  </methodCall>
 
 Header requirements
@@ -202,11 +202,11 @@ The following questions came up on the UserLand discussion group as XML-RPC was
 
     What timezone should be assumed for the dateTime.iso8601 type? UTC? localtime?
 
-    Don't assume a timezone. It should be specified by the server in its documentation what assumptions it makes about timezones. 
+    Don't assume a timezone. It should be specified by the server in its documentation what assumptions it makes about timezones.
 
 Additions
 
-    <base64> type. 1/21/99 DW. 
+    <base64> type. 1/21/99 DW.
 
 Updated 6/30/03 DW
 
@@ -222,4 +222,4 @@ This document and translations of it may be copied and furnished to others, and
 
 This document may not be modified in any way, such as by removing the copyright notice or references to UserLand or other organizations. Further, while these copyright restrictions apply to the written XML-RPC specification, no claim of ownership is made by UserLand to the protocol it describes. Any party may, for commercial or non-commercial purposes, implement this protocol without royalty or license fee to UserLand. The limited permissions granted herein are perpetual and will not be revoked by UserLand or its successors or assigns.
 
-This document and the information contained herein is provided on an "AS IS" basis and USERLAND DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
\ No newline at end of file
+This document and the information contained herein is provided on an "AS IS" basis and USERLAND DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/SocketHttpListener/SocketHttpListener.csproj b/SocketHttpListener/SocketHttpListener.csproj
index ca9056a6ad..680776103c 100644
--- a/SocketHttpListener/SocketHttpListener.csproj
+++ b/SocketHttpListener/SocketHttpListener.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Include="..\SharedVersion.cs" />
+    </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    </PropertyGroup>
 
 </Project>
diff --git a/debian/conf/logging.json b/debian/conf/logging.json
index 5d98484cdf..f32b2089eb 100644
--- a/debian/conf/logging.json
+++ b/debian/conf/logging.json
@@ -2,7 +2,8 @@
     "Serilog": {
         "MinimumLevel": "Information",
         "WriteTo": [
-            { "Name": "Console",
+            {
+                "Name": "Console",
                 "Args": {
                     "outputTemplate": "[{Timestamp:HH:mm:ss}] [{Level:u3}] {Message:lj}{NewLine}{Exception}"
                 }
diff --git a/jellyfin.code-workspace b/jellyfin.code-workspace
new file mode 100644
index 0000000000..7882b38219
--- /dev/null
+++ b/jellyfin.code-workspace
@@ -0,0 +1,17 @@
+{
+    "folders": [
+        {
+            "path": "."
+        }
+    ],
+    "settings": {
+        "files.eol": "\n",
+        "editor.renderWhitespace": "boundary",
+        "files.exclude": {
+            "**/bin": true,
+            "**/jellyfin-web": true,
+            "**/obj": true
+        },
+        "formatFiles.excludePattern": "**/node_modules,**/.vscode,**/dist/**,**/.chrome,ThirdParty,RSSDP,Mono.Nat,unRaid,debian"
+    }
+}
-- 
cgit v1.2.3


From 8f41ba4d3aa0a7001748c0282e39baf50f0af13f Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Sun, 13 Jan 2019 21:02:23 +0100
Subject: Find+Sed BOM removal *.cs:
 MediaBrowser.LocalMetadata-MediaBrowser.Model

---
 MediaBrowser.LocalMetadata/BaseXmlProvider.cs                           | 2 +-
 MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs      | 2 +-
 MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs          | 2 +-
 .../Images/InternalMetadataFolderImageProvider.cs                       | 2 +-
 MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs                 | 2 +-
 MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs                   | 2 +-
 MediaBrowser.LocalMetadata/Parsers/GameSystemXmlParser.cs               | 2 +-
 MediaBrowser.LocalMetadata/Parsers/GameXmlParser.cs                     | 2 +-
 MediaBrowser.LocalMetadata/Parsers/PlaylistXmlParser.cs                 | 2 +-
 MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs               | 2 +-
 MediaBrowser.LocalMetadata/Providers/GameSystemXmlProvider.cs           | 2 +-
 MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs                 | 2 +-
 MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs             | 2 +-
 MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs                       | 2 +-
 MediaBrowser.LocalMetadata/Savers/BoxSetXmlSaver.cs                     | 2 +-
 MediaBrowser.LocalMetadata/Savers/GameSystemXmlSaver.cs                 | 2 +-
 MediaBrowser.LocalMetadata/Savers/GameXmlSaver.cs                       | 2 +-
 MediaBrowser.LocalMetadata/Savers/PersonXmlSaver.cs                     | 2 +-
 MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs                   | 2 +-
 .../Configuration/EncodingConfigurationFactory.cs                       | 2 +-
 MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs                      | 2 +-
 MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs                       | 2 +-
 MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs                  | 2 +-
 MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs                       | 2 +-
 MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs                | 2 +-
 MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs                     | 2 +-
 MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs                      | 2 +-
 MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs                    | 2 +-
 MediaBrowser.MediaEncoding/Probing/InternalMediaInfoResult.cs           | 2 +-
 MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs             | 2 +-
 MediaBrowser.MediaEncoding/Subtitles/AssParser.cs                       | 2 +-
 MediaBrowser.MediaEncoding/Subtitles/ConfigurationExtension.cs          | 2 +-
 MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs                 | 2 +-
 MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs                 | 2 +-
 MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs                      | 2 +-
 MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs          | 2 +-
 MediaBrowser.MediaEncoding/Subtitles/ParserValues.cs                    | 2 +-
 MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs                       | 2 +-
 MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs                       | 2 +-
 MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs                       | 2 +-
 MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs                 | 2 +-
 MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs                      | 2 +-
 MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs                       | 2 +-
 MediaBrowser.Model/Activity/ActivityLogEntry.cs                         | 2 +-
 MediaBrowser.Model/Activity/IActivityManager.cs                         | 2 +-
 MediaBrowser.Model/Activity/IActivityRepository.cs                      | 2 +-
 MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs                     | 2 +-
 MediaBrowser.Model/Branding/BrandingOptions.cs                          | 2 +-
 MediaBrowser.Model/Channels/ChannelFeatures.cs                          | 2 +-
 MediaBrowser.Model/Channels/ChannelInfo.cs                              | 2 +-
 MediaBrowser.Model/Channels/ChannelMediaContentType.cs                  | 2 +-
 MediaBrowser.Model/Channels/ChannelMediaType.cs                         | 2 +-
 MediaBrowser.Model/Channels/ChannelQuery.cs                             | 2 +-
 MediaBrowser.Model/Collections/CollectionCreationResult.cs              | 2 +-
 MediaBrowser.Model/Configuration/AccessSchedule.cs                      | 2 +-
 MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs        | 2 +-
 MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs                    | 2 +-
 MediaBrowser.Model/Configuration/EncodingOptions.cs                     | 2 +-
 MediaBrowser.Model/Configuration/FanartOptions.cs                       | 2 +-
 MediaBrowser.Model/Configuration/ImageSavingConvention.cs               | 2 +-
 MediaBrowser.Model/Configuration/LibraryOptions.cs                      | 2 +-
 MediaBrowser.Model/Configuration/MetadataConfiguration.cs               | 2 +-
 MediaBrowser.Model/Configuration/MetadataOptions.cs                     | 2 +-
 MediaBrowser.Model/Configuration/MetadataPlugin.cs                      | 2 +-
 MediaBrowser.Model/Configuration/ServerConfiguration.cs                 | 2 +-
 MediaBrowser.Model/Configuration/SubtitlePlaybackMode.cs                | 2 +-
 MediaBrowser.Model/Configuration/UserConfiguration.cs                   | 2 +-
 MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs                 | 2 +-
 MediaBrowser.Model/Connect/ConnectAuthorization.cs                      | 2 +-
 MediaBrowser.Model/Connect/ConnectUser.cs                               | 2 +-
 MediaBrowser.Model/Connect/ConnectUserQuery.cs                          | 2 +-
 MediaBrowser.Model/Connect/UserLinkType.cs                              | 2 +-
 MediaBrowser.Model/Cryptography/ICryptoProvider.cs                      | 2 +-
 MediaBrowser.Model/Devices/ContentUploadHistory.cs                      | 2 +-
 MediaBrowser.Model/Devices/DeviceInfo.cs                                | 2 +-
 MediaBrowser.Model/Devices/DeviceQuery.cs                               | 2 +-
 MediaBrowser.Model/Devices/DevicesOptions.cs                            | 2 +-
 MediaBrowser.Model/Devices/LocalFileInfo.cs                             | 2 +-
 MediaBrowser.Model/Diagnostics/IProcess.cs                              | 2 +-
 MediaBrowser.Model/Diagnostics/IProcessFactory.cs                       | 2 +-
 MediaBrowser.Model/Dlna/AudioOptions.cs                                 | 2 +-
 MediaBrowser.Model/Dlna/CodecProfile.cs                                 | 2 +-
 MediaBrowser.Model/Dlna/CodecType.cs                                    | 2 +-
 MediaBrowser.Model/Dlna/ConditionProcessor.cs                           | 2 +-
 MediaBrowser.Model/Dlna/ContainerProfile.cs                             | 2 +-
 MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs                        | 2 +-
 MediaBrowser.Model/Dlna/DeviceIdentification.cs                         | 2 +-
 MediaBrowser.Model/Dlna/DeviceProfile.cs                                | 2 +-
 MediaBrowser.Model/Dlna/DeviceProfileInfo.cs                            | 2 +-
 MediaBrowser.Model/Dlna/DeviceProfileType.cs                            | 2 +-
 MediaBrowser.Model/Dlna/DirectPlayProfile.cs                            | 2 +-
 MediaBrowser.Model/Dlna/DlnaFlags.cs                                    | 2 +-
 MediaBrowser.Model/Dlna/DlnaMaps.cs                                     | 2 +-
 MediaBrowser.Model/Dlna/DlnaProfileType.cs                              | 2 +-
 MediaBrowser.Model/Dlna/HeaderMatchType.cs                              | 2 +-
 MediaBrowser.Model/Dlna/HttpHeaderInfo.cs                               | 2 +-
 MediaBrowser.Model/Dlna/IDeviceDiscovery.cs                             | 2 +-
 MediaBrowser.Model/Dlna/ITranscoderSupport.cs                           | 2 +-
 MediaBrowser.Model/Dlna/MediaFormatProfile.cs                           | 2 +-
 MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs                   | 2 +-
 MediaBrowser.Model/Dlna/PlaybackErrorCode.cs                            | 2 +-
 MediaBrowser.Model/Dlna/ProfileCondition.cs                             | 2 +-
 MediaBrowser.Model/Dlna/ProfileConditionType.cs                         | 2 +-
 MediaBrowser.Model/Dlna/ProfileConditionValue.cs                        | 2 +-
 MediaBrowser.Model/Dlna/ResolutionNormalizer.cs                         | 2 +-
 MediaBrowser.Model/Dlna/ResponseProfile.cs                              | 2 +-
 MediaBrowser.Model/Dlna/SearchType.cs                                   | 2 +-
 MediaBrowser.Model/Dlna/SortCriteria.cs                                 | 2 +-
 MediaBrowser.Model/Dlna/StreamBuilder.cs                                | 2 +-
 MediaBrowser.Model/Dlna/StreamInfo.cs                                   | 2 +-
 MediaBrowser.Model/Dlna/SubtitleProfile.cs                              | 2 +-
 MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs                            | 2 +-
 MediaBrowser.Model/Dlna/TranscodingProfile.cs                           | 2 +-
 MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs                               | 2 +-
 MediaBrowser.Model/Dlna/VideoOptions.cs                                 | 2 +-
 MediaBrowser.Model/Dlna/XmlAttribute.cs                                 | 2 +-
 MediaBrowser.Model/Drawing/DrawingUtils.cs                              | 2 +-
 MediaBrowser.Model/Drawing/ImageFormat.cs                               | 2 +-
 MediaBrowser.Model/Drawing/ImageOrientation.cs                          | 2 +-
 MediaBrowser.Model/Dto/BaseItemDto.cs                                   | 2 +-
 MediaBrowser.Model/Dto/BaseItemPerson.cs                                | 2 +-
 MediaBrowser.Model/Dto/GameSystemSummary.cs                             | 2 +-
 MediaBrowser.Model/Dto/IHasServerId.cs                                  | 2 +-
 MediaBrowser.Model/Dto/IItemDto.cs                                      | 2 +-
 MediaBrowser.Model/Dto/ImageByNameInfo.cs                               | 2 +-
 MediaBrowser.Model/Dto/ImageInfo.cs                                     | 2 +-
 MediaBrowser.Model/Dto/ImageOptions.cs                                  | 2 +-
 MediaBrowser.Model/Dto/ItemCounts.cs                                    | 2 +-
 MediaBrowser.Model/Dto/ItemIndex.cs                                     | 2 +-
 MediaBrowser.Model/Dto/MediaSourceInfo.cs                               | 2 +-
 MediaBrowser.Model/Dto/MetadataEditorInfo.cs                            | 2 +-
 MediaBrowser.Model/Dto/NameIdPair.cs                                    | 2 +-
 MediaBrowser.Model/Dto/NameValuePair.cs                                 | 2 +-
 MediaBrowser.Model/Dto/RecommendationDto.cs                             | 2 +-
 MediaBrowser.Model/Dto/UserDto.cs                                       | 2 +-
 MediaBrowser.Model/Dto/UserItemDataDto.cs                               | 2 +-
 MediaBrowser.Model/Entities/ChapterInfo.cs                              | 2 +-
 MediaBrowser.Model/Entities/CollectionType.cs                           | 2 +-
 MediaBrowser.Model/Entities/DisplayPreferences.cs                       | 2 +-
 MediaBrowser.Model/Entities/EmptyRequestResult.cs                       | 2 +-
 MediaBrowser.Model/Entities/ExtraType.cs                                | 2 +-
 MediaBrowser.Model/Entities/IHasProviderIds.cs                          | 2 +-
 MediaBrowser.Model/Entities/ImageType.cs                                | 2 +-
 MediaBrowser.Model/Entities/LibraryUpdateInfo.cs                        | 2 +-
 MediaBrowser.Model/Entities/LocationType.cs                             | 2 +-
 MediaBrowser.Model/Entities/MediaStream.cs                              | 2 +-
 MediaBrowser.Model/Entities/MediaType.cs                                | 2 +-
 MediaBrowser.Model/Entities/MediaUrl.cs                                 | 2 +-
 MediaBrowser.Model/Entities/MetadataFields.cs                           | 2 +-
 MediaBrowser.Model/Entities/MetadataProviders.cs                        | 2 +-
 MediaBrowser.Model/Entities/PackageReviewInfo.cs                        | 2 +-
 MediaBrowser.Model/Entities/ParentalRating.cs                           | 2 +-
 MediaBrowser.Model/Entities/PersonType.cs                               | 2 +-
 MediaBrowser.Model/Entities/PluginSecurityInfo.cs                       | 2 +-
 MediaBrowser.Model/Entities/SeriesStatus.cs                             | 2 +-
 MediaBrowser.Model/Entities/UserDataSaveReason.cs                       | 2 +-
 MediaBrowser.Model/Entities/Video3DFormat.cs                            | 2 +-
 MediaBrowser.Model/Entities/VideoType.cs                                | 2 +-
 MediaBrowser.Model/Entities/VirtualFolderInfo.cs                        | 2 +-
 MediaBrowser.Model/Events/GenericEventArgs.cs                           | 2 +-
 MediaBrowser.Model/Extensions/LinqExtensions.cs                         | 2 +-
 MediaBrowser.Model/Extensions/ListHelper.cs                             | 2 +-
 MediaBrowser.Model/Extensions/StringHelper.cs                           | 2 +-
 MediaBrowser.Model/Globalization/CountryInfo.cs                         | 2 +-
 MediaBrowser.Model/Globalization/CultureDto.cs                          | 2 +-
 MediaBrowser.Model/Globalization/ILocalizationManager.cs                | 2 +-
 MediaBrowser.Model/IO/FileSystemEntryInfo.cs                            | 2 +-
 MediaBrowser.Model/IO/FileSystemMetadata.cs                             | 2 +-
 MediaBrowser.Model/IO/IIsoManager.cs                                    | 2 +-
 MediaBrowser.Model/IO/IIsoMount.cs                                      | 2 +-
 MediaBrowser.Model/IO/IShortcutHandler.cs                               | 2 +-
 MediaBrowser.Model/IO/IStreamHelper.cs                                  | 2 +-
 MediaBrowser.Model/IO/IZipClient.cs                                     | 2 +-
 MediaBrowser.Model/IO/StreamDefaults.cs                                 | 2 +-
 MediaBrowser.Model/Library/PlayAccess.cs                                | 2 +-
 MediaBrowser.Model/Library/UserViewQuery.cs                             | 2 +-
 MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs                           | 2 +-
 MediaBrowser.Model/LiveTv/ChannelType.cs                                | 2 +-
 MediaBrowser.Model/LiveTv/DayPattern.cs                                 | 2 +-
 MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs                         | 2 +-
 MediaBrowser.Model/LiveTv/LiveTvOptions.cs                              | 2 +-
 MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs                          | 2 +-
 MediaBrowser.Model/LiveTv/ProgramAudio.cs                               | 2 +-
 MediaBrowser.Model/LiveTv/RecordingQuery.cs                             | 2 +-
 MediaBrowser.Model/LiveTv/RecordingStatus.cs                            | 2 +-
 MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs                         | 2 +-
 MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs                           | 2 +-
 MediaBrowser.Model/LiveTv/TimerInfoDto.cs                               | 2 +-
 MediaBrowser.Model/LiveTv/TimerQuery.cs                                 | 2 +-
 MediaBrowser.Model/MediaInfo/AudioCodec.cs                              | 2 +-
 MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs                          | 2 +-
 MediaBrowser.Model/MediaInfo/Container.cs                               | 2 +-
 MediaBrowser.Model/MediaInfo/IBlurayExaminer.cs                         | 2 +-
 MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs                       | 2 +-
 MediaBrowser.Model/MediaInfo/LiveStreamResponse.cs                      | 2 +-
 MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs                     | 2 +-
 MediaBrowser.Model/MediaInfo/PlaybackInfoResponse.cs                    | 2 +-
 MediaBrowser.Model/MediaInfo/SubtitleFormat.cs                          | 2 +-
 MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs                      | 2 +-
 MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs                       | 2 +-
 MediaBrowser.Model/MediaInfo/TransportStreamTimestamp.cs                | 2 +-
 MediaBrowser.Model/MediaInfo/VideoCodec.cs                              | 2 +-
 MediaBrowser.Model/Net/EndPointInfo.cs                                  | 2 +-
 MediaBrowser.Model/Net/HttpException.cs                                 | 2 +-
 MediaBrowser.Model/Net/HttpResponse.cs                                  | 2 +-
 MediaBrowser.Model/Net/IAcceptSocket.cs                                 | 2 +-
 MediaBrowser.Model/Net/ISocket.cs                                       | 2 +-
 MediaBrowser.Model/Net/ISocketFactory.cs                                | 2 +-
 MediaBrowser.Model/Net/IpAddressInfo.cs                                 | 2 +-
 MediaBrowser.Model/Net/IpEndPointInfo.cs                                | 2 +-
 MediaBrowser.Model/Net/MimeTypes.cs                                     | 2 +-
 MediaBrowser.Model/Net/NetworkShare.cs                                  | 2 +-
 MediaBrowser.Model/Net/NetworkShareType.cs                              | 2 +-
 MediaBrowser.Model/Net/SocketReceiveResult.cs                           | 2 +-
 MediaBrowser.Model/Net/WebSocketMessage.cs                              | 2 +-
 MediaBrowser.Model/Notifications/NotificationLevel.cs                   | 2 +-
 MediaBrowser.Model/Notifications/NotificationOptions.cs                 | 2 +-
 MediaBrowser.Model/Notifications/NotificationRequest.cs                 | 2 +-
 MediaBrowser.Model/Notifications/NotificationTypeInfo.cs                | 2 +-
 MediaBrowser.Model/Playlists/PlaylistCreationRequest.cs                 | 2 +-
 MediaBrowser.Model/Playlists/PlaylistCreationResult.cs                  | 2 +-
 MediaBrowser.Model/Playlists/PlaylistItemQuery.cs                       | 2 +-
 MediaBrowser.Model/Plugins/BasePluginConfiguration.cs                   | 2 +-
 MediaBrowser.Model/Plugins/IHasWebPages.cs                              | 2 +-
 MediaBrowser.Model/Plugins/PluginInfo.cs                                | 2 +-
 MediaBrowser.Model/Plugins/PluginPageInfo.cs                            | 2 +-
 MediaBrowser.Model/Providers/ExternalIdInfo.cs                          | 2 +-
 MediaBrowser.Model/Providers/ExternalUrl.cs                             | 2 +-
 MediaBrowser.Model/Providers/ImageProviderInfo.cs                       | 2 +-
 MediaBrowser.Model/Providers/RemoteImageInfo.cs                         | 2 +-
 MediaBrowser.Model/Providers/RemoteImageQuery.cs                        | 2 +-
 MediaBrowser.Model/Providers/RemoteImageResult.cs                       | 2 +-
 MediaBrowser.Model/Providers/RemoteSearchResult.cs                      | 2 +-
 MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs                      | 2 +-
 MediaBrowser.Model/Querying/AllThemeMediaResult.cs                      | 2 +-
 MediaBrowser.Model/Querying/EpisodeQuery.cs                             | 2 +-
 MediaBrowser.Model/Querying/ItemCountsQuery.cs                          | 2 +-
 MediaBrowser.Model/Querying/ItemFields.cs                               | 2 +-
 MediaBrowser.Model/Querying/ItemFilter.cs                               | 2 +-
 MediaBrowser.Model/Querying/ItemSortBy.cs                               | 2 +-
 MediaBrowser.Model/Querying/LatestItemsQuery.cs                         | 2 +-
 MediaBrowser.Model/Querying/MovieRecommendationQuery.cs                 | 2 +-
 MediaBrowser.Model/Querying/NextUpQuery.cs                              | 2 +-
 MediaBrowser.Model/Querying/QueryFilters.cs                             | 2 +-
 MediaBrowser.Model/Querying/QueryResult.cs                              | 2 +-
 MediaBrowser.Model/Querying/SessionQuery.cs                             | 2 +-
 MediaBrowser.Model/Querying/SimilarItemsQuery.cs                        | 2 +-
 MediaBrowser.Model/Querying/ThemeMediaResult.cs                         | 2 +-
 MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs                    | 2 +-
 MediaBrowser.Model/Querying/UserQuery.cs                                | 2 +-
 MediaBrowser.Model/Reflection/IAssemblyInfo.cs                          | 2 +-
 MediaBrowser.Model/Search/SearchHint.cs                                 | 2 +-
 MediaBrowser.Model/Search/SearchHintResult.cs                           | 2 +-
 MediaBrowser.Model/Search/SearchQuery.cs                                | 2 +-
 MediaBrowser.Model/Serialization/IJsonSerializer.cs                     | 2 +-
 MediaBrowser.Model/Serialization/IXmlSerializer.cs                      | 2 +-
 MediaBrowser.Model/Serialization/IgnoreDataMemberAttribute.cs           | 2 +-
 MediaBrowser.Model/Services/ApiMemberAttribute.cs                       | 2 +-
 MediaBrowser.Model/Services/HttpUtility.cs                              | 2 +-
 MediaBrowser.Model/Services/IAsyncStreamWriter.cs                       | 2 +-
 MediaBrowser.Model/Services/IHasHeaders.cs                              | 2 +-
 MediaBrowser.Model/Services/IHasRequestFilter.cs                        | 2 +-
 MediaBrowser.Model/Services/IHttpRequest.cs                             | 2 +-
 MediaBrowser.Model/Services/IHttpResponse.cs                            | 2 +-
 MediaBrowser.Model/Services/IHttpResult.cs                              | 2 +-
 MediaBrowser.Model/Services/IRequest.cs                                 | 2 +-
 MediaBrowser.Model/Services/IRequiresRequestStream.cs                   | 2 +-
 MediaBrowser.Model/Services/IService.cs                                 | 2 +-
 MediaBrowser.Model/Services/IStreamWriter.cs                            | 2 +-
 MediaBrowser.Model/Services/RouteAttribute.cs                           | 2 +-
 MediaBrowser.Model/Session/BrowseRequest.cs                             | 2 +-
 MediaBrowser.Model/Session/ClientCapabilities.cs                        | 2 +-
 MediaBrowser.Model/Session/GeneralCommand.cs                            | 2 +-
 MediaBrowser.Model/Session/GeneralCommandType.cs                        | 2 +-
 MediaBrowser.Model/Session/MessageCommand.cs                            | 2 +-
 MediaBrowser.Model/Session/PlayCommand.cs                               | 2 +-
 MediaBrowser.Model/Session/PlayMethod.cs                                | 2 +-
 MediaBrowser.Model/Session/PlayRequest.cs                               | 2 +-
 MediaBrowser.Model/Session/PlaybackProgressInfo.cs                      | 2 +-
 MediaBrowser.Model/Session/PlaybackStartInfo.cs                         | 2 +-
 MediaBrowser.Model/Session/PlaybackStopInfo.cs                          | 2 +-
 MediaBrowser.Model/Session/PlayerStateInfo.cs                           | 2 +-
 MediaBrowser.Model/Session/PlaystateCommand.cs                          | 2 +-
 MediaBrowser.Model/Session/PlaystateRequest.cs                          | 2 +-
 MediaBrowser.Model/Session/SessionUserInfo.cs                           | 2 +-
 MediaBrowser.Model/Session/UserDataChangeInfo.cs                        | 2 +-
 MediaBrowser.Model/Sync/SyncCategory.cs                                 | 2 +-
 MediaBrowser.Model/Sync/SyncJob.cs                                      | 2 +-
 MediaBrowser.Model/Sync/SyncJobStatus.cs                                | 2 +-
 MediaBrowser.Model/Sync/SyncTarget.cs                                   | 2 +-
 MediaBrowser.Model/System/IEnvironmentInfo.cs                           | 2 +-
 MediaBrowser.Model/System/ISystemEvents.cs                              | 2 +-
 MediaBrowser.Model/System/LogFile.cs                                    | 2 +-
 MediaBrowser.Model/System/SystemInfo.cs                                 | 2 +-
 MediaBrowser.Model/Tasks/IConfigurableScheduledTask.cs                  | 2 +-
 MediaBrowser.Model/Tasks/IScheduledTask.cs                              | 2 +-
 MediaBrowser.Model/Tasks/IScheduledTaskWorker.cs                        | 2 +-
 MediaBrowser.Model/Tasks/ITaskManager.cs                                | 2 +-
 MediaBrowser.Model/Tasks/ITaskTrigger.cs                                | 2 +-
 MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs                        | 2 +-
 MediaBrowser.Model/Tasks/SystemEvent.cs                                 | 2 +-
 MediaBrowser.Model/Tasks/TaskCompletionEventArgs.cs                     | 2 +-
 MediaBrowser.Model/Tasks/TaskCompletionStatus.cs                        | 2 +-
 MediaBrowser.Model/Tasks/TaskInfo.cs                                    | 2 +-
 MediaBrowser.Model/Tasks/TaskOptions.cs                                 | 2 +-
 MediaBrowser.Model/Tasks/TaskResult.cs                                  | 2 +-
 MediaBrowser.Model/Tasks/TaskState.cs                                   | 2 +-
 MediaBrowser.Model/Tasks/TaskTriggerInfo.cs                             | 2 +-
 MediaBrowser.Model/Text/ITextEncoding.cs                                | 2 +-
 MediaBrowser.Model/Threading/ITimer.cs                                  | 2 +-
 MediaBrowser.Model/Threading/ITimerFactory.cs                           | 2 +-
 MediaBrowser.Model/Updates/CheckForUpdateResult.cs                      | 2 +-
 MediaBrowser.Model/Updates/InstallationInfo.cs                          | 2 +-
 MediaBrowser.Model/Updates/PackageInfo.cs                               | 2 +-
 MediaBrowser.Model/Updates/PackageVersionInfo.cs                        | 2 +-
 MediaBrowser.Model/Users/ForgotPasswordAction.cs                        | 2 +-
 MediaBrowser.Model/Users/ForgotPasswordResult.cs                        | 2 +-
 MediaBrowser.Model/Users/PinRedeemResult.cs                             | 2 +-
 MediaBrowser.Model/Users/UserAction.cs                                  | 2 +-
 MediaBrowser.Model/Users/UserActionType.cs                              | 2 +-
 MediaBrowser.Model/Users/UserPolicy.cs                                  | 2 +-
 MediaBrowser.Model/Xml/IXmlReaderSettingsFactory.cs                     | 2 +-
 322 files changed, 322 insertions(+), 322 deletions(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/MediaBrowser.LocalMetadata/BaseXmlProvider.cs b/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
index f0fe983c3e..2e4de4d933 100644
--- a/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Entities;
diff --git a/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs b/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
index 3fee604527..73f9b69c86 100644
--- a/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
diff --git a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
index b4d5f41215..589cbf4dfe 100644
--- a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Controller.Entities;
diff --git a/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs b/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
index 0a3a6bbbe6..23d65e5ac4 100644
--- a/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
diff --git a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
index b06756df32..fef673bfd2 100644
--- a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
diff --git a/MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs
index e4d1c1a7d4..e595e9d068 100644
--- a/MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Xml;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
diff --git a/MediaBrowser.LocalMetadata/Parsers/GameSystemXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/GameSystemXmlParser.cs
index a0022b919b..a4997270f4 100644
--- a/MediaBrowser.LocalMetadata/Parsers/GameSystemXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/GameSystemXmlParser.cs
@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Xml;
 using MediaBrowser.Controller.Entities;
diff --git a/MediaBrowser.LocalMetadata/Parsers/GameXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/GameXmlParser.cs
index bdd35e76e9..cc908b97b5 100644
--- a/MediaBrowser.LocalMetadata/Parsers/GameXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/GameXmlParser.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml;
diff --git a/MediaBrowser.LocalMetadata/Parsers/PlaylistXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/PlaylistXmlParser.cs
index 86040465a3..ff69cb0237 100644
--- a/MediaBrowser.LocalMetadata/Parsers/PlaylistXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/PlaylistXmlParser.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Xml;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Playlists;
diff --git a/MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs
index 981b5cb3a9..539f818c65 100644
--- a/MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Threading;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Providers;
diff --git a/MediaBrowser.LocalMetadata/Providers/GameSystemXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/GameSystemXmlProvider.cs
index 4225c5f660..62f31d4fa7 100644
--- a/MediaBrowser.LocalMetadata/Providers/GameSystemXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/Providers/GameSystemXmlProvider.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Threading;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
diff --git a/MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs
index 2fa1c97ea8..537bd073c5 100644
--- a/MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Threading;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
diff --git a/MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs
index 81f48b96dd..4180a4f153 100644
--- a/MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs
@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.LocalMetadata.Parsers;
diff --git a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
index 20cc4ffba5..4fef3055b1 100644
--- a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
diff --git a/MediaBrowser.LocalMetadata/Savers/BoxSetXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/BoxSetXmlSaver.cs
index 02be72259c..b4d5440a52 100644
--- a/MediaBrowser.LocalMetadata/Savers/BoxSetXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/BoxSetXmlSaver.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Xml;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
diff --git a/MediaBrowser.LocalMetadata/Savers/GameSystemXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/GameSystemXmlSaver.cs
index c26e9a9bb5..cf123171aa 100644
--- a/MediaBrowser.LocalMetadata/Savers/GameSystemXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/GameSystemXmlSaver.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Xml;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
diff --git a/MediaBrowser.LocalMetadata/Savers/GameXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/GameXmlSaver.cs
index 51a5e4df99..3b79296182 100644
--- a/MediaBrowser.LocalMetadata/Savers/GameXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/GameXmlSaver.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.IO;
 using System.Xml;
 using MediaBrowser.Controller.Configuration;
diff --git a/MediaBrowser.LocalMetadata/Savers/PersonXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/PersonXmlSaver.cs
index fd481e9d33..7dd2c589fe 100644
--- a/MediaBrowser.LocalMetadata/Savers/PersonXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/PersonXmlSaver.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.LocalMetadata.Savers
+namespace MediaBrowser.LocalMetadata.Savers
 {
     ///// <summary>
     ///// Class PersonXmlSaver
diff --git a/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
index 502489f85c..09bb6d8f72 100644
--- a/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Xml;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
diff --git a/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs b/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
index b475c99c47..1af4146bc8 100644
--- a/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
+++ b/MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.Configuration;
diff --git a/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
index 22fc545640..05a2d84e92 100644
--- a/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
diff --git a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
index b4e623f3a9..ed4c445cd1 100644
--- a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Text;
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
index 578e9f2644..262772959a 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
index 60289feda1..a3a6506bc4 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
index 35d26a5e28..95454c4477 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
index 50ba485296..44e62446b2 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Model.MediaInfo;
 
diff --git a/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
index 3dd37b4ed9..fe315d83c5 100644
--- a/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
diff --git a/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs b/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
index 12d906bb22..f4d0899b60 100644
--- a/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
+++ b/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace MediaBrowser.MediaEncoding.Probing
diff --git a/MediaBrowser.MediaEncoding/Probing/InternalMediaInfoResult.cs b/MediaBrowser.MediaEncoding/Probing/InternalMediaInfoResult.cs
index 350a2e3e5a..cc9d27608b 100644
--- a/MediaBrowser.MediaEncoding/Probing/InternalMediaInfoResult.cs
+++ b/MediaBrowser.MediaEncoding/Probing/InternalMediaInfoResult.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace MediaBrowser.MediaEncoding.Probing
 {
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index 411a69ed3c..51d2bcba7e 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
diff --git a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
index a0fa7ceb49..0aa6a3e443 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
diff --git a/MediaBrowser.MediaEncoding/Subtitles/ConfigurationExtension.cs b/MediaBrowser.MediaEncoding/Subtitles/ConfigurationExtension.cs
index 973c653a47..92544f4f62 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/ConfigurationExtension.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/ConfigurationExtension.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.Providers;
 
diff --git a/MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs b/MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs
index 75de81f461..f0d1071967 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Threading;
 using MediaBrowser.Model.MediaInfo;
 
diff --git a/MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs
index e28da91857..3401c2d670 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Threading;
 using MediaBrowser.Model.MediaInfo;
 
diff --git a/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
index 0c791aedac..8995fcfe1f 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Text;
 using System.Threading;
 using MediaBrowser.Model.MediaInfo;
diff --git a/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs b/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs
index 1c1906de7e..0e418ecf7e 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
diff --git a/MediaBrowser.MediaEncoding/Subtitles/ParserValues.cs b/MediaBrowser.MediaEncoding/Subtitles/ParserValues.cs
index b8c2fef1e4..bf8808eb8a 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/ParserValues.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/ParserValues.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.MediaEncoding.Subtitles
+namespace MediaBrowser.MediaEncoding.Subtitles
 {
     public class ParserValues
     {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
index 943d86ee57..c3f6d49475 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs
index c05929fdeb..6f96a641e9 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Text;
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
index d88fea07e8..1cd714f327 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 3e6ec460fd..58a05e2f33 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Globalization;
 using System.IO;
diff --git a/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs
index f0cf3b31ad..cdaf949641 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
diff --git a/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
index 092add9921..d67d1dad84 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
diff --git a/MediaBrowser.Model/Activity/ActivityLogEntry.cs b/MediaBrowser.Model/Activity/ActivityLogEntry.cs
index 7e936ce534..186fd89ee0 100644
--- a/MediaBrowser.Model/Activity/ActivityLogEntry.cs
+++ b/MediaBrowser.Model/Activity/ActivityLogEntry.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Model.Activity
diff --git a/MediaBrowser.Model/Activity/IActivityManager.cs b/MediaBrowser.Model/Activity/IActivityManager.cs
index 7fff26987a..897d93d790 100644
--- a/MediaBrowser.Model/Activity/IActivityManager.cs
+++ b/MediaBrowser.Model/Activity/IActivityManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Querying;
 
diff --git a/MediaBrowser.Model/Activity/IActivityRepository.cs b/MediaBrowser.Model/Activity/IActivityRepository.cs
index 5a2c52400e..f0e3b902c4 100644
--- a/MediaBrowser.Model/Activity/IActivityRepository.cs
+++ b/MediaBrowser.Model/Activity/IActivityRepository.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Model.Activity
diff --git a/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs b/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs
index e2f7806055..8e0fd26245 100644
--- a/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs
+++ b/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.ApiClient
 {
     public class ServerDiscoveryInfo
diff --git a/MediaBrowser.Model/Branding/BrandingOptions.cs b/MediaBrowser.Model/Branding/BrandingOptions.cs
index 3b207d345c..3f05b97b8d 100644
--- a/MediaBrowser.Model/Branding/BrandingOptions.cs
+++ b/MediaBrowser.Model/Branding/BrandingOptions.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Branding
 {
     public class BrandingOptions
diff --git a/MediaBrowser.Model/Channels/ChannelFeatures.cs b/MediaBrowser.Model/Channels/ChannelFeatures.cs
index 259370b7ee..ee1d11bc05 100644
--- a/MediaBrowser.Model/Channels/ChannelFeatures.cs
+++ b/MediaBrowser.Model/Channels/ChannelFeatures.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Channels
 {
diff --git a/MediaBrowser.Model/Channels/ChannelInfo.cs b/MediaBrowser.Model/Channels/ChannelInfo.cs
index 36e3c17d98..39cd92e01e 100644
--- a/MediaBrowser.Model/Channels/ChannelInfo.cs
+++ b/MediaBrowser.Model/Channels/ChannelInfo.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Channels
 {
     public class ChannelInfo
diff --git a/MediaBrowser.Model/Channels/ChannelMediaContentType.cs b/MediaBrowser.Model/Channels/ChannelMediaContentType.cs
index 20c4446d42..010ff80486 100644
--- a/MediaBrowser.Model/Channels/ChannelMediaContentType.cs
+++ b/MediaBrowser.Model/Channels/ChannelMediaContentType.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Channels
+namespace MediaBrowser.Model.Channels
 {
     public enum ChannelMediaContentType
     {
diff --git a/MediaBrowser.Model/Channels/ChannelMediaType.cs b/MediaBrowser.Model/Channels/ChannelMediaType.cs
index 8ceb3cce5e..a3fa5cdf9b 100644
--- a/MediaBrowser.Model/Channels/ChannelMediaType.cs
+++ b/MediaBrowser.Model/Channels/ChannelMediaType.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Channels
+namespace MediaBrowser.Model.Channels
 {
     public enum ChannelMediaType
     {
diff --git a/MediaBrowser.Model/Channels/ChannelQuery.cs b/MediaBrowser.Model/Channels/ChannelQuery.cs
index d6282874d4..32b368922d 100644
--- a/MediaBrowser.Model/Channels/ChannelQuery.cs
+++ b/MediaBrowser.Model/Channels/ChannelQuery.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
 
diff --git a/MediaBrowser.Model/Collections/CollectionCreationResult.cs b/MediaBrowser.Model/Collections/CollectionCreationResult.cs
index 689625ac38..2691f7970d 100644
--- a/MediaBrowser.Model/Collections/CollectionCreationResult.cs
+++ b/MediaBrowser.Model/Collections/CollectionCreationResult.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Collections
 {
diff --git a/MediaBrowser.Model/Configuration/AccessSchedule.cs b/MediaBrowser.Model/Configuration/AccessSchedule.cs
index 3a66cf5bbc..73a17f18c1 100644
--- a/MediaBrowser.Model/Configuration/AccessSchedule.cs
+++ b/MediaBrowser.Model/Configuration/AccessSchedule.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Configuration
 {
     public class AccessSchedule
diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
index d9a7462114..ce4ef1cfe4 100644
--- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Configuration
+namespace MediaBrowser.Model.Configuration
 {
     /// <summary>
     /// Serves as a common base class for the Server and UI application Configurations
diff --git a/MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs b/MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs
index 1c7de11fd8..298141af7c 100644
--- a/MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs
+++ b/MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Configuration
 {
     public enum DynamicDayOfWeek
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index fbc5e1b375..dddf8b89ce 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Configuration
 {
     public class EncodingOptions
diff --git a/MediaBrowser.Model/Configuration/FanartOptions.cs b/MediaBrowser.Model/Configuration/FanartOptions.cs
index 6924b25d7d..0c991e0899 100644
--- a/MediaBrowser.Model/Configuration/FanartOptions.cs
+++ b/MediaBrowser.Model/Configuration/FanartOptions.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Configuration
 {
     public class FanartOptions
diff --git a/MediaBrowser.Model/Configuration/ImageSavingConvention.cs b/MediaBrowser.Model/Configuration/ImageSavingConvention.cs
index c9a49afd71..7206fa5fc4 100644
--- a/MediaBrowser.Model/Configuration/ImageSavingConvention.cs
+++ b/MediaBrowser.Model/Configuration/ImageSavingConvention.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Configuration
+namespace MediaBrowser.Model.Configuration
 {
     public enum ImageSavingConvention
     {
diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs
index bb3b613e87..ec9b276a0b 100644
--- a/MediaBrowser.Model/Configuration/LibraryOptions.cs
+++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using MediaBrowser.Model.Entities;
 
diff --git a/MediaBrowser.Model/Configuration/MetadataConfiguration.cs b/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
index d1658e5d63..91549ee66f 100644
--- a/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Configuration
 {
     public class MetadataConfiguration
diff --git a/MediaBrowser.Model/Configuration/MetadataOptions.cs b/MediaBrowser.Model/Configuration/MetadataOptions.cs
index dde2bd090e..c095b8cdd1 100644
--- a/MediaBrowser.Model/Configuration/MetadataOptions.cs
+++ b/MediaBrowser.Model/Configuration/MetadataOptions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Configuration
 {
diff --git a/MediaBrowser.Model/Configuration/MetadataPlugin.cs b/MediaBrowser.Model/Configuration/MetadataPlugin.cs
index f3e0ce1064..d6f863e553 100644
--- a/MediaBrowser.Model/Configuration/MetadataPlugin.cs
+++ b/MediaBrowser.Model/Configuration/MetadataPlugin.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Configuration
+namespace MediaBrowser.Model.Configuration
 {
     public class MetadataPlugin
     {
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 2faa52da58..ed58003292 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.Configuration
diff --git a/MediaBrowser.Model/Configuration/SubtitlePlaybackMode.cs b/MediaBrowser.Model/Configuration/SubtitlePlaybackMode.cs
index 678abd8582..fc429934fa 100644
--- a/MediaBrowser.Model/Configuration/SubtitlePlaybackMode.cs
+++ b/MediaBrowser.Model/Configuration/SubtitlePlaybackMode.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Configuration
+namespace MediaBrowser.Model.Configuration
 {
     public enum SubtitlePlaybackMode
     {
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 39b9561381..689459eba0 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Configuration
 {
diff --git a/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs b/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
index de8a59a3d9..40c97c7f9a 100644
--- a/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
+++ b/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Configuration
 {
     public class XbmcMetadataOptions
diff --git a/MediaBrowser.Model/Connect/ConnectAuthorization.cs b/MediaBrowser.Model/Connect/ConnectAuthorization.cs
index a949612ab5..cdb3172d94 100644
--- a/MediaBrowser.Model/Connect/ConnectAuthorization.cs
+++ b/MediaBrowser.Model/Connect/ConnectAuthorization.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Connect
 {
diff --git a/MediaBrowser.Model/Connect/ConnectUser.cs b/MediaBrowser.Model/Connect/ConnectUser.cs
index da290da120..919bb50c69 100644
--- a/MediaBrowser.Model/Connect/ConnectUser.cs
+++ b/MediaBrowser.Model/Connect/ConnectUser.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Connect
 {
     public class ConnectUser
diff --git a/MediaBrowser.Model/Connect/ConnectUserQuery.cs b/MediaBrowser.Model/Connect/ConnectUserQuery.cs
index a7dc649a8f..607f6bab95 100644
--- a/MediaBrowser.Model/Connect/ConnectUserQuery.cs
+++ b/MediaBrowser.Model/Connect/ConnectUserQuery.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Connect
 {
     public class ConnectUserQuery
diff --git a/MediaBrowser.Model/Connect/UserLinkType.cs b/MediaBrowser.Model/Connect/UserLinkType.cs
index 4ac5bfde1b..d86772c960 100644
--- a/MediaBrowser.Model/Connect/UserLinkType.cs
+++ b/MediaBrowser.Model/Connect/UserLinkType.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Connect
 {
     public enum UserLinkType
diff --git a/MediaBrowser.Model/Cryptography/ICryptoProvider.cs b/MediaBrowser.Model/Cryptography/ICryptoProvider.cs
index 2e9778d662..b027d2ad0b 100644
--- a/MediaBrowser.Model/Cryptography/ICryptoProvider.cs
+++ b/MediaBrowser.Model/Cryptography/ICryptoProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 namespace MediaBrowser.Model.Cryptography
diff --git a/MediaBrowser.Model/Devices/ContentUploadHistory.cs b/MediaBrowser.Model/Devices/ContentUploadHistory.cs
index 65c83b0adc..5dd9bf2d04 100644
--- a/MediaBrowser.Model/Devices/ContentUploadHistory.cs
+++ b/MediaBrowser.Model/Devices/ContentUploadHistory.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Devices
+namespace MediaBrowser.Model.Devices
 {
     public class ContentUploadHistory
     {
diff --git a/MediaBrowser.Model/Devices/DeviceInfo.cs b/MediaBrowser.Model/Devices/DeviceInfo.cs
index 245dd7bb66..214c49e5e4 100644
--- a/MediaBrowser.Model/Devices/DeviceInfo.cs
+++ b/MediaBrowser.Model/Devices/DeviceInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Session;
 
 namespace MediaBrowser.Model.Devices
diff --git a/MediaBrowser.Model/Devices/DeviceQuery.cs b/MediaBrowser.Model/Devices/DeviceQuery.cs
index 2838239e40..84d1f2a9e8 100644
--- a/MediaBrowser.Model/Devices/DeviceQuery.cs
+++ b/MediaBrowser.Model/Devices/DeviceQuery.cs
@@ -1,4 +1,4 @@
-
+
 using System;
 
 namespace MediaBrowser.Model.Devices
diff --git a/MediaBrowser.Model/Devices/DevicesOptions.cs b/MediaBrowser.Model/Devices/DevicesOptions.cs
index 8e478d005d..5bbd33b73b 100644
--- a/MediaBrowser.Model/Devices/DevicesOptions.cs
+++ b/MediaBrowser.Model/Devices/DevicesOptions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Devices
 {
diff --git a/MediaBrowser.Model/Devices/LocalFileInfo.cs b/MediaBrowser.Model/Devices/LocalFileInfo.cs
index e7a78bf8b5..4d67e3c694 100644
--- a/MediaBrowser.Model/Devices/LocalFileInfo.cs
+++ b/MediaBrowser.Model/Devices/LocalFileInfo.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Devices
 {
     public class LocalFileInfo
diff --git a/MediaBrowser.Model/Diagnostics/IProcess.cs b/MediaBrowser.Model/Diagnostics/IProcess.cs
index 7cd26af007..cade631c99 100644
--- a/MediaBrowser.Model/Diagnostics/IProcess.cs
+++ b/MediaBrowser.Model/Diagnostics/IProcess.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 
diff --git a/MediaBrowser.Model/Diagnostics/IProcessFactory.cs b/MediaBrowser.Model/Diagnostics/IProcessFactory.cs
index 15e3d71233..a11be8f4e7 100644
--- a/MediaBrowser.Model/Diagnostics/IProcessFactory.cs
+++ b/MediaBrowser.Model/Diagnostics/IProcessFactory.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Diagnostics
+namespace MediaBrowser.Model.Diagnostics
 {
     public interface IProcessFactory
     {
diff --git a/MediaBrowser.Model/Dlna/AudioOptions.cs b/MediaBrowser.Model/Dlna/AudioOptions.cs
index 29a7a11540..33e2982e93 100644
--- a/MediaBrowser.Model/Dlna/AudioOptions.cs
+++ b/MediaBrowser.Model/Dlna/AudioOptions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.Dlna
diff --git a/MediaBrowser.Model/Dlna/CodecProfile.cs b/MediaBrowser.Model/Dlna/CodecProfile.cs
index 6965d30592..9ea248908b 100644
--- a/MediaBrowser.Model/Dlna/CodecProfile.cs
+++ b/MediaBrowser.Model/Dlna/CodecProfile.cs
@@ -1,4 +1,4 @@
-using System.Xml.Serialization;
+using System.Xml.Serialization;
 using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Dlna
diff --git a/MediaBrowser.Model/Dlna/CodecType.cs b/MediaBrowser.Model/Dlna/CodecType.cs
index e4eabcd18a..d777be4c22 100644
--- a/MediaBrowser.Model/Dlna/CodecType.cs
+++ b/MediaBrowser.Model/Dlna/CodecType.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Dlna
+namespace MediaBrowser.Model.Dlna
 {
     public enum CodecType
     {
diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
index 1a5bf75153..fe89267351 100644
--- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs
+++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
diff --git a/MediaBrowser.Model/Dlna/ContainerProfile.cs b/MediaBrowser.Model/Dlna/ContainerProfile.cs
index ccad4cead4..073324c264 100644
--- a/MediaBrowser.Model/Dlna/ContainerProfile.cs
+++ b/MediaBrowser.Model/Dlna/ContainerProfile.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml.Serialization;
 using MediaBrowser.Model.Extensions;
 
diff --git a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
index aca3513056..ecca415d3d 100644
--- a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
+++ b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using MediaBrowser.Model.MediaInfo;
 
diff --git a/MediaBrowser.Model/Dlna/DeviceIdentification.cs b/MediaBrowser.Model/Dlna/DeviceIdentification.cs
index cbde2d710c..84573521aa 100644
--- a/MediaBrowser.Model/Dlna/DeviceIdentification.cs
+++ b/MediaBrowser.Model/Dlna/DeviceIdentification.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Dlna
+namespace MediaBrowser.Model.Dlna
 {
     public class DeviceIdentification
     {
diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs
index 2e4e942d92..3a626deaa0 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml.Serialization;
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
diff --git a/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs b/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
index b2afdf2924..9b3515fc3d 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Dlna
 {
     public class DeviceProfileInfo
diff --git a/MediaBrowser.Model/Dlna/DeviceProfileType.cs b/MediaBrowser.Model/Dlna/DeviceProfileType.cs
index 19d866f513..2449fa434a 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfileType.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfileType.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Dlna
+namespace MediaBrowser.Model.Dlna
 {
     public enum DeviceProfileType
     {
diff --git a/MediaBrowser.Model/Dlna/DirectPlayProfile.cs b/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
index e6b7a57217..5a54847d74 100644
--- a/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
+++ b/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
@@ -1,4 +1,4 @@
-using System.Xml.Serialization;
+using System.Xml.Serialization;
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/DlnaFlags.cs b/MediaBrowser.Model/Dlna/DlnaFlags.cs
index 28c93464d9..d076e73ece 100644
--- a/MediaBrowser.Model/Dlna/DlnaFlags.cs
+++ b/MediaBrowser.Model/Dlna/DlnaFlags.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/DlnaMaps.cs b/MediaBrowser.Model/Dlna/DlnaMaps.cs
index 8dadc32d60..880d057240 100644
--- a/MediaBrowser.Model/Dlna/DlnaMaps.cs
+++ b/MediaBrowser.Model/Dlna/DlnaMaps.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Dlna
+namespace MediaBrowser.Model.Dlna
 {
     public class DlnaMaps
     {
diff --git a/MediaBrowser.Model/Dlna/DlnaProfileType.cs b/MediaBrowser.Model/Dlna/DlnaProfileType.cs
index 39b4b688ef..6a23bbb040 100644
--- a/MediaBrowser.Model/Dlna/DlnaProfileType.cs
+++ b/MediaBrowser.Model/Dlna/DlnaProfileType.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Dlna
+namespace MediaBrowser.Model.Dlna
 {
     public enum DlnaProfileType
     {
diff --git a/MediaBrowser.Model/Dlna/HeaderMatchType.cs b/MediaBrowser.Model/Dlna/HeaderMatchType.cs
index 764a512ac0..b0a1438f6d 100644
--- a/MediaBrowser.Model/Dlna/HeaderMatchType.cs
+++ b/MediaBrowser.Model/Dlna/HeaderMatchType.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Dlna
+namespace MediaBrowser.Model.Dlna
 {
     public enum HeaderMatchType
     {
diff --git a/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs b/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs
index 791d5967fb..d157275048 100644
--- a/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs
+++ b/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs
@@ -1,4 +1,4 @@
-using System.Xml.Serialization;
+using System.Xml.Serialization;
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/IDeviceDiscovery.cs b/MediaBrowser.Model/Dlna/IDeviceDiscovery.cs
index 70191ff23c..3de3fe761d 100644
--- a/MediaBrowser.Model/Dlna/IDeviceDiscovery.cs
+++ b/MediaBrowser.Model/Dlna/IDeviceDiscovery.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Events;
 
 namespace MediaBrowser.Model.Dlna
diff --git a/MediaBrowser.Model/Dlna/ITranscoderSupport.cs b/MediaBrowser.Model/Dlna/ITranscoderSupport.cs
index 14723bd273..c0ff54c3fc 100644
--- a/MediaBrowser.Model/Dlna/ITranscoderSupport.cs
+++ b/MediaBrowser.Model/Dlna/ITranscoderSupport.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Dlna
+namespace MediaBrowser.Model.Dlna
 {
     public interface ITranscoderSupport
     {
diff --git a/MediaBrowser.Model/Dlna/MediaFormatProfile.cs b/MediaBrowser.Model/Dlna/MediaFormatProfile.cs
index f3d04335fb..376849c435 100644
--- a/MediaBrowser.Model/Dlna/MediaFormatProfile.cs
+++ b/MediaBrowser.Model/Dlna/MediaFormatProfile.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Dlna
 {
     public enum MediaFormatProfile
diff --git a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
index 1b20ab567b..42c78e335f 100644
--- a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
+++ b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Model.Extensions;
diff --git a/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs b/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs
index 4ed4129854..9412cd1b68 100644
--- a/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs
+++ b/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Dlna
 {
     public enum PlaybackErrorCode
diff --git a/MediaBrowser.Model/Dlna/ProfileCondition.cs b/MediaBrowser.Model/Dlna/ProfileCondition.cs
index 5464daf226..b83566f6e2 100644
--- a/MediaBrowser.Model/Dlna/ProfileCondition.cs
+++ b/MediaBrowser.Model/Dlna/ProfileCondition.cs
@@ -1,4 +1,4 @@
-using System.Xml.Serialization;
+using System.Xml.Serialization;
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/ProfileConditionType.cs b/MediaBrowser.Model/Dlna/ProfileConditionType.cs
index 71afd54bf2..2628412622 100644
--- a/MediaBrowser.Model/Dlna/ProfileConditionType.cs
+++ b/MediaBrowser.Model/Dlna/ProfileConditionType.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Dlna
+namespace MediaBrowser.Model.Dlna
 {
     public enum ProfileConditionType
     {
diff --git a/MediaBrowser.Model/Dlna/ProfileConditionValue.cs b/MediaBrowser.Model/Dlna/ProfileConditionValue.cs
index e28d9e5cb2..bae46bdcfc 100644
--- a/MediaBrowser.Model/Dlna/ProfileConditionValue.cs
+++ b/MediaBrowser.Model/Dlna/ProfileConditionValue.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Dlna
+namespace MediaBrowser.Model.Dlna
 {
     public enum ProfileConditionValue
     {
diff --git a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
index 4cde26a03c..cf92633c31 100644
--- a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
+++ b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Dlna
diff --git a/MediaBrowser.Model/Dlna/ResponseProfile.cs b/MediaBrowser.Model/Dlna/ResponseProfile.cs
index d69dc9868b..8c6b0806fd 100644
--- a/MediaBrowser.Model/Dlna/ResponseProfile.cs
+++ b/MediaBrowser.Model/Dlna/ResponseProfile.cs
@@ -1,4 +1,4 @@
-using System.Xml.Serialization;
+using System.Xml.Serialization;
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/SearchType.cs b/MediaBrowser.Model/Dlna/SearchType.cs
index a34d3862db..05c59f5de6 100644
--- a/MediaBrowser.Model/Dlna/SearchType.cs
+++ b/MediaBrowser.Model/Dlna/SearchType.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Dlna
+namespace MediaBrowser.Model.Dlna
 {
     public enum SearchType
     {
diff --git a/MediaBrowser.Model/Dlna/SortCriteria.cs b/MediaBrowser.Model/Dlna/SortCriteria.cs
index ecaf32614c..7465e05f89 100644
--- a/MediaBrowser.Model/Dlna/SortCriteria.cs
+++ b/MediaBrowser.Model/Dlna/SortCriteria.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index d7335907a9..f1ec71d1d9 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 61bba4126b..2bc6908db5 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
diff --git a/MediaBrowser.Model/Dlna/SubtitleProfile.cs b/MediaBrowser.Model/Dlna/SubtitleProfile.cs
index 77451e3460..f950b6cb82 100644
--- a/MediaBrowser.Model/Dlna/SubtitleProfile.cs
+++ b/MediaBrowser.Model/Dlna/SubtitleProfile.cs
@@ -1,4 +1,4 @@
-using System.Xml.Serialization;
+using System.Xml.Serialization;
 using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Dlna
diff --git a/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs b/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs
index e8973fce04..eac5d4b362 100644
--- a/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs
+++ b/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Dlna
+namespace MediaBrowser.Model.Dlna
 {
     public enum TranscodeSeekInfo
     {
diff --git a/MediaBrowser.Model/Dlna/TranscodingProfile.cs b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
index a37b292597..dc2f0c90d2 100644
--- a/MediaBrowser.Model/Dlna/TranscodingProfile.cs
+++ b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
@@ -1,4 +1,4 @@
-using System.Xml.Serialization;
+using System.Xml.Serialization;
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs b/MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs
index f4b9d1e9bc..4edbb503bb 100644
--- a/MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs
+++ b/MediaBrowser.Model/Dlna/UpnpDeviceInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using MediaBrowser.Model.Net;
 
diff --git a/MediaBrowser.Model/Dlna/VideoOptions.cs b/MediaBrowser.Model/Dlna/VideoOptions.cs
index 35d0dd18c9..9c4a38292a 100644
--- a/MediaBrowser.Model/Dlna/VideoOptions.cs
+++ b/MediaBrowser.Model/Dlna/VideoOptions.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Dlna
+namespace MediaBrowser.Model.Dlna
 {
     /// <summary>
     /// Class VideoOptions.
diff --git a/MediaBrowser.Model/Dlna/XmlAttribute.cs b/MediaBrowser.Model/Dlna/XmlAttribute.cs
index 7ee15233ad..aa64177a8a 100644
--- a/MediaBrowser.Model/Dlna/XmlAttribute.cs
+++ b/MediaBrowser.Model/Dlna/XmlAttribute.cs
@@ -1,4 +1,4 @@
-using System.Xml.Serialization;
+using System.Xml.Serialization;
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Drawing/DrawingUtils.cs b/MediaBrowser.Model/Drawing/DrawingUtils.cs
index e6235cb06f..fbd0742181 100644
--- a/MediaBrowser.Model/Drawing/DrawingUtils.cs
+++ b/MediaBrowser.Model/Drawing/DrawingUtils.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Drawing
+namespace MediaBrowser.Model.Drawing
 {
     /// <summary>
     /// Class DrawingUtils
diff --git a/MediaBrowser.Model/Drawing/ImageFormat.cs b/MediaBrowser.Model/Drawing/ImageFormat.cs
index 0172c9754f..31619a472a 100644
--- a/MediaBrowser.Model/Drawing/ImageFormat.cs
+++ b/MediaBrowser.Model/Drawing/ImageFormat.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Drawing
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Drawing/ImageOrientation.cs b/MediaBrowser.Model/Drawing/ImageOrientation.cs
index c320a82240..0df72411cf 100644
--- a/MediaBrowser.Model/Drawing/ImageOrientation.cs
+++ b/MediaBrowser.Model/Drawing/ImageOrientation.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Drawing
 {
     public enum ImageOrientation
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 241ddfce6e..3e267a39d9 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Entities;
diff --git a/MediaBrowser.Model/Dto/BaseItemPerson.cs b/MediaBrowser.Model/Dto/BaseItemPerson.cs
index 35b4e92494..f42ef4c915 100644
--- a/MediaBrowser.Model/Dto/BaseItemPerson.cs
+++ b/MediaBrowser.Model/Dto/BaseItemPerson.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.Model.Dto
 {
diff --git a/MediaBrowser.Model/Dto/GameSystemSummary.cs b/MediaBrowser.Model/Dto/GameSystemSummary.cs
index b42e988420..e2400a7443 100644
--- a/MediaBrowser.Model/Dto/GameSystemSummary.cs
+++ b/MediaBrowser.Model/Dto/GameSystemSummary.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Dto
 {
diff --git a/MediaBrowser.Model/Dto/IHasServerId.cs b/MediaBrowser.Model/Dto/IHasServerId.cs
index 0515203da9..19991c622b 100644
--- a/MediaBrowser.Model/Dto/IHasServerId.cs
+++ b/MediaBrowser.Model/Dto/IHasServerId.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Dto
 {
     public interface IHasServerId
diff --git a/MediaBrowser.Model/Dto/IItemDto.cs b/MediaBrowser.Model/Dto/IItemDto.cs
index 3e7d1c6085..60c579cdd0 100644
--- a/MediaBrowser.Model/Dto/IItemDto.cs
+++ b/MediaBrowser.Model/Dto/IItemDto.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Dto
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Dto/ImageByNameInfo.cs b/MediaBrowser.Model/Dto/ImageByNameInfo.cs
index b7921d993d..2bda8bf204 100644
--- a/MediaBrowser.Model/Dto/ImageByNameInfo.cs
+++ b/MediaBrowser.Model/Dto/ImageByNameInfo.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Dto
 {
     public class ImageByNameInfo
diff --git a/MediaBrowser.Model/Dto/ImageInfo.cs b/MediaBrowser.Model/Dto/ImageInfo.cs
index 5eabb16a56..792eaff031 100644
--- a/MediaBrowser.Model/Dto/ImageInfo.cs
+++ b/MediaBrowser.Model/Dto/ImageInfo.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Dto
 {
diff --git a/MediaBrowser.Model/Dto/ImageOptions.cs b/MediaBrowser.Model/Dto/ImageOptions.cs
index e98d544353..1fd4a5383a 100644
--- a/MediaBrowser.Model/Dto/ImageOptions.cs
+++ b/MediaBrowser.Model/Dto/ImageOptions.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Drawing;
+using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Dto
diff --git a/MediaBrowser.Model/Dto/ItemCounts.cs b/MediaBrowser.Model/Dto/ItemCounts.cs
index 8ceb3a86b9..da941d2582 100644
--- a/MediaBrowser.Model/Dto/ItemCounts.cs
+++ b/MediaBrowser.Model/Dto/ItemCounts.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Dto
+namespace MediaBrowser.Model.Dto
 {
     /// <summary>
     /// Class LibrarySummary
diff --git a/MediaBrowser.Model/Dto/ItemIndex.cs b/MediaBrowser.Model/Dto/ItemIndex.cs
index 96cef622b2..de29f97d48 100644
--- a/MediaBrowser.Model/Dto/ItemIndex.cs
+++ b/MediaBrowser.Model/Dto/ItemIndex.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Dto
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
index ea851f3c29..c2219dc332 100644
--- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs
+++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.MediaInfo;
diff --git a/MediaBrowser.Model/Dto/MetadataEditorInfo.cs b/MediaBrowser.Model/Dto/MetadataEditorInfo.cs
index 5dacbeef6e..46bcb62f4a 100644
--- a/MediaBrowser.Model/Dto/MetadataEditorInfo.cs
+++ b/MediaBrowser.Model/Dto/MetadataEditorInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Providers;
diff --git a/MediaBrowser.Model/Dto/NameIdPair.cs b/MediaBrowser.Model/Dto/NameIdPair.cs
index 50318ac951..ccd42f17f7 100644
--- a/MediaBrowser.Model/Dto/NameIdPair.cs
+++ b/MediaBrowser.Model/Dto/NameIdPair.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Dto
 {
diff --git a/MediaBrowser.Model/Dto/NameValuePair.cs b/MediaBrowser.Model/Dto/NameValuePair.cs
index 564e32dcdb..f0971c0764 100644
--- a/MediaBrowser.Model/Dto/NameValuePair.cs
+++ b/MediaBrowser.Model/Dto/NameValuePair.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Dto
 {
     public class NameValuePair
diff --git a/MediaBrowser.Model/Dto/RecommendationDto.cs b/MediaBrowser.Model/Dto/RecommendationDto.cs
index 79d3d6c6f4..0a890573bf 100644
--- a/MediaBrowser.Model/Dto/RecommendationDto.cs
+++ b/MediaBrowser.Model/Dto/RecommendationDto.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Dto
 {
diff --git a/MediaBrowser.Model/Dto/UserDto.cs b/MediaBrowser.Model/Dto/UserDto.cs
index de945dec05..b00f5919f3 100644
--- a/MediaBrowser.Model/Dto/UserDto.cs
+++ b/MediaBrowser.Model/Dto/UserDto.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Connect;
 using MediaBrowser.Model.Users;
diff --git a/MediaBrowser.Model/Dto/UserItemDataDto.cs b/MediaBrowser.Model/Dto/UserItemDataDto.cs
index 507dbb06d9..fa512e94c3 100644
--- a/MediaBrowser.Model/Dto/UserItemDataDto.cs
+++ b/MediaBrowser.Model/Dto/UserItemDataDto.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Dto
 {
diff --git a/MediaBrowser.Model/Entities/ChapterInfo.cs b/MediaBrowser.Model/Entities/ChapterInfo.cs
index c24ca553b5..dfd6fdf4a3 100644
--- a/MediaBrowser.Model/Entities/ChapterInfo.cs
+++ b/MediaBrowser.Model/Entities/ChapterInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Entities
 {
diff --git a/MediaBrowser.Model/Entities/CollectionType.cs b/MediaBrowser.Model/Entities/CollectionType.cs
index 12945eddd4..bda1661184 100644
--- a/MediaBrowser.Model/Entities/CollectionType.cs
+++ b/MediaBrowser.Model/Entities/CollectionType.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Entities
+namespace MediaBrowser.Model.Entities
 {
     public static class CollectionType
     {
diff --git a/MediaBrowser.Model/Entities/DisplayPreferences.cs b/MediaBrowser.Model/Entities/DisplayPreferences.cs
index 2bc0c2e1df..f9b3ac7b36 100644
--- a/MediaBrowser.Model/Entities/DisplayPreferences.cs
+++ b/MediaBrowser.Model/Entities/DisplayPreferences.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Entities
 {
diff --git a/MediaBrowser.Model/Entities/EmptyRequestResult.cs b/MediaBrowser.Model/Entities/EmptyRequestResult.cs
index 5c9a725fd9..2b2b9bee94 100644
--- a/MediaBrowser.Model/Entities/EmptyRequestResult.cs
+++ b/MediaBrowser.Model/Entities/EmptyRequestResult.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Entities
 {
     public class EmptyRequestResult
diff --git a/MediaBrowser.Model/Entities/ExtraType.cs b/MediaBrowser.Model/Entities/ExtraType.cs
index ab8da58c07..b632e77540 100644
--- a/MediaBrowser.Model/Entities/ExtraType.cs
+++ b/MediaBrowser.Model/Entities/ExtraType.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Entities
 {
     public enum ExtraType
diff --git a/MediaBrowser.Model/Entities/IHasProviderIds.cs b/MediaBrowser.Model/Entities/IHasProviderIds.cs
index 796850dbd4..3b8d74cb45 100644
--- a/MediaBrowser.Model/Entities/IHasProviderIds.cs
+++ b/MediaBrowser.Model/Entities/IHasProviderIds.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Entities
 {
diff --git a/MediaBrowser.Model/Entities/ImageType.cs b/MediaBrowser.Model/Entities/ImageType.cs
index 6e0ba717f0..c2427f96da 100644
--- a/MediaBrowser.Model/Entities/ImageType.cs
+++ b/MediaBrowser.Model/Entities/ImageType.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs b/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs
index 2ae7bead21..9c9b3ef676 100644
--- a/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs
+++ b/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Entities
 {
diff --git a/MediaBrowser.Model/Entities/LocationType.cs b/MediaBrowser.Model/Entities/LocationType.cs
index 84de803aa2..828e238b2c 100644
--- a/MediaBrowser.Model/Entities/LocationType.cs
+++ b/MediaBrowser.Model/Entities/LocationType.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 256fd3cefb..b51942af85 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using MediaBrowser.Model.Dlna;
diff --git a/MediaBrowser.Model/Entities/MediaType.cs b/MediaBrowser.Model/Entities/MediaType.cs
index 0c9bde6fb6..65236c792c 100644
--- a/MediaBrowser.Model/Entities/MediaType.cs
+++ b/MediaBrowser.Model/Entities/MediaType.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/MediaUrl.cs b/MediaBrowser.Model/Entities/MediaUrl.cs
index 2e17bba8a8..cffb5b8579 100644
--- a/MediaBrowser.Model/Entities/MediaUrl.cs
+++ b/MediaBrowser.Model/Entities/MediaUrl.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Entities
 {
     public class MediaUrl
diff --git a/MediaBrowser.Model/Entities/MetadataFields.cs b/MediaBrowser.Model/Entities/MetadataFields.cs
index 85f2da31e0..e76f51249b 100644
--- a/MediaBrowser.Model/Entities/MetadataFields.cs
+++ b/MediaBrowser.Model/Entities/MetadataFields.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/MetadataProviders.cs b/MediaBrowser.Model/Entities/MetadataProviders.cs
index efd4339d5c..2d639a63e8 100644
--- a/MediaBrowser.Model/Entities/MetadataProviders.cs
+++ b/MediaBrowser.Model/Entities/MetadataProviders.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/PackageReviewInfo.cs b/MediaBrowser.Model/Entities/PackageReviewInfo.cs
index 52500a41ea..b73ba8dd0e 100644
--- a/MediaBrowser.Model/Entities/PackageReviewInfo.cs
+++ b/MediaBrowser.Model/Entities/PackageReviewInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Entities
 {
diff --git a/MediaBrowser.Model/Entities/ParentalRating.cs b/MediaBrowser.Model/Entities/ParentalRating.cs
index 302c1e2991..5dbbf7cb97 100644
--- a/MediaBrowser.Model/Entities/ParentalRating.cs
+++ b/MediaBrowser.Model/Entities/ParentalRating.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/PersonType.cs b/MediaBrowser.Model/Entities/PersonType.cs
index bc274972da..20d585ab0d 100644
--- a/MediaBrowser.Model/Entities/PersonType.cs
+++ b/MediaBrowser.Model/Entities/PersonType.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/PluginSecurityInfo.cs b/MediaBrowser.Model/Entities/PluginSecurityInfo.cs
index 5cab55013e..28a68aa186 100644
--- a/MediaBrowser.Model/Entities/PluginSecurityInfo.cs
+++ b/MediaBrowser.Model/Entities/PluginSecurityInfo.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/SeriesStatus.cs b/MediaBrowser.Model/Entities/SeriesStatus.cs
index d04a2856cf..558a1cd027 100644
--- a/MediaBrowser.Model/Entities/SeriesStatus.cs
+++ b/MediaBrowser.Model/Entities/SeriesStatus.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/UserDataSaveReason.cs b/MediaBrowser.Model/Entities/UserDataSaveReason.cs
index d9691f3953..b1590e62f6 100644
--- a/MediaBrowser.Model/Entities/UserDataSaveReason.cs
+++ b/MediaBrowser.Model/Entities/UserDataSaveReason.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/Video3DFormat.cs b/MediaBrowser.Model/Entities/Video3DFormat.cs
index 722df42819..c9e6590d2a 100644
--- a/MediaBrowser.Model/Entities/Video3DFormat.cs
+++ b/MediaBrowser.Model/Entities/Video3DFormat.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Entities
 {
     public enum Video3DFormat
diff --git a/MediaBrowser.Model/Entities/VideoType.cs b/MediaBrowser.Model/Entities/VideoType.cs
index 05c2fa32c6..d8f4cf6d04 100644
--- a/MediaBrowser.Model/Entities/VideoType.cs
+++ b/MediaBrowser.Model/Entities/VideoType.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/VirtualFolderInfo.cs b/MediaBrowser.Model/Entities/VirtualFolderInfo.cs
index cae0aa58c4..6bdbdb489e 100644
--- a/MediaBrowser.Model/Entities/VirtualFolderInfo.cs
+++ b/MediaBrowser.Model/Entities/VirtualFolderInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Configuration;
 
 namespace MediaBrowser.Model.Entities
diff --git a/MediaBrowser.Model/Events/GenericEventArgs.cs b/MediaBrowser.Model/Events/GenericEventArgs.cs
index 3c558577ad..fc8bc620f9 100644
--- a/MediaBrowser.Model/Events/GenericEventArgs.cs
+++ b/MediaBrowser.Model/Events/GenericEventArgs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Events
 {
diff --git a/MediaBrowser.Model/Extensions/LinqExtensions.cs b/MediaBrowser.Model/Extensions/LinqExtensions.cs
index 4e33edb41f..f0febf1d0a 100644
--- a/MediaBrowser.Model/Extensions/LinqExtensions.cs
+++ b/MediaBrowser.Model/Extensions/LinqExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 // TODO: @bond Remove
diff --git a/MediaBrowser.Model/Extensions/ListHelper.cs b/MediaBrowser.Model/Extensions/ListHelper.cs
index 68379d4634..b5bd077028 100644
--- a/MediaBrowser.Model/Extensions/ListHelper.cs
+++ b/MediaBrowser.Model/Extensions/ListHelper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Extensions
 {
diff --git a/MediaBrowser.Model/Extensions/StringHelper.cs b/MediaBrowser.Model/Extensions/StringHelper.cs
index fa79d09dbb..78e23e7676 100644
--- a/MediaBrowser.Model/Extensions/StringHelper.cs
+++ b/MediaBrowser.Model/Extensions/StringHelper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 
 namespace MediaBrowser.Model.Extensions
diff --git a/MediaBrowser.Model/Globalization/CountryInfo.cs b/MediaBrowser.Model/Globalization/CountryInfo.cs
index 16aea8436b..3ae26a158e 100644
--- a/MediaBrowser.Model/Globalization/CountryInfo.cs
+++ b/MediaBrowser.Model/Globalization/CountryInfo.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Globalization
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Globalization/CultureDto.cs b/MediaBrowser.Model/Globalization/CultureDto.cs
index c0eb8b2ad0..f229f20553 100644
--- a/MediaBrowser.Model/Globalization/CultureDto.cs
+++ b/MediaBrowser.Model/Globalization/CultureDto.cs
@@ -1,4 +1,4 @@
-using global::System;
+using global::System;
 
 namespace MediaBrowser.Model.Globalization
 {
diff --git a/MediaBrowser.Model/Globalization/ILocalizationManager.cs b/MediaBrowser.Model/Globalization/ILocalizationManager.cs
index a3fb3ecee2..a2531e5041 100644
--- a/MediaBrowser.Model/Globalization/ILocalizationManager.cs
+++ b/MediaBrowser.Model/Globalization/ILocalizationManager.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Globalization
diff --git a/MediaBrowser.Model/IO/FileSystemEntryInfo.cs b/MediaBrowser.Model/IO/FileSystemEntryInfo.cs
index f17e2e5c34..40877680fd 100644
--- a/MediaBrowser.Model/IO/FileSystemEntryInfo.cs
+++ b/MediaBrowser.Model/IO/FileSystemEntryInfo.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.IO
 {
     /// <summary>
diff --git a/MediaBrowser.Model/IO/FileSystemMetadata.cs b/MediaBrowser.Model/IO/FileSystemMetadata.cs
index 665bc255c7..2a6d139599 100644
--- a/MediaBrowser.Model/IO/FileSystemMetadata.cs
+++ b/MediaBrowser.Model/IO/FileSystemMetadata.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.IO
 {
diff --git a/MediaBrowser.Model/IO/IIsoManager.cs b/MediaBrowser.Model/IO/IIsoManager.cs
index 2e684b976e..24b6e5f054 100644
--- a/MediaBrowser.Model/IO/IIsoManager.cs
+++ b/MediaBrowser.Model/IO/IIsoManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
diff --git a/MediaBrowser.Model/IO/IIsoMount.cs b/MediaBrowser.Model/IO/IIsoMount.cs
index 1cc3de19e6..825c0c2435 100644
--- a/MediaBrowser.Model/IO/IIsoMount.cs
+++ b/MediaBrowser.Model/IO/IIsoMount.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.IO
 {
diff --git a/MediaBrowser.Model/IO/IShortcutHandler.cs b/MediaBrowser.Model/IO/IShortcutHandler.cs
index 16255e51f0..4c72a8e771 100644
--- a/MediaBrowser.Model/IO/IShortcutHandler.cs
+++ b/MediaBrowser.Model/IO/IShortcutHandler.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.IO
 {
     public interface IShortcutHandler
diff --git a/MediaBrowser.Model/IO/IStreamHelper.cs b/MediaBrowser.Model/IO/IStreamHelper.cs
index 7ed6015c00..97d985df6c 100644
--- a/MediaBrowser.Model/IO/IStreamHelper.cs
+++ b/MediaBrowser.Model/IO/IStreamHelper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/MediaBrowser.Model/IO/IZipClient.cs b/MediaBrowser.Model/IO/IZipClient.cs
index c1dfc6cd61..eaddd6df32 100644
--- a/MediaBrowser.Model/IO/IZipClient.cs
+++ b/MediaBrowser.Model/IO/IZipClient.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 
 namespace MediaBrowser.Model.IO
 {
diff --git a/MediaBrowser.Model/IO/StreamDefaults.cs b/MediaBrowser.Model/IO/StreamDefaults.cs
index 1e99ff4b55..2ca12a74dc 100644
--- a/MediaBrowser.Model/IO/StreamDefaults.cs
+++ b/MediaBrowser.Model/IO/StreamDefaults.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.IO
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Library/PlayAccess.cs b/MediaBrowser.Model/Library/PlayAccess.cs
index 6ec845fc73..1962d48bad 100644
--- a/MediaBrowser.Model/Library/PlayAccess.cs
+++ b/MediaBrowser.Model/Library/PlayAccess.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Library
 {
     public enum PlayAccess
diff --git a/MediaBrowser.Model/Library/UserViewQuery.cs b/MediaBrowser.Model/Library/UserViewQuery.cs
index 9801b8e8ee..c2e1896035 100644
--- a/MediaBrowser.Model/Library/UserViewQuery.cs
+++ b/MediaBrowser.Model/Library/UserViewQuery.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Library
 {
diff --git a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
index 660542314d..311b5b0c5c 100644
--- a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.LiveTv
diff --git a/MediaBrowser.Model/LiveTv/ChannelType.cs b/MediaBrowser.Model/LiveTv/ChannelType.cs
index bca16f8396..56221ab49d 100644
--- a/MediaBrowser.Model/LiveTv/ChannelType.cs
+++ b/MediaBrowser.Model/LiveTv/ChannelType.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.LiveTv
 {
     /// <summary>
diff --git a/MediaBrowser.Model/LiveTv/DayPattern.cs b/MediaBrowser.Model/LiveTv/DayPattern.cs
index 57d4ac4619..73b15507b6 100644
--- a/MediaBrowser.Model/LiveTv/DayPattern.cs
+++ b/MediaBrowser.Model/LiveTv/DayPattern.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.LiveTv
+namespace MediaBrowser.Model.LiveTv
 {
     public enum DayPattern
     {
diff --git a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
index a2953bc83e..eedf89db0f 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.LiveTv
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
index d604124e08..36fe0c3d23 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.LiveTv
diff --git a/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs b/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
index 4b7ee971c0..9ad13391a9 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.LiveTv
 {
diff --git a/MediaBrowser.Model/LiveTv/ProgramAudio.cs b/MediaBrowser.Model/LiveTv/ProgramAudio.cs
index 6059a4174b..158d67eb9b 100644
--- a/MediaBrowser.Model/LiveTv/ProgramAudio.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramAudio.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.LiveTv
+namespace MediaBrowser.Model.LiveTv
 {
     public enum ProgramAudio
     {
diff --git a/MediaBrowser.Model/LiveTv/RecordingQuery.cs b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
index 79f7fac430..f98d7fe867 100644
--- a/MediaBrowser.Model/LiveTv/RecordingQuery.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
 
diff --git a/MediaBrowser.Model/LiveTv/RecordingStatus.cs b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
index 496e6f421f..bb93fedbc4 100644
--- a/MediaBrowser.Model/LiveTv/RecordingStatus.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.LiveTv
 {
     public enum RecordingStatus
diff --git a/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
index 6ebc5ce299..72c7a0c901 100644
--- a/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using MediaBrowser.Model.Entities;
 
diff --git a/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs b/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs
index 2369a53b6d..a15ba7a129 100644
--- a/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs
+++ b/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.LiveTv
 {
diff --git a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
index d1aa3118fb..208f731c5d 100644
--- a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.LiveTv
 {
diff --git a/MediaBrowser.Model/LiveTv/TimerQuery.cs b/MediaBrowser.Model/LiveTv/TimerQuery.cs
index 9a6552fb96..1478cc148b 100644
--- a/MediaBrowser.Model/LiveTv/TimerQuery.cs
+++ b/MediaBrowser.Model/LiveTv/TimerQuery.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.LiveTv
+namespace MediaBrowser.Model.LiveTv
 {
     public class TimerQuery
     {
diff --git a/MediaBrowser.Model/MediaInfo/AudioCodec.cs b/MediaBrowser.Model/MediaInfo/AudioCodec.cs
index 51dddd9029..5ed67fd784 100644
--- a/MediaBrowser.Model/MediaInfo/AudioCodec.cs
+++ b/MediaBrowser.Model/MediaInfo/AudioCodec.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.MediaInfo
+namespace MediaBrowser.Model.MediaInfo
 {
     public class AudioCodec
     {
diff --git a/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs b/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs
index a08f8adbf9..e728ecdfdb 100644
--- a/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs
+++ b/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.MediaInfo
 {
diff --git a/MediaBrowser.Model/MediaInfo/Container.cs b/MediaBrowser.Model/MediaInfo/Container.cs
index 3762edf9fa..10b22d16b3 100644
--- a/MediaBrowser.Model/MediaInfo/Container.cs
+++ b/MediaBrowser.Model/MediaInfo/Container.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.MediaInfo
 {
     public class Container
diff --git a/MediaBrowser.Model/MediaInfo/IBlurayExaminer.cs b/MediaBrowser.Model/MediaInfo/IBlurayExaminer.cs
index 78d5b197f4..600f18e7e2 100644
--- a/MediaBrowser.Model/MediaInfo/IBlurayExaminer.cs
+++ b/MediaBrowser.Model/MediaInfo/IBlurayExaminer.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.MediaInfo
 {
     /// <summary>
diff --git a/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs b/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
index 6013be0548..edede8ba93 100644
--- a/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
+++ b/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Dlna;
 
 namespace MediaBrowser.Model.MediaInfo
diff --git a/MediaBrowser.Model/MediaInfo/LiveStreamResponse.cs b/MediaBrowser.Model/MediaInfo/LiveStreamResponse.cs
index e79e37a717..dd4b694697 100644
--- a/MediaBrowser.Model/MediaInfo/LiveStreamResponse.cs
+++ b/MediaBrowser.Model/MediaInfo/LiveStreamResponse.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.MediaInfo
 {
diff --git a/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs b/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs
index 71847d809e..e5fad4e114 100644
--- a/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs
+++ b/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Dlna;
 
 namespace MediaBrowser.Model.MediaInfo
diff --git a/MediaBrowser.Model/MediaInfo/PlaybackInfoResponse.cs b/MediaBrowser.Model/MediaInfo/PlaybackInfoResponse.cs
index 10d26c900d..38638af42c 100644
--- a/MediaBrowser.Model/MediaInfo/PlaybackInfoResponse.cs
+++ b/MediaBrowser.Model/MediaInfo/PlaybackInfoResponse.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.MediaInfo
diff --git a/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs b/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs
index cdcb6f6667..208e9bab96 100644
--- a/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs
+++ b/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.MediaInfo
+namespace MediaBrowser.Model.MediaInfo
 {
     public class SubtitleFormat
     {
diff --git a/MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs b/MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs
index b4ab6ed97c..37734fe458 100644
--- a/MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs
+++ b/MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.MediaInfo
 {
     public class SubtitleTrackEvent
diff --git a/MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs b/MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs
index 42070b9ff9..962f4d2fe3 100644
--- a/MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs
+++ b/MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.MediaInfo
+namespace MediaBrowser.Model.MediaInfo
 {
     public class SubtitleTrackInfo
     {
diff --git a/MediaBrowser.Model/MediaInfo/TransportStreamTimestamp.cs b/MediaBrowser.Model/MediaInfo/TransportStreamTimestamp.cs
index edfe2fda68..46ce2302e0 100644
--- a/MediaBrowser.Model/MediaInfo/TransportStreamTimestamp.cs
+++ b/MediaBrowser.Model/MediaInfo/TransportStreamTimestamp.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.MediaInfo
+namespace MediaBrowser.Model.MediaInfo
 {
     public enum TransportStreamTimestamp
     {
diff --git a/MediaBrowser.Model/MediaInfo/VideoCodec.cs b/MediaBrowser.Model/MediaInfo/VideoCodec.cs
index cc24c7ad93..a26ce1b708 100644
--- a/MediaBrowser.Model/MediaInfo/VideoCodec.cs
+++ b/MediaBrowser.Model/MediaInfo/VideoCodec.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.MediaInfo
+namespace MediaBrowser.Model.MediaInfo
 {
     public class VideoCodec
     {
diff --git a/MediaBrowser.Model/Net/EndPointInfo.cs b/MediaBrowser.Model/Net/EndPointInfo.cs
index 5a158e7859..b73799ea88 100644
--- a/MediaBrowser.Model/Net/EndPointInfo.cs
+++ b/MediaBrowser.Model/Net/EndPointInfo.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Net
+namespace MediaBrowser.Model.Net
 {
     public class EndPointInfo
     {
diff --git a/MediaBrowser.Model/Net/HttpException.cs b/MediaBrowser.Model/Net/HttpException.cs
index 2f45299e38..16253ed6cc 100644
--- a/MediaBrowser.Model/Net/HttpException.cs
+++ b/MediaBrowser.Model/Net/HttpException.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net;
 
 namespace MediaBrowser.Model.Net
diff --git a/MediaBrowser.Model/Net/HttpResponse.cs b/MediaBrowser.Model/Net/HttpResponse.cs
index f4bd8e681d..286b1c0afd 100644
--- a/MediaBrowser.Model/Net/HttpResponse.cs
+++ b/MediaBrowser.Model/Net/HttpResponse.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
diff --git a/MediaBrowser.Model/Net/IAcceptSocket.cs b/MediaBrowser.Model/Net/IAcceptSocket.cs
index af5a1fcfbe..2b21d3e660 100644
--- a/MediaBrowser.Model/Net/IAcceptSocket.cs
+++ b/MediaBrowser.Model/Net/IAcceptSocket.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Net
 {
diff --git a/MediaBrowser.Model/Net/ISocket.cs b/MediaBrowser.Model/Net/ISocket.cs
index a9d772855c..992ccb49b0 100644
--- a/MediaBrowser.Model/Net/ISocket.cs
+++ b/MediaBrowser.Model/Net/ISocket.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/MediaBrowser.Model/Net/ISocketFactory.cs b/MediaBrowser.Model/Net/ISocketFactory.cs
index 2100aae2a3..a878f84b06 100644
--- a/MediaBrowser.Model/Net/ISocketFactory.cs
+++ b/MediaBrowser.Model/Net/ISocketFactory.cs
@@ -1,4 +1,4 @@
-
+
 using System.IO;
 
 namespace MediaBrowser.Model.Net
diff --git a/MediaBrowser.Model/Net/IpAddressInfo.cs b/MediaBrowser.Model/Net/IpAddressInfo.cs
index c2c228faf0..7a278d4d41 100644
--- a/MediaBrowser.Model/Net/IpAddressInfo.cs
+++ b/MediaBrowser.Model/Net/IpAddressInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Net
 {
diff --git a/MediaBrowser.Model/Net/IpEndPointInfo.cs b/MediaBrowser.Model/Net/IpEndPointInfo.cs
index 2a04f447f7..f8c125144c 100644
--- a/MediaBrowser.Model/Net/IpEndPointInfo.cs
+++ b/MediaBrowser.Model/Net/IpEndPointInfo.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 
 namespace MediaBrowser.Model.Net
 {
diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index 2245a564fa..e5d1ab462a 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/MediaBrowser.Model/Net/NetworkShare.cs b/MediaBrowser.Model/Net/NetworkShare.cs
index 5ce84eeedd..5aab59d1c0 100644
--- a/MediaBrowser.Model/Net/NetworkShare.cs
+++ b/MediaBrowser.Model/Net/NetworkShare.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Net
 {
     public class NetworkShare
diff --git a/MediaBrowser.Model/Net/NetworkShareType.cs b/MediaBrowser.Model/Net/NetworkShareType.cs
index 41dc9003ee..3270d5b74f 100644
--- a/MediaBrowser.Model/Net/NetworkShareType.cs
+++ b/MediaBrowser.Model/Net/NetworkShareType.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Net
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Net/SocketReceiveResult.cs b/MediaBrowser.Model/Net/SocketReceiveResult.cs
index 5a5004de67..cffc2ad27e 100644
--- a/MediaBrowser.Model/Net/SocketReceiveResult.cs
+++ b/MediaBrowser.Model/Net/SocketReceiveResult.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Net
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Net/WebSocketMessage.cs b/MediaBrowser.Model/Net/WebSocketMessage.cs
index c049a96ef0..a6e0ca6322 100644
--- a/MediaBrowser.Model/Net/WebSocketMessage.cs
+++ b/MediaBrowser.Model/Net/WebSocketMessage.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Net
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Notifications/NotificationLevel.cs b/MediaBrowser.Model/Notifications/NotificationLevel.cs
index a49ee2fe63..4427b9677c 100644
--- a/MediaBrowser.Model/Notifications/NotificationLevel.cs
+++ b/MediaBrowser.Model/Notifications/NotificationLevel.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Notifications
 {
     public enum NotificationLevel
diff --git a/MediaBrowser.Model/Notifications/NotificationOptions.cs b/MediaBrowser.Model/Notifications/NotificationOptions.cs
index 154379692e..f48b5ee7fc 100644
--- a/MediaBrowser.Model/Notifications/NotificationOptions.cs
+++ b/MediaBrowser.Model/Notifications/NotificationOptions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Users;
 
diff --git a/MediaBrowser.Model/Notifications/NotificationRequest.cs b/MediaBrowser.Model/Notifications/NotificationRequest.cs
index 7fa57ca9a3..5a2634e73d 100644
--- a/MediaBrowser.Model/Notifications/NotificationRequest.cs
+++ b/MediaBrowser.Model/Notifications/NotificationRequest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Notifications
 {
diff --git a/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs b/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs
index 95e83e0769..ff957e6449 100644
--- a/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs
+++ b/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Notifications
+namespace MediaBrowser.Model.Notifications
 {
     public class NotificationTypeInfo
     {
diff --git a/MediaBrowser.Model/Playlists/PlaylistCreationRequest.cs b/MediaBrowser.Model/Playlists/PlaylistCreationRequest.cs
index db2724efae..007965c0fc 100644
--- a/MediaBrowser.Model/Playlists/PlaylistCreationRequest.cs
+++ b/MediaBrowser.Model/Playlists/PlaylistCreationRequest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Playlists
 {
diff --git a/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs b/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs
index bbab8a18d2..bb7c7b140a 100644
--- a/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs
+++ b/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Playlists
 {
     public class PlaylistCreationResult
diff --git a/MediaBrowser.Model/Playlists/PlaylistItemQuery.cs b/MediaBrowser.Model/Playlists/PlaylistItemQuery.cs
index 0f6a0c8c55..1f03c14d31 100644
--- a/MediaBrowser.Model/Playlists/PlaylistItemQuery.cs
+++ b/MediaBrowser.Model/Playlists/PlaylistItemQuery.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Querying;
+using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Model.Playlists
 {
diff --git a/MediaBrowser.Model/Plugins/BasePluginConfiguration.cs b/MediaBrowser.Model/Plugins/BasePluginConfiguration.cs
index 9a8bfadd16..3dc5c6773b 100644
--- a/MediaBrowser.Model/Plugins/BasePluginConfiguration.cs
+++ b/MediaBrowser.Model/Plugins/BasePluginConfiguration.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Plugins
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Plugins/IHasWebPages.cs b/MediaBrowser.Model/Plugins/IHasWebPages.cs
index 0745c3c602..5bda7e65e4 100644
--- a/MediaBrowser.Model/Plugins/IHasWebPages.cs
+++ b/MediaBrowser.Model/Plugins/IHasWebPages.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Plugins
 {
diff --git a/MediaBrowser.Model/Plugins/PluginInfo.cs b/MediaBrowser.Model/Plugins/PluginInfo.cs
index b8ac5fe99e..9ff9ea457f 100644
--- a/MediaBrowser.Model/Plugins/PluginInfo.cs
+++ b/MediaBrowser.Model/Plugins/PluginInfo.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Plugins
+namespace MediaBrowser.Model.Plugins
 {
     /// <summary>
     /// This is a serializable stub class that is used by the api to provide information about installed plugins.
diff --git a/MediaBrowser.Model/Plugins/PluginPageInfo.cs b/MediaBrowser.Model/Plugins/PluginPageInfo.cs
index 045a0072c5..8ed2064b9b 100644
--- a/MediaBrowser.Model/Plugins/PluginPageInfo.cs
+++ b/MediaBrowser.Model/Plugins/PluginPageInfo.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Plugins
+namespace MediaBrowser.Model.Plugins
 {
     public class PluginPageInfo
     {
diff --git a/MediaBrowser.Model/Providers/ExternalIdInfo.cs b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
index 2c5cfe91b9..3ccc3cc934 100644
--- a/MediaBrowser.Model/Providers/ExternalIdInfo.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Providers
 {
     public class ExternalIdInfo
diff --git a/MediaBrowser.Model/Providers/ExternalUrl.cs b/MediaBrowser.Model/Providers/ExternalUrl.cs
index 36e6314345..69cead92ab 100644
--- a/MediaBrowser.Model/Providers/ExternalUrl.cs
+++ b/MediaBrowser.Model/Providers/ExternalUrl.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Providers
+namespace MediaBrowser.Model.Providers
 {
     public class ExternalUrl
     {
diff --git a/MediaBrowser.Model/Providers/ImageProviderInfo.cs b/MediaBrowser.Model/Providers/ImageProviderInfo.cs
index fed6cb7445..1c4cff3739 100644
--- a/MediaBrowser.Model/Providers/ImageProviderInfo.cs
+++ b/MediaBrowser.Model/Providers/ImageProviderInfo.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Providers
 {
diff --git a/MediaBrowser.Model/Providers/RemoteImageInfo.cs b/MediaBrowser.Model/Providers/RemoteImageInfo.cs
index 90c1ba0af2..aacd108ec1 100644
--- a/MediaBrowser.Model/Providers/RemoteImageInfo.cs
+++ b/MediaBrowser.Model/Providers/RemoteImageInfo.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Providers
diff --git a/MediaBrowser.Model/Providers/RemoteImageQuery.cs b/MediaBrowser.Model/Providers/RemoteImageQuery.cs
index bf59de84bf..7c9216ce78 100644
--- a/MediaBrowser.Model/Providers/RemoteImageQuery.cs
+++ b/MediaBrowser.Model/Providers/RemoteImageQuery.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Providers
 {
diff --git a/MediaBrowser.Model/Providers/RemoteImageResult.cs b/MediaBrowser.Model/Providers/RemoteImageResult.cs
index a7d3a5c881..5ca00f7701 100644
--- a/MediaBrowser.Model/Providers/RemoteImageResult.cs
+++ b/MediaBrowser.Model/Providers/RemoteImageResult.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Providers
+namespace MediaBrowser.Model.Providers
 {
     /// <summary>
     /// Class RemoteImageResult.
diff --git a/MediaBrowser.Model/Providers/RemoteSearchResult.cs b/MediaBrowser.Model/Providers/RemoteSearchResult.cs
index 03b3699265..88e3bc69c7 100644
--- a/MediaBrowser.Model/Providers/RemoteSearchResult.cs
+++ b/MediaBrowser.Model/Providers/RemoteSearchResult.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using MediaBrowser.Model.Entities;
 
diff --git a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
index 0a4a52cd5f..861aabf720 100644
--- a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
+++ b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Providers
 {
diff --git a/MediaBrowser.Model/Querying/AllThemeMediaResult.cs b/MediaBrowser.Model/Querying/AllThemeMediaResult.cs
index 1ca9136c48..f843a33e68 100644
--- a/MediaBrowser.Model/Querying/AllThemeMediaResult.cs
+++ b/MediaBrowser.Model/Querying/AllThemeMediaResult.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Querying
+namespace MediaBrowser.Model.Querying
 {
     public class AllThemeMediaResult
     {
diff --git a/MediaBrowser.Model/Querying/EpisodeQuery.cs b/MediaBrowser.Model/Querying/EpisodeQuery.cs
index cae87b852c..e2231d3565 100644
--- a/MediaBrowser.Model/Querying/EpisodeQuery.cs
+++ b/MediaBrowser.Model/Querying/EpisodeQuery.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Querying
 {
     public class EpisodeQuery
diff --git a/MediaBrowser.Model/Querying/ItemCountsQuery.cs b/MediaBrowser.Model/Querying/ItemCountsQuery.cs
index 0bf681537b..c12ada345e 100644
--- a/MediaBrowser.Model/Querying/ItemCountsQuery.cs
+++ b/MediaBrowser.Model/Querying/ItemCountsQuery.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Querying
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index ceccf5ee5d..af1aaf486c 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Querying
+namespace MediaBrowser.Model.Querying
 {
     /// <summary>
     /// Used to control the data that gets attached to DtoBaseItems
diff --git a/MediaBrowser.Model/Querying/ItemFilter.cs b/MediaBrowser.Model/Querying/ItemFilter.cs
index ff28bd08c4..ee7e49fb07 100644
--- a/MediaBrowser.Model/Querying/ItemFilter.cs
+++ b/MediaBrowser.Model/Querying/ItemFilter.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Querying
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Querying/ItemSortBy.cs b/MediaBrowser.Model/Querying/ItemSortBy.cs
index 66bdc8aa5b..541990eb99 100644
--- a/MediaBrowser.Model/Querying/ItemSortBy.cs
+++ b/MediaBrowser.Model/Querying/ItemSortBy.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Querying
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Querying/LatestItemsQuery.cs b/MediaBrowser.Model/Querying/LatestItemsQuery.cs
index dfd0fcb5b6..4a5818ac5f 100644
--- a/MediaBrowser.Model/Querying/LatestItemsQuery.cs
+++ b/MediaBrowser.Model/Querying/LatestItemsQuery.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Querying
diff --git a/MediaBrowser.Model/Querying/MovieRecommendationQuery.cs b/MediaBrowser.Model/Querying/MovieRecommendationQuery.cs
index 91417a4a77..ec63abb64a 100644
--- a/MediaBrowser.Model/Querying/MovieRecommendationQuery.cs
+++ b/MediaBrowser.Model/Querying/MovieRecommendationQuery.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Querying
 {
     public class MovieRecommendationQuery
diff --git a/MediaBrowser.Model/Querying/NextUpQuery.cs b/MediaBrowser.Model/Querying/NextUpQuery.cs
index af44841b34..ff146cedee 100644
--- a/MediaBrowser.Model/Querying/NextUpQuery.cs
+++ b/MediaBrowser.Model/Querying/NextUpQuery.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Querying
diff --git a/MediaBrowser.Model/Querying/QueryFilters.cs b/MediaBrowser.Model/Querying/QueryFilters.cs
index 0b224ca456..2f38299db3 100644
--- a/MediaBrowser.Model/Querying/QueryFilters.cs
+++ b/MediaBrowser.Model/Querying/QueryFilters.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.Querying
diff --git a/MediaBrowser.Model/Querying/QueryResult.cs b/MediaBrowser.Model/Querying/QueryResult.cs
index 6f9923d087..992c7e6235 100644
--- a/MediaBrowser.Model/Querying/QueryResult.cs
+++ b/MediaBrowser.Model/Querying/QueryResult.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Querying
 {
     public class QueryResult<T>
diff --git a/MediaBrowser.Model/Querying/SessionQuery.cs b/MediaBrowser.Model/Querying/SessionQuery.cs
index fa7df315ca..d02768ed71 100644
--- a/MediaBrowser.Model/Querying/SessionQuery.cs
+++ b/MediaBrowser.Model/Querying/SessionQuery.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Querying
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Querying/SimilarItemsQuery.cs b/MediaBrowser.Model/Querying/SimilarItemsQuery.cs
index 0dd4915508..68f761bd4d 100644
--- a/MediaBrowser.Model/Querying/SimilarItemsQuery.cs
+++ b/MediaBrowser.Model/Querying/SimilarItemsQuery.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Querying
+namespace MediaBrowser.Model.Querying
 {
     public class SimilarItemsQuery
     {
diff --git a/MediaBrowser.Model/Querying/ThemeMediaResult.cs b/MediaBrowser.Model/Querying/ThemeMediaResult.cs
index 0387ec8303..bae954d78e 100644
--- a/MediaBrowser.Model/Querying/ThemeMediaResult.cs
+++ b/MediaBrowser.Model/Querying/ThemeMediaResult.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.Querying
diff --git a/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
index bdac249bd0..5eac2860da 100644
--- a/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
+++ b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Querying
 {
diff --git a/MediaBrowser.Model/Querying/UserQuery.cs b/MediaBrowser.Model/Querying/UserQuery.cs
index 48dbd30aa9..c668f9d8c5 100644
--- a/MediaBrowser.Model/Querying/UserQuery.cs
+++ b/MediaBrowser.Model/Querying/UserQuery.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Querying
 {
     public class UserQuery
diff --git a/MediaBrowser.Model/Reflection/IAssemblyInfo.cs b/MediaBrowser.Model/Reflection/IAssemblyInfo.cs
index e8e9c414cf..5c4536c1c1 100644
--- a/MediaBrowser.Model/Reflection/IAssemblyInfo.cs
+++ b/MediaBrowser.Model/Reflection/IAssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Reflection;
 
diff --git a/MediaBrowser.Model/Search/SearchHint.cs b/MediaBrowser.Model/Search/SearchHint.cs
index 48da8e4bc5..8a187f18ef 100644
--- a/MediaBrowser.Model/Search/SearchHint.cs
+++ b/MediaBrowser.Model/Search/SearchHint.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Search
 {
diff --git a/MediaBrowser.Model/Search/SearchHintResult.cs b/MediaBrowser.Model/Search/SearchHintResult.cs
index 372528f827..3d82bfcebf 100644
--- a/MediaBrowser.Model/Search/SearchHintResult.cs
+++ b/MediaBrowser.Model/Search/SearchHintResult.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Search
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Search/SearchQuery.cs b/MediaBrowser.Model/Search/SearchQuery.cs
index 9ed2f4ffb8..96a8cb00c3 100644
--- a/MediaBrowser.Model/Search/SearchQuery.cs
+++ b/MediaBrowser.Model/Search/SearchQuery.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Search
 {
diff --git a/MediaBrowser.Model/Serialization/IJsonSerializer.cs b/MediaBrowser.Model/Serialization/IJsonSerializer.cs
index 06e48f4123..ae0cf6f365 100644
--- a/MediaBrowser.Model/Serialization/IJsonSerializer.cs
+++ b/MediaBrowser.Model/Serialization/IJsonSerializer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 
diff --git a/MediaBrowser.Model/Serialization/IXmlSerializer.cs b/MediaBrowser.Model/Serialization/IXmlSerializer.cs
index 0fa35c133c..902ebd4d18 100644
--- a/MediaBrowser.Model/Serialization/IXmlSerializer.cs
+++ b/MediaBrowser.Model/Serialization/IXmlSerializer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 namespace MediaBrowser.Model.Serialization
diff --git a/MediaBrowser.Model/Serialization/IgnoreDataMemberAttribute.cs b/MediaBrowser.Model/Serialization/IgnoreDataMemberAttribute.cs
index 8e23edc24c..b43949fe38 100644
--- a/MediaBrowser.Model/Serialization/IgnoreDataMemberAttribute.cs
+++ b/MediaBrowser.Model/Serialization/IgnoreDataMemberAttribute.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Serialization
 {
diff --git a/MediaBrowser.Model/Services/ApiMemberAttribute.cs b/MediaBrowser.Model/Services/ApiMemberAttribute.cs
index 9e5faad29f..8b155c8abe 100644
--- a/MediaBrowser.Model/Services/ApiMemberAttribute.cs
+++ b/MediaBrowser.Model/Services/ApiMemberAttribute.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Services
 {
diff --git a/MediaBrowser.Model/Services/HttpUtility.cs b/MediaBrowser.Model/Services/HttpUtility.cs
index 1bf3b28d1b..98882e1146 100644
--- a/MediaBrowser.Model/Services/HttpUtility.cs
+++ b/MediaBrowser.Model/Services/HttpUtility.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
diff --git a/MediaBrowser.Model/Services/IAsyncStreamWriter.cs b/MediaBrowser.Model/Services/IAsyncStreamWriter.cs
index b10e12813a..f16a877e64 100644
--- a/MediaBrowser.Model/Services/IAsyncStreamWriter.cs
+++ b/MediaBrowser.Model/Services/IAsyncStreamWriter.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/MediaBrowser.Model/Services/IHasHeaders.cs b/MediaBrowser.Model/Services/IHasHeaders.cs
index 35e652b0ff..b2d413b70e 100644
--- a/MediaBrowser.Model/Services/IHasHeaders.cs
+++ b/MediaBrowser.Model/Services/IHasHeaders.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Services
 {
diff --git a/MediaBrowser.Model/Services/IHasRequestFilter.cs b/MediaBrowser.Model/Services/IHasRequestFilter.cs
index 90cfc2a310..97c11e435b 100644
--- a/MediaBrowser.Model/Services/IHasRequestFilter.cs
+++ b/MediaBrowser.Model/Services/IHasRequestFilter.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Services
 {
     public interface IHasRequestFilter
diff --git a/MediaBrowser.Model/Services/IHttpRequest.cs b/MediaBrowser.Model/Services/IHttpRequest.cs
index ceb25c8d2d..579f80c968 100644
--- a/MediaBrowser.Model/Services/IHttpRequest.cs
+++ b/MediaBrowser.Model/Services/IHttpRequest.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Services
+namespace MediaBrowser.Model.Services
 {
     public interface IHttpRequest : IRequest
     {
diff --git a/MediaBrowser.Model/Services/IHttpResponse.cs b/MediaBrowser.Model/Services/IHttpResponse.cs
index fa3442a7f0..a8b79f3949 100644
--- a/MediaBrowser.Model/Services/IHttpResponse.cs
+++ b/MediaBrowser.Model/Services/IHttpResponse.cs
@@ -1,4 +1,4 @@
-using System.Net;
+using System.Net;
 
 namespace MediaBrowser.Model.Services
 {
diff --git a/MediaBrowser.Model/Services/IHttpResult.cs b/MediaBrowser.Model/Services/IHttpResult.cs
index 11831adea1..bfa30f60d1 100644
--- a/MediaBrowser.Model/Services/IHttpResult.cs
+++ b/MediaBrowser.Model/Services/IHttpResult.cs
@@ -1,4 +1,4 @@
-using System.Net;
+using System.Net;
 
 namespace MediaBrowser.Model.Services
 {
diff --git a/MediaBrowser.Model/Services/IRequest.cs b/MediaBrowser.Model/Services/IRequest.cs
index 681bab294a..ac9b981b98 100644
--- a/MediaBrowser.Model/Services/IRequest.cs
+++ b/MediaBrowser.Model/Services/IRequest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
diff --git a/MediaBrowser.Model/Services/IRequiresRequestStream.cs b/MediaBrowser.Model/Services/IRequiresRequestStream.cs
index 0b8ac3ed34..2f17c6a9aa 100644
--- a/MediaBrowser.Model/Services/IRequiresRequestStream.cs
+++ b/MediaBrowser.Model/Services/IRequiresRequestStream.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 
 namespace MediaBrowser.Model.Services
 {
diff --git a/MediaBrowser.Model/Services/IService.cs b/MediaBrowser.Model/Services/IService.cs
index 3e0ff280b3..cc64e60bc8 100644
--- a/MediaBrowser.Model/Services/IService.cs
+++ b/MediaBrowser.Model/Services/IService.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Services
 {
     // marker interface
diff --git a/MediaBrowser.Model/Services/IStreamWriter.cs b/MediaBrowser.Model/Services/IStreamWriter.cs
index 1fc11049e0..9d65cff63d 100644
--- a/MediaBrowser.Model/Services/IStreamWriter.cs
+++ b/MediaBrowser.Model/Services/IStreamWriter.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 
 namespace MediaBrowser.Model.Services
 {
diff --git a/MediaBrowser.Model/Services/RouteAttribute.cs b/MediaBrowser.Model/Services/RouteAttribute.cs
index 0dc52af7b7..f6316e2b15 100644
--- a/MediaBrowser.Model/Services/RouteAttribute.cs
+++ b/MediaBrowser.Model/Services/RouteAttribute.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Services
 {
diff --git a/MediaBrowser.Model/Session/BrowseRequest.cs b/MediaBrowser.Model/Session/BrowseRequest.cs
index a4fdbcc38d..d0ad28ea60 100644
--- a/MediaBrowser.Model/Session/BrowseRequest.cs
+++ b/MediaBrowser.Model/Session/BrowseRequest.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Session
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Session/ClientCapabilities.cs b/MediaBrowser.Model/Session/ClientCapabilities.cs
index 1dbc02f09c..fa74efb1b7 100644
--- a/MediaBrowser.Model/Session/ClientCapabilities.cs
+++ b/MediaBrowser.Model/Session/ClientCapabilities.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Dlna;
 
 namespace MediaBrowser.Model.Session
diff --git a/MediaBrowser.Model/Session/GeneralCommand.cs b/MediaBrowser.Model/Session/GeneralCommand.cs
index e86b44dcad..74e58e6786 100644
--- a/MediaBrowser.Model/Session/GeneralCommand.cs
+++ b/MediaBrowser.Model/Session/GeneralCommand.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Session
diff --git a/MediaBrowser.Model/Session/GeneralCommandType.cs b/MediaBrowser.Model/Session/GeneralCommandType.cs
index e40c5e43b3..4bb0c5cc50 100644
--- a/MediaBrowser.Model/Session/GeneralCommandType.cs
+++ b/MediaBrowser.Model/Session/GeneralCommandType.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Session
+namespace MediaBrowser.Model.Session
 {
     /// <summary>
     /// This exists simply to identify a set of known commands.
diff --git a/MediaBrowser.Model/Session/MessageCommand.cs b/MediaBrowser.Model/Session/MessageCommand.cs
index 3e4f32349b..d392f7d2ee 100644
--- a/MediaBrowser.Model/Session/MessageCommand.cs
+++ b/MediaBrowser.Model/Session/MessageCommand.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Session
 {
     public class MessageCommand
diff --git a/MediaBrowser.Model/Session/PlayCommand.cs b/MediaBrowser.Model/Session/PlayCommand.cs
index 413553ac89..b7a8f39ba0 100644
--- a/MediaBrowser.Model/Session/PlayCommand.cs
+++ b/MediaBrowser.Model/Session/PlayCommand.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Session
+namespace MediaBrowser.Model.Session
 {
     /// <summary>
     /// Enum PlayCommand
diff --git a/MediaBrowser.Model/Session/PlayMethod.cs b/MediaBrowser.Model/Session/PlayMethod.cs
index c782ec9c17..8daf8c953b 100644
--- a/MediaBrowser.Model/Session/PlayMethod.cs
+++ b/MediaBrowser.Model/Session/PlayMethod.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Session
+namespace MediaBrowser.Model.Session
 {
     public enum PlayMethod
     {
diff --git a/MediaBrowser.Model/Session/PlayRequest.cs b/MediaBrowser.Model/Session/PlayRequest.cs
index eedf5772e8..075ae77302 100644
--- a/MediaBrowser.Model/Session/PlayRequest.cs
+++ b/MediaBrowser.Model/Session/PlayRequest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Model.Session
diff --git a/MediaBrowser.Model/Session/PlaybackProgressInfo.cs b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
index 2ce7b7c42c..c1d6306710 100644
--- a/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
+++ b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.Session
diff --git a/MediaBrowser.Model/Session/PlaybackStartInfo.cs b/MediaBrowser.Model/Session/PlaybackStartInfo.cs
index f6f496e4ea..19e1823f4c 100644
--- a/MediaBrowser.Model/Session/PlaybackStartInfo.cs
+++ b/MediaBrowser.Model/Session/PlaybackStartInfo.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Session
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Session/PlaybackStopInfo.cs b/MediaBrowser.Model/Session/PlaybackStopInfo.cs
index 1f466fcf3f..8a85b1998d 100644
--- a/MediaBrowser.Model/Session/PlaybackStopInfo.cs
+++ b/MediaBrowser.Model/Session/PlaybackStopInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.Session
diff --git a/MediaBrowser.Model/Session/PlayerStateInfo.cs b/MediaBrowser.Model/Session/PlayerStateInfo.cs
index 2ac91a66c7..7e54e16c8f 100644
--- a/MediaBrowser.Model/Session/PlayerStateInfo.cs
+++ b/MediaBrowser.Model/Session/PlayerStateInfo.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Session
+namespace MediaBrowser.Model.Session
 {
     public class PlayerStateInfo
     {
diff --git a/MediaBrowser.Model/Session/PlaystateCommand.cs b/MediaBrowser.Model/Session/PlaystateCommand.cs
index a1af96b6ad..018ad61382 100644
--- a/MediaBrowser.Model/Session/PlaystateCommand.cs
+++ b/MediaBrowser.Model/Session/PlaystateCommand.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Session
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Session/PlaystateRequest.cs b/MediaBrowser.Model/Session/PlaystateRequest.cs
index 1cf9a1fa40..08d3f00725 100644
--- a/MediaBrowser.Model/Session/PlaystateRequest.cs
+++ b/MediaBrowser.Model/Session/PlaystateRequest.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Session
+namespace MediaBrowser.Model.Session
 {
     public class PlaystateRequest
     {
diff --git a/MediaBrowser.Model/Session/SessionUserInfo.cs b/MediaBrowser.Model/Session/SessionUserInfo.cs
index 75be49f1e5..42a56b92b9 100644
--- a/MediaBrowser.Model/Session/SessionUserInfo.cs
+++ b/MediaBrowser.Model/Session/SessionUserInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Session
 {
diff --git a/MediaBrowser.Model/Session/UserDataChangeInfo.cs b/MediaBrowser.Model/Session/UserDataChangeInfo.cs
index 9c8b441e29..ef0e2c89a7 100644
--- a/MediaBrowser.Model/Session/UserDataChangeInfo.cs
+++ b/MediaBrowser.Model/Session/UserDataChangeInfo.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.Session
 {
diff --git a/MediaBrowser.Model/Sync/SyncCategory.cs b/MediaBrowser.Model/Sync/SyncCategory.cs
index e0d7486853..a01b365979 100644
--- a/MediaBrowser.Model/Sync/SyncCategory.cs
+++ b/MediaBrowser.Model/Sync/SyncCategory.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Sync
 {
     public enum SyncCategory
diff --git a/MediaBrowser.Model/Sync/SyncJob.cs b/MediaBrowser.Model/Sync/SyncJob.cs
index 3b2e30d702..7a1f76fe91 100644
--- a/MediaBrowser.Model/Sync/SyncJob.cs
+++ b/MediaBrowser.Model/Sync/SyncJob.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Sync
 {
diff --git a/MediaBrowser.Model/Sync/SyncJobStatus.cs b/MediaBrowser.Model/Sync/SyncJobStatus.cs
index 2d1d30802b..e8b7c8d1b8 100644
--- a/MediaBrowser.Model/Sync/SyncJobStatus.cs
+++ b/MediaBrowser.Model/Sync/SyncJobStatus.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Sync
 {
     public enum SyncJobStatus
diff --git a/MediaBrowser.Model/Sync/SyncTarget.cs b/MediaBrowser.Model/Sync/SyncTarget.cs
index 8901f0f276..c2b36cddfa 100644
--- a/MediaBrowser.Model/Sync/SyncTarget.cs
+++ b/MediaBrowser.Model/Sync/SyncTarget.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Sync
 {
     public class SyncTarget
diff --git a/MediaBrowser.Model/System/IEnvironmentInfo.cs b/MediaBrowser.Model/System/IEnvironmentInfo.cs
index faf9f0a422..757d3c949c 100644
--- a/MediaBrowser.Model/System/IEnvironmentInfo.cs
+++ b/MediaBrowser.Model/System/IEnvironmentInfo.cs
@@ -1,4 +1,4 @@
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 
 namespace MediaBrowser.Model.System
 {
diff --git a/MediaBrowser.Model/System/ISystemEvents.cs b/MediaBrowser.Model/System/ISystemEvents.cs
index dec8ed8c02..8c47d6fbfb 100644
--- a/MediaBrowser.Model/System/ISystemEvents.cs
+++ b/MediaBrowser.Model/System/ISystemEvents.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.System
 {
diff --git a/MediaBrowser.Model/System/LogFile.cs b/MediaBrowser.Model/System/LogFile.cs
index ba409c5423..913e8e1eaa 100644
--- a/MediaBrowser.Model/System/LogFile.cs
+++ b/MediaBrowser.Model/System/LogFile.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.System
 {
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index a28ce10700..b0432ae74a 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -1,4 +1,4 @@
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using MediaBrowser.Model.Updates;
 
 namespace MediaBrowser.Model.System
diff --git a/MediaBrowser.Model/Tasks/IConfigurableScheduledTask.cs b/MediaBrowser.Model/Tasks/IConfigurableScheduledTask.cs
index ab58f091c3..9c4b75c549 100644
--- a/MediaBrowser.Model/Tasks/IConfigurableScheduledTask.cs
+++ b/MediaBrowser.Model/Tasks/IConfigurableScheduledTask.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Tasks
+namespace MediaBrowser.Model.Tasks
 {
     public interface IConfigurableScheduledTask
     {
diff --git a/MediaBrowser.Model/Tasks/IScheduledTask.cs b/MediaBrowser.Model/Tasks/IScheduledTask.cs
index 81ba239ad8..a615ebb07e 100644
--- a/MediaBrowser.Model/Tasks/IScheduledTask.cs
+++ b/MediaBrowser.Model/Tasks/IScheduledTask.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/MediaBrowser.Model/Tasks/IScheduledTaskWorker.cs b/MediaBrowser.Model/Tasks/IScheduledTaskWorker.cs
index c0140b6cb6..61e3a65ebe 100644
--- a/MediaBrowser.Model/Tasks/IScheduledTaskWorker.cs
+++ b/MediaBrowser.Model/Tasks/IScheduledTaskWorker.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Events;
 
 namespace MediaBrowser.Model.Tasks
diff --git a/MediaBrowser.Model/Tasks/ITaskManager.cs b/MediaBrowser.Model/Tasks/ITaskManager.cs
index f183336aeb..a7c2f6d86e 100644
--- a/MediaBrowser.Model/Tasks/ITaskManager.cs
+++ b/MediaBrowser.Model/Tasks/ITaskManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Events;
diff --git a/MediaBrowser.Model/Tasks/ITaskTrigger.cs b/MediaBrowser.Model/Tasks/ITaskTrigger.cs
index 00e7803525..c8433ed21c 100644
--- a/MediaBrowser.Model/Tasks/ITaskTrigger.cs
+++ b/MediaBrowser.Model/Tasks/ITaskTrigger.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Model.Tasks
diff --git a/MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs b/MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs
index 2dec79e93b..197c47f801 100644
--- a/MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs
+++ b/MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Tasks
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Tasks/SystemEvent.cs b/MediaBrowser.Model/Tasks/SystemEvent.cs
index 4d49a38ccb..1e6cfe13b3 100644
--- a/MediaBrowser.Model/Tasks/SystemEvent.cs
+++ b/MediaBrowser.Model/Tasks/SystemEvent.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Tasks
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Tasks/TaskCompletionEventArgs.cs b/MediaBrowser.Model/Tasks/TaskCompletionEventArgs.cs
index be9eaa613d..05eaff8dac 100644
--- a/MediaBrowser.Model/Tasks/TaskCompletionEventArgs.cs
+++ b/MediaBrowser.Model/Tasks/TaskCompletionEventArgs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Tasks
 {
diff --git a/MediaBrowser.Model/Tasks/TaskCompletionStatus.cs b/MediaBrowser.Model/Tasks/TaskCompletionStatus.cs
index 6ba5ba5e4f..9acdf61d8d 100644
--- a/MediaBrowser.Model/Tasks/TaskCompletionStatus.cs
+++ b/MediaBrowser.Model/Tasks/TaskCompletionStatus.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Tasks
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Tasks/TaskInfo.cs b/MediaBrowser.Model/Tasks/TaskInfo.cs
index 49bf198ef6..8d80e68cff 100644
--- a/MediaBrowser.Model/Tasks/TaskInfo.cs
+++ b/MediaBrowser.Model/Tasks/TaskInfo.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Tasks
+namespace MediaBrowser.Model.Tasks
 {
     /// <summary>
     /// Class TaskInfo
diff --git a/MediaBrowser.Model/Tasks/TaskOptions.cs b/MediaBrowser.Model/Tasks/TaskOptions.cs
index caca154a9f..b068034295 100644
--- a/MediaBrowser.Model/Tasks/TaskOptions.cs
+++ b/MediaBrowser.Model/Tasks/TaskOptions.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Tasks
 {
     public class TaskOptions
diff --git a/MediaBrowser.Model/Tasks/TaskResult.cs b/MediaBrowser.Model/Tasks/TaskResult.cs
index 9cc45a16b2..eede9069f2 100644
--- a/MediaBrowser.Model/Tasks/TaskResult.cs
+++ b/MediaBrowser.Model/Tasks/TaskResult.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Tasks
 {
diff --git a/MediaBrowser.Model/Tasks/TaskState.cs b/MediaBrowser.Model/Tasks/TaskState.cs
index 889ce6875a..60c4b06d1c 100644
--- a/MediaBrowser.Model/Tasks/TaskState.cs
+++ b/MediaBrowser.Model/Tasks/TaskState.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Tasks
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Tasks/TaskTriggerInfo.cs b/MediaBrowser.Model/Tasks/TaskTriggerInfo.cs
index 901a300d0f..80101ec482 100644
--- a/MediaBrowser.Model/Tasks/TaskTriggerInfo.cs
+++ b/MediaBrowser.Model/Tasks/TaskTriggerInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Tasks
 {
diff --git a/MediaBrowser.Model/Text/ITextEncoding.cs b/MediaBrowser.Model/Text/ITextEncoding.cs
index d6fd3463b8..1a5918eb76 100644
--- a/MediaBrowser.Model/Text/ITextEncoding.cs
+++ b/MediaBrowser.Model/Text/ITextEncoding.cs
@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 
 namespace MediaBrowser.Model.Text
 {
diff --git a/MediaBrowser.Model/Threading/ITimer.cs b/MediaBrowser.Model/Threading/ITimer.cs
index 42090250bf..2bec222665 100644
--- a/MediaBrowser.Model/Threading/ITimer.cs
+++ b/MediaBrowser.Model/Threading/ITimer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Threading
 {
diff --git a/MediaBrowser.Model/Threading/ITimerFactory.cs b/MediaBrowser.Model/Threading/ITimerFactory.cs
index 5f3df1738d..1161958a4b 100644
--- a/MediaBrowser.Model/Threading/ITimerFactory.cs
+++ b/MediaBrowser.Model/Threading/ITimerFactory.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Threading
 {
diff --git a/MediaBrowser.Model/Updates/CheckForUpdateResult.cs b/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
index ff0bba197e..79558b0cf9 100644
--- a/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
+++ b/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Updates
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Updates/InstallationInfo.cs b/MediaBrowser.Model/Updates/InstallationInfo.cs
index 09b4975a86..a3f19e2360 100644
--- a/MediaBrowser.Model/Updates/InstallationInfo.cs
+++ b/MediaBrowser.Model/Updates/InstallationInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Updates
 {
diff --git a/MediaBrowser.Model/Updates/PackageInfo.cs b/MediaBrowser.Model/Updates/PackageInfo.cs
index b8afd89816..ff4ed26d31 100644
--- a/MediaBrowser.Model/Updates/PackageInfo.cs
+++ b/MediaBrowser.Model/Updates/PackageInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Updates
 {
diff --git a/MediaBrowser.Model/Updates/PackageVersionInfo.cs b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
index 7126ae7a53..570fb3e022 100644
--- a/MediaBrowser.Model/Updates/PackageVersionInfo.cs
+++ b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.Model.Updates
diff --git a/MediaBrowser.Model/Users/ForgotPasswordAction.cs b/MediaBrowser.Model/Users/ForgotPasswordAction.cs
index f75b1d74bf..b5240cb34b 100644
--- a/MediaBrowser.Model/Users/ForgotPasswordAction.cs
+++ b/MediaBrowser.Model/Users/ForgotPasswordAction.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Users
 {
     public enum ForgotPasswordAction
diff --git a/MediaBrowser.Model/Users/ForgotPasswordResult.cs b/MediaBrowser.Model/Users/ForgotPasswordResult.cs
index 7dbb1e96bd..2f9b4cf48a 100644
--- a/MediaBrowser.Model/Users/ForgotPasswordResult.cs
+++ b/MediaBrowser.Model/Users/ForgotPasswordResult.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Users
 {
diff --git a/MediaBrowser.Model/Users/PinRedeemResult.cs b/MediaBrowser.Model/Users/PinRedeemResult.cs
index 6a01bf2d42..0edf2f422c 100644
--- a/MediaBrowser.Model/Users/PinRedeemResult.cs
+++ b/MediaBrowser.Model/Users/PinRedeemResult.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Users
 {
     public class PinRedeemResult
diff --git a/MediaBrowser.Model/Users/UserAction.cs b/MediaBrowser.Model/Users/UserAction.cs
index 5f401b9f0d..48b5bbef13 100644
--- a/MediaBrowser.Model/Users/UserAction.cs
+++ b/MediaBrowser.Model/Users/UserAction.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Users
 {
diff --git a/MediaBrowser.Model/Users/UserActionType.cs b/MediaBrowser.Model/Users/UserActionType.cs
index 493de62729..110b8904e4 100644
--- a/MediaBrowser.Model/Users/UserActionType.cs
+++ b/MediaBrowser.Model/Users/UserActionType.cs
@@ -1,4 +1,4 @@
-
+
 namespace MediaBrowser.Model.Users
 {
     public enum UserActionType
diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
index 55eeb78bf9..23805b79f5 100644
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Configuration;
 
 namespace MediaBrowser.Model.Users
diff --git a/MediaBrowser.Model/Xml/IXmlReaderSettingsFactory.cs b/MediaBrowser.Model/Xml/IXmlReaderSettingsFactory.cs
index b9628ec3eb..b39325958b 100644
--- a/MediaBrowser.Model/Xml/IXmlReaderSettingsFactory.cs
+++ b/MediaBrowser.Model/Xml/IXmlReaderSettingsFactory.cs
@@ -1,4 +1,4 @@
-using System.Xml;
+using System.Xml;
 
 namespace MediaBrowser.Model.Xml
 {
-- 
cgit v1.2.3


From 089ad8e7c2ee6360b2ff24751202766795a2e82d Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Sun, 13 Jan 2019 21:10:15 +0100
Subject: Find+Sed BOM removal *.xml,*.csproj,*,json,*.sln,*.txt

---
 BDInfo/BDInfo.csproj                                                | 2 +-
 BDInfo/ReadMe.txt                                                   | 2 +-
 DvdLib/DvdLib.csproj                                                | 2 +-
 Emby.Dlna/Emby.Dlna.csproj                                          | 2 +-
 Emby.Drawing.Skia/Emby.Drawing.Skia.csproj                          | 2 +-
 Emby.Drawing/Emby.Drawing.csproj                                    | 2 +-
 Emby.IsoMounting/IsoMounter.sln                                     | 2 +-
 Emby.Notifications/Emby.Notifications.csproj                        | 2 +-
 Emby.Photos/Emby.Photos.csproj                                      | 2 +-
 Emby.Server.Implementations/Emby.Server.Implementations.csproj      | 2 +-
 Emby.Server.Implementations/Localization/Ratings/ca.txt             | 2 +-
 Emby.Server.Implementations/Localization/iso6392.txt                | 2 +-
 Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj             | 2 +-
 Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj                   | 2 +-
 Emby.XmlTv/Emby.XmlTv.sln                                           | 2 +-
 Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj                             | 2 +-
 Jellyfin.Server/Jellyfin.Server.csproj                              | 2 +-
 MediaBrowser.Api/MediaBrowser.Api.csproj                            | 2 +-
 MediaBrowser.Common/MediaBrowser.Common.csproj                      | 2 +-
 MediaBrowser.Controller/MediaBrowser.Controller.csproj              | 2 +-
 MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj        | 2 +-
 MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj        | 2 +-
 MediaBrowser.Model/MediaBrowser.Model.csproj                        | 2 +-
 MediaBrowser.Providers/MediaBrowser.Providers.csproj                | 2 +-
 MediaBrowser.Tests/ConsistencyTests/Resources/StringCheckSample.xml | 2 +-
 MediaBrowser.Tests/MediaBrowser.Tests.csproj                        | 2 +-
 MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj          | 2 +-
 MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj          | 2 +-
 MediaBrowser.sln                                                    | 2 +-
 Mono.Nat/Mono.Nat.csproj                                            | 2 +-
 OpenSubtitlesHandler/Methods Implemeted.txt                         | 2 +-
 OpenSubtitlesHandler/OpenSubtitlesHandler.csproj                    | 2 +-
 OpenSubtitlesHandler/Readme.txt                                     | 2 +-
 OpenSubtitlesHandler/XML-RPC/Docs/XML-RPC.txt                       | 2 +-
 RSSDP/RSSDP.csproj                                                  | 2 +-
 SocketHttpListener/SocketHttpListener.csproj                        | 2 +-
 36 files changed, 36 insertions(+), 36 deletions(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/BDInfo/BDInfo.csproj b/BDInfo/BDInfo.csproj
index 5246e09cb5..662583b3fd 100644
--- a/BDInfo/BDInfo.csproj
+++ b/BDInfo/BDInfo.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
         <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
diff --git a/BDInfo/ReadMe.txt b/BDInfo/ReadMe.txt
index 65490065de..e70b0b66cd 100644
--- a/BDInfo/ReadMe.txt
+++ b/BDInfo/ReadMe.txt
@@ -1,4 +1,4 @@
-The source is taken from the BDRom folder of this project:
+The source is taken from the BDRom folder of this project:
 
 http://www.cinemasquid.com/blu-ray/tools/bdinfo
 
diff --git a/DvdLib/DvdLib.csproj b/DvdLib/DvdLib.csproj
index 5246e09cb5..662583b3fd 100644
--- a/DvdLib/DvdLib.csproj
+++ b/DvdLib/DvdLib.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
         <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
diff --git a/Emby.Dlna/Emby.Dlna.csproj b/Emby.Dlna/Emby.Dlna.csproj
index b2ac9c2dfd..7ddd7c1dc4 100644
--- a/Emby.Dlna/Emby.Dlna.csproj
+++ b/Emby.Dlna/Emby.Dlna.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
         <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
diff --git a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
index b01bb8b087..a0892e8bb0 100644
--- a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
+++ b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/Emby.Drawing/Emby.Drawing.csproj b/Emby.Drawing/Emby.Drawing.csproj
index 3e19ddfe59..36e66d5441 100644
--- a/Emby.Drawing/Emby.Drawing.csproj
+++ b/Emby.Drawing/Emby.Drawing.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
         <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
diff --git a/Emby.IsoMounting/IsoMounter.sln b/Emby.IsoMounting/IsoMounter.sln
index 7505be4f70..55db1b1aec 100644
--- a/Emby.IsoMounting/IsoMounter.sln
+++ b/Emby.IsoMounting/IsoMounter.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27004.2009
diff --git a/Emby.Notifications/Emby.Notifications.csproj b/Emby.Notifications/Emby.Notifications.csproj
index 58bb07ebd5..95d99c6923 100644
--- a/Emby.Notifications/Emby.Notifications.csproj
+++ b/Emby.Notifications/Emby.Notifications.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/Emby.Photos/Emby.Photos.csproj b/Emby.Photos/Emby.Photos.csproj
index 7a560f256d..af7fa39321 100644
--- a/Emby.Photos/Emby.Photos.csproj
+++ b/Emby.Photos/Emby.Photos.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
         <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index dab3284854..54950658cb 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
         <ProjectReference Include="..\Emby.Naming\Emby.Naming.csproj" />
diff --git a/Emby.Server.Implementations/Localization/Ratings/ca.txt b/Emby.Server.Implementations/Localization/Ratings/ca.txt
index fb8d7a27f5..5aef0580f8 100644
--- a/Emby.Server.Implementations/Localization/Ratings/ca.txt
+++ b/Emby.Server.Implementations/Localization/Ratings/ca.txt
@@ -1,4 +1,4 @@
-CA-G,1
+CA-G,1
 CA-PG,5
 CA-14A,7
 CA-A,8
diff --git a/Emby.Server.Implementations/Localization/iso6392.txt b/Emby.Server.Implementations/Localization/iso6392.txt
index 05a17f5942..f2cea78b62 100644
--- a/Emby.Server.Implementations/Localization/iso6392.txt
+++ b/Emby.Server.Implementations/Localization/iso6392.txt
@@ -1,4 +1,4 @@
-aar||aa|Afar|afar
+aar||aa|Afar|afar
 abk||ab|Abkhazian|abkhaze
 ace|||Achinese|aceh
 ach|||Acoli|acoli
diff --git a/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj b/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj
index cf6fe76dec..5d213c1772 100644
--- a/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj
+++ b/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <ItemGroup>
         <Reference Include="System" />
         <Reference Include="System.Core" />
diff --git a/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj b/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj
index 64fa8f090f..74ad859ff1 100644
--- a/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj
+++ b/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build"
     xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
diff --git a/Emby.XmlTv/Emby.XmlTv.sln b/Emby.XmlTv/Emby.XmlTv.sln
index 519cbfc9db..8243d4b72b 100644
--- a/Emby.XmlTv/Emby.XmlTv.sln
+++ b/Emby.XmlTv/Emby.XmlTv.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.24720.0
diff --git a/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj b/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj
index a43c92318e..d9f43a991e 100644
--- a/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj
+++ b/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj
index ea7ca84fab..a462539ad6 100644
--- a/Jellyfin.Server/Jellyfin.Server.csproj
+++ b/Jellyfin.Server/Jellyfin.Server.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <AssemblyName>jellyfin</AssemblyName>
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index 3e19ddfe59..36e66d5441 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
         <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index 51e7568af6..4e4eaf32ed 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <Authors>Jellyfin Contributors</Authors>
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index fa76d25556..ce31eb8066 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <Authors>Jellyfin Contributors</Authors>
diff --git a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
index b5a2610e12..96c4749ace 100644
--- a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
+++ b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
         <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
diff --git a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
index 28de11e404..a6f247813a 100644
--- a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
+++ b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 48b62fd819..2ffe473b2f 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <Authors>Jellyfin Contributors</Authors>
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index c7717915d5..e7c090631b 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
         <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
diff --git a/MediaBrowser.Tests/ConsistencyTests/Resources/StringCheckSample.xml b/MediaBrowser.Tests/ConsistencyTests/Resources/StringCheckSample.xml
index 5f2e024c5b..9c65bddcd4 100644
--- a/MediaBrowser.Tests/ConsistencyTests/Resources/StringCheckSample.xml
+++ b/MediaBrowser.Tests/ConsistencyTests/Resources/StringCheckSample.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <?xml-stylesheet type="text/xsl" href="StringCheck.xslt"?>
 <StringUsages Mode="All">
   <Dictionary Token="LabelExit" Text="Exit" />
diff --git a/MediaBrowser.Tests/MediaBrowser.Tests.csproj b/MediaBrowser.Tests/MediaBrowser.Tests.csproj
index 666ae94fb0..5c5f0d82c9 100644
--- a/MediaBrowser.Tests/MediaBrowser.Tests.csproj
+++ b/MediaBrowser.Tests/MediaBrowser.Tests.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build"
     xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index db7c102e09..8b8136e1ea 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
         <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
diff --git a/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj b/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj
index 3e19ddfe59..36e66d5441 100644
--- a/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj
+++ b/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
         <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
diff --git a/MediaBrowser.sln b/MediaBrowser.sln
index 3fd7d8df91..c9676553ed 100644
--- a/MediaBrowser.sln
+++ b/MediaBrowser.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.3
diff --git a/Mono.Nat/Mono.Nat.csproj b/Mono.Nat/Mono.Nat.csproj
index 26028eca9e..edfd5c9bb0 100644
--- a/Mono.Nat/Mono.Nat.csproj
+++ b/Mono.Nat/Mono.Nat.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
diff --git a/OpenSubtitlesHandler/Methods Implemeted.txt b/OpenSubtitlesHandler/Methods Implemeted.txt
index 3e5bc02900..e3493d9a2c 100644
--- a/OpenSubtitlesHandler/Methods Implemeted.txt	
+++ b/OpenSubtitlesHandler/Methods Implemeted.txt	
@@ -1,4 +1,4 @@
-List of available OpenSubtitles.org server XML-RPC methods.
+List of available OpenSubtitles.org server XML-RPC methods.
 ==========================================================
 Legends:
 * OK: this method is fully implemented, tested and works fine.
diff --git a/OpenSubtitlesHandler/OpenSubtitlesHandler.csproj b/OpenSubtitlesHandler/OpenSubtitlesHandler.csproj
index 2f7adbbd0c..7ce28f2284 100644
--- a/OpenSubtitlesHandler/OpenSubtitlesHandler.csproj
+++ b/OpenSubtitlesHandler/OpenSubtitlesHandler.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
         <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
diff --git a/OpenSubtitlesHandler/Readme.txt b/OpenSubtitlesHandler/Readme.txt
index 01943cc30f..d5814aec16 100644
--- a/OpenSubtitlesHandler/Readme.txt
+++ b/OpenSubtitlesHandler/Readme.txt
@@ -1,4 +1,4 @@
-OpenSubtitlesHandler
+OpenSubtitlesHandler
 ====================
 This project is for OpenSubtitles.org integration‏. The point is to allow user to access OpenSubtitles.org database directly
 within ASM without the need to open internet browser.
diff --git a/OpenSubtitlesHandler/XML-RPC/Docs/XML-RPC.txt b/OpenSubtitlesHandler/XML-RPC/Docs/XML-RPC.txt
index fe90f24620..a4de38cdea 100644
--- a/OpenSubtitlesHandler/XML-RPC/Docs/XML-RPC.txt
+++ b/OpenSubtitlesHandler/XML-RPC/Docs/XML-RPC.txt
@@ -1,4 +1,4 @@
-XML-RPC Specification
+XML-RPC Specification
 
 Tue, Jun 15, 1999; by Dave Winer.
 
diff --git a/RSSDP/RSSDP.csproj b/RSSDP/RSSDP.csproj
index 0737dc2135..f06d4687b9 100644
--- a/RSSDP/RSSDP.csproj
+++ b/RSSDP/RSSDP.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
diff --git a/SocketHttpListener/SocketHttpListener.csproj b/SocketHttpListener/SocketHttpListener.csproj
index 680776103c..2e08c15a77 100644
--- a/SocketHttpListener/SocketHttpListener.csproj
+++ b/SocketHttpListener/SocketHttpListener.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
         <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-- 
cgit v1.2.3


From 9fa60ec9340cbc8b4ed3e866fcf61852077902a1 Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Sun, 13 Jan 2019 21:20:44 +0100
Subject: Find+Sed BOM removal all toher files, except test files.

---
 Emby.XmlTv/Emby.XmlTv/XmlTvSchema.dtd                               | 2 +-
 Emby.XmlTv/Nuget/Emby.XmlTv.nuspec                                  | 2 +-
 MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.nuget.targets | 2 +-
 MediaBrowser.MediaEncoding/packages.config                          | 2 +-
 build-jellyfin.ps1                                                  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/Emby.XmlTv/Emby.XmlTv/XmlTvSchema.dtd b/Emby.XmlTv/Emby.XmlTv/XmlTvSchema.dtd
index f723eadc0e..889939224a 100644
--- a/Emby.XmlTv/Emby.XmlTv/XmlTvSchema.dtd
+++ b/Emby.XmlTv/Emby.XmlTv/XmlTvSchema.dtd
@@ -1,4 +1,4 @@
-<!-- DTD for TV listings
+<!-- DTD for TV listings
 
 This is a DTD to represent a TV listing.  It doesn't explicitly group
 programmes by day or by channel, instead broadcast time and channel
diff --git a/Emby.XmlTv/Nuget/Emby.XmlTv.nuspec b/Emby.XmlTv/Nuget/Emby.XmlTv.nuspec
index 06d2905487..087ce1e6ed 100644
--- a/Emby.XmlTv/Nuget/Emby.XmlTv.nuspec
+++ b/Emby.XmlTv/Nuget/Emby.XmlTv.nuspec
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>Emby.XmlTv</id>
diff --git a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.nuget.targets b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.nuget.targets
index e69ce0e64f..f793e09bcb 100644
--- a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.nuget.targets
+++ b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.nuget.targets
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Target Name="EmitMSBuildWarning" BeforeTargets="Build">
     <Warning Text="Packages containing MSBuild targets and props files cannot be fully installed in projects targeting multiple frameworks. The MSBuild targets and props files have been ignored." />
diff --git a/MediaBrowser.MediaEncoding/packages.config b/MediaBrowser.MediaEncoding/packages.config
index 6b8deb9c96..bbeaf5f002 100644
--- a/MediaBrowser.MediaEncoding/packages.config
+++ b/MediaBrowser.MediaEncoding/packages.config
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
 </packages>
\ No newline at end of file
diff --git a/build-jellyfin.ps1 b/build-jellyfin.ps1
index 2247166211..d063d403c0 100644
--- a/build-jellyfin.ps1
+++ b/build-jellyfin.ps1
@@ -1,4 +1,4 @@
-[CmdletBinding()]
+[CmdletBinding()]
 param(
     [switch]$InstallFFMPEG,
     [switch]$InstallNSSM,
-- 
cgit v1.2.3


From a36658f6f0ed342d8b55dbf7c9ff95fe3abfa818 Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Sun, 13 Jan 2019 21:31:14 +0100
Subject: ReSharper Reformat: Properties to expression bodied form.

---
 BDInfo/BDInfoSettings.cs                           |  96 ++--------
 BDInfo/TSStream.cs                                 |  31 +---
 BDInfo/TSStreamBuffer.cs                           |  16 +-
 BDInfo/TSStreamClip.cs                             |   8 +-
 Emby.Dlna/Api/DlnaServerService.cs                 |  24 +--
 Emby.Dlna/Didl/StringWriterWithEncoding.cs         |   5 +-
 Emby.Dlna/DlnaManager.cs                           |  16 +-
 Emby.Dlna/Eventing/EventSubscription.cs            |   8 +-
 Emby.Dlna/PlayTo/Device.cs                         |  39 +----
 Emby.Dlna/PlayTo/DeviceInfo.cs                     |  18 +-
 Emby.Dlna/PlayTo/PlayToController.cs               |  21 +--
 Emby.Dlna/PlayTo/TransportCommands.cs              |  20 +--
 Emby.Drawing.Skia/SkiaEncoder.cs                   |  79 +++------
 Emby.Drawing/ImageProcessor.cs                     | 101 +++++------
 Emby.Drawing/NullImageEncoder.cs                   |  40 ++---
 Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs     |  23 +--
 Emby.IsoMounting/IsoMounter/Plugin.cs              |  18 +-
 Emby.Naming/Common/EpisodeExpression.cs            |  11 +-
 Emby.Naming/Video/VideoFileInfo.cs                 |   5 +-
 Emby.Photos/PhotoProvider.cs                       |   5 +-
 .../Data/SqliteItemRepository.cs                   |  24 +--
 Jellyfin.Server/CoreAppHost.cs                     |  17 +-
 Jellyfin.Server/SocketSharp/RequestMono.cs         |  75 ++------
 Jellyfin.Server/SocketSharp/SharpWebSocket.cs      |   8 +-
 .../SocketSharp/WebSocketSharpRequest.cs           | 170 ++++--------------
 .../SocketSharp/WebSocketSharpResponse.cs          |  34 ++--
 MediaBrowser.Api/BaseApiService.cs                 |  16 +-
 MediaBrowser.Api/LiveTv/ProgressiveFileCopier.cs   |   8 +-
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |   5 +-
 MediaBrowser.Api/Playback/Hls/BaseHlsService.cs    |   5 +-
 .../Progressive/BaseProgressiveStreamingService.cs |   5 +-
 .../Progressive/ProgressiveStreamWriter.cs         |   8 +-
 .../Playback/StaticRemoteStreamWriter.cs           |   5 +-
 MediaBrowser.Api/Playback/StreamRequest.cs         |   8 +-
 MediaBrowser.Api/Playback/StreamState.cs           |  20 +--
 .../ScheduledTasksWebSocketListener.cs             |   5 +-
 .../Session/SessionInfoWebSocketListener.cs        |   5 +-
 .../System/ActivityLogWebSocketListener.cs         |   5 +-
 MediaBrowser.Common/Net/HttpRequestOptions.cs      |  14 +-
 MediaBrowser.Common/Plugins/BasePlugin.cs          |  41 +----
 MediaBrowser.Controller/Channels/Channel.cs        |  13 +-
 .../Entities/AggregateFolder.cs                    |  26 +--
 MediaBrowser.Controller/Entities/Audio/Audio.cs    |  52 +-----
 .../Entities/Audio/MusicAlbum.cs                   |  49 +-----
 .../Entities/Audio/MusicArtist.cs                  |  66 +------
 .../Entities/Audio/MusicGenre.cs                   |  37 +---
 MediaBrowser.Controller/Entities/AudioBook.cs      |  16 +-
 MediaBrowser.Controller/Entities/BaseItem.cs       | 195 ++++-----------------
 .../Entities/BasePluginFolder.cs                   |  21 +--
 MediaBrowser.Controller/Entities/Book.cs           |   8 +-
 .../Entities/CollectionFolder.cs                   |  45 +----
 MediaBrowser.Controller/Entities/Folder.cs         |  97 ++--------
 MediaBrowser.Controller/Entities/Game.cs           |  15 +-
 MediaBrowser.Controller/Entities/GameGenre.cs      |  24 +--
 MediaBrowser.Controller/Entities/GameSystem.cs     |  32 +---
 MediaBrowser.Controller/Entities/Genre.cs          |  32 +---
 MediaBrowser.Controller/Entities/Movies/BoxSet.cs  |  29 +--
 MediaBrowser.Controller/Entities/Movies/Movie.cs   |  13 +-
 MediaBrowser.Controller/Entities/MusicVideo.cs     |   8 +-
 MediaBrowser.Controller/Entities/Person.cs         |  32 +---
 MediaBrowser.Controller/Entities/Photo.cs          |  24 +--
 MediaBrowser.Controller/Entities/PhotoAlbum.cs     |  24 +--
 MediaBrowser.Controller/Entities/Studio.cs         |  32 +---
 MediaBrowser.Controller/Entities/TV/Episode.cs     |  66 +------
 MediaBrowser.Controller/Entities/TV/Season.cs      |  36 +---
 MediaBrowser.Controller/Entities/TV/Series.cs      |  43 +----
 MediaBrowser.Controller/Entities/Trailer.cs        |   9 +-
 MediaBrowser.Controller/Entities/User.cs           |  62 ++-----
 MediaBrowser.Controller/Entities/UserItemData.cs   |   5 +-
 MediaBrowser.Controller/Entities/UserRootFolder.cs |  32 +---
 MediaBrowser.Controller/Entities/UserView.cs       |  32 +---
 MediaBrowser.Controller/Entities/Video.cs          |  62 ++-----
 MediaBrowser.Controller/Entities/Year.cs           |  24 +--
 MediaBrowser.Controller/Library/ItemResolveArgs.cs |  16 +-
 MediaBrowser.Controller/LiveTv/LiveTvChannel.cs    |  46 +----
 MediaBrowser.Controller/LiveTv/LiveTvProgram.cs    |  61 +------
 MediaBrowser.Controller/LiveTv/TimerInfo.cs        |  42 +----
 .../MediaEncoding/EncodingJobInfo.cs               |  74 ++------
 .../MediaEncoding/EncodingJobOptions.cs            |   8 +-
 .../Net/AuthenticatedAttribute.cs                  |   5 +-
 MediaBrowser.Controller/Net/AuthorizationInfo.cs   |   8 +-
 .../Net/BasePeriodicWebSocketListener.cs           |   8 +-
 MediaBrowser.Controller/Playlists/Playlist.cs      |  64 +------
 .../Resolvers/BaseItemResolver.cs                  |   8 +-
 MediaBrowser.LocalMetadata/BaseXmlProvider.cs      |  25 +--
 .../Images/CollectionFolderImageProvider.cs        |  14 +-
 .../Images/EpisodeLocalImageProvider.cs            |  10 +-
 .../Images/InternalMetadataFolderImageProvider.cs  |  14 +-
 .../Images/LocalImageProvider.cs                   |  10 +-
 MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs  |  16 +-
 MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs |   6 +-
 MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs  |   4 +-
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |   5 +-
 MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs |   6 +-
 .../Subtitles/OpenSubtitleDownloader.cs            |   5 +-
 .../Subtitles/SubtitleEncoder.cs                   |   8 +-
 MediaBrowser.Model/Dlna/SortCriteria.cs            |   5 +-
 MediaBrowser.Model/Dlna/StreamInfo.cs              |  27 +--
 MediaBrowser.Model/Drawing/ImageSize.cs            |  14 +-
 MediaBrowser.Model/Dto/BaseItemPerson.cs           |   8 +-
 MediaBrowser.Model/Entities/LibraryUpdateInfo.cs   |   8 +-
 .../Services/QueryParamCollection.cs               |  36 +---
 MediaBrowser.Model/Updates/CheckForUpdateResult.cs |   2 +-
 MediaBrowser.Model/Updates/PackageVersionInfo.cs   |   5 +-
 .../BoxSets/BoxSetMetadataService.cs               |  32 +---
 .../BoxSets/MovieDbBoxSetImageProvider.cs          |  15 +-
 .../BoxSets/MovieDbBoxSetProvider.cs               |   5 +-
 .../Folders/FolderMetadataService.cs               |   9 +-
 .../Manager/GenericPriorityQueue.cs                |  16 +-
 MediaBrowser.Providers/Manager/MetadataService.cs  |  43 +----
 .../MediaInfo/AudioImageProvider.cs                |  13 +-
 .../MediaInfo/FFProbeProvider.cs                   |  14 +-
 .../MediaInfo/SubtitleScheduledTask.cs             |  20 +--
 .../MediaInfo/VideoImageProvider.cs                |  14 +-
 .../Movies/FanartMovieImageProvider.cs             |  15 +-
 .../Movies/MovieDbImageProvider.cs                 |  15 +-
 MediaBrowser.Providers/Movies/MovieDbProvider.cs   |  13 +-
 .../Movies/MovieDbTrailerProvider.cs               |  13 +-
 MediaBrowser.Providers/Movies/MovieExternalIds.cs  | 105 +++--------
 .../Music/AlbumMetadataService.cs                  |  24 +--
 .../Music/ArtistMetadataService.cs                 |   8 +-
 .../Music/AudioDbAlbumImageProvider.cs             |  14 +-
 .../Music/AudioDbAlbumProvider.cs                  |  14 +-
 .../Music/AudioDbArtistImageProvider.cs            |  14 +-
 .../Music/AudioDbArtistProvider.cs                 |  14 +-
 MediaBrowser.Providers/Music/AudioDbExternalIds.cs |  60 ++-----
 .../Music/FanArtAlbumProvider.cs                   |  19 +-
 .../Music/FanArtArtistProvider.cs                  |  15 +-
 .../Music/MovieDbMusicVideoProvider.cs             |   5 +-
 .../Music/MusicBrainzAlbumProvider.cs              |  10 +-
 .../Music/MusicBrainzArtistProvider.cs             |   5 +-
 MediaBrowser.Providers/Music/MusicExternalIds.cs   | 105 +++--------
 MediaBrowser.Providers/Omdb/OmdbImageProvider.cs   |  15 +-
 MediaBrowser.Providers/Omdb/OmdbItemProvider.cs    |  14 +-
 .../People/MovieDbPersonImageProvider.cs           |  15 +-
 .../People/MovieDbPersonProvider.cs                |   5 +-
 .../People/TvdbPersonImageProvider.cs              |  15 +-
 .../Playlists/PlaylistItemsProvider.cs             |  14 +-
 .../Playlists/PlaylistMetadataService.cs           |  24 +--
 .../Studios/StudiosImageProvider.cs                |  10 +-
 .../TV/FanArt/FanArtSeasonProvider.cs              |  15 +-
 .../TV/FanArt/FanartSeriesProvider.cs              |  15 +-
 .../TV/Omdb/OmdbEpisodeProvider.cs                 |  14 +-
 MediaBrowser.Providers/TV/SeasonMetadataService.cs |   8 +-
 .../TV/TheMovieDb/MovieDbEpisodeImageProvider.cs   |  14 +-
 .../TV/TheMovieDb/MovieDbEpisodeProvider.cs        |  14 +-
 .../TV/TheMovieDb/MovieDbProviderBase.cs           |   5 +-
 .../TV/TheMovieDb/MovieDbSeasonProvider.cs         |   5 +-
 .../TV/TheMovieDb/MovieDbSeriesImageProvider.cs    |  19 +-
 .../TV/TheMovieDb/MovieDbSeriesProvider.cs         |  14 +-
 .../TV/TheTVDB/TvdbEpisodeImageProvider.cs         |  10 +-
 .../TV/TheTVDB/TvdbEpisodeProvider.cs              |   7 +-
 .../TV/TheTVDB/TvdbSeasonImageProvider.cs          |  15 +-
 .../TV/TheTVDB/TvdbSeriesImageProvider.cs          |  15 +-
 .../TV/TheTVDB/TvdbSeriesProvider.cs               |  13 +-
 MediaBrowser.Providers/TV/TvExternalIds.cs         |  60 ++-----
 .../Videos/VideoMetadataService.cs                 |   9 +-
 MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs |  10 +-
 .../Parsers/MovieNfoParser.cs                      |   8 +-
 .../Parsers/SeriesNfoParser.cs                     |  13 +-
 .../Providers/BaseNfoProvider.cs                   |   8 +-
 MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs   |  16 +-
 SocketHttpListener/CloseEventArgs.cs               |  26 +--
 SocketHttpListener/ErrorEventArgs.cs               |   8 +-
 SocketHttpListener/HttpBase.cs                     |  16 +-
 SocketHttpListener/HttpResponse.cs                 |  40 +----
 SocketHttpListener/MessageEventArgs.cs             |  24 +--
 SocketHttpListener/Net/ChunkStream.cs              |  15 +-
 SocketHttpListener/Net/ChunkedInputStream.cs       |   4 +-
 SocketHttpListener/Net/HttpConnection.cs           |  32 +---
 SocketHttpListener/Net/HttpEndPointListener.cs     |   8 +-
 SocketHttpListener/Net/HttpListener.cs             |  23 +--
 .../Net/HttpListenerBasicIdentity.cs               |  29 +--
 SocketHttpListener/Net/HttpListenerContext.cs      |  16 +-
 .../Net/HttpListenerPrefixCollection.cs            |  15 +-
 .../Net/HttpListenerResponse.Managed.cs            |   4 +-
 SocketHttpListener/Net/HttpListenerResponse.cs     |  27 ++-
 SocketHttpListener/Net/HttpRequestStream.cs        |  18 +-
 SocketHttpListener/Net/HttpResponseStream.cs       |  18 +-
 SocketHttpListener/Net/HttpStreamAsyncResult.cs    |   5 +-
 SocketHttpListener/Net/ListenerPrefix.cs           |  24 +--
 SocketHttpListener/PayloadData.cs                  |  43 +----
 SocketHttpListener/SocketStream.cs                 |  28 ++-
 SocketHttpListener/WebSocket.cs                    |  14 +-
 SocketHttpListener/WebSocketFrame.cs               | 192 +++-----------------
 185 files changed, 792 insertions(+), 3796 deletions(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/BDInfo/BDInfoSettings.cs b/BDInfo/BDInfoSettings.cs
index d127710f49..f4cb300166 100644
--- a/BDInfo/BDInfoSettings.cs
+++ b/BDInfo/BDInfoSettings.cs
@@ -3,103 +3,31 @@ namespace BDInfo
 {
     class BDInfoSettings
     {
-        public static bool GenerateStreamDiagnostics
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public static bool GenerateStreamDiagnostics => true;
 
-        public static bool EnableSSIF
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public static bool EnableSSIF => true;
 
-        public static bool AutosaveReport
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public static bool AutosaveReport => false;
 
-        public static bool GenerateFrameDataFile
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public static bool GenerateFrameDataFile => false;
 
-        public static bool FilterLoopingPlaylists
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public static bool FilterLoopingPlaylists => true;
 
-        public static bool FilterShortPlaylists
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public static bool FilterShortPlaylists => false;
 
-        public static int FilterShortPlaylistsValue
-        {
-            get
-            {
-                return 0;
-            }
-        }
+        public static int FilterShortPlaylistsValue => 0;
 
-        public static bool UseImagePrefix
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public static bool UseImagePrefix => false;
 
-        public static string UseImagePrefixValue
-        {
-            get
-            {
-                return null;
-            }
-        }
+        public static string UseImagePrefixValue => null;
 
         /// <summary>
         /// Setting this to false throws an IComparer error on some discs.
         /// </summary>
-        public static bool KeepStreamOrder
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public static bool KeepStreamOrder => true;
 
-        public static bool GenerateTextSummary
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public static bool GenerateTextSummary => false;
 
-        public static string LastPath
-        {
-            get
-            {
-                return string.Empty;
-            }
-        }
+        public static string LastPath => string.Empty;
     }
 }
diff --git a/BDInfo/TSStream.cs b/BDInfo/TSStream.cs
index 98269a362a..fad3f1acbc 100644
--- a/BDInfo/TSStream.cs
+++ b/BDInfo/TSStream.cs
@@ -142,21 +142,12 @@ namespace BDInfo
         public double PacketSeconds = 0;
         public int AngleIndex = 0;
 
-        public ulong PacketSize
-        {
-            get
-            {
-                return PacketCount * 192;
-            }
-        }
+        public ulong PacketSize => PacketCount * 192;
 
         private string _LanguageCode;
         public string LanguageCode
         {
-            get
-            {
-                return _LanguageCode;
-            }
+            get => _LanguageCode;
             set
             {
                 _LanguageCode = value;
@@ -398,13 +389,7 @@ namespace BDInfo
             }
         }
 
-        public virtual string Description
-        {
-            get
-            {
-                return "";
-            }
-        }
+        public virtual string Description => "";
 
         public abstract TSStream Clone();
 
@@ -444,10 +429,7 @@ namespace BDInfo
         private TSVideoFormat _VideoFormat;
         public TSVideoFormat VideoFormat
         {
-            get
-            {
-                return _VideoFormat;
-            }
+            get => _VideoFormat;
             set
             {
                 _VideoFormat = value;
@@ -488,10 +470,7 @@ namespace BDInfo
         private TSFrameRate _FrameRate;
         public TSFrameRate FrameRate
         {
-            get
-            {
-                return _FrameRate;
-            }
+            get => _FrameRate;
             set
             {
                 _FrameRate = value;
diff --git a/BDInfo/TSStreamBuffer.cs b/BDInfo/TSStreamBuffer.cs
index 36f3149fa4..17025c2e31 100644
--- a/BDInfo/TSStreamBuffer.cs
+++ b/BDInfo/TSStreamBuffer.cs
@@ -37,21 +37,9 @@ namespace BDInfo
             Stream = new MemoryStream(Buffer);
         }
 
-        public long Length
-        {
-            get
-            {
-                return (long)BufferLength;
-            }
-        }
+        public long Length => (long)BufferLength;
 
-        public long Position
-        {
-            get
-            {
-                return Stream.Position;
-            }
-        }
+        public long Position => Stream.Position;
 
         public void Add(
             byte[] buffer,
diff --git a/BDInfo/TSStreamClip.cs b/BDInfo/TSStreamClip.cs
index 23408859d3..20f795e536 100644
--- a/BDInfo/TSStreamClip.cs
+++ b/BDInfo/TSStreamClip.cs
@@ -74,13 +74,7 @@ namespace BDInfo
             }
         }
 
-        public ulong PacketSize
-        {
-            get
-            {
-                return PacketCount * 192;
-            }
-        }
+        public ulong PacketSize => PacketCount * 192;
 
         public ulong PacketBitRate
         {
diff --git a/Emby.Dlna/Api/DlnaServerService.cs b/Emby.Dlna/Api/DlnaServerService.cs
index 44c9ebc712..f4009ee936 100644
--- a/Emby.Dlna/Api/DlnaServerService.cs
+++ b/Emby.Dlna/Api/DlnaServerService.cs
@@ -115,29 +115,11 @@ namespace Emby.Dlna.Api
         public IRequest Request { get; set; }
         private IHttpResultFactory _resultFactory;
 
-        private IContentDirectory ContentDirectory
-        {
-            get
-            {
-                return DlnaEntryPoint.Current.ContentDirectory;
-            }
-        }
+        private IContentDirectory ContentDirectory => DlnaEntryPoint.Current.ContentDirectory;
 
-        private IConnectionManager ConnectionManager
-        {
-            get
-            {
-                return DlnaEntryPoint.Current.ConnectionManager;
-            }
-        }
+        private IConnectionManager ConnectionManager => DlnaEntryPoint.Current.ConnectionManager;
 
-        private IMediaReceiverRegistrar MediaReceiverRegistrar
-        {
-            get
-            {
-                return DlnaEntryPoint.Current.MediaReceiverRegistrar;
-            }
-        }
+        private IMediaReceiverRegistrar MediaReceiverRegistrar => DlnaEntryPoint.Current.MediaReceiverRegistrar;
 
         public DlnaServerService(IDlnaManager dlnaManager, IHttpResultFactory httpResultFactory)
         {
diff --git a/Emby.Dlna/Didl/StringWriterWithEncoding.cs b/Emby.Dlna/Didl/StringWriterWithEncoding.cs
index 93ed323d0f..c3c4bd393b 100644
--- a/Emby.Dlna/Didl/StringWriterWithEncoding.cs
+++ b/Emby.Dlna/Didl/StringWriterWithEncoding.cs
@@ -51,9 +51,6 @@ namespace Emby.Dlna.Didl
             _encoding = encoding;
         }
 
-        public override Encoding Encoding
-        {
-            get { return (null == _encoding) ? base.Encoding : _encoding; }
-        }
+        public override Encoding Encoding => (null == _encoding) ? base.Encoding : _encoding;
     }
 }
diff --git a/Emby.Dlna/DlnaManager.cs b/Emby.Dlna/DlnaManager.cs
index 2a65ce40a6..62b2619087 100644
--- a/Emby.Dlna/DlnaManager.cs
+++ b/Emby.Dlna/DlnaManager.cs
@@ -261,21 +261,9 @@ namespace Emby.Dlna
             return false;
         }
 
-        private string UserProfilesPath
-        {
-            get
-            {
-                return Path.Combine(_appPaths.ConfigurationDirectoryPath, "dlna", "user");
-            }
-        }
+        private string UserProfilesPath => Path.Combine(_appPaths.ConfigurationDirectoryPath, "dlna", "user");
 
-        private string SystemProfilesPath
-        {
-            get
-            {
-                return Path.Combine(_appPaths.ConfigurationDirectoryPath, "dlna", "system");
-            }
-        }
+        private string SystemProfilesPath => Path.Combine(_appPaths.ConfigurationDirectoryPath, "dlna", "system");
 
         private IEnumerable<DeviceProfile> GetProfiles(string path, DeviceProfileType type)
         {
diff --git a/Emby.Dlna/Eventing/EventSubscription.cs b/Emby.Dlna/Eventing/EventSubscription.cs
index 4c72c4211f..eb8781e0cd 100644
--- a/Emby.Dlna/Eventing/EventSubscription.cs
+++ b/Emby.Dlna/Eventing/EventSubscription.cs
@@ -23,12 +23,6 @@ namespace Emby.Dlna.Eventing
             TriggerCount++;
         }
 
-        public bool IsExpired
-        {
-            get
-            {
-                return SubscriptionTime.AddSeconds(TimeoutSeconds) >= DateTime.UtcNow;
-            }
-        }
+        public bool IsExpired => SubscriptionTime.AddSeconds(TimeoutSeconds) >= DateTime.UtcNow;
     }
 }
diff --git a/Emby.Dlna/PlayTo/Device.cs b/Emby.Dlna/PlayTo/Device.cs
index 1176461080..a85720b5f9 100644
--- a/Emby.Dlna/PlayTo/Device.cs
+++ b/Emby.Dlna/PlayTo/Device.cs
@@ -35,10 +35,7 @@ namespace Emby.Dlna.PlayTo
                 RefreshVolumeIfNeeded();
                 return _volume;
             }
-            set
-            {
-                _volume = value;
-            }
+            set => _volume = value;
         }
 
         public TimeSpan? Duration { get; set; }
@@ -46,41 +43,17 @@ namespace Emby.Dlna.PlayTo
         private TimeSpan _position = TimeSpan.FromSeconds(0);
         public TimeSpan Position
         {
-            get
-            {
-                return _position;
-            }
-            set
-            {
-                _position = value;
-            }
+            get => _position;
+            set => _position = value;
         }
 
         public TRANSPORTSTATE TransportState { get; private set; }
 
-        public bool IsPlaying
-        {
-            get
-            {
-                return TransportState == TRANSPORTSTATE.PLAYING;
-            }
-        }
+        public bool IsPlaying => TransportState == TRANSPORTSTATE.PLAYING;
 
-        public bool IsPaused
-        {
-            get
-            {
-                return TransportState == TRANSPORTSTATE.PAUSED || TransportState == TRANSPORTSTATE.PAUSED_PLAYBACK;
-            }
-        }
+        public bool IsPaused => TransportState == TRANSPORTSTATE.PAUSED || TransportState == TRANSPORTSTATE.PAUSED_PLAYBACK;
 
-        public bool IsStopped
-        {
-            get
-            {
-                return TransportState == TRANSPORTSTATE.STOPPED;
-            }
-        }
+        public bool IsStopped => TransportState == TRANSPORTSTATE.STOPPED;
 
         #endregion
 
diff --git a/Emby.Dlna/PlayTo/DeviceInfo.cs b/Emby.Dlna/PlayTo/DeviceInfo.cs
index d81ce584b2..9e7c04bdb3 100644
--- a/Emby.Dlna/PlayTo/DeviceInfo.cs
+++ b/Emby.Dlna/PlayTo/DeviceInfo.cs
@@ -34,26 +34,14 @@ namespace Emby.Dlna.PlayTo
         private string _baseUrl = string.Empty;
         public string BaseUrl
         {
-            get
-            {
-                return _baseUrl;
-            }
-            set
-            {
-                _baseUrl = value;
-            }
+            get => _baseUrl;
+            set => _baseUrl = value;
         }
 
         public DeviceIcon Icon { get; set; }
 
         private readonly List<DeviceService> _services = new List<DeviceService>();
-        public List<DeviceService> Services
-        {
-            get
-            {
-                return _services;
-            }
-        }
+        public List<DeviceService> Services => _services;
 
         public DeviceIdentification ToDeviceIdentification()
         {
diff --git a/Emby.Dlna/PlayTo/PlayToController.cs b/Emby.Dlna/PlayTo/PlayToController.cs
index 49c944790f..95be02ff43 100644
--- a/Emby.Dlna/PlayTo/PlayToController.cs
+++ b/Emby.Dlna/PlayTo/PlayToController.cs
@@ -44,18 +44,9 @@ namespace Emby.Dlna.PlayTo
         private readonly string _accessToken;
         private readonly DateTime _creationTime;
 
-        public bool IsSessionActive
-        {
-            get
-            {
-                return !_disposed && _device != null;
-            }
-        }
+        public bool IsSessionActive => !_disposed && _device != null;
 
-        public bool SupportsMediaControl
-        {
-            get { return IsSessionActive; }
-        }
+        public bool SupportsMediaControl => IsSessionActive;
 
         public PlayToController(SessionInfo session, ISessionManager sessionManager, ILibraryManager libraryManager, ILogger logger, IDlnaManager dlnaManager, IUserManager userManager, IImageProcessor imageProcessor, string serverAddress, string accessToken, IDeviceDiscovery deviceDiscovery, IUserDataManager userDataManager, ILocalizationManager localization, IMediaSourceManager mediaSourceManager, IConfigurationManager config, IMediaEncoder mediaEncoder)
         {
@@ -436,13 +427,7 @@ namespace Emby.Dlna.PlayTo
 
         private int _currentPlaylistIndex;
         private readonly List<PlaylistItem> _playlist = new List<PlaylistItem>();
-        private List<PlaylistItem> Playlist
-        {
-            get
-            {
-                return _playlist;
-            }
-        }
+        private List<PlaylistItem> Playlist => _playlist;
 
         private void AddItemFromId(Guid id, List<BaseItem> list)
         {
diff --git a/Emby.Dlna/PlayTo/TransportCommands.cs b/Emby.Dlna/PlayTo/TransportCommands.cs
index bb6d691153..b96fa43e50 100644
--- a/Emby.Dlna/PlayTo/TransportCommands.cs
+++ b/Emby.Dlna/PlayTo/TransportCommands.cs
@@ -12,27 +12,15 @@ namespace Emby.Dlna.PlayTo
         private List<StateVariable> _stateVariables = new List<StateVariable>();
         public List<StateVariable> StateVariables
         {
-            get
-            {
-                return _stateVariables;
-            }
-            set
-            {
-                _stateVariables = value;
-            }
+            get => _stateVariables;
+            set => _stateVariables = value;
         }
 
         private List<ServiceAction> _serviceActions = new List<ServiceAction>();
         public List<ServiceAction> ServiceActions
         {
-            get
-            {
-                return _serviceActions;
-            }
-            set
-            {
-                _serviceActions = value;
-            }
+            get => _serviceActions;
+            set => _serviceActions = value;
         }
 
         public static TransportCommands Create(XDocument document)
diff --git a/Emby.Drawing.Skia/SkiaEncoder.cs b/Emby.Drawing.Skia/SkiaEncoder.cs
index 3f82fd4b7c..8f517681e8 100644
--- a/Emby.Drawing.Skia/SkiaEncoder.cs
+++ b/Emby.Drawing.Skia/SkiaEncoder.cs
@@ -34,46 +34,34 @@ namespace Emby.Drawing.Skia
             LogVersion();
         }
 
-        public string[] SupportedInputFormats
-        {
-            get
+        public string[] SupportedInputFormats =>
+            new[]
             {
-                // Some common file name extensions for RAW picture files include: .cr2, .crw, .dng, .nef, .orf, .rw2, .pef, .arw, .sr2, .srf, and .tif.
-                return new[]
-                {
-                    "jpeg",
-                    "jpg",
-                    "png",
-
-                    "dng",
-
-                    "webp",
-                    "gif",
-                    "bmp",
-                    "ico",
-                    "astc",
-                    "ktx",
-                    "pkm",
-                    "wbmp",
-
-                    // TODO
-                    // Are all of these supported? https://github.com/google/skia/blob/master/infra/bots/recipes/test.py#L454
-
-                    // working on windows at least
-                    "cr2",
-                    "nef",
-                    "arw"
-                };
-            }
-        }
+                "jpeg",
+                "jpg",
+                "png",
 
-        public ImageFormat[] SupportedOutputFormats
-        {
-            get
-            {
-                return new[] { ImageFormat.Webp, ImageFormat.Jpg, ImageFormat.Png };
-            }
-        }
+                "dng",
+
+                "webp",
+                "gif",
+                "bmp",
+                "ico",
+                "astc",
+                "ktx",
+                "pkm",
+                "wbmp",
+
+                // TODO
+                // Are all of these supported? https://github.com/google/skia/blob/master/infra/bots/recipes/test.py#L454
+
+                // working on windows at least
+                "cr2",
+                "nef",
+                "arw"
+            };
+
+        public ImageFormat[] SupportedOutputFormats => new[] { ImageFormat.Webp, ImageFormat.Jpg, ImageFormat.Png };
 
         private void LogVersion()
         {
@@ -666,19 +654,10 @@ namespace Emby.Drawing.Skia
             }
         }
 
-        public string Name
-        {
-            get { return "Skia"; }
-        }
+        public string Name => "Skia";
 
-        public bool SupportsImageCollageCreation
-        {
-            get { return true; }
-        }
+        public bool SupportsImageCollageCreation => true;
 
-        public bool SupportsImageEncoding
-        {
-            get { return true; }
-        }
+        public bool SupportsImageEncoding => true;
     }
 }
diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index 5b9b15857a..57a6eb148c 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -74,7 +74,7 @@ namespace Emby.Drawing
 
         public IImageEncoder ImageEncoder
         {
-            get { return _imageEncoder; }
+            get => _imageEncoder;
             set
             {
                 if (value == null)
@@ -86,67 +86,44 @@ namespace Emby.Drawing
             }
         }
 
-        public string[] SupportedInputFormats
-        {
-            get
-            {
-                return new string[]
-                {
-                    "tiff",
-                    "tif",
-                    "jpeg",
-                    "jpg",
-                    "png",
-                    "aiff",
-                    "cr2",
-                    "crw",
-
-                    // Remove until supported
-                    //"nef",
-                    "orf",
-                    "pef",
-                    "arw",
-                    "webp",
-                    "gif",
-                    "bmp",
-                    "erf",
-                    "raf",
-                    "rw2",
-                    "nrw",
-                    "dng",
-                    "ico",
-                    "astc",
-                    "ktx",
-                    "pkm",
-                    "wbmp"
-                };
-            }
-        }
-
-
-        public bool SupportsImageCollageCreation
-        {
-            get
-            {
-                return _imageEncoder.SupportsImageCollageCreation;
-            }
-        }
-
-        private string ResizedImageCachePath
-        {
-            get
-            {
-                return Path.Combine(_appPaths.ImageCachePath, "resized-images");
-            }
-        }
-
-        private string EnhancedImageCachePath
-        {
-            get
-            {
-                return Path.Combine(_appPaths.ImageCachePath, "enhanced-images");
-            }
-        }
+        public string[] SupportedInputFormats =>
+            new string[]
+            {
+                "tiff",
+                "tif",
+                "jpeg",
+                "jpg",
+                "png",
+                "aiff",
+                "cr2",
+                "crw",
+
+                // Remove until supported
+                //"nef",
+                "orf",
+                "pef",
+                "arw",
+                "webp",
+                "gif",
+                "bmp",
+                "erf",
+                "raf",
+                "rw2",
+                "nrw",
+                "dng",
+                "ico",
+                "astc",
+                "ktx",
+                "pkm",
+                "wbmp"
+            };
+
+
+        public bool SupportsImageCollageCreation => _imageEncoder.SupportsImageCollageCreation;
+
+        private string ResizedImageCachePath => Path.Combine(_appPaths.ImageCachePath, "resized-images");
+
+        private string EnhancedImageCachePath => Path.Combine(_appPaths.ImageCachePath, "enhanced-images");
 
         public void AddParts(IEnumerable<IImageEnhancer> enhancers)
         {
diff --git a/Emby.Drawing/NullImageEncoder.cs b/Emby.Drawing/NullImageEncoder.cs
index 748ae6f2c8..e6f205a1f5 100644
--- a/Emby.Drawing/NullImageEncoder.cs
+++ b/Emby.Drawing/NullImageEncoder.cs
@@ -6,26 +6,15 @@ namespace Emby.Drawing
 {
     public class NullImageEncoder : IImageEncoder
     {
-        public string[] SupportedInputFormats
-        {
-            get
+        public string[] SupportedInputFormats =>
+            new[]
             {
-                return new[]
-                {
-                    "png",
-                    "jpeg",
-                    "jpg"
-                };
-            }
-        }
+                "png",
+                "jpeg",
+                "jpg"
+            };
 
-        public ImageFormat[] SupportedOutputFormats
-        {
-            get
-            {
-                return new[] { ImageFormat.Jpg, ImageFormat.Png };
-            }
-        }
+        public ImageFormat[] SupportedOutputFormats => new[] { ImageFormat.Jpg, ImageFormat.Png };
 
         public void CropWhiteSpace(string inputPath, string outputPath)
         {
@@ -42,20 +31,11 @@ namespace Emby.Drawing
             throw new NotImplementedException();
         }
 
-        public string Name
-        {
-            get { return "Null Image Encoder"; }
-        }
+        public string Name => "Null Image Encoder";
 
-        public bool SupportsImageCollageCreation
-        {
-            get { return false; }
-        }
+        public bool SupportsImageCollageCreation => false;
 
-        public bool SupportsImageEncoding
-        {
-            get { return false; }
-        }
+        public bool SupportsImageEncoding => false;
 
         public ImageSize GetImageSize(string path)
         {
diff --git a/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs b/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs
index 846f3b2ce6..ac486f1675 100644
--- a/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs
+++ b/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs
@@ -13,7 +13,7 @@ namespace IsoMounter
     public class LinuxIsoManager : IIsoMounter
     {
         [DllImport("libc", SetLastError = true)]
-        public static extern uint getuid();
+        static extern uint getuid();
 
         #region Private Fields
 
@@ -102,26 +102,11 @@ namespace IsoMounter
 
         #region Interface Implementation for IIsoMounter
 
-        public bool IsInstalled
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public bool IsInstalled => true;
 
-        public string Name
-        {
-            get { return "LinuxMount"; }
-        }
+        public string Name => "LinuxMount";
 
-        public bool RequiresInstallation
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public bool RequiresInstallation => false;
 
         public bool CanMount(string path)
         {
diff --git a/Emby.IsoMounting/IsoMounter/Plugin.cs b/Emby.IsoMounting/IsoMounter/Plugin.cs
index bcacab9067..f45b39d3e4 100644
--- a/Emby.IsoMounting/IsoMounter/Plugin.cs
+++ b/Emby.IsoMounting/IsoMounter/Plugin.cs
@@ -13,30 +13,18 @@ namespace IsoMounter
         }
 
         private Guid _id = new Guid("4682DD4C-A675-4F1B-8E7C-79ADF137A8F8");
-        public override Guid Id
-        {
-            get { return _id; }
-        }
+        public override Guid Id => _id;
 
         /// <summary>
         /// Gets the name of the plugin
         /// </summary>
         /// <value>The name.</value>
-        public override string Name
-        {
-            get { return "Iso Mounter"; }
-        }
+        public override string Name => "Iso Mounter";
 
         /// <summary>
         /// Gets the description.
         /// </summary>
         /// <value>The description.</value>
-        public override string Description
-        {
-            get
-            {
-                return "Mount and stream ISO contents";
-            }
-        }
+        public override string Description => "Mount and stream ISO contents";
     }
 }
diff --git a/Emby.Naming/Common/EpisodeExpression.cs b/Emby.Naming/Common/EpisodeExpression.cs
index ebaacd3a15..fd85bf76ad 100644
--- a/Emby.Naming/Common/EpisodeExpression.cs
+++ b/Emby.Naming/Common/EpisodeExpression.cs
@@ -6,7 +6,8 @@ namespace Emby.Naming.Common
     public class EpisodeExpression
     {
         private string _expression;
-        public string Expression { get { return _expression; } set { _expression = value; _regex = null; } }
+        public string Expression { get => _expression;
+            set { _expression = value; _regex = null; } }
 
         public bool IsByDate { get; set; }
         public bool IsOptimistic { get; set; }
@@ -16,13 +17,7 @@ namespace Emby.Naming.Common
         public string[] DateTimeFormats { get; set; }
 
         private Regex _regex;
-        public Regex Regex
-        {
-            get
-            {
-                return _regex ?? (_regex = new Regex(Expression, RegexOptions.IgnoreCase | RegexOptions.Compiled));
-            }
-        }
+        public Regex Regex => _regex ?? (_regex = new Regex(Expression, RegexOptions.IgnoreCase | RegexOptions.Compiled));
 
         public EpisodeExpression(string expression, bool byDate)
         {
diff --git a/Emby.Naming/Video/VideoFileInfo.cs b/Emby.Naming/Video/VideoFileInfo.cs
index d14d04b20e..6a29ada7ea 100644
--- a/Emby.Naming/Video/VideoFileInfo.cs
+++ b/Emby.Naming/Video/VideoFileInfo.cs
@@ -65,10 +65,7 @@ namespace Emby.Naming.Video
         /// Gets the file name without extension.
         /// </summary>
         /// <value>The file name without extension.</value>
-        public string FileNameWithoutExtension
-        {
-            get { return !IsDirectory ? System.IO.Path.GetFileNameWithoutExtension(Path) : System.IO.Path.GetFileName(Path); }
-        }
+        public string FileNameWithoutExtension => !IsDirectory ? System.IO.Path.GetFileNameWithoutExtension(Path) : System.IO.Path.GetFileName(Path);
 
         public override string ToString()
         {
diff --git a/Emby.Photos/PhotoProvider.cs b/Emby.Photos/PhotoProvider.cs
index 40480b2ae6..99d0ed7aba 100644
--- a/Emby.Photos/PhotoProvider.cs
+++ b/Emby.Photos/PhotoProvider.cs
@@ -199,9 +199,6 @@ namespace Emby.Photos
             return Task.FromResult(result);
         }
 
-        public string Name
-        {
-            get { return "Embedded Information"; }
-        }
+        public string Name => "Embedded Information";
     }
 }
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 8621de563e..325bad501e 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -45,13 +45,7 @@ namespace Emby.Server.Implementations.Data
         /// Gets the name of the repository
         /// </summary>
         /// <value>The name.</value>
-        public string Name
-        {
-            get
-            {
-                return "SQLite";
-            }
-        }
+        public string Name => "SQLite";
 
         /// <summary>
         /// Gets the json serializer.
@@ -97,21 +91,9 @@ namespace Emby.Server.Implementations.Data
 
         private const string ChaptersTableName = "Chapters2";
 
-        protected override int? CacheSize
-        {
-            get
-            {
-                return 20000;
-            }
-        }
+        protected override int? CacheSize => 20000;
 
-        protected override bool EnableTempStoreMemory
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableTempStoreMemory => true;
 
         /// <summary>
         /// Opens the connection to the database
diff --git a/Jellyfin.Server/CoreAppHost.cs b/Jellyfin.Server/CoreAppHost.cs
index 50e24a0c21..b18562a69f 100644
--- a/Jellyfin.Server/CoreAppHost.cs
+++ b/Jellyfin.Server/CoreAppHost.cs
@@ -16,14 +16,7 @@ namespace Jellyfin.Server
         {
         }
 
-        public override bool CanSelfRestart
-        {
-            get
-            {
-                // A restart script must be provided
-                return StartupOptions.ContainsOption("-restartpath");
-            }
-        }
+        public override bool CanSelfRestart => StartupOptions.ContainsOption("-restartpath");
 
         protected override void RestartInternal() => Program.Restart();
 
@@ -32,13 +25,7 @@ namespace Jellyfin.Server
 
         protected override void ShutdownInternal() => Program.Shutdown();
 
-        protected override bool SupportsDualModeSockets
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool SupportsDualModeSockets => true;
 
         protected override IHttpListener CreateHttpListener()
             => new WebSocketSharpListener(
diff --git a/Jellyfin.Server/SocketSharp/RequestMono.cs b/Jellyfin.Server/SocketSharp/RequestMono.cs
index ffa57758a4..6e5a4e75a3 100644
--- a/Jellyfin.Server/SocketSharp/RequestMono.cs
+++ b/Jellyfin.Server/SocketSharp/RequestMono.cs
@@ -113,21 +113,9 @@ namespace Jellyfin.SocketSharp
             return form;
         }
 
-        public string Accept
-        {
-            get
-            {
-                return string.IsNullOrEmpty(request.Headers["Accept"]) ? null : request.Headers["Accept"];
-            }
-        }
+        public string Accept => string.IsNullOrEmpty(request.Headers["Accept"]) ? null : request.Headers["Accept"];
 
-        public string Authorization
-        {
-            get
-            {
-                return string.IsNullOrEmpty(request.Headers["Authorization"]) ? null : request.Headers["Authorization"];
-            }
-        }
+        public string Authorization => string.IsNullOrEmpty(request.Headers["Authorization"]) ? null : request.Headers["Authorization"];
 
         protected bool validate_cookies, validate_query_string, validate_form;
         protected bool checked_cookies, checked_query_string, checked_form;
@@ -410,30 +398,17 @@ namespace Jellyfin.SocketSharp
                     throw new NotSupportedException();
                 }
 
-                public override bool CanRead
-                {
-                    get { return true; }
-                }
-                public override bool CanSeek
-                {
-                    get { return true; }
-                }
-                public override bool CanWrite
-                {
-                    get { return false; }
-                }
+                public override bool CanRead => true;
 
-                public override long Length
-                {
-                    get { return end - offset; }
-                }
+                public override bool CanSeek => true;
+
+                public override bool CanWrite => false;
+
+                public override long Length => end - offset;
 
                 public override long Position
                 {
-                    get
-                    {
-                        return position - offset;
-                    }
+                    get => position - offset;
                     set
                     {
                         if (value > Length)
@@ -451,37 +426,13 @@ namespace Jellyfin.SocketSharp
                 this.stream = new ReadSubStream(base_stream, offset, length);
             }
 
-            public string ContentType
-            {
-                get
-                {
-                    return content_type;
-                }
-            }
+            public string ContentType => content_type;
 
-            public int ContentLength
-            {
-                get
-                {
-                    return (int)stream.Length;
-                }
-            }
+            public int ContentLength => (int)stream.Length;
 
-            public string FileName
-            {
-                get
-                {
-                    return name;
-                }
-            }
+            public string FileName => name;
 
-            public Stream InputStream
-            {
-                get
-                {
-                    return stream;
-                }
-            }
+            public Stream InputStream => stream;
         }
 
         class Helpers
diff --git a/Jellyfin.Server/SocketSharp/SharpWebSocket.cs b/Jellyfin.Server/SocketSharp/SharpWebSocket.cs
index cb346cac57..d0dcd86ebf 100644
--- a/Jellyfin.Server/SocketSharp/SharpWebSocket.cs
+++ b/Jellyfin.Server/SocketSharp/SharpWebSocket.cs
@@ -85,13 +85,7 @@ namespace Jellyfin.SocketSharp
         /// Gets or sets the state.
         /// </summary>
         /// <value>The state.</value>
-        public WebSocketState State
-        {
-            get
-            {
-                return WebSocket.ReadyState;
-            }
-        }
+        public WebSocketState State => WebSocket.ReadyState;
 
         /// <summary>
         /// Sends the async.
diff --git a/Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs b/Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs
index c6c87cdea8..e38468388b 100644
--- a/Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs
+++ b/Jellyfin.Server/SocketSharp/WebSocketSharpRequest.cs
@@ -39,88 +39,38 @@ namespace Jellyfin.SocketSharp
             return string.IsNullOrEmpty(endHostUrl) ? null : endHostUrl.TrimEnd('/');
         }
 
-        public HttpListenerRequest HttpRequest
-        {
-            get { return request; }
-        }
+        public HttpListenerRequest HttpRequest => request;
 
-        public object OriginalRequest
-        {
-            get { return request; }
-        }
+        public object OriginalRequest => request;
 
-        public IResponse Response
-        {
-            get { return response; }
-        }
+        public IResponse Response => response;
 
-        public IHttpResponse HttpResponse
-        {
-            get { return response; }
-        }
+        public IHttpResponse HttpResponse => response;
 
         public string OperationName { get; set; }
 
         public object Dto { get; set; }
 
-        public string RawUrl
-        {
-            get { return request.RawUrl; }
-        }
+        public string RawUrl => request.RawUrl;
 
-        public string AbsoluteUri
-        {
-            get { return request.Url.AbsoluteUri.TrimEnd('/'); }
-        }
+        public string AbsoluteUri => request.Url.AbsoluteUri.TrimEnd('/');
 
-        public string UserHostAddress
-        {
-            get { return request.UserHostAddress; }
-        }
+        public string UserHostAddress => request.UserHostAddress;
 
-        public string XForwardedFor
-        {
-            get
-            {
-                return string.IsNullOrEmpty(request.Headers["X-Forwarded-For"]) ? null : request.Headers["X-Forwarded-For"];
-            }
-        }
+        public string XForwardedFor => string.IsNullOrEmpty(request.Headers["X-Forwarded-For"]) ? null : request.Headers["X-Forwarded-For"];
 
-        public int? XForwardedPort
-        {
-            get
-            {
-                return string.IsNullOrEmpty(request.Headers["X-Forwarded-Port"]) ? (int?)null : int.Parse(request.Headers["X-Forwarded-Port"]);
-            }
-        }
+        public int? XForwardedPort => string.IsNullOrEmpty(request.Headers["X-Forwarded-Port"]) ? (int?)null : int.Parse(request.Headers["X-Forwarded-Port"]);
 
-        public string XForwardedProtocol
-        {
-            get
-            {
-                return string.IsNullOrEmpty(request.Headers["X-Forwarded-Proto"]) ? null : request.Headers["X-Forwarded-Proto"];
-            }
-        }
+        public string XForwardedProtocol => string.IsNullOrEmpty(request.Headers["X-Forwarded-Proto"]) ? null : request.Headers["X-Forwarded-Proto"];
 
-        public string XRealIp
-        {
-            get
-            {
-                return string.IsNullOrEmpty(request.Headers["X-Real-IP"]) ? null : request.Headers["X-Real-IP"];
-            }
-        }
+        public string XRealIp => string.IsNullOrEmpty(request.Headers["X-Real-IP"]) ? null : request.Headers["X-Real-IP"];
 
         private string remoteIp;
-        public string RemoteIp
-        {
-            get
-            {
-                return remoteIp ??
-                    (remoteIp = (CheckBadChars(XForwardedFor)) ??
-                                (NormalizeIp(CheckBadChars(XRealIp)) ??
-                                (request.RemoteEndPoint != null ? NormalizeIp(request.RemoteEndPoint.Address.ToString()) : null)));
-            }
-        }
+        public string RemoteIp =>
+            remoteIp ??
+            (remoteIp = (CheckBadChars(XForwardedFor)) ??
+                        (NormalizeIp(CheckBadChars(XRealIp)) ??
+                         (request.RemoteEndPoint != null ? NormalizeIp(request.RemoteEndPoint.Address.ToString()) : null)));
 
         private static readonly char[] HttpTrimCharacters = new char[] { (char)0x09, (char)0xA, (char)0xB, (char)0xC, (char)0xD, (char)0x20 };
 
@@ -215,34 +165,20 @@ namespace Jellyfin.SocketSharp
             return ip;
         }
 
-        public bool IsSecureConnection
-        {
-            get { return request.IsSecureConnection || XForwardedProtocol == "https"; }
-        }
+        public bool IsSecureConnection => request.IsSecureConnection || XForwardedProtocol == "https";
 
-        public string[] AcceptTypes
-        {
-            get { return request.AcceptTypes; }
-        }
+        public string[] AcceptTypes => request.AcceptTypes;
 
         private Dictionary<string, object> items;
-        public Dictionary<string, object> Items
-        {
-            get { return items ?? (items = new Dictionary<string, object>()); }
-        }
+        public Dictionary<string, object> Items => items ?? (items = new Dictionary<string, object>());
 
         private string responseContentType;
         public string ResponseContentType
         {
-            get
-            {
-                return responseContentType
-                    ?? (responseContentType = GetResponseContentType(this));
-            }
-            set
-            {
-                this.responseContentType = value;
-            }
+            get =>
+                responseContentType
+                ?? (responseContentType = GetResponseContentType(this));
+            set => this.responseContentType = value;
         }
 
         public const string FormUrlEncoded = "application/x-www-form-urlencoded";
@@ -434,58 +370,32 @@ namespace Jellyfin.SocketSharp
             }
         }
 
-        public string UserAgent
-        {
-            get { return request.UserAgent; }
-        }
+        public string UserAgent => request.UserAgent;
 
-        public QueryParamCollection Headers
-        {
-            get { return request.Headers; }
-        }
+        public QueryParamCollection Headers => request.Headers;
 
         private QueryParamCollection queryString;
-        public QueryParamCollection QueryString
-        {
-            get { return queryString ?? (queryString = MyHttpUtility.ParseQueryString(request.Url.Query)); }
-        }
+        public QueryParamCollection QueryString => queryString ?? (queryString = MyHttpUtility.ParseQueryString(request.Url.Query));
 
-        public bool IsLocal
-        {
-            get { return request.IsLocal; }
-        }
+        public bool IsLocal => request.IsLocal;
 
         private string httpMethod;
-        public string HttpMethod
-        {
-            get
-            {
-                return httpMethod
-                    ?? (httpMethod = request.HttpMethod);
-            }
-        }
+        public string HttpMethod =>
+            httpMethod
+            ?? (httpMethod = request.HttpMethod);
 
-        public string Verb
-        {
-            get { return HttpMethod; }
-        }
+        public string Verb => HttpMethod;
 
-        public string ContentType
-        {
-            get { return request.ContentType; }
-        }
+        public string ContentType => request.ContentType;
 
         public Encoding contentEncoding;
         public Encoding ContentEncoding
         {
-            get { return contentEncoding ?? request.ContentEncoding; }
-            set { contentEncoding = value; }
+            get => contentEncoding ?? request.ContentEncoding;
+            set => contentEncoding = value;
         }
 
-        public Uri UrlReferrer
-        {
-            get { return request.UrlReferrer; }
-        }
+        public Uri UrlReferrer => request.UrlReferrer;
 
         public static Encoding GetEncoding(string contentTypeHeader)
         {
@@ -501,15 +411,9 @@ namespace Jellyfin.SocketSharp
             }
         }
 
-        public Stream InputStream
-        {
-            get { return request.InputStream; }
-        }
+        public Stream InputStream => request.InputStream;
 
-        public long ContentLength
-        {
-            get { return request.ContentLength64; }
-        }
+        public long ContentLength => request.ContentLength64;
 
         private IHttpFile[] httpFiles;
         public IHttpFile[] Files
diff --git a/Jellyfin.Server/SocketSharp/WebSocketSharpResponse.cs b/Jellyfin.Server/SocketSharp/WebSocketSharpResponse.cs
index 8b1e8bbb7c..21bfac55da 100644
--- a/Jellyfin.Server/SocketSharp/WebSocketSharpResponse.cs
+++ b/Jellyfin.Server/SocketSharp/WebSocketSharpResponse.cs
@@ -31,27 +31,24 @@ namespace Jellyfin.SocketSharp
 
         public IRequest Request { get; private set; }
         public Dictionary<string, object> Items { get; private set; }
-        public object OriginalResponse
-        {
-            get { return _response; }
-        }
+        public object OriginalResponse => _response;
 
         public int StatusCode
         {
-            get { return this._response.StatusCode; }
-            set { this._response.StatusCode = value; }
+            get => this._response.StatusCode;
+            set => this._response.StatusCode = value;
         }
 
         public string StatusDescription
         {
-            get { return this._response.StatusDescription; }
-            set { this._response.StatusDescription = value; }
+            get => this._response.StatusDescription;
+            set => this._response.StatusDescription = value;
         }
 
         public string ContentType
         {
-            get { return _response.ContentType; }
-            set { _response.ContentType = value; }
+            get => _response.ContentType;
+            set => _response.ContentType = value;
         }
 
         //public ICookies Cookies { get; set; }
@@ -67,13 +64,7 @@ namespace Jellyfin.SocketSharp
             _response.AddHeader(name, value);
         }
 
-        public QueryParamCollection Headers
-        {
-            get
-            {
-                return _response.Headers;
-            }
-        }
+        public QueryParamCollection Headers => _response.Headers;
 
         public string GetHeader(string name)
         {
@@ -85,10 +76,7 @@ namespace Jellyfin.SocketSharp
             _response.Redirect(url);
         }
 
-        public Stream OutputStream
-        {
-            get { return _response.OutputStream; }
-        }
+        public Stream OutputStream => _response.OutputStream;
 
         public void Close()
         {
@@ -179,8 +167,8 @@ namespace Jellyfin.SocketSharp
 
         public bool SendChunked
         {
-            get { return _response.SendChunked; }
-            set { _response.SendChunked = value; }
+            get => _response.SendChunked;
+            set => _response.SendChunked = value;
         }
 
         public bool KeepAlive { get; set; }
diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index ff0d23fcd9..8decea5a24 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -22,25 +22,13 @@ namespace MediaBrowser.Api
         /// Gets or sets the logger.
         /// </summary>
         /// <value>The logger.</value>
-        public ILogger Logger
-        {
-            get
-            {
-                return ApiEntryPoint.Instance.Logger;
-            }
-        }
+        public ILogger Logger => ApiEntryPoint.Instance.Logger;
 
         /// <summary>
         /// Gets or sets the HTTP result factory.
         /// </summary>
         /// <value>The HTTP result factory.</value>
-        public IHttpResultFactory ResultFactory
-        {
-            get
-            {
-                return ApiEntryPoint.Instance.ResultFactory;
-            }
-        }
+        public IHttpResultFactory ResultFactory => ApiEntryPoint.Instance.ResultFactory;
 
         /// <summary>
         /// Gets or sets the request context.
diff --git a/MediaBrowser.Api/LiveTv/ProgressiveFileCopier.cs b/MediaBrowser.Api/LiveTv/ProgressiveFileCopier.cs
index 28590444ef..8412bf66b9 100644
--- a/MediaBrowser.Api/LiveTv/ProgressiveFileCopier.cs
+++ b/MediaBrowser.Api/LiveTv/ProgressiveFileCopier.cs
@@ -45,13 +45,7 @@ namespace MediaBrowser.Api.LiveTv
             _streamHelper = streamHelper;
         }
 
-        public IDictionary<string, string> Headers
-        {
-            get
-            {
-                return _outputHeaders;
-            }
-        }
+        public IDictionary<string, string> Headers => _outputHeaders;
 
         private Stream GetInputStream(bool allowAsyncFileRead)
         {
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index c6781cad9d..cdf9c7d0b4 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -141,10 +141,7 @@ namespace MediaBrowser.Api.Playback
             return Path.Combine(folder, dataHash + (outputFileExtension ?? string.Empty).ToLower());
         }
 
-        protected virtual bool EnableOutputInSubFolder
-        {
-            get { return false; }
-        }
+        protected virtual bool EnableOutputInSubFolder => false;
 
         protected readonly CultureInfo UsCulture = new CultureInfo("en-US");
 
diff --git a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
index 969ab9c3bc..1e90d03b0a 100644
--- a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
@@ -52,10 +52,7 @@ namespace MediaBrowser.Api.Playback.Hls
         /// Gets the type of the transcoding job.
         /// </summary>
         /// <value>The type of the transcoding job.</value>
-        protected override TranscodingJobType TranscodingJobType
-        {
-            get { return TranscodingJobType.Hls; }
-        }
+        protected override TranscodingJobType TranscodingJobType => TranscodingJobType.Hls;
 
         /// <summary>
         /// Processes the request.
diff --git a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
index e3fb0ad52f..bb21fe5ae1 100644
--- a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
@@ -102,10 +102,7 @@ namespace MediaBrowser.Api.Playback.Progressive
         /// Gets the type of the transcoding job.
         /// </summary>
         /// <value>The type of the transcoding job.</value>
-        protected override TranscodingJobType TranscodingJobType
-        {
-            get { return TranscodingJobType.Progressive; }
-        }
+        protected override TranscodingJobType TranscodingJobType => TranscodingJobType.Progressive;
 
         /// <summary>
         /// Processes the request.
diff --git a/MediaBrowser.Api/Playback/Progressive/ProgressiveStreamWriter.cs b/MediaBrowser.Api/Playback/Progressive/ProgressiveStreamWriter.cs
index cad08ea24f..3dd9de2a1b 100644
--- a/MediaBrowser.Api/Playback/Progressive/ProgressiveStreamWriter.cs
+++ b/MediaBrowser.Api/Playback/Progressive/ProgressiveStreamWriter.cs
@@ -50,13 +50,7 @@ namespace MediaBrowser.Api.Playback.Progressive
             _environment = environment;
         }
 
-        public IDictionary<string, string> Headers
-        {
-            get
-            {
-                return _outputHeaders;
-            }
-        }
+        public IDictionary<string, string> Headers => _outputHeaders;
 
         private Stream GetInputStream(bool allowAsyncFileRead)
         {
diff --git a/MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs b/MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs
index 5a309ba091..3b8b299957 100644
--- a/MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs
+++ b/MediaBrowser.Api/Playback/StaticRemoteStreamWriter.cs
@@ -31,10 +31,7 @@ namespace MediaBrowser.Api.Playback
         /// Gets the options.
         /// </summary>
         /// <value>The options.</value>
-        public IDictionary<string, string> Headers
-        {
-            get { return _options; }
-        }
+        public IDictionary<string, string> Headers => _options;
 
         public async Task WriteToAsync(Stream responseStream, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Api/Playback/StreamRequest.cs b/MediaBrowser.Api/Playback/StreamRequest.cs
index 4771e188f6..da1f00c3e9 100644
--- a/MediaBrowser.Api/Playback/StreamRequest.cs
+++ b/MediaBrowser.Api/Playback/StreamRequest.cs
@@ -50,13 +50,7 @@ namespace MediaBrowser.Api.Playback
         /// Gets a value indicating whether this instance has fixed resolution.
         /// </summary>
         /// <value><c>true</c> if this instance has fixed resolution; otherwise, <c>false</c>.</value>
-        public bool HasFixedResolution
-        {
-            get
-            {
-                return Width.HasValue || Height.HasValue;
-            }
-        }
+        public bool HasFixedResolution => Width.HasValue || Height.HasValue;
 
         public bool EnableSubtitlesInManifest { get; set; }
     }
diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs
index fc2310683d..400ad47cc6 100644
--- a/MediaBrowser.Api/Playback/StreamState.cs
+++ b/MediaBrowser.Api/Playback/StreamState.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.Api.Playback
 
         public StreamRequest Request
         {
-            get { return (StreamRequest)BaseRequest; }
+            get => (StreamRequest)BaseRequest;
             set
             {
                 BaseRequest = value;
@@ -28,10 +28,7 @@ namespace MediaBrowser.Api.Playback
 
         public TranscodingThrottler TranscodingThrottler { get; set; }
 
-        public VideoStreamRequest VideoRequest
-        {
-            get { return Request as VideoStreamRequest; }
-        }
+        public VideoStreamRequest VideoRequest => Request as VideoStreamRequest;
 
         /// <summary>
         /// Gets or sets the log file stream.
@@ -42,10 +39,7 @@ namespace MediaBrowser.Api.Playback
 
         public string WaitForPath { get; set; }
 
-        public bool IsOutputVideo
-        {
-            get { return Request is VideoStreamRequest; }
-        }
+        public bool IsOutputVideo => Request is VideoStreamRequest;
 
         public int SegmentLength
         {
@@ -98,13 +92,7 @@ namespace MediaBrowser.Api.Playback
             }
         }
 
-        public int HlsListSize
-        {
-            get
-            {
-                return 0;
-            }
-        }
+        public int HlsListSize => 0;
 
         public string UserAgent { get; set; }
 
diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
index f1edc5a228..b0c4b29c17 100644
--- a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
@@ -24,10 +24,7 @@ namespace MediaBrowser.Api.ScheduledTasks
         /// Gets the name.
         /// </summary>
         /// <value>The name.</value>
-        protected override string Name
-        {
-            get { return "ScheduledTasksInfo"; }
-        }
+        protected override string Name => "ScheduledTasksInfo";
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ScheduledTasksWebSocketListener" /> class.
diff --git a/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs b/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs
index f2cb1d4850..387ccad25e 100644
--- a/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs
+++ b/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs
@@ -17,10 +17,7 @@ namespace MediaBrowser.Api.Session
         /// Gets the name.
         /// </summary>
         /// <value>The name.</value>
-        protected override string Name
-        {
-            get { return "Sessions"; }
-        }
+        protected override string Name => "Sessions";
 
         /// <summary>
         /// The _kernel
diff --git a/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs b/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
index 1b1fc8ff83..0df46c3996 100644
--- a/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
+++ b/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs
@@ -17,10 +17,7 @@ namespace MediaBrowser.Api.System
         /// Gets the name.
         /// </summary>
         /// <value>The name.</value>
-        protected override string Name
-        {
-            get { return "ActivityLogEntry"; }
-        }
+        protected override string Name => "ActivityLogEntry";
 
         /// <summary>
         /// The _kernel
diff --git a/MediaBrowser.Common/Net/HttpRequestOptions.cs b/MediaBrowser.Common/Net/HttpRequestOptions.cs
index 938b562850..0b21472f04 100644
--- a/MediaBrowser.Common/Net/HttpRequestOptions.cs
+++ b/MediaBrowser.Common/Net/HttpRequestOptions.cs
@@ -24,11 +24,8 @@ namespace MediaBrowser.Common.Net
         /// <value>The accept header.</value>
         public string AcceptHeader
         {
-            get { return GetHeaderValue("Accept"); }
-            set
-            {
-                RequestHeaders["Accept"] = value;
-            }
+            get => GetHeaderValue("Accept");
+            set => RequestHeaders["Accept"] = value;
         }
         /// <summary>
         /// Gets or sets the cancellation token.
@@ -48,11 +45,8 @@ namespace MediaBrowser.Common.Net
         /// <value>The user agent.</value>
         public string UserAgent
         {
-            get { return GetHeaderValue("User-Agent"); }
-            set
-            {
-                RequestHeaders["User-Agent"] = value;
-            }
+            get => GetHeaderValue("User-Agent");
+            set => RequestHeaders["User-Agent"] = value;
         }
 
         /// <summary>
diff --git a/MediaBrowser.Common/Plugins/BasePlugin.cs b/MediaBrowser.Common/Plugins/BasePlugin.cs
index cd52803c64..a14c9fb34b 100644
--- a/MediaBrowser.Common/Plugins/BasePlugin.cs
+++ b/MediaBrowser.Common/Plugins/BasePlugin.cs
@@ -18,10 +18,7 @@ namespace MediaBrowser.Common.Plugins
         /// Gets the description.
         /// </summary>
         /// <value>The description.</value>
-        public virtual string Description
-        {
-            get { return string.Empty; }
-        }
+        public virtual string Description => string.Empty;
 
         /// <summary>
         /// Gets the unique id.
@@ -108,10 +105,7 @@ namespace MediaBrowser.Common.Plugins
         /// Gets the type of configuration this plugin uses
         /// </summary>
         /// <value>The type of the configuration.</value>
-        public Type ConfigurationType
-        {
-            get { return typeof(TConfigurationType); }
-        }
+        public Type ConfigurationType => typeof(TConfigurationType);
 
         private Action<string> _directoryCreateFn;
         public void SetStartupInfo(Action<string> directoryCreateFn)
@@ -124,13 +118,7 @@ namespace MediaBrowser.Common.Plugins
         /// Gets the name the assembly file
         /// </summary>
         /// <value>The name of the assembly file.</value>
-        protected string AssemblyFileName
-        {
-            get
-            {
-                return Path.GetFileName(AssemblyFilePath);
-            }
-        }
+        protected string AssemblyFileName => Path.GetFileName(AssemblyFilePath);
 
         /// <summary>
         /// The _configuration sync lock
@@ -161,10 +149,7 @@ namespace MediaBrowser.Common.Plugins
                 }
                 return _configuration;
             }
-            protected set
-            {
-                _configuration = value;
-            }
+            protected set => _configuration = value;
         }
 
         private TConfigurationType LoadConfiguration()
@@ -185,22 +170,13 @@ namespace MediaBrowser.Common.Plugins
         /// Gets the name of the configuration file. Subclasses should override
         /// </summary>
         /// <value>The name of the configuration file.</value>
-        public virtual string ConfigurationFileName
-        {
-            get { return Path.ChangeExtension(AssemblyFileName, ".xml"); }
-        }
+        public virtual string ConfigurationFileName => Path.ChangeExtension(AssemblyFileName, ".xml");
 
         /// <summary>
         /// Gets the full path to the configuration file
         /// </summary>
         /// <value>The configuration file path.</value>
-        public string ConfigurationFilePath
-        {
-            get
-            {
-                return Path.Combine(ApplicationPaths.PluginConfigurationsPath, ConfigurationFileName);
-            }
-        }
+        public string ConfigurationFilePath => Path.Combine(ApplicationPaths.PluginConfigurationsPath, ConfigurationFileName);
 
         /// <summary>
         /// Initializes a new instance of the <see cref="BasePlugin{TConfigurationType}" /> class.
@@ -253,10 +229,7 @@ namespace MediaBrowser.Common.Plugins
         /// Gets the plugin's configuration
         /// </summary>
         /// <value>The configuration.</value>
-        BasePluginConfiguration IHasPluginConfiguration.Configuration
-        {
-            get { return Configuration; }
-        }
+        BasePluginConfiguration IHasPluginConfiguration.Configuration => Configuration;
 
         public override PluginInfo GetPluginInfo()
         {
diff --git a/MediaBrowser.Controller/Channels/Channel.cs b/MediaBrowser.Controller/Channels/Channel.cs
index 022d4aa820..adf03fb661 100644
--- a/MediaBrowser.Controller/Channels/Channel.cs
+++ b/MediaBrowser.Controller/Channels/Channel.cs
@@ -31,19 +31,10 @@ namespace MediaBrowser.Controller.Channels
         }
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsInheritedParentImages => false;
 
         [IgnoreDataMember]
-        public override SourceType SourceType
-        {
-            get { return SourceType.Channel; }
-        }
+        public override SourceType SourceType => SourceType.Channel;
 
         protected override QueryResult<BaseItem> GetItemsInternal(InternalItemsQuery query)
         {
diff --git a/MediaBrowser.Controller/Entities/AggregateFolder.cs b/MediaBrowser.Controller/Entities/AggregateFolder.cs
index a484f31f1b..522b3e33e9 100644
--- a/MediaBrowser.Controller/Entities/AggregateFolder.cs
+++ b/MediaBrowser.Controller/Entities/AggregateFolder.cs
@@ -24,10 +24,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool IsPhysicalRoot
-        {
-            get { return true; }
-        }
+        public override bool IsPhysicalRoot => true;
 
         public override bool CanDelete()
         {
@@ -35,13 +32,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsPlayedStatus
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPlayedStatus => false;
 
         /// <summary>
         /// The _virtual children
@@ -52,19 +43,10 @@ namespace MediaBrowser.Controller.Entities
         /// Gets the virtual children.
         /// </summary>
         /// <value>The virtual children.</value>
-        public ConcurrentBag<BaseItem> VirtualChildren
-        {
-            get { return _virtualChildren; }
-        }
+        public ConcurrentBag<BaseItem> VirtualChildren => _virtualChildren;
 
         [IgnoreDataMember]
-        public override string[] PhysicalLocations
-        {
-            get
-            {
-                return PhysicalLocationsList;
-            }
-        }
+        public override string[] PhysicalLocations => PhysicalLocationsList;
 
         public string[] PhysicalLocationsList { get; set; }
 
diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index e9eb1e9075..13a6fe44a9 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -41,49 +41,22 @@ namespace MediaBrowser.Controller.Entities.Audio
         }
 
         [IgnoreDataMember]
-        public override bool SupportsPlayedStatus
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool SupportsPlayedStatus => true;
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get { return false; }
-        }
+        public override bool SupportsPeople => false;
 
         [IgnoreDataMember]
-        public override bool SupportsAddingToPlaylist
-        {
-            get { return true; }
-        }
+        public override bool SupportsAddingToPlaylist => true;
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get { return true; }
-        }
+        public override bool SupportsInheritedParentImages => true;
 
         [IgnoreDataMember]
-        protected override bool SupportsOwnedItems
-        {
-            get
-            {
-                return false;
-            }
-        }
+        protected override bool SupportsOwnedItems => false;
 
         [IgnoreDataMember]
-        public override Folder LatestItemsIndexContainer
-        {
-            get
-            {
-                return AlbumEntity;
-            }
-        }
+        public override Folder LatestItemsIndexContainer => AlbumEntity;
 
         public override bool CanDownload()
         {
@@ -115,23 +88,14 @@ namespace MediaBrowser.Controller.Entities.Audio
         }
 
         [IgnoreDataMember]
-        public MusicAlbum AlbumEntity
-        {
-            get { return FindParent<MusicAlbum>(); }
-        }
+        public MusicAlbum AlbumEntity => FindParent<MusicAlbum>();
 
         /// <summary>
         /// Gets the type of the media.
         /// </summary>
         /// <value>The type of the media.</value>
         [IgnoreDataMember]
-        public override string MediaType
-        {
-            get
-            {
-                return Model.Entities.MediaType.Audio;
-            }
-        }
+        public override string MediaType => Model.Entities.MediaType.Audio;
 
         /// <summary>
         /// Creates the name of the sort.
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index b91aa4d0b1..a3e05f0d2d 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -28,22 +28,13 @@ namespace MediaBrowser.Controller.Entities.Audio
         }
 
         [IgnoreDataMember]
-        public override bool SupportsAddingToPlaylist
-        {
-            get { return true; }
-        }
+        public override bool SupportsAddingToPlaylist => true;
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get { return true; }
-        }
+        public override bool SupportsInheritedParentImages => true;
 
         [IgnoreDataMember]
-        public MusicArtist MusicArtist
-        {
-            get { return GetMusicArtist(new DtoOptions(true)); }
-        }
+        public MusicArtist MusicArtist => GetMusicArtist(new DtoOptions(true));
 
         public MusicArtist GetMusicArtist(DtoOptions options)
         {
@@ -66,22 +57,10 @@ namespace MediaBrowser.Controller.Entities.Audio
         }
 
         [IgnoreDataMember]
-        public override bool SupportsPlayedStatus
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPlayedStatus => false;
 
         [IgnoreDataMember]
-        public override bool SupportsCumulativeRunTimeTicks
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool SupportsCumulativeRunTimeTicks => true;
 
         [IgnoreDataMember]
         public string[] AllArtists
@@ -107,29 +86,17 @@ namespace MediaBrowser.Controller.Entities.Audio
         }
 
         [IgnoreDataMember]
-        public string AlbumArtist
-        {
-            get { return AlbumArtists.Length == 0 ? null : AlbumArtists[0]; }
-        }
+        public string AlbumArtist => AlbumArtists.Length == 0 ? null : AlbumArtists[0];
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get { return false; }
-        }
+        public override bool SupportsPeople => false;
 
         /// <summary>
         /// Gets the tracks.
         /// </summary>
         /// <value>The tracks.</value>
         [IgnoreDataMember]
-        public IEnumerable<BaseItem> Tracks
-        {
-            get
-            {
-                return GetRecursiveChildren(i => i is Audio);
-            }
-        }
+        public IEnumerable<BaseItem> Tracks => GetRecursiveChildren(i => i is Audio);
 
         protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
         {
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
index d1e047c5dc..2d464bd321 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
@@ -19,61 +19,25 @@ namespace MediaBrowser.Controller.Entities.Audio
     public class MusicArtist : Folder, IItemByName, IHasMusicGenres, IHasDualAccess, IHasLookupInfo<ArtistInfo>
     {
         [IgnoreDataMember]
-        public bool IsAccessedByName
-        {
-            get { return ParentId.Equals(Guid.Empty); }
-        }
+        public bool IsAccessedByName => ParentId.Equals(Guid.Empty);
 
         [IgnoreDataMember]
-        public override bool IsFolder
-        {
-            get
-            {
-                return !IsAccessedByName;
-            }
-        }
+        public override bool IsFolder => !IsAccessedByName;
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsInheritedParentImages => false;
 
         [IgnoreDataMember]
-        public override bool SupportsCumulativeRunTimeTicks
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool SupportsCumulativeRunTimeTicks => true;
 
         [IgnoreDataMember]
-        public override bool IsDisplayedAsFolder
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool IsDisplayedAsFolder => true;
 
         [IgnoreDataMember]
-        public override bool SupportsAddingToPlaylist
-        {
-            get { return true; }
-        }
+        public override bool SupportsAddingToPlaylist => true;
 
         [IgnoreDataMember]
-        public override bool SupportsPlayedStatus
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPlayedStatus => false;
 
         public override double GetDefaultPrimaryImageAspectRatio()
         {
@@ -154,13 +118,7 @@ namespace MediaBrowser.Controller.Entities.Audio
         /// </summary>
         /// <value>The containing folder path.</value>
         [IgnoreDataMember]
-        public override string ContainingFolderPath
-        {
-            get
-            {
-                return Path;
-            }
-        }
+        public override string ContainingFolderPath => Path;
 
         /// <summary>
         /// Gets the user data key.
@@ -207,13 +165,7 @@ namespace MediaBrowser.Controller.Entities.Audio
         }
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPeople => false;
 
         public static string GetPath(string name)
         {
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs b/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
index 5525ddcc54..d26aaf2bb1 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
@@ -24,28 +24,13 @@ namespace MediaBrowser.Controller.Entities.Audio
         }
 
         [IgnoreDataMember]
-        public override bool SupportsAddingToPlaylist
-        {
-            get { return true; }
-        }
+        public override bool SupportsAddingToPlaylist => true;
 
         [IgnoreDataMember]
-        public override bool SupportsAncestors
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsAncestors => false;
 
         [IgnoreDataMember]
-        public override bool IsDisplayedAsFolder
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool IsDisplayedAsFolder => true;
 
         /// <summary>
         /// Returns the folder containing the item.
@@ -53,13 +38,7 @@ namespace MediaBrowser.Controller.Entities.Audio
         /// </summary>
         /// <value>The containing folder path.</value>
         [IgnoreDataMember]
-        public override string ContainingFolderPath
-        {
-            get
-            {
-                return Path;
-            }
-        }
+        public override string ContainingFolderPath => Path;
 
         public override double GetDefaultPrimaryImageAspectRatio()
         {
@@ -77,13 +56,7 @@ namespace MediaBrowser.Controller.Entities.Audio
         }
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPeople => false;
 
         public IList<BaseItem> GetTaggedItems(InternalItemsQuery query)
         {
diff --git a/MediaBrowser.Controller/Entities/AudioBook.cs b/MediaBrowser.Controller/Entities/AudioBook.cs
index 95d1690d5d..65c8a5fdd0 100644
--- a/MediaBrowser.Controller/Entities/AudioBook.cs
+++ b/MediaBrowser.Controller/Entities/AudioBook.cs
@@ -8,22 +8,10 @@ namespace MediaBrowser.Controller.Entities
     public class AudioBook : Audio.Audio, IHasSeries, IHasLookupInfo<SongInfo>
     {
         [IgnoreDataMember]
-        public override bool SupportsPositionTicksResume
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool SupportsPositionTicksResume => true;
 
         [IgnoreDataMember]
-        public override bool SupportsPlayedStatus
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool SupportsPlayedStatus => true;
 
         [IgnoreDataMember]
         public string SeriesPresentationUniqueKey { get; set; }
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 65f2ad9922..995f394834 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -108,19 +108,10 @@ namespace MediaBrowser.Controller.Entities
         public Guid ChannelId { get; set; }
 
         [IgnoreDataMember]
-        public virtual bool SupportsAddingToPlaylist
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public virtual bool SupportsAddingToPlaylist => false;
 
         [IgnoreDataMember]
-        public virtual bool AlwaysScanInternalMetadataPath
-        {
-            get { return false; }
-        }
+        public virtual bool AlwaysScanInternalMetadataPath => false;
 
         /// <summary>
         /// Gets a value indicating whether this instance is in mixed folder.
@@ -130,31 +121,13 @@ namespace MediaBrowser.Controller.Entities
         public bool IsInMixedFolder { get; set; }
 
         [IgnoreDataMember]
-        public virtual bool SupportsPlayedStatus
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public virtual bool SupportsPlayedStatus => false;
 
         [IgnoreDataMember]
-        public virtual bool SupportsPositionTicksResume
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public virtual bool SupportsPositionTicksResume => false;
 
         [IgnoreDataMember]
-        public virtual bool SupportsRemoteImageDownloading
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public virtual bool SupportsRemoteImageDownloading => true;
 
         private string _name;
         /// <summary>
@@ -164,10 +137,7 @@ namespace MediaBrowser.Controller.Entities
         [IgnoreDataMember]
         public virtual string Name
         {
-            get
-            {
-                return _name;
-            }
+            get => _name;
             set
             {
                 _name = value;
@@ -178,10 +148,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public bool IsUnaired
-        {
-            get { return PremiereDate.HasValue && PremiereDate.Value.ToLocalTime().Date >= DateTime.Now.Date; }
-        }
+        public bool IsUnaired => PremiereDate.HasValue && PremiereDate.Value.ToLocalTime().Date >= DateTime.Now.Date;
 
         [IgnoreDataMember]
         public int? TotalBitrate { get; set; }
@@ -189,13 +156,7 @@ namespace MediaBrowser.Controller.Entities
         public ExtraType? ExtraType { get; set; }
 
         [IgnoreDataMember]
-        public bool IsThemeMedia
-        {
-            get
-            {
-                return ExtraType.HasValue && (ExtraType.Value == Model.Entities.ExtraType.ThemeSong || ExtraType.Value == Model.Entities.ExtraType.ThemeVideo);
-            }
-        }
+        public bool IsThemeMedia => ExtraType.HasValue && (ExtraType.Value == Model.Entities.ExtraType.ThemeSong || ExtraType.Value == Model.Entities.ExtraType.ThemeVideo);
 
         [IgnoreDataMember]
         public string OriginalTitle { get; set; }
@@ -295,13 +256,7 @@ namespace MediaBrowser.Controller.Entities
         public string ExternalEtag { get; set; }
 
         [IgnoreDataMember]
-        public virtual bool IsHidden
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public virtual bool IsHidden => false;
 
         public BaseItem GetOwner()
         {
@@ -362,22 +317,10 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public bool IsFileProtocol
-        {
-            get
-            {
-                return IsPathProtocol(MediaProtocol.File);
-            }
-        }
+        public bool IsFileProtocol => IsPathProtocol(MediaProtocol.File);
 
         [IgnoreDataMember]
-        public bool HasPathProtocol
-        {
-            get
-            {
-                return PathProtocol.HasValue;
-            }
-        }
+        public bool HasPathProtocol => PathProtocol.HasValue;
 
         [IgnoreDataMember]
         public virtual bool SupportsLocalMetadata
@@ -408,13 +351,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public virtual bool EnableAlphaNumericSorting
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public virtual bool EnableAlphaNumericSorting => true;
 
         private List<Tuple<StringBuilder, bool>> GetSortChunks(string s1)
         {
@@ -455,10 +392,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The primary image path.</value>
         [IgnoreDataMember]
-        public string PrimaryImagePath
-        {
-            get { return this.GetImagePath(ImageType.Primary); }
-        }
+        public string PrimaryImagePath => this.GetImagePath(ImageType.Primary);
 
         public bool IsMetadataFetcherEnabled(LibraryOptions libraryOptions, string name)
         {
@@ -637,13 +571,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The type of the media.</value>
         [IgnoreDataMember]
-        public virtual string MediaType
-        {
-            get
-            {
-                return null;
-            }
-        }
+        public virtual string MediaType => null;
 
         [IgnoreDataMember]
         public virtual string[] PhysicalLocations
@@ -667,7 +595,7 @@ namespace MediaBrowser.Controller.Entities
         [IgnoreDataMember]
         public string ForcedSortName
         {
-            get { return _forcedSortName; }
+            get => _forcedSortName;
             set { _forcedSortName = value; _sortName = null; }
         }
 
@@ -695,10 +623,7 @@ namespace MediaBrowser.Controller.Entities
                 }
                 return _sortName;
             }
-            set
-            {
-                _sortName = value;
-            }
+            set => _sortName = value;
         }
 
         public string GetInternalMetadataPath()
@@ -816,7 +741,7 @@ namespace MediaBrowser.Controller.Entities
         [IgnoreDataMember]
         public Folder Parent
         {
-            get { return GetParent() as Folder; }
+            get => GetParent() as Folder;
             set
             {
 
@@ -1007,10 +932,7 @@ namespace MediaBrowser.Controller.Entities
         public int? ParentIndexNumber { get; set; }
 
         [IgnoreDataMember]
-        public virtual bool HasLocalAlternateVersions
-        {
-            get { return false; }
-        }
+        public virtual bool HasLocalAlternateVersions => false;
 
         [IgnoreDataMember]
         public string OfficialRatingForComparison
@@ -1426,22 +1348,13 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        protected virtual bool SupportsOwnedItems
-        {
-            get { return !ParentId.Equals(Guid.Empty) && IsFileProtocol; }
-        }
+        protected virtual bool SupportsOwnedItems => !ParentId.Equals(Guid.Empty) && IsFileProtocol;
 
         [IgnoreDataMember]
-        public virtual bool SupportsPeople
-        {
-            get { return false; }
-        }
+        public virtual bool SupportsPeople => false;
 
         [IgnoreDataMember]
-        public virtual bool SupportsThemeMedia
-        {
-            get { return false; }
-        }
+        public virtual bool SupportsThemeMedia => false;
 
         /// <summary>
         /// Refreshes owned items such as trailers, theme videos, special features, etc.
@@ -1602,10 +1515,7 @@ namespace MediaBrowser.Controller.Entities
         public Dictionary<string, string> ProviderIds { get; set; }
 
         [IgnoreDataMember]
-        public virtual Folder LatestItemsIndexContainer
-        {
-            get { return null; }
-        }
+        public virtual Folder LatestItemsIndexContainer => null;
 
         public virtual double GetDefaultPrimaryImageAspectRatio()
         {
@@ -1923,10 +1833,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public virtual bool SupportsInheritedParentImages
-        {
-            get { return false; }
-        }
+        public virtual bool SupportsInheritedParentImages => false;
 
         protected bool IsVisibleStandaloneInternal(User user, bool checkFolders)
         {
@@ -1969,22 +1876,10 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value><c>true</c> if this instance is folder; otherwise, <c>false</c>.</value>
         [IgnoreDataMember]
-        public virtual bool IsFolder
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public virtual bool IsFolder => false;
 
         [IgnoreDataMember]
-        public virtual bool IsDisplayedAsFolder
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public virtual bool IsDisplayedAsFolder => false;
 
         public virtual string GetClientTypeName()
         {
@@ -2070,13 +1965,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public virtual bool EnableRememberingTrackSelections
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public virtual bool EnableRememberingTrackSelections => true;
 
         /// <summary>
         /// Adds a studio to the item
@@ -2813,22 +2702,10 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public virtual bool SupportsAncestors
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public virtual bool SupportsAncestors => true;
 
         [IgnoreDataMember]
-        public virtual bool StopRefreshIfLocalMetadataFound
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public virtual bool StopRefreshIfLocalMetadataFound => true;
 
         public virtual IEnumerable<Guid> GetIdsForAncestorQuery()
         {
@@ -2915,13 +2792,7 @@ namespace MediaBrowser.Controller.Entities
             return GetExtras();
         }
 
-        public virtual bool IsHD
-        {
-            get
-            {
-                return Height >= 720;
-            }
-        }
+        public virtual bool IsHD => Height >= 720;
         public bool IsShortcut { get; set; }
         public string ShortcutPath { get; set; }
         public int Width { get; set; }
@@ -2933,12 +2804,6 @@ namespace MediaBrowser.Controller.Entities
         }
         // what does this do?
         public static ExtraType[] DisplayExtraTypes = new[] { Model.Entities.ExtraType.ThemeSong, Model.Entities.ExtraType.ThemeVideo };
-        public virtual bool SupportsExternalTransfer
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public virtual bool SupportsExternalTransfer => false;
     }
 }
diff --git a/MediaBrowser.Controller/Entities/BasePluginFolder.cs b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
index 2185159955..c15ba1a1e5 100644
--- a/MediaBrowser.Controller/Entities/BasePluginFolder.cs
+++ b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
@@ -10,10 +10,7 @@ namespace MediaBrowser.Controller.Entities
     public abstract class BasePluginFolder : Folder, ICollectionFolder
     {
         [IgnoreDataMember]
-        public virtual string CollectionType
-        {
-            get { return null; }
-        }
+        public virtual string CollectionType => null;
 
         public override bool CanDelete()
         {
@@ -26,22 +23,10 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsInheritedParentImages => false;
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPeople => false;
 
         //public override double? GetDefaultPrimaryImageAspectRatio()
         //{
diff --git a/MediaBrowser.Controller/Entities/Book.cs b/MediaBrowser.Controller/Entities/Book.cs
index febd0cc202..7a23d9a663 100644
--- a/MediaBrowser.Controller/Entities/Book.cs
+++ b/MediaBrowser.Controller/Entities/Book.cs
@@ -9,13 +9,7 @@ namespace MediaBrowser.Controller.Entities
     public class Book : BaseItem, IHasLookupInfo<BookInfo>, IHasSeries
     {
         [IgnoreDataMember]
-        public override string MediaType
-        {
-            get
-            {
-                return Model.Entities.MediaType.Book;
-            }
-        }
+        public override string MediaType => Model.Entities.MediaType.Book;
 
         [IgnoreDataMember]
         public string SeriesPresentationUniqueKey { get; set; }
diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index f0713a74b0..c56dc04ece 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -34,22 +34,10 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsPlayedStatus
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPlayedStatus => false;
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsInheritedParentImages => false;
 
         public override bool CanDelete()
         {
@@ -158,22 +146,10 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The display prefs id.</value>
         [IgnoreDataMember]
-        public override Guid DisplayPreferencesId
-        {
-            get
-            {
-                return Id;
-            }
-        }
+        public override Guid DisplayPreferencesId => Id;
 
         [IgnoreDataMember]
-        public override string[] PhysicalLocations
-        {
-            get
-            {
-                return PhysicalLocationsList;
-            }
-        }
+        public override string[] PhysicalLocations => PhysicalLocationsList;
 
         public override bool IsSaveLocalMetadataEnabled()
         {
@@ -337,10 +313,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The actual children.</value>
         [IgnoreDataMember]
-        public override IEnumerable<BaseItem> Children
-        {
-            get { return GetActualChildren(); }
-        }
+        public override IEnumerable<BaseItem> Children => GetActualChildren();
 
         public IEnumerable<BaseItem> GetActualChildren()
         {
@@ -386,12 +359,6 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPeople => false;
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 5573bbf31b..fe53d2f051 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -47,80 +47,35 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsThemeMedia
-        {
-            get { return true; }
-        }
+        public override bool SupportsThemeMedia => true;
 
         [IgnoreDataMember]
-        public virtual bool IsPreSorted
-        {
-            get { return false; }
-        }
+        public virtual bool IsPreSorted => false;
 
         [IgnoreDataMember]
-        public virtual bool IsPhysicalRoot
-        {
-            get { return false; }
-        }
+        public virtual bool IsPhysicalRoot => false;
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool SupportsInheritedParentImages => true;
 
         [IgnoreDataMember]
-        public override bool SupportsPlayedStatus
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool SupportsPlayedStatus => true;
 
         /// <summary>
         /// Gets a value indicating whether this instance is folder.
         /// </summary>
         /// <value><c>true</c> if this instance is folder; otherwise, <c>false</c>.</value>
         [IgnoreDataMember]
-        public override bool IsFolder
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool IsFolder => true;
 
         [IgnoreDataMember]
-        public override bool IsDisplayedAsFolder
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool IsDisplayedAsFolder => true;
 
         [IgnoreDataMember]
-        public virtual bool SupportsCumulativeRunTimeTicks
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public virtual bool SupportsCumulativeRunTimeTicks => false;
 
         [IgnoreDataMember]
-        public virtual bool SupportsDateLastMediaAdded
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public virtual bool SupportsDateLastMediaAdded => false;
 
         public override bool CanDelete()
         {
@@ -172,10 +127,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        protected virtual bool SupportsShortcutChildren
-        {
-            get { return false; }
-        }
+        protected virtual bool SupportsShortcutChildren => false;
 
         /// <summary>
         /// Adds the child.
@@ -210,23 +162,14 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The actual children.</value>
         [IgnoreDataMember]
-        public virtual IEnumerable<BaseItem> Children
-        {
-            get
-            {
-                return LoadChildren();
-            }
-        }
+        public virtual IEnumerable<BaseItem> Children => LoadChildren();
 
         /// <summary>
         /// thread-safe access to all recursive children of this folder - without regard to user
         /// </summary>
         /// <value>The recursive children.</value>
         [IgnoreDataMember]
-        public IEnumerable<BaseItem> RecursiveChildren
-        {
-            get { return GetRecursiveChildren(); }
-        }
+        public IEnumerable<BaseItem> RecursiveChildren => GetRecursiveChildren();
 
         public override bool IsVisible(User user)
         {
@@ -1421,13 +1364,7 @@ namespace MediaBrowser.Controller.Entities
             return list;
         }
 
-        protected virtual bool FilterLinkedChildrenPerUser
-        {
-            get
-            {
-                return false;
-            }
-        }
+        protected virtual bool FilterLinkedChildrenPerUser => false;
 
         public bool ContainsLinkedChildByItemId(Guid itemId)
         {
@@ -1524,13 +1461,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        protected override bool SupportsOwnedItems
-        {
-            get
-            {
-                return base.SupportsOwnedItems || SupportsShortcutChildren;
-            }
-        }
+        protected override bool SupportsOwnedItems => base.SupportsOwnedItems || SupportsShortcutChildren;
 
         protected override async Task<bool> RefreshedOwnedItems(MetadataRefreshOptions options, List<FileSystemMetadata> fileSystemChildren, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Controller/Entities/Game.cs b/MediaBrowser.Controller/Entities/Game.cs
index 46cdfcf159..82a4531ff0 100644
--- a/MediaBrowser.Controller/Entities/Game.cs
+++ b/MediaBrowser.Controller/Entities/Game.cs
@@ -27,26 +27,17 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsThemeMedia
-        {
-            get { return true; }
-        }
+        public override bool SupportsThemeMedia => true;
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get { return false; }
-        }
+        public override bool SupportsPeople => false;
 
         /// <summary>
         /// Gets the type of the media.
         /// </summary>
         /// <value>The type of the media.</value>
         [IgnoreDataMember]
-        public override string MediaType
-        {
-            get { return Model.Entities.MediaType.Game; }
-        }
+        public override string MediaType => Model.Entities.MediaType.Game;
 
         /// <summary>
         /// Gets or sets the players supported.
diff --git a/MediaBrowser.Controller/Entities/GameGenre.cs b/MediaBrowser.Controller/Entities/GameGenre.cs
index e552739043..c0fd4ae893 100644
--- a/MediaBrowser.Controller/Entities/GameGenre.cs
+++ b/MediaBrowser.Controller/Entities/GameGenre.cs
@@ -32,22 +32,10 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The containing folder path.</value>
         [IgnoreDataMember]
-        public override string ContainingFolderPath
-        {
-            get
-            {
-                return Path;
-            }
-        }
+        public override string ContainingFolderPath => Path;
 
         [IgnoreDataMember]
-        public override bool SupportsAncestors
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsAncestors => false;
 
         public override bool IsSaveLocalMetadataEnabled()
         {
@@ -68,13 +56,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPeople => false;
 
         public static string GetPath(string name)
         {
diff --git a/MediaBrowser.Controller/Entities/GameSystem.cs b/MediaBrowser.Controller/Entities/GameSystem.cs
index e9c915ead7..63f830d256 100644
--- a/MediaBrowser.Controller/Entities/GameSystem.cs
+++ b/MediaBrowser.Controller/Entities/GameSystem.cs
@@ -18,31 +18,13 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The display prefs id.</value>
         [IgnoreDataMember]
-        public override Guid DisplayPreferencesId
-        {
-            get
-            {
-                return Id;
-            }
-        }
+        public override Guid DisplayPreferencesId => Id;
 
         [IgnoreDataMember]
-        public override bool SupportsPlayedStatus
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPlayedStatus => false;
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsInheritedParentImages => false;
 
         public override double GetDefaultPrimaryImageAspectRatio()
         {
@@ -90,12 +72,6 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPeople => false;
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Genre.cs b/MediaBrowser.Controller/Entities/Genre.cs
index 9380deb335..3f3ab35513 100644
--- a/MediaBrowser.Controller/Entities/Genre.cs
+++ b/MediaBrowser.Controller/Entities/Genre.cs
@@ -35,31 +35,13 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The containing folder path.</value>
         [IgnoreDataMember]
-        public override string ContainingFolderPath
-        {
-            get
-            {
-                return Path;
-            }
-        }
+        public override string ContainingFolderPath => Path;
 
         [IgnoreDataMember]
-        public override bool IsDisplayedAsFolder
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool IsDisplayedAsFolder => true;
 
         [IgnoreDataMember]
-        public override bool SupportsAncestors
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsAncestors => false;
 
         public override bool IsSaveLocalMetadataEnabled()
         {
@@ -80,13 +62,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPeople => false;
 
         public static string GetPath(string name)
         {
diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index c2384ca72d..124a943ef8 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -25,28 +25,13 @@ namespace MediaBrowser.Controller.Entities.Movies
         }
 
         [IgnoreDataMember]
-        protected override bool FilterLinkedChildrenPerUser
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool FilterLinkedChildrenPerUser => true;
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsInheritedParentImages => false;
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get { return true; }
-        }
+        public override bool SupportsPeople => true;
 
         public Guid[] LocalTrailerIds { get; set; }
         public Guid[] RemoteTrailerIds { get; set; }
@@ -110,13 +95,7 @@ namespace MediaBrowser.Controller.Entities.Movies
         }
 
         [IgnoreDataMember]
-        public override bool IsPreSorted
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool IsPreSorted => true;
 
         public override bool IsAuthorizedToDelete(User user, List<Folder> allCollectionFolders)
         {
diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs
index 0da021558e..232d116241 100644
--- a/MediaBrowser.Controller/Entities/Movies/Movie.cs
+++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs
@@ -39,8 +39,8 @@ namespace MediaBrowser.Controller.Entities.Movies
         [IgnoreDataMember]
         public string CollectionName
         {
-            get { return TmdbCollectionName; }
-            set { TmdbCollectionName = value; }
+            get => TmdbCollectionName;
+            set => TmdbCollectionName = value;
         }
 
         public override double GetDefaultPrimaryImageAspectRatio()
@@ -184,13 +184,6 @@ namespace MediaBrowser.Controller.Entities.Movies
         }
 
         [IgnoreDataMember]
-        public override bool StopRefreshIfLocalMetadataFound
-        {
-            get
-            {
-                // Need people id's from internet metadata
-                return false;
-            }
-        }
+        public override bool StopRefreshIfLocalMetadataFound => false;
     }
 }
diff --git a/MediaBrowser.Controller/Entities/MusicVideo.cs b/MediaBrowser.Controller/Entities/MusicVideo.cs
index e990b9374d..5bf082b7ee 100644
--- a/MediaBrowser.Controller/Entities/MusicVideo.cs
+++ b/MediaBrowser.Controller/Entities/MusicVideo.cs
@@ -17,13 +17,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public string[] AllArtists
-        {
-            get
-            {
-                return Artists;
-            }
-        }
+        public string[] AllArtists => Artists;
 
         public override UnratedItem GetBlockUnratedType()
         {
diff --git a/MediaBrowser.Controller/Entities/Person.cs b/MediaBrowser.Controller/Entities/Person.cs
index 0615414477..0ba8b3b48f 100644
--- a/MediaBrowser.Controller/Entities/Person.cs
+++ b/MediaBrowser.Controller/Entities/Person.cs
@@ -51,13 +51,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The containing folder path.</value>
         [IgnoreDataMember]
-        public override string ContainingFolderPath
-        {
-            get
-            {
-                return Path;
-            }
-        }
+        public override string ContainingFolderPath => Path;
 
         public override bool CanDelete()
         {
@@ -70,31 +64,13 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool EnableAlphaNumericSorting
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool EnableAlphaNumericSorting => false;
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPeople => false;
 
         [IgnoreDataMember]
-        public override bool SupportsAncestors
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsAncestors => false;
 
         public static string GetPath(string name)
         {
diff --git a/MediaBrowser.Controller/Entities/Photo.cs b/MediaBrowser.Controller/Entities/Photo.cs
index 2e6830e788..686bb643b1 100644
--- a/MediaBrowser.Controller/Entities/Photo.cs
+++ b/MediaBrowser.Controller/Entities/Photo.cs
@@ -6,31 +6,13 @@ namespace MediaBrowser.Controller.Entities
     public class Photo : BaseItem
     {
         [IgnoreDataMember]
-        public override bool SupportsLocalMetadata
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsLocalMetadata => false;
 
         [IgnoreDataMember]
-        public override string MediaType
-        {
-            get
-            {
-                return Model.Entities.MediaType.Photo;
-            }
-        }
+        public override string MediaType => Model.Entities.MediaType.Photo;
 
         [IgnoreDataMember]
-        public override Folder LatestItemsIndexContainer
-        {
-            get
-            {
-                return AlbumEntity;
-            }
-        }
+        public override Folder LatestItemsIndexContainer => AlbumEntity;
 
 
         [IgnoreDataMember]
diff --git a/MediaBrowser.Controller/Entities/PhotoAlbum.cs b/MediaBrowser.Controller/Entities/PhotoAlbum.cs
index 42992bbd57..4cd0c8b668 100644
--- a/MediaBrowser.Controller/Entities/PhotoAlbum.cs
+++ b/MediaBrowser.Controller/Entities/PhotoAlbum.cs
@@ -5,30 +5,12 @@ namespace MediaBrowser.Controller.Entities
     public class PhotoAlbum : Folder
     {
         [IgnoreDataMember]
-        public override bool AlwaysScanInternalMetadataPath
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool AlwaysScanInternalMetadataPath => true;
 
         [IgnoreDataMember]
-        public override bool SupportsPlayedStatus
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPlayedStatus => false;
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsInheritedParentImages => false;
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Studio.cs b/MediaBrowser.Controller/Entities/Studio.cs
index b95199f7e1..d6da0d48c7 100644
--- a/MediaBrowser.Controller/Entities/Studio.cs
+++ b/MediaBrowser.Controller/Entities/Studio.cs
@@ -29,31 +29,13 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The containing folder path.</value>
         [IgnoreDataMember]
-        public override string ContainingFolderPath
-        {
-            get
-            {
-                return Path;
-            }
-        }
+        public override string ContainingFolderPath => Path;
 
         [IgnoreDataMember]
-        public override bool IsDisplayedAsFolder
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool IsDisplayedAsFolder => true;
 
         [IgnoreDataMember]
-        public override bool SupportsAncestors
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsAncestors => false;
 
         public override double GetDefaultPrimaryImageAspectRatio()
         {
@@ -81,13 +63,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPeople => false;
 
         public static string GetPath(string name)
         {
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 8a04d7a8df..072b1d89af 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -47,61 +47,25 @@ namespace MediaBrowser.Controller.Entities.TV
         }
 
         [IgnoreDataMember]
-        protected override bool SupportsOwnedItems
-        {
-            get
-            {
-                return IsStacked || MediaSourceCount > 1;
-            }
-        }
+        protected override bool SupportsOwnedItems => IsStacked || MediaSourceCount > 1;
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get { return true; }
-        }
+        public override bool SupportsInheritedParentImages => true;
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get { return true; }
-        }
+        public override bool SupportsPeople => true;
 
         [IgnoreDataMember]
-        public int? AiredSeasonNumber
-        {
-            get
-            {
-                return AirsAfterSeasonNumber ?? AirsBeforeSeasonNumber ?? ParentIndexNumber;
-            }
-        }
+        public int? AiredSeasonNumber => AirsAfterSeasonNumber ?? AirsBeforeSeasonNumber ?? ParentIndexNumber;
 
         [IgnoreDataMember]
-        public override Folder LatestItemsIndexContainer
-        {
-            get
-            {
-                return Series;
-            }
-        }
+        public override Folder LatestItemsIndexContainer => Series;
 
         [IgnoreDataMember]
-        public override Guid DisplayParentId
-        {
-            get
-            {
-                return SeasonId;
-            }
-        }
+        public override Guid DisplayParentId => SeasonId;
 
         [IgnoreDataMember]
-        protected override bool EnableDefaultVideoUserDataKeys
-        {
-            get
-            {
-                return false;
-            }
-        }
+        protected override bool EnableDefaultVideoUserDataKeys => false;
 
         public override double GetDefaultPrimaryImageAspectRatio()
         {
@@ -166,13 +130,7 @@ namespace MediaBrowser.Controller.Entities.TV
         }
 
         [IgnoreDataMember]
-        public bool IsInSeasonFolder
-        {
-            get
-            {
-                return FindParent<Season>() != null;
-            }
-        }
+        public bool IsInSeasonFolder => FindParent<Season>() != null;
 
         [IgnoreDataMember]
         public string SeriesPresentationUniqueKey { get; set; }
@@ -278,13 +236,7 @@ namespace MediaBrowser.Controller.Entities.TV
         }
 
         [IgnoreDataMember]
-        public bool IsMissingEpisode
-        {
-            get
-            {
-                return LocationType == LocationType.Virtual;
-            }
-        }
+        public bool IsMissingEpisode => LocationType == LocationType.Virtual;
 
         [IgnoreDataMember]
         public Guid SeasonId { get; set; }
diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs
index 4c8c9b5904..b40009e0c7 100644
--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -16,46 +16,22 @@ namespace MediaBrowser.Controller.Entities.TV
     public class Season : Folder, IHasSeries, IHasLookupInfo<SeasonInfo>
     {
         [IgnoreDataMember]
-        public override bool SupportsAddingToPlaylist
-        {
-            get { return true; }
-        }
+        public override bool SupportsAddingToPlaylist => true;
 
         [IgnoreDataMember]
-        public override bool IsPreSorted
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool IsPreSorted => true;
 
         [IgnoreDataMember]
-        public override bool SupportsDateLastMediaAdded
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsDateLastMediaAdded => false;
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get { return true; }
-        }
+        public override bool SupportsPeople => true;
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get { return true; }
-        }
+        public override bool SupportsInheritedParentImages => true;
 
         [IgnoreDataMember]
-        public override Guid DisplayParentId
-        {
-            get { return SeriesId; }
-        }
+        public override Guid DisplayParentId => SeriesId;
 
         public override double GetDefaultPrimaryImageAspectRatio()
         {
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index e48c8dd291..5ba4613c06 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -32,43 +32,19 @@ namespace MediaBrowser.Controller.Entities.TV
         public string AirTime { get; set; }
 
         [IgnoreDataMember]
-        public override bool SupportsAddingToPlaylist
-        {
-            get { return true; }
-        }
+        public override bool SupportsAddingToPlaylist => true;
 
         [IgnoreDataMember]
-        public override bool IsPreSorted
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool IsPreSorted => true;
 
         [IgnoreDataMember]
-        public override bool SupportsDateLastMediaAdded
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool SupportsDateLastMediaAdded => true;
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsInheritedParentImages => false;
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get { return true; }
-        }
+        public override bool SupportsPeople => true;
 
         public Guid[] LocalTrailerIds { get; set; }
         public Guid[] RemoteTrailerIds { get; set; }
@@ -526,13 +502,6 @@ namespace MediaBrowser.Controller.Entities.TV
         }
 
         [IgnoreDataMember]
-        public override bool StopRefreshIfLocalMetadataFound
-        {
-            get
-            {
-                // Need people id's from internet metadata
-                return false;
-            }
-        }
+        public override bool StopRefreshIfLocalMetadataFound => false;
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Trailer.cs b/MediaBrowser.Controller/Entities/Trailer.cs
index 2ce7761037..5bf22d7bc8 100644
--- a/MediaBrowser.Controller/Entities/Trailer.cs
+++ b/MediaBrowser.Controller/Entities/Trailer.cs
@@ -94,13 +94,6 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool StopRefreshIfLocalMetadataFound
-        {
-            get
-            {
-                // Need people id's from internet metadata
-                return false;
-            }
-        }
+        public override bool StopRefreshIfLocalMetadataFound => false;
     }
 }
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index 03facf1072..16fef9a824 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -40,14 +40,8 @@ namespace MediaBrowser.Controller.Entities
         // Strictly to remove IgnoreDataMember
         public override ItemImageInfo[] ImageInfos
         {
-            get
-            {
-                return base.ImageInfos;
-            }
-            set
-            {
-                base.ImageInfos = value;
-            }
+            get => base.ImageInfos;
+            set => base.ImageInfos = value;
         }
 
         /// <summary>
@@ -57,15 +51,8 @@ namespace MediaBrowser.Controller.Entities
         [IgnoreDataMember]
         public override string Path
         {
-            get
-            {
-                // Return this so that metadata providers will look in here
-                return ConfigurationDirectoryPath;
-            }
-            set
-            {
-                base.Path = value;
-            }
+            get => ConfigurationDirectoryPath;
+            set => base.Path = value;
         }
 
         private string _name;
@@ -75,10 +62,7 @@ namespace MediaBrowser.Controller.Entities
         /// <value>The name.</value>
         public override string Name
         {
-            get
-            {
-                return _name;
-            }
+            get => _name;
             set
             {
                 _name = value;
@@ -94,26 +78,14 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The containing folder path.</value>
         [IgnoreDataMember]
-        public override string ContainingFolderPath
-        {
-            get
-            {
-                return Path;
-            }
-        }
+        public override string ContainingFolderPath => Path;
 
         /// <summary>
         /// Gets the root folder.
         /// </summary>
         /// <value>The root folder.</value>
         [IgnoreDataMember]
-        public Folder RootFolder
-        {
-            get
-            {
-                return LibraryManager.GetUserRootFolder();
-            }
-        }
+        public Folder RootFolder => LibraryManager.GetUserRootFolder();
 
         /// <summary>
         /// Gets or sets the last login date.
@@ -146,7 +118,7 @@ namespace MediaBrowser.Controller.Entities
 
                 return _config;
             }
-            set { _config = value; }
+            set => _config = value;
         }
 
         private volatile UserPolicy _policy;
@@ -169,7 +141,7 @@ namespace MediaBrowser.Controller.Entities
 
                 return _policy;
             }
-            set { _policy = value; }
+            set => _policy = value;
         }
 
         /// <summary>
@@ -232,13 +204,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The configuration directory path.</value>
         [IgnoreDataMember]
-        public string ConfigurationDirectoryPath
-        {
-            get
-            {
-                return GetConfigurationDirectoryPath(Name);
-            }
-        }
+        public string ConfigurationDirectoryPath => GetConfigurationDirectoryPath(Name);
 
         public override double GetDefaultPrimaryImageAspectRatio()
         {
@@ -327,13 +293,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPeople => false;
 
         public long InternalId { get; set; }
 
diff --git a/MediaBrowser.Controller/Entities/UserItemData.cs b/MediaBrowser.Controller/Entities/UserItemData.cs
index 0739d5f57c..8a87aff5f5 100644
--- a/MediaBrowser.Controller/Entities/UserItemData.cs
+++ b/MediaBrowser.Controller/Entities/UserItemData.cs
@@ -31,10 +31,7 @@ namespace MediaBrowser.Controller.Entities
         /// <exception cref="System.ArgumentOutOfRangeException">Rating;A 0 to 10 rating is required for UserItemData.</exception>
         public double? Rating
         {
-            get
-            {
-                return _rating;
-            }
+            get => _rating;
             set
             {
                 if (value.HasValue)
diff --git a/MediaBrowser.Controller/Entities/UserRootFolder.cs b/MediaBrowser.Controller/Entities/UserRootFolder.cs
index 7b55d8bb98..7fe8df8af3 100644
--- a/MediaBrowser.Controller/Entities/UserRootFolder.cs
+++ b/MediaBrowser.Controller/Entities/UserRootFolder.cs
@@ -34,22 +34,10 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsInheritedParentImages => false;
 
         [IgnoreDataMember]
-        public override bool SupportsPlayedStatus
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPlayedStatus => false;
 
         private void ClearCache()
         {
@@ -88,22 +76,10 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        protected override bool SupportsShortcutChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool SupportsShortcutChildren => true;
 
         [IgnoreDataMember]
-        public override bool IsPreSorted
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool IsPreSorted => true;
 
         protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
         {
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index 9c45a803b3..de4105df97 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -20,13 +20,7 @@ namespace MediaBrowser.Controller.Entities
         public static IPlaylistManager PlaylistManager;
 
         [IgnoreDataMember]
-        public string CollectionType
-        {
-            get
-            {
-                return ViewType;
-            }
-        }
+        public string CollectionType => ViewType;
 
         public override IEnumerable<Guid> GetIdsForAncestorQuery()
         {
@@ -48,22 +42,10 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsInheritedParentImages => false;
 
         [IgnoreDataMember]
-        public override bool SupportsPlayedStatus
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPlayedStatus => false;
 
         public override int GetChildCount(User user)
         {
@@ -188,12 +170,6 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPeople => false;
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index cc236cbbac..dd4440c3b6 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -33,28 +33,13 @@ namespace MediaBrowser.Controller.Entities
         public LinkedChild[] LinkedAlternateVersions { get; set; }
 
         [IgnoreDataMember]
-        public override bool SupportsPlayedStatus
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool SupportsPlayedStatus => true;
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get { return true; }
-        }
+        public override bool SupportsPeople => true;
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool SupportsInheritedParentImages => true;
 
         [IgnoreDataMember]
         public override bool SupportsPositionTicksResume
@@ -106,10 +91,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsThemeMedia
-        {
-            get { return true; }
-        }
+        public override bool SupportsThemeMedia => true;
 
         /// <summary>
         /// Gets or sets the timestamp.
@@ -199,10 +181,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsAddingToPlaylist
-        {
-            get { return true; }
-        }
+        public override bool SupportsAddingToPlaylist => true;
 
         [IgnoreDataMember]
         public int MediaSourceCount
@@ -222,16 +201,10 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public bool IsStacked
-        {
-            get { return AdditionalParts.Length > 0; }
-        }
+        public bool IsStacked => AdditionalParts.Length > 0;
 
         [IgnoreDataMember]
-        public override bool HasLocalAlternateVersions
-        {
-            get { return LocalAlternateVersions.Length > 0; }
-        }
+        public override bool HasLocalAlternateVersions => LocalAlternateVersions.Length > 0;
 
         public IEnumerable<Guid> GetAdditionalPartIds()
         {
@@ -289,13 +262,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        protected virtual bool EnableDefaultVideoUserDataKeys
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected virtual bool EnableDefaultVideoUserDataKeys => true;
 
         public override List<string> GetUserDataKeys()
         {
@@ -466,23 +433,14 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value><c>true</c> if [is3 D]; otherwise, <c>false</c>.</value>
         [IgnoreDataMember]
-        public bool Is3D
-        {
-            get { return Video3DFormat.HasValue; }
-        }
+        public bool Is3D => Video3DFormat.HasValue;
 
         /// <summary>
         /// Gets the type of the media.
         /// </summary>
         /// <value>The type of the media.</value>
         [IgnoreDataMember]
-        public override string MediaType
-        {
-            get
-            {
-                return Model.Entities.MediaType.Video;
-            }
-        }
+        public override string MediaType => Model.Entities.MediaType.Video;
 
         protected override async Task<bool> RefreshedOwnedItems(MetadataRefreshOptions options, List<FileSystemMetadata> fileSystemChildren, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Controller/Entities/Year.cs b/MediaBrowser.Controller/Entities/Year.cs
index 054724b21f..643c0ddcf0 100644
--- a/MediaBrowser.Controller/Entities/Year.cs
+++ b/MediaBrowser.Controller/Entities/Year.cs
@@ -25,13 +25,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The containing folder path.</value>
         [IgnoreDataMember]
-        public override string ContainingFolderPath
-        {
-            get
-            {
-                return Path;
-            }
-        }
+        public override string ContainingFolderPath => Path;
 
         public override double GetDefaultPrimaryImageAspectRatio()
         {
@@ -42,13 +36,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsAncestors
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsAncestors => false;
 
         public override bool CanDelete()
         {
@@ -89,13 +77,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         [IgnoreDataMember]
-        public override bool SupportsPeople
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPeople => false;
 
         public static string GetPath(string name)
         {
diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
index dfe23f1930..eb459e8904 100644
--- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs
+++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
@@ -67,13 +67,7 @@ namespace MediaBrowser.Controller.Library
         /// Gets a value indicating whether this instance is directory.
         /// </summary>
         /// <value><c>true</c> if this instance is directory; otherwise, <c>false</c>.</value>
-        public bool IsDirectory
-        {
-            get
-            {
-                return FileInfo.IsDirectory;
-            }
-        }
+        public bool IsDirectory => FileInfo.IsDirectory;
 
         /// <summary>
         /// Gets a value indicating whether this instance is vf.
@@ -103,13 +97,7 @@ namespace MediaBrowser.Controller.Library
         /// Gets a value indicating whether this instance is physical root.
         /// </summary>
         /// <value><c>true</c> if this instance is physical root; otherwise, <c>false</c>.</value>
-        public bool IsPhysicalRoot
-        {
-            get
-            {
-                return IsDirectory && BaseItem.FileSystem.AreEqual(Path, _appPaths.RootFolderPath);
-            }
-        }
+        public bool IsPhysicalRoot => IsDirectory && BaseItem.FileSystem.AreEqual(Path, _appPaths.RootFolderPath);
 
         /// <summary>
         /// Gets or sets the additional locations.
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
index 93300243b6..55f47aae9b 100644
--- a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
@@ -32,28 +32,13 @@ namespace MediaBrowser.Controller.LiveTv
         }
 
         [IgnoreDataMember]
-        public override bool SupportsPositionTicksResume
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsPositionTicksResume => false;
 
         [IgnoreDataMember]
-        public override SourceType SourceType
-        {
-            get { return SourceType.LiveTV; }
-        }
+        public override SourceType SourceType => SourceType.LiveTV;
 
         [IgnoreDataMember]
-        public override bool EnableRememberingTrackSelections
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool EnableRememberingTrackSelections => false;
 
         /// <summary>
         /// Gets or sets the number.
@@ -68,14 +53,7 @@ namespace MediaBrowser.Controller.LiveTv
         public ChannelType ChannelType { get; set; }
 
         [IgnoreDataMember]
-        public override LocationType LocationType
-        {
-            get
-            {
-                // TODO: This should be removed
-                return LocationType.Remote;
-            }
-        }
+        public override LocationType LocationType => LocationType.Remote;
 
         protected override string CreateSortName()
         {
@@ -93,13 +71,7 @@ namespace MediaBrowser.Controller.LiveTv
         }
 
         [IgnoreDataMember]
-        public override string MediaType
-        {
-            get
-            {
-                return ChannelType == ChannelType.Radio ? Model.Entities.MediaType.Audio : Model.Entities.MediaType.Video;
-            }
-        }
+        public override string MediaType => ChannelType == ChannelType.Radio ? Model.Entities.MediaType.Audio : Model.Entities.MediaType.Video;
 
         public override string GetClientTypeName()
         {
@@ -176,13 +148,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value><c>true</c> if this instance is kids; otherwise, <c>false</c>.</value>
         [IgnoreDataMember]
-        public bool IsKids
-        {
-            get
-            {
-                return Tags.Contains("Kids", StringComparer.OrdinalIgnoreCase);
-            }
-        }
+        public bool IsKids => Tags.Contains("Kids", StringComparer.OrdinalIgnoreCase);
 
         [IgnoreDataMember]
         public bool IsRepeat { get; set; }
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
index 15394cc209..8bde6a5da8 100644
--- a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
@@ -63,10 +63,7 @@ namespace MediaBrowser.Controller.LiveTv
         }
 
         [IgnoreDataMember]
-        public override SourceType SourceType
-        {
-            get { return SourceType.LiveTV; }
-        }
+        public override SourceType SourceType => SourceType.LiveTV;
 
         /// <summary>
         /// The start date of the program, in UTC.
@@ -103,13 +100,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value><c>true</c> if this instance is sports; otherwise, <c>false</c>.</value>
         [IgnoreDataMember]
-        public bool IsSports
-        {
-            get
-            {
-                return Tags.Contains("Sports", StringComparer.OrdinalIgnoreCase);
-            }
-        }
+        public bool IsSports => Tags.Contains("Sports", StringComparer.OrdinalIgnoreCase);
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is series.
@@ -123,52 +114,28 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value><c>true</c> if this instance is live; otherwise, <c>false</c>.</value>
         [IgnoreDataMember]
-        public bool IsLive
-        {
-            get
-            {
-                return Tags.Contains("Live", StringComparer.OrdinalIgnoreCase);
-            }
-        }
+        public bool IsLive => Tags.Contains("Live", StringComparer.OrdinalIgnoreCase);
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is news.
         /// </summary>
         /// <value><c>true</c> if this instance is news; otherwise, <c>false</c>.</value>
         [IgnoreDataMember]
-        public bool IsNews
-        {
-            get
-            {
-                return Tags.Contains("News", StringComparer.OrdinalIgnoreCase);
-            }
-        }
+        public bool IsNews => Tags.Contains("News", StringComparer.OrdinalIgnoreCase);
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is kids.
         /// </summary>
         /// <value><c>true</c> if this instance is kids; otherwise, <c>false</c>.</value>
         [IgnoreDataMember]
-        public bool IsKids
-        {
-            get
-            {
-                return Tags.Contains("Kids", StringComparer.OrdinalIgnoreCase);
-            }
-        }
+        public bool IsKids => Tags.Contains("Kids", StringComparer.OrdinalIgnoreCase);
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is premiere.
         /// </summary>
         /// <value><c>true</c> if this instance is premiere; otherwise, <c>false</c>.</value>
         [IgnoreDataMember]
-        public bool IsPremiere
-        {
-            get
-            {
-                return Tags.Contains("Premiere", StringComparer.OrdinalIgnoreCase);
-            }
-        }
+        public bool IsPremiere => Tags.Contains("Premiere", StringComparer.OrdinalIgnoreCase);
 
         /// <summary>
         /// Returns the folder containing the item.
@@ -176,13 +143,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value>The containing folder path.</value>
         [IgnoreDataMember]
-        public override string ContainingFolderPath
-        {
-            get
-            {
-                return Path;
-            }
-        }
+        public override string ContainingFolderPath => Path;
 
         //[IgnoreDataMember]
         //public override string MediaType
@@ -251,13 +212,7 @@ namespace MediaBrowser.Controller.LiveTv
         }
 
         [IgnoreDataMember]
-        public override bool SupportsAncestors
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsAncestors => false;
 
         private LiveTvOptions GetConfiguration()
         {
diff --git a/MediaBrowser.Controller/LiveTv/TimerInfo.cs b/MediaBrowser.Controller/LiveTv/TimerInfo.cs
index 8088e73324..d89ec4fbf0 100644
--- a/MediaBrowser.Controller/LiveTv/TimerInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/TimerInfo.cs
@@ -115,27 +115,11 @@ namespace MediaBrowser.Controller.LiveTv
         /// <value>The episode number.</value>
         public int? EpisodeNumber { get; set; }
         public bool IsMovie { get; set; }
-        public bool IsKids
-        {
-            get
-            {
-                return Tags.Contains("Kids", StringComparer.OrdinalIgnoreCase);
-            }
-        }
-        public bool IsSports
-        {
-            get
-            {
-                return Tags.Contains("Sports", StringComparer.OrdinalIgnoreCase);
-            }
-        }
-        public bool IsNews
-        {
-            get
-            {
-                return Tags.Contains("News", StringComparer.OrdinalIgnoreCase);
-            }
-        }
+        public bool IsKids => Tags.Contains("Kids", StringComparer.OrdinalIgnoreCase);
+
+        public bool IsSports => Tags.Contains("Sports", StringComparer.OrdinalIgnoreCase);
+
+        public bool IsNews => Tags.Contains("News", StringComparer.OrdinalIgnoreCase);
         public bool IsSeries { get; set; }
 
         /// <summary>
@@ -143,22 +127,10 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value><c>true</c> if this instance is live; otherwise, <c>false</c>.</value>
         [IgnoreDataMember]
-        public bool IsLive
-        {
-            get
-            {
-                return Tags.Contains("Live", StringComparer.OrdinalIgnoreCase);
-            }
-        }
+        public bool IsLive => Tags.Contains("Live", StringComparer.OrdinalIgnoreCase);
 
         [IgnoreDataMember]
-        public bool IsPremiere
-        {
-            get
-            {
-                return Tags.Contains("Premiere", StringComparer.OrdinalIgnoreCase);
-            }
-        }
+        public bool IsPremiere => Tags.Contains("Premiere", StringComparer.OrdinalIgnoreCase);
 
         public int? ProductionYear { get; set; }
         public string EpisodeTitle { get; set; }
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
index dd846fafe2..bb09d365e3 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -61,53 +61,17 @@ namespace MediaBrowser.Controller.MediaEncoding
             }
         }
 
-        public bool IgnoreInputDts
-        {
-            get
-            {
-                return MediaSource.IgnoreDts;
-            }
-        }
+        public bool IgnoreInputDts => MediaSource.IgnoreDts;
 
-        public bool IgnoreInputIndex
-        {
-            get
-            {
-                return MediaSource.IgnoreIndex;
-            }
-        }
+        public bool IgnoreInputIndex => MediaSource.IgnoreIndex;
 
-        public bool GenPtsInput
-        {
-            get
-            {
-                return MediaSource.GenPtsInput;
-            }
-        }
+        public bool GenPtsInput => MediaSource.GenPtsInput;
 
-        public bool DiscardCorruptFramesInput
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public bool DiscardCorruptFramesInput => false;
 
-        public bool EnableFastSeekInput
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public bool EnableFastSeekInput => false;
 
-        public bool GenPtsOutput
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public bool GenPtsOutput => false;
 
         public string OutputContainer { get; set; }
 
@@ -142,15 +106,9 @@ namespace MediaBrowser.Controller.MediaEncoding
 
         public BaseEncodingJobOptions BaseRequest { get; set; }
 
-        public long? StartTimeTicks
-        {
-            get { return BaseRequest.StartTimeTicks; }
-        }
+        public long? StartTimeTicks => BaseRequest.StartTimeTicks;
 
-        public bool CopyTimestamps
-        {
-            get { return BaseRequest.CopyTimestamps; }
-        }
+        public bool CopyTimestamps => BaseRequest.CopyTimestamps;
 
         public int? OutputAudioBitrate;
         public int? OutputAudioChannels;
@@ -323,13 +281,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             SupportedSubtitleCodecs = Array.Empty<string>();
         }
 
-        public bool IsSegmentedLiveStream
-        {
-            get
-            {
-                return TranscodingType != TranscodingJobType.Progressive && !RunTimeTicks.HasValue;
-            }
-        }
+        public bool IsSegmentedLiveStream => TranscodingType != TranscodingJobType.Progressive && !RunTimeTicks.HasValue;
 
         public bool EnableBreakOnNonKeyFrames(string videoCodec)
         {
@@ -346,13 +298,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             return false;
         }
 
-        public int? TotalOutputBitrate
-        {
-            get
-            {
-                return (OutputAudioBitrate ?? 0) + (OutputVideoBitrate ?? 0);
-            }
-        }
+        public int? TotalOutputBitrate => (OutputAudioBitrate ?? 0) + (OutputVideoBitrate ?? 0);
 
         public int? OutputWidth
         {
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
index 48d2b65adc..625f0b3892 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
@@ -20,13 +20,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         /// Gets a value indicating whether this instance has fixed resolution.
         /// </summary>
         /// <value><c>true</c> if this instance has fixed resolution; otherwise, <c>false</c>.</value>
-        public bool HasFixedResolution
-        {
-            get
-            {
-                return Width.HasValue || Height.HasValue;
-            }
-        }
+        public bool HasFixedResolution => Width.HasValue || Height.HasValue;
 
         private readonly CultureInfo _usCulture = new CultureInfo("en-US");
         public EncodingJobOptions(StreamInfo info, DeviceProfile deviceProfile)
diff --git a/MediaBrowser.Controller/Net/AuthenticatedAttribute.cs b/MediaBrowser.Controller/Net/AuthenticatedAttribute.cs
index 9ef0eb80f9..64c2294e3d 100644
--- a/MediaBrowser.Controller/Net/AuthenticatedAttribute.cs
+++ b/MediaBrowser.Controller/Net/AuthenticatedAttribute.cs
@@ -44,10 +44,7 @@ namespace MediaBrowser.Controller.Net
         /// &gt;0 Executed after global request filters
         /// </summary>
         /// <value>The priority.</value>
-        public int Priority
-        {
-            get { return 0; }
-        }
+        public int Priority => 0;
 
         public string[] GetRoles()
         {
diff --git a/MediaBrowser.Controller/Net/AuthorizationInfo.cs b/MediaBrowser.Controller/Net/AuthorizationInfo.cs
index 2471989a08..3e004763df 100644
--- a/MediaBrowser.Controller/Net/AuthorizationInfo.cs
+++ b/MediaBrowser.Controller/Net/AuthorizationInfo.cs
@@ -9,13 +9,7 @@ namespace MediaBrowser.Controller.Net
         /// Gets or sets the user identifier.
         /// </summary>
         /// <value>The user identifier.</value>
-        public Guid UserId
-        {
-            get
-            {
-                return User == null ? Guid.Empty : User.Id;
-            }
-        }
+        public Guid UserId => User == null ? Guid.Empty : User.Id;
 
         /// <summary>
         /// Gets or sets the device identifier.
diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
index bee53b4c58..4e7e1c8ed2 100644
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -83,13 +83,7 @@ namespace MediaBrowser.Controller.Net
 
         protected readonly CultureInfo UsCulture = new CultureInfo("en-US");
 
-        protected virtual bool SendOnTimer
-        {
-            get
-            {
-                return false;
-            }
-        }
+        protected virtual bool SendOnTimer => false;
 
         protected virtual void ParseMessageParams(string[] values)
         {
diff --git a/MediaBrowser.Controller/Playlists/Playlist.cs b/MediaBrowser.Controller/Playlists/Playlist.cs
index af8d6cb114..9696436608 100644
--- a/MediaBrowser.Controller/Playlists/Playlist.cs
+++ b/MediaBrowser.Controller/Playlists/Playlist.cs
@@ -34,13 +34,7 @@ namespace MediaBrowser.Controller.Playlists
         }
 
         [IgnoreDataMember]
-        public bool IsFile
-        {
-            get
-            {
-                return IsPlaylistFile(Path);
-            }
-        }
+        public bool IsFile => IsPlaylistFile(Path);
 
         public static bool IsPlaylistFile(string path)
         {
@@ -64,49 +58,19 @@ namespace MediaBrowser.Controller.Playlists
         }
 
         [IgnoreDataMember]
-        protected override bool FilterLinkedChildrenPerUser
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool FilterLinkedChildrenPerUser => true;
 
         [IgnoreDataMember]
-        public override bool SupportsInheritedParentImages
-        {
-            get
-            {
-                return false;
-            }
-        }
+        public override bool SupportsInheritedParentImages => false;
 
         [IgnoreDataMember]
-        public override bool SupportsPlayedStatus
-        {
-            get
-            {
-                return string.Equals(MediaType, "Video", StringComparison.OrdinalIgnoreCase);
-            }
-        }
+        public override bool SupportsPlayedStatus => string.Equals(MediaType, "Video", StringComparison.OrdinalIgnoreCase);
 
         [IgnoreDataMember]
-        public override bool AlwaysScanInternalMetadataPath
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool AlwaysScanInternalMetadataPath => true;
 
         [IgnoreDataMember]
-        public override bool SupportsCumulativeRunTimeTicks
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool SupportsCumulativeRunTimeTicks => true;
 
         public override double GetDefaultPrimaryImageAspectRatio()
         {
@@ -229,24 +193,12 @@ namespace MediaBrowser.Controller.Playlists
         }
 
         [IgnoreDataMember]
-        public override bool IsPreSorted
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override bool IsPreSorted => true;
 
         public string PlaylistMediaType { get; set; }
 
         [IgnoreDataMember]
-        public override string MediaType
-        {
-            get
-            {
-                return PlaylistMediaType;
-            }
-        }
+        public override string MediaType => PlaylistMediaType;
 
         public void SetMediaType(string value)
         {
diff --git a/MediaBrowser.Controller/Resolvers/BaseItemResolver.cs b/MediaBrowser.Controller/Resolvers/BaseItemResolver.cs
index 1016535e1c..637a7e3f05 100644
--- a/MediaBrowser.Controller/Resolvers/BaseItemResolver.cs
+++ b/MediaBrowser.Controller/Resolvers/BaseItemResolver.cs
@@ -24,13 +24,7 @@ namespace MediaBrowser.Controller.Resolvers
         /// Gets the priority.
         /// </summary>
         /// <value>The priority.</value>
-        public virtual ResolverPriority Priority
-        {
-            get
-            {
-                return ResolverPriority.First;
-            }
-        }
+        public virtual ResolverPriority Priority => ResolverPriority.First;
 
         /// <summary>
         /// Sets initial values on the newly resolved item
diff --git a/MediaBrowser.LocalMetadata/BaseXmlProvider.cs b/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
index 2e4de4d933..e67b3ebacd 100644
--- a/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
@@ -67,32 +67,13 @@ namespace MediaBrowser.LocalMetadata
             return file.Exists && FileSystem.GetLastWriteTimeUtc(file) > item.DateLastSaved;
         }
 
-        public string Name
-        {
-            get
-            {
-                return XmlProviderUtils.Name;
-            }
-        }
+        public string Name => XmlProviderUtils.Name;
 
-        public virtual int Order
-        {
-            get
-            {
-                // After Nfo
-                return 1;
-            }
-        }
+        public virtual int Order => 1;
     }
 
     static class XmlProviderUtils
     {
-        public static string Name
-        {
-            get
-            {
-                return "Emby Xml";
-            }
-        }
+        public static string Name => "Emby Xml";
     }
 }
diff --git a/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs b/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
index 73f9b69c86..f5e028ab81 100644
--- a/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
@@ -14,24 +14,14 @@ namespace MediaBrowser.LocalMetadata.Images
             _fileSystem = fileSystem;
         }
 
-        public string Name
-        {
-            get { return "Collection Folder Images"; }
-        }
+        public string Name => "Collection Folder Images";
 
         public bool Supports(BaseItem item)
         {
             return item is CollectionFolder && item.SupportsLocalMetadata;
         }
 
-        public int Order
-        {
-            get
-            {
-                // Run after LocalImageProvider
-                return 1;
-            }
-        }
+        public int Order => 1;
 
         public List<LocalImageInfo> GetImages(BaseItem item, IDirectoryService directoryService)
         {
diff --git a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
index 589cbf4dfe..894f461296 100644
--- a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
@@ -18,15 +18,9 @@ namespace MediaBrowser.LocalMetadata.Images
             _fileSystem = fileSystem;
         }
 
-        public string Name
-        {
-            get { return "Local Images"; }
-        }
+        public string Name => "Local Images";
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public bool Supports(BaseItem item)
         {
diff --git a/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs b/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
index 23d65e5ac4..2a2f36fbd6 100644
--- a/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
@@ -19,10 +19,7 @@ namespace MediaBrowser.LocalMetadata.Images
             _fileSystem = fileSystem;
         }
 
-        public string Name
-        {
-            get { return "Internal Images"; }
-        }
+        public string Name => "Internal Images";
 
         public bool Supports(BaseItem item)
         {
@@ -50,14 +47,7 @@ namespace MediaBrowser.LocalMetadata.Images
             return true;
         }
 
-        public int Order
-        {
-            get
-            {
-                // Make sure this is last so that all other locations are scanned first
-                return 1000;
-            }
-        }
+        public int Order => 1000;
 
         public List<LocalImageInfo> GetImages(BaseItem item, IDirectoryService directoryService)
         {
diff --git a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
index 479e13da44..0a4928ed7f 100644
--- a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
@@ -21,15 +21,9 @@ namespace MediaBrowser.LocalMetadata.Images
             _fileSystem = fileSystem;
         }
 
-        public string Name
-        {
-            get { return "Local Images"; }
-        }
+        public string Name => "Local Images";
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public bool Supports(BaseItem item)
         {
diff --git a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
index 4fef3055b1..2ddf922f96 100644
--- a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
@@ -42,21 +42,9 @@ namespace MediaBrowser.LocalMetadata.Savers
         protected ILogger Logger { get; private set; }
         protected IXmlReaderSettingsFactory XmlReaderSettingsFactory { get; private set; }
 
-        protected ItemUpdateType MinimumUpdateType
-        {
-            get
-            {
-                return ItemUpdateType.MetadataDownload;
-            }
-        }
+        protected ItemUpdateType MinimumUpdateType => ItemUpdateType.MetadataDownload;
 
-        public string Name
-        {
-            get
-            {
-                return XmlProviderUtils.Name;
-            }
-        }
+        public string Name => XmlProviderUtils.Name;
 
         public string GetSavePath(BaseItem item)
         {
diff --git a/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
index 05a2d84e92..d5773fe315 100644
--- a/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
@@ -53,10 +53,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
             return null;
         }
 
-        protected override bool IsVideoEncoder
-        {
-            get { return false; }
-        }
-
+        protected override bool IsVideoEncoder => false;
     }
 }
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
index a3a6506bc4..df78d117af 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
@@ -20,8 +20,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         public EncodingJobOptions Options
         {
-            get { return (EncodingJobOptions)BaseRequest; }
-            set { BaseRequest = value; }
+            get => (EncodingJobOptions)BaseRequest;
+            set => BaseRequest = value;
         }
 
         public string Id { get; set; }
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 7b368923c3..8489cc9b17 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -415,10 +415,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         /// Gets the encoder path.
         /// </summary>
         /// <value>The encoder path.</value>
-        public string EncoderPath
-        {
-            get { return FFMpegPath; }
-        }
+        public string EncoderPath => FFMpegPath;
 
         /// <summary>
         /// Gets the media info.
diff --git a/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
index fe315d83c5..bf23a73bd4 100644
--- a/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
@@ -54,10 +54,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
             return null;
         }
 
-        protected override bool IsVideoEncoder
-        {
-            get { return true; }
-        }
-
+        protected override bool IsVideoEncoder => true;
     }
 }
diff --git a/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs b/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs
index 0e418ecf7e..a1d925881c 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs
@@ -83,10 +83,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             return _encryption.DecryptString(password.Substring(2));
         }
 
-        public string Name
-        {
-            get { return "Open Subtitles"; }
-        }
+        public string Name => "Open Subtitles";
 
         private SubtitleOptions GetOptions()
         {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 58a05e2f33..3b75146136 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -60,13 +60,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             _textEncoding = textEncoding;
         }
 
-        private string SubtitleCachePath
-        {
-            get
-            {
-                return Path.Combine(_appPaths.DataPath, "subtitles");
-            }
-        }
+        private string SubtitleCachePath => Path.Combine(_appPaths.DataPath, "subtitles");
 
         private Stream ConvertSubtitles(Stream stream,
             string inputFormat,
diff --git a/MediaBrowser.Model/Dlna/SortCriteria.cs b/MediaBrowser.Model/Dlna/SortCriteria.cs
index 7465e05f89..b5c1ac408e 100644
--- a/MediaBrowser.Model/Dlna/SortCriteria.cs
+++ b/MediaBrowser.Model/Dlna/SortCriteria.cs
@@ -4,10 +4,7 @@ namespace MediaBrowser.Model.Dlna
 {
     public class SortCriteria
     {
-        public SortOrder SortOrder
-        {
-            get { return SortOrder.Ascending; }
-        }
+        public SortOrder SortOrder => SortOrder.Ascending;
 
         public SortCriteria(string value)
         {
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 2bc6908db5..86d7c9d621 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -127,22 +127,11 @@ namespace MediaBrowser.Model.Dlna
 
         public Dictionary<string, string> StreamOptions { get; private set; }
 
-        public string MediaSourceId
-        {
-            get
-            {
-                return MediaSource == null ? null : MediaSource.Id;
-            }
-        }
+        public string MediaSourceId => MediaSource == null ? null : MediaSource.Id;
 
-        public bool IsDirectStream
-        {
-            get
-            {
-                return PlayMethod == PlayMethod.DirectStream ||
-                    PlayMethod == PlayMethod.DirectPlay;
-            }
-        }
+        public bool IsDirectStream =>
+            PlayMethod == PlayMethod.DirectStream ||
+            PlayMethod == PlayMethod.DirectPlay;
 
         public string ToUrl(string baseUrl, string accessToken)
         {
@@ -911,13 +900,7 @@ namespace MediaBrowser.Model.Dlna
             }
         }
 
-        public int? TargetTotalBitrate
-        {
-            get
-            {
-                return (TargetAudioBitrate ?? 0) + (TargetVideoBitrate ?? 0);
-            }
-        }
+        public int? TargetTotalBitrate => (TargetAudioBitrate ?? 0) + (TargetVideoBitrate ?? 0);
 
         public bool? IsTargetAnamorphic
         {
diff --git a/MediaBrowser.Model/Drawing/ImageSize.cs b/MediaBrowser.Model/Drawing/ImageSize.cs
index b6866d38e3..b27df346cb 100644
--- a/MediaBrowser.Model/Drawing/ImageSize.cs
+++ b/MediaBrowser.Model/Drawing/ImageSize.cs
@@ -16,14 +16,8 @@ namespace MediaBrowser.Model.Drawing
         /// <value>The height.</value>
         public double Height
         {
-            get
-            {
-                return _height;
-            }
-            set
-            {
-                _height = value;
-            }
+            get => _height;
+            set => _height = value;
         }
 
         /// <summary>
@@ -32,8 +26,8 @@ namespace MediaBrowser.Model.Drawing
         /// <value>The width.</value>
         public double Width
         {
-            get { return _width; }
-            set { _width = value; }
+            get => _width;
+            set => _width = value;
         }
 
         public bool Equals(ImageSize size)
diff --git a/MediaBrowser.Model/Dto/BaseItemPerson.cs b/MediaBrowser.Model/Dto/BaseItemPerson.cs
index f42ef4c915..7011ff8ea5 100644
--- a/MediaBrowser.Model/Dto/BaseItemPerson.cs
+++ b/MediaBrowser.Model/Dto/BaseItemPerson.cs
@@ -42,12 +42,6 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value><c>true</c> if this instance has primary image; otherwise, <c>false</c>.</value>
         [IgnoreDataMember]
-        public bool HasPrimaryImage
-        {
-            get
-            {
-                return PrimaryImageTag != null;
-            }
-        }
+        public bool HasPrimaryImage => PrimaryImageTag != null;
     }
 }
diff --git a/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs b/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs
index 9c9b3ef676..b83df87e23 100644
--- a/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs
+++ b/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs
@@ -38,13 +38,7 @@ namespace MediaBrowser.Model.Entities
 
         public string[] CollectionFolders { get; set; }
 
-        public bool IsEmpty
-        {
-            get
-            {
-                return FoldersAddedTo.Length == 0 && FoldersRemovedFrom.Length == 0 && ItemsAdded.Length == 0 && ItemsRemoved.Length == 0 && ItemsUpdated.Length == 0 && CollectionFolders.Length == 0;
-            }
-        }
+        public bool IsEmpty => FoldersAddedTo.Length == 0 && FoldersRemovedFrom.Length == 0 && ItemsAdded.Length == 0 && ItemsRemoved.Length == 0 && ItemsUpdated.Length == 0 && CollectionFolders.Length == 0;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="LibraryUpdateInfo"/> class.
diff --git a/MediaBrowser.Model/Services/QueryParamCollection.cs b/MediaBrowser.Model/Services/QueryParamCollection.cs
index 05ba6f18d3..4297b97c66 100644
--- a/MediaBrowser.Model/Services/QueryParamCollection.cs
+++ b/MediaBrowser.Model/Services/QueryParamCollection.cs
@@ -177,40 +177,8 @@ namespace MediaBrowser.Model.Services
         /// <returns>The query parameter value or array of values</returns>
         public string this[string name]
         {
-            get { return Get(name); }
-            set
-            {
-                Set(name, value);
-                //var parameters = this.Where(p => p.Name == name).ToArray();
-                //var values = new[] { value };
-
-                //for (int i = 0; ; i++)
-                //{
-                //    if (i < parameters.Length && i < values.Length)
-                //    {
-                //        if (values[i] == null)
-                //            Remove(parameters[i]);
-                //        else if (values[i] is NameValuePair)
-                //            this[IndexOf(parameters[i])] = (NameValuePair)values[i];
-                //        else
-                //            parameters[i].Value = values[i];
-                //    }
-                //    else if (i < parameters.Length)
-                //        Remove(parameters[i]);
-                //    else if (i < values.Length)
-                //    {
-                //        if (values[i] != null)
-                //        {
-                //            if (values[i] is NameValuePair)
-                //                Add((NameValuePair)values[i]);
-                //            else
-                //                Add(name, values[i]);
-                //        }
-                //    }
-                //    else
-                //        break;
-                //}
-            }
+            get => Get(name);
+            set => Set(name, value);
         }
 
         private string GetQueryStringValue(NameValuePair pair)
diff --git a/MediaBrowser.Model/Updates/CheckForUpdateResult.cs b/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
index 79558b0cf9..ed6ed22a06 100644
--- a/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
+++ b/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
@@ -18,7 +18,7 @@ namespace MediaBrowser.Model.Updates
         /// <value>The available version.</value>
         public string AvailableVersion
         {
-            get { return Package != null ? Package.versionStr : "0.0.0.1"; }
+            get => Package != null ? Package.versionStr : "0.0.0.1";
             set { } // need this for the serializer
         }
 
diff --git a/MediaBrowser.Model/Updates/PackageVersionInfo.cs b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
index 570fb3e022..be531770d4 100644
--- a/MediaBrowser.Model/Updates/PackageVersionInfo.cs
+++ b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
@@ -36,10 +36,7 @@ namespace MediaBrowser.Model.Updates
         /// </summary>
         /// <value>The version.</value>
         [IgnoreDataMember]
-        public Version version
-        {
-            get { return _version ?? (_version = new Version(ValueOrDefault(versionStr, "0.0.0.1"))); }
-        }
+        public Version version => _version ?? (_version = new Version(ValueOrDefault(versionStr, "0.0.0.1")));
 
         /// <summary>
         /// Values the or default.
diff --git a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
index 99fbddf098..693edb1435 100644
--- a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
+++ b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
@@ -52,36 +52,12 @@ namespace MediaBrowser.Providers.BoxSets
         {
         }
 
-        protected override bool EnableUpdatingGenresFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingGenresFromChildren => true;
 
-        protected override bool EnableUpdatingOfficialRatingFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingOfficialRatingFromChildren => true;
 
-        protected override bool EnableUpdatingStudiosFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingStudiosFromChildren => true;
 
-        protected override bool EnableUpdatingPremiereDateFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingPremiereDateFromChildren => true;
     }
 }
diff --git a/MediaBrowser.Providers/BoxSets/MovieDbBoxSetImageProvider.cs b/MediaBrowser.Providers/BoxSets/MovieDbBoxSetImageProvider.cs
index 6619ea980e..c6c1a2a945 100644
--- a/MediaBrowser.Providers/BoxSets/MovieDbBoxSetImageProvider.cs
+++ b/MediaBrowser.Providers/BoxSets/MovieDbBoxSetImageProvider.cs
@@ -23,15 +23,9 @@ namespace MediaBrowser.Providers.BoxSets
             _httpClient = httpClient;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "TheMovieDb"; }
-        }
+        public static string ProviderName => "TheMovieDb";
 
         public bool Supports(BaseItem item)
         {
@@ -150,10 +144,7 @@ namespace MediaBrowser.Providers.BoxSets
                 .ThenByDescending(i => i.vote_count);
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs b/MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs
index a832606a9a..e06d93520a 100644
--- a/MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs
+++ b/MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs
@@ -241,10 +241,7 @@ namespace MediaBrowser.Providers.BoxSets
             return DownloadInfo(tmdbId, preferredMetadataLanguage, cancellationToken);
         }
 
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
         private static string GetDataFilePath(IApplicationPaths appPaths, string tmdbId, string preferredLanguage)
         {
diff --git a/MediaBrowser.Providers/Folders/FolderMetadataService.cs b/MediaBrowser.Providers/Folders/FolderMetadataService.cs
index 39f6e04a50..c839befff8 100644
--- a/MediaBrowser.Providers/Folders/FolderMetadataService.cs
+++ b/MediaBrowser.Providers/Folders/FolderMetadataService.cs
@@ -11,14 +11,7 @@ namespace MediaBrowser.Providers.Folders
 {
     public class FolderMetadataService : MetadataService<Folder, ItemLookupInfo>
     {
-        public override int Order
-        {
-            get
-            {
-                // Make sure the type-specific services get picked first
-                return 10;
-            }
-        }
+        public override int Order => 10;
 
         protected override void MergeData(MetadataResult<Folder> source, MetadataResult<Folder> target, MetadataFields[] lockedFields, bool replaceData, bool mergeMetadataSettings)
         {
diff --git a/MediaBrowser.Providers/Manager/GenericPriorityQueue.cs b/MediaBrowser.Providers/Manager/GenericPriorityQueue.cs
index 7d921d8641..2b73fdcd37 100644
--- a/MediaBrowser.Providers/Manager/GenericPriorityQueue.cs
+++ b/MediaBrowser.Providers/Manager/GenericPriorityQueue.cs
@@ -41,25 +41,13 @@ namespace Priority_Queue
         /// Returns the number of nodes in the queue.
         /// O(1)
         /// </summary>
-        public int Count
-        {
-            get
-            {
-                return _numNodes;
-            }
-        }
+        public int Count => _numNodes;
 
         /// <summary>
         /// Returns the maximum number of items that can be enqueued at once in this queue.  Once you hit this number (ie. once Count == MaxSize),
         /// attempting to enqueue another item will cause undefined behavior.  O(1)
         /// </summary>
-        public int MaxSize
-        {
-            get
-            {
-                return _nodes.Length - 1;
-            }
-        }
+        public int MaxSize => _nodes.Length - 1;
 
         /// <summary>
         /// Removes every node from the queue.
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index 7a713b4e5c..3322582cc8 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -441,34 +441,13 @@ namespace MediaBrowser.Providers.Manager
             return updateType;
         }
 
-        protected virtual bool EnableUpdatingPremiereDateFromChildren
-        {
-            get
-            {
-                return false;
-            }
-        }
-        protected virtual bool EnableUpdatingGenresFromChildren
-        {
-            get
-            {
-                return false;
-            }
-        }
-        protected virtual bool EnableUpdatingStudiosFromChildren
-        {
-            get
-            {
-                return false;
-            }
-        }
-        protected virtual bool EnableUpdatingOfficialRatingFromChildren
-        {
-            get
-            {
-                return false;
-            }
-        }
+        protected virtual bool EnableUpdatingPremiereDateFromChildren => false;
+
+        protected virtual bool EnableUpdatingGenresFromChildren => false;
+
+        protected virtual bool EnableUpdatingStudiosFromChildren => false;
+
+        protected virtual bool EnableUpdatingOfficialRatingFromChildren => false;
 
         private ItemUpdateType UpdatePremiereDate(TItemType item, IList<BaseItem> children)
         {
@@ -926,13 +905,7 @@ namespace MediaBrowser.Providers.Manager
             bool replaceData,
             bool mergeMetadataSettings);
 
-        public virtual int Order
-        {
-            get
-            {
-                return 0;
-            }
-        }
+        public virtual int Order => 0;
 
         private bool HasChanged(BaseItem item, IHasItemChangeMonitor changeMonitor, IDirectoryService directoryService)
         {
diff --git a/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs b/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
index ffbb2d7c16..0b902ccecb 100644
--- a/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
@@ -119,18 +119,9 @@ namespace MediaBrowser.Providers.MediaInfo
             return Path.Combine(AudioImagesPath, prefix, filename);
         }
 
-        public string AudioImagesPath
-        {
-            get
-            {
-                return Path.Combine(_config.ApplicationPaths.CachePath, "extracted-audio-images");
-            }
-        }
+        public string AudioImagesPath => Path.Combine(_config.ApplicationPaths.CachePath, "extracted-audio-images");
 
-        public string Name
-        {
-            get { return "Image Extractor"; }
-        }
+        public string Name => "Image Extractor";
 
         public bool Supports(BaseItem item)
         {
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
index 31be4d6d3e..70bf862fb7 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
@@ -53,10 +53,7 @@ namespace MediaBrowser.Providers.MediaInfo
         private readonly IChannelManager _channelManager;
         private readonly IMediaSourceManager _mediaSourceManager;
 
-        public string Name
-        {
-            get { return "ffprobe"; }
-        }
+        public string Name => "ffprobe";
 
         public bool HasChanged(BaseItem item, IDirectoryService directoryService)
         {
@@ -227,13 +224,6 @@ namespace MediaBrowser.Providers.MediaInfo
             return prober.Probe(item, options, cancellationToken);
         }
 
-        public int Order
-        {
-            get
-            {
-                // Run last
-                return 100;
-            }
-        }
+        public int Order => 100;
     }
 }
diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
index c5a47836fd..b7598ef22f 100644
--- a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
+++ b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
@@ -36,20 +36,11 @@ namespace MediaBrowser.Providers.MediaInfo
             _json = json;
         }
 
-        public string Name
-        {
-            get { return "Download missing subtitles"; }
-        }
+        public string Name => "Download missing subtitles";
 
-        public string Description
-        {
-            get { return "Searches the internet for missing subtitles based on metadata configuration."; }
-        }
+        public string Description => "Searches the internet for missing subtitles based on metadata configuration.";
 
-        public string Category
-        {
-            get { return "Library"; }
-        }
+        public string Category => "Library";
 
         private SubtitleOptions GetOptions()
         {
@@ -213,9 +204,6 @@ namespace MediaBrowser.Providers.MediaInfo
             };
         }
 
-        public string Key
-        {
-            get { return "DownloadSubtitles"; }
-        }
+        public string Key => "DownloadSubtitles";
     }
 }
diff --git a/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs b/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
index e0b6d97ce7..6aaad41f75 100644
--- a/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
@@ -120,10 +120,7 @@ namespace MediaBrowser.Providers.MediaInfo
             };
         }
 
-        public string Name
-        {
-            get { return "Screen Grabber"; }
-        }
+        public string Name => "Screen Grabber";
 
         public bool Supports(BaseItem item)
         {
@@ -146,13 +143,6 @@ namespace MediaBrowser.Providers.MediaInfo
             return false;
         }
 
-        public int Order
-        {
-            get
-            {
-                // Make sure this comes after internet image providers
-                return 100;
-            }
-        }
+        public int Order => 100;
     }
 }
diff --git a/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs b/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs
index d495ffed10..79e61f6a71 100644
--- a/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs
+++ b/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs
@@ -45,15 +45,9 @@ namespace MediaBrowser.Providers.Movies
             Current = this;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "FanArt"; }
-        }
+        public static string ProviderName => "FanArt";
 
         public bool Supports(BaseItem item)
         {
@@ -199,10 +193,7 @@ namespace MediaBrowser.Providers.Movies
             }).Where(i => i != null));
         }
 
-        public int Order
-        {
-            get { return 1; }
-        }
+        public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Movies/MovieDbImageProvider.cs b/MediaBrowser.Providers/Movies/MovieDbImageProvider.cs
index 0c7c5cecf7..b9c5d7ce59 100644
--- a/MediaBrowser.Providers/Movies/MovieDbImageProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbImageProvider.cs
@@ -29,15 +29,9 @@ namespace MediaBrowser.Providers.Movies
             _fileSystem = fileSystem;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "TheMovieDb"; }
-        }
+        public static string ProviderName => "TheMovieDb";
 
         public bool Supports(BaseItem item)
         {
@@ -199,10 +193,7 @@ namespace MediaBrowser.Providers.Movies
             return null;
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
index d85d777019..ef5c781dc0 100644
--- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
@@ -122,10 +122,7 @@ namespace MediaBrowser.Providers.Movies
             return movieDb.GetMetadata(id, cancellationToken);
         }
 
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
         /// <summary>
         /// The _TMDB settings task
@@ -633,13 +630,7 @@ namespace MediaBrowser.Providers.Movies
             }
         }
 
-        public int Order
-        {
-            get
-            {
-                return 1;
-            }
-        }
+        public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Movies/MovieDbTrailerProvider.cs b/MediaBrowser.Providers/Movies/MovieDbTrailerProvider.cs
index 485e6a2f95..2a3cdf097e 100644
--- a/MediaBrowser.Providers/Movies/MovieDbTrailerProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbTrailerProvider.cs
@@ -27,18 +27,9 @@ namespace MediaBrowser.Providers.Movies
             return MovieDbProvider.Current.GetItemMetadata<Trailer>(info, cancellationToken);
         }
 
-        public string Name
-        {
-            get { return MovieDbProvider.Current.Name; }
-        }
+        public string Name => MovieDbProvider.Current.Name;
 
-        public int Order
-        {
-            get
-            {
-                return 0;
-            }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Movies/MovieExternalIds.cs b/MediaBrowser.Providers/Movies/MovieExternalIds.cs
index 63bcd9e2df..3783c50324 100644
--- a/MediaBrowser.Providers/Movies/MovieExternalIds.cs
+++ b/MediaBrowser.Providers/Movies/MovieExternalIds.cs
@@ -11,20 +11,11 @@ namespace MediaBrowser.Providers.Movies
     {
         public const string BaseMovieDbUrl = "https://www.themoviedb.org/";
 
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
-        public string Key
-        {
-            get { return MetadataProviders.Tmdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Tmdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return BaseMovieDbUrl + "movie/{0}"; }
-        }
+        public string UrlFormatString => BaseMovieDbUrl + "movie/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -41,20 +32,11 @@ namespace MediaBrowser.Providers.Movies
 
     public class MovieDbSeriesExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
-        public string Key
-        {
-            get { return MetadataProviders.Tmdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Tmdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return MovieDbMovieExternalId.BaseMovieDbUrl + "tv/{0}"; }
-        }
+        public string UrlFormatString => MovieDbMovieExternalId.BaseMovieDbUrl + "tv/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -64,20 +46,11 @@ namespace MediaBrowser.Providers.Movies
 
     public class MovieDbMovieCollectionExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheMovieDb Collection"; }
-        }
+        public string Name => "TheMovieDb Collection";
 
-        public string Key
-        {
-            get { return MetadataProviders.TmdbCollection.ToString(); }
-        }
+        public string Key => MetadataProviders.TmdbCollection.ToString();
 
-        public string UrlFormatString
-        {
-            get { return MovieDbMovieExternalId.BaseMovieDbUrl + "collection/{0}"; }
-        }
+        public string UrlFormatString => MovieDbMovieExternalId.BaseMovieDbUrl + "collection/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -87,20 +60,11 @@ namespace MediaBrowser.Providers.Movies
 
     public class MovieDbPersonExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
-        public string Key
-        {
-            get { return MetadataProviders.Tmdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Tmdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return MovieDbMovieExternalId.BaseMovieDbUrl + "person/{0}"; }
-        }
+        public string UrlFormatString => MovieDbMovieExternalId.BaseMovieDbUrl + "person/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -110,20 +74,11 @@ namespace MediaBrowser.Providers.Movies
 
     public class MovieDbCollectionExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
-        public string Key
-        {
-            get { return MetadataProviders.Tmdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Tmdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return MovieDbMovieExternalId.BaseMovieDbUrl + "collection/{0}"; }
-        }
+        public string UrlFormatString => MovieDbMovieExternalId.BaseMovieDbUrl + "collection/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -133,20 +88,11 @@ namespace MediaBrowser.Providers.Movies
 
     public class ImdbExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "IMDb"; }
-        }
+        public string Name => "IMDb";
 
-        public string Key
-        {
-            get { return MetadataProviders.Imdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Imdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://www.imdb.com/title/{0}"; }
-        }
+        public string UrlFormatString => "https://www.imdb.com/title/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -164,20 +110,11 @@ namespace MediaBrowser.Providers.Movies
 
     public class ImdbPersonExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "IMDb"; }
-        }
+        public string Name => "IMDb";
 
-        public string Key
-        {
-            get { return MetadataProviders.Imdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Imdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://www.imdb.com/name/{0}"; }
-        }
+        public string UrlFormatString => "https://www.imdb.com/name/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
diff --git a/MediaBrowser.Providers/Music/AlbumMetadataService.cs b/MediaBrowser.Providers/Music/AlbumMetadataService.cs
index d4ade56869..33a6c2fa36 100644
--- a/MediaBrowser.Providers/Music/AlbumMetadataService.cs
+++ b/MediaBrowser.Providers/Music/AlbumMetadataService.cs
@@ -50,29 +50,11 @@ namespace MediaBrowser.Providers.Music
             return updateType;
         }
 
-        protected override bool EnableUpdatingPremiereDateFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingPremiereDateFromChildren => true;
 
-        protected override bool EnableUpdatingGenresFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingGenresFromChildren => true;
 
-        protected override bool EnableUpdatingStudiosFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingStudiosFromChildren => true;
 
         private ItemUpdateType SetAlbumArtistFromSongs(MusicAlbum item, IEnumerable<Audio> songs)
         {
diff --git a/MediaBrowser.Providers/Music/ArtistMetadataService.cs b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
index 5e88e801e2..de9551f83c 100644
--- a/MediaBrowser.Providers/Music/ArtistMetadataService.cs
+++ b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
@@ -24,13 +24,7 @@ namespace MediaBrowser.Providers.Music
                 item.GetRecursiveChildren(i => i is IHasArtist && !i.IsFolder);
         }
 
-        protected override bool EnableUpdatingGenresFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingGenresFromChildren => true;
 
         protected override void MergeData(MetadataResult<MusicArtist> source, MetadataResult<MusicArtist> target, MetadataFields[] lockedFields, bool replaceData, bool mergeMetadataSettings)
         {
diff --git a/MediaBrowser.Providers/Music/AudioDbAlbumImageProvider.cs b/MediaBrowser.Providers/Music/AudioDbAlbumImageProvider.cs
index 5082d6cf64..7ff6e8fa81 100644
--- a/MediaBrowser.Providers/Music/AudioDbAlbumImageProvider.cs
+++ b/MediaBrowser.Providers/Music/AudioDbAlbumImageProvider.cs
@@ -91,19 +91,9 @@ namespace MediaBrowser.Providers.Music
             });
         }
 
-        public string Name
-        {
-            get { return "TheAudioDB"; }
-        }
+        public string Name => "TheAudioDB";
 
-        public int Order
-        {
-            get
-            {
-                // After embedded and fanart
-                return 2;
-            }
-        }
+        public int Order => 2;
 
         public bool Supports(BaseItem item)
         {
diff --git a/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs b/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs
index 14747ffe76..f19537b0ba 100644
--- a/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs
@@ -126,10 +126,7 @@ namespace MediaBrowser.Providers.Music
             item.Overview = (overview ?? string.Empty).StripHtml();
         }
 
-        public string Name
-        {
-            get { return "TheAudioDB"; }
-        }
+        public string Name => "TheAudioDB";
 
         internal Task EnsureInfo(string musicBrainzReleaseGroupId, CancellationToken cancellationToken)
         {
@@ -196,14 +193,7 @@ namespace MediaBrowser.Providers.Music
             return Path.Combine(dataPath, "album.json");
         }
 
-        public int Order
-        {
-            get
-            {
-                // After music brainz
-                return 1;
-            }
-        }
+        public int Order => 1;
 
         public class Album
         {
diff --git a/MediaBrowser.Providers/Music/AudioDbArtistImageProvider.cs b/MediaBrowser.Providers/Music/AudioDbArtistImageProvider.cs
index 5385342f26..8ca3f97c8b 100644
--- a/MediaBrowser.Providers/Music/AudioDbArtistImageProvider.cs
+++ b/MediaBrowser.Providers/Music/AudioDbArtistImageProvider.cs
@@ -133,23 +133,13 @@ namespace MediaBrowser.Providers.Music
             });
         }
 
-        public string Name
-        {
-            get { return "TheAudioDB"; }
-        }
+        public string Name => "TheAudioDB";
 
         public bool Supports(BaseItem item)
         {
             return item is MusicArtist;
         }
 
-        public int Order
-        {
-            get
-            {
-                // After fanart
-                return 1;
-            }
-        }
+        public int Order => 1;
     }
 }
diff --git a/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs b/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs
index a889fffcb5..87b6a30e7f 100644
--- a/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs
+++ b/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs
@@ -114,10 +114,7 @@ namespace MediaBrowser.Providers.Music
             item.Overview = (overview ?? string.Empty).StripHtml();
         }
 
-        public string Name
-        {
-            get { return "TheAudioDB"; }
-        }
+        public string Name => "TheAudioDB";
 
         internal Task EnsureArtistInfo(string musicBrainzId, CancellationToken cancellationToken)
         {
@@ -246,14 +243,7 @@ namespace MediaBrowser.Providers.Music
             public List<Artist> artists { get; set; }
         }
 
-        public int Order
-        {
-            get
-            {
-                // After musicbrainz
-                return 1;
-            }
-        }
+        public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Music/AudioDbExternalIds.cs b/MediaBrowser.Providers/Music/AudioDbExternalIds.cs
index 62d6c0704b..3e1022d7d4 100644
--- a/MediaBrowser.Providers/Music/AudioDbExternalIds.cs
+++ b/MediaBrowser.Providers/Music/AudioDbExternalIds.cs
@@ -6,20 +6,11 @@ namespace MediaBrowser.Providers.Music
 {
     public class AudioDbAlbumExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheAudioDb"; }
-        }
+        public string Name => "TheAudioDb";
 
-        public string Key
-        {
-            get { return MetadataProviders.AudioDbAlbum.ToString(); }
-        }
+        public string Key => MetadataProviders.AudioDbAlbum.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://www.theaudiodb.com/album/{0}"; }
-        }
+        public string UrlFormatString => "https://www.theaudiodb.com/album/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -29,20 +20,11 @@ namespace MediaBrowser.Providers.Music
 
     public class AudioDbOtherAlbumExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheAudioDb Album"; }
-        }
+        public string Name => "TheAudioDb Album";
 
-        public string Key
-        {
-            get { return MetadataProviders.AudioDbAlbum.ToString(); }
-        }
+        public string Key => MetadataProviders.AudioDbAlbum.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://www.theaudiodb.com/album/{0}"; }
-        }
+        public string UrlFormatString => "https://www.theaudiodb.com/album/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -52,20 +34,11 @@ namespace MediaBrowser.Providers.Music
 
     public class AudioDbArtistExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheAudioDb"; }
-        }
+        public string Name => "TheAudioDb";
 
-        public string Key
-        {
-            get { return MetadataProviders.AudioDbArtist.ToString(); }
-        }
+        public string Key => MetadataProviders.AudioDbArtist.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://www.theaudiodb.com/artist/{0}"; }
-        }
+        public string UrlFormatString => "https://www.theaudiodb.com/artist/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -75,20 +48,11 @@ namespace MediaBrowser.Providers.Music
 
     public class AudioDbOtherArtistExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheAudioDb Artist"; }
-        }
+        public string Name => "TheAudioDb Artist";
 
-        public string Key
-        {
-            get { return MetadataProviders.AudioDbArtist.ToString(); }
-        }
+        public string Key => MetadataProviders.AudioDbArtist.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://www.theaudiodb.com/artist/{0}"; }
-        }
+        public string UrlFormatString => "https://www.theaudiodb.com/artist/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
diff --git a/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs b/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs
index c4f352ffda..09c11899b2 100644
--- a/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs
@@ -35,15 +35,9 @@ namespace MediaBrowser.Providers.Music
             _jsonSerializer = jsonSerializer;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "FanArt"; }
-        }
+        public static string ProviderName => "FanArt";
 
         public bool Supports(BaseItem item)
         {
@@ -194,14 +188,7 @@ namespace MediaBrowser.Providers.Music
             }).Where(i => i != null));
         }
 
-        public int Order
-        {
-            get
-            {
-                // After embedded provider
-                return 1;
-            }
-        }
+        public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs
index 2021ff4381..9d63484a84 100644
--- a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs
+++ b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs
@@ -46,15 +46,9 @@ namespace MediaBrowser.Providers.Music
             Current = this;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "FanArt"; }
-        }
+        public static string ProviderName => "FanArt";
 
         public bool Supports(BaseItem item)
         {
@@ -192,10 +186,7 @@ namespace MediaBrowser.Providers.Music
             }).Where(i => i != null));
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Music/MovieDbMusicVideoProvider.cs b/MediaBrowser.Providers/Music/MovieDbMusicVideoProvider.cs
index 9924fe5e5d..506cbfb89c 100644
--- a/MediaBrowser.Providers/Music/MovieDbMusicVideoProvider.cs
+++ b/MediaBrowser.Providers/Music/MovieDbMusicVideoProvider.cs
@@ -22,10 +22,7 @@ namespace MediaBrowser.Providers.Music
             return Task.FromResult((IEnumerable<RemoteSearchResult>)new List<RemoteSearchResult>());
         }
 
-        public string Name
-        {
-            get { return MovieDbProvider.Current.Name; }
-        }
+        public string Name => MovieDbProvider.Current.Name;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
index 2074464916..3c54b2d2fc 100644
--- a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
@@ -216,10 +216,7 @@ namespace MediaBrowser.Providers.Music
             return result;
         }
 
-        public string Name
-        {
-            get { return "MusicBrainz"; }
-        }
+        public string Name => "MusicBrainz";
 
         private Task<ReleaseResult> GetReleaseResult(string artistMusicBrainId, string artistName, string albumName, CancellationToken cancellationToken)
         {
@@ -753,10 +750,7 @@ namespace MediaBrowser.Providers.Music
             return await _httpClient.SendAsync(options, "GET").ConfigureAwait(false);
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs b/MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs
index 72c1ffe8c5..8d10834c32 100644
--- a/MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs
+++ b/MediaBrowser.Providers/Music/MusicBrainzArtistProvider.cs
@@ -283,10 +283,7 @@ namespace MediaBrowser.Providers.Music
             return WebUtility.UrlEncode(name);
         }
 
-        public string Name
-        {
-            get { return "MusicBrainz"; }
-        }
+        public string Name => "MusicBrainz";
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Music/MusicExternalIds.cs b/MediaBrowser.Providers/Music/MusicExternalIds.cs
index 2750653c7f..614de11cac 100644
--- a/MediaBrowser.Providers/Music/MusicExternalIds.cs
+++ b/MediaBrowser.Providers/Music/MusicExternalIds.cs
@@ -7,20 +7,11 @@ namespace MediaBrowser.Providers.Music
 {
     public class MusicBrainzReleaseGroupExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "MusicBrainz Release Group"; }
-        }
+        public string Name => "MusicBrainz Release Group";
 
-        public string Key
-        {
-            get { return MetadataProviders.MusicBrainzReleaseGroup.ToString(); }
-        }
+        public string Key => MetadataProviders.MusicBrainzReleaseGroup.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://musicbrainz.org/release-group/{0}"; }
-        }
+        public string UrlFormatString => "https://musicbrainz.org/release-group/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -30,20 +21,11 @@ namespace MediaBrowser.Providers.Music
 
     public class MusicBrainzAlbumArtistExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "MusicBrainz Album Artist"; }
-        }
+        public string Name => "MusicBrainz Album Artist";
 
-        public string Key
-        {
-            get { return MetadataProviders.MusicBrainzAlbumArtist.ToString(); }
-        }
+        public string Key => MetadataProviders.MusicBrainzAlbumArtist.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://musicbrainz.org/artist/{0}"; }
-        }
+        public string UrlFormatString => "https://musicbrainz.org/artist/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -53,20 +35,11 @@ namespace MediaBrowser.Providers.Music
 
     public class MusicBrainzAlbumExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "MusicBrainz Album"; }
-        }
+        public string Name => "MusicBrainz Album";
 
-        public string Key
-        {
-            get { return MetadataProviders.MusicBrainzAlbum.ToString(); }
-        }
+        public string Key => MetadataProviders.MusicBrainzAlbum.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://musicbrainz.org/release/{0}"; }
-        }
+        public string UrlFormatString => "https://musicbrainz.org/release/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -76,20 +49,11 @@ namespace MediaBrowser.Providers.Music
 
     public class MusicBrainzArtistExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "MusicBrainz"; }
-        }
+        public string Name => "MusicBrainz";
 
-        public string Key
-        {
-            get { return MetadataProviders.MusicBrainzArtist.ToString(); }
-        }
+        public string Key => MetadataProviders.MusicBrainzArtist.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://musicbrainz.org/artist/{0}"; }
-        }
+        public string UrlFormatString => "https://musicbrainz.org/artist/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -99,20 +63,11 @@ namespace MediaBrowser.Providers.Music
 
     public class MusicBrainzOtherArtistExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "MusicBrainz Artist"; }
-        }
+        public string Name => "MusicBrainz Artist";
 
-        public string Key
-        {
-            get { return MetadataProviders.MusicBrainzArtist.ToString(); }
-        }
+        public string Key => MetadataProviders.MusicBrainzArtist.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://musicbrainz.org/artist/{0}"; }
-        }
+        public string UrlFormatString => "https://musicbrainz.org/artist/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -122,20 +77,11 @@ namespace MediaBrowser.Providers.Music
 
     public class MusicBrainzTrackId : IExternalId
     {
-        public string Name
-        {
-            get { return "MusicBrainz Track"; }
-        }
+        public string Name => "MusicBrainz Track";
 
-        public string Key
-        {
-            get { return MetadataProviders.MusicBrainzTrack.ToString(); }
-        }
+        public string Key => MetadataProviders.MusicBrainzTrack.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "https://musicbrainz.org/track/{0}"; }
-        }
+        public string UrlFormatString => "https://musicbrainz.org/track/{0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -145,20 +91,11 @@ namespace MediaBrowser.Providers.Music
 
     public class ImvdbId : IExternalId
     {
-        public string Name
-        {
-            get { return "IMVDb"; }
-        }
+        public string Name => "IMVDb";
 
-        public string Key
-        {
-            get { return "IMVDb"; }
-        }
+        public string Key => "IMVDb";
 
-        public string UrlFormatString
-        {
-            get { return null; }
-        }
+        public string UrlFormatString => null;
 
         public bool Supports(IHasProviderIds item)
         {
diff --git a/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs b/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs
index c30801a91d..8592b5c67d 100644
--- a/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs
+++ b/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs
@@ -86,24 +86,13 @@ namespace MediaBrowser.Providers.Omdb
             });
         }
 
-        public string Name
-        {
-            get { return "The Open Movie Database"; }
-        }
+        public string Name => "The Open Movie Database";
 
         public bool Supports(BaseItem item)
         {
             return item is Movie || item is Trailer || item is Episode;
         }
 
-        public int Order
-        {
-            get
-            {
-                // After other internet providers, because they're better
-                // But before fallback providers like screengrab
-                return 90;
-            }
-        }
+        public int Order => 90;
     }
 }
diff --git a/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs b/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
index 19ce7dddd5..5dab978c06 100644
--- a/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
+++ b/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
@@ -43,14 +43,7 @@ namespace MediaBrowser.Providers.Omdb
             _appHost = appHost;
         }
 
-        public int Order
-        {
-            get
-            {
-                // After primary option
-                return 2;
-            }
-        }
+        public int Order => 2;
 
         public Task<IEnumerable<RemoteSearchResult>> GetSearchResults(SeriesInfo searchInfo, CancellationToken cancellationToken)
         {
@@ -203,10 +196,7 @@ namespace MediaBrowser.Providers.Omdb
             return GetSearchResults(searchInfo, "movie", cancellationToken);
         }
 
-        public string Name
-        {
-            get { return "The Open Movie Database"; }
-        }
+        public string Name => "The Open Movie Database";
 
         public async Task<MetadataResult<Series>> GetMetadata(SeriesInfo info, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/People/MovieDbPersonImageProvider.cs b/MediaBrowser.Providers/People/MovieDbPersonImageProvider.cs
index 0a222b42f0..3019ee5062 100644
--- a/MediaBrowser.Providers/People/MovieDbPersonImageProvider.cs
+++ b/MediaBrowser.Providers/People/MovieDbPersonImageProvider.cs
@@ -27,15 +27,9 @@ namespace MediaBrowser.Providers.People
             _httpClient = httpClient;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "TheMovieDb"; }
-        }
+        public static string ProviderName => "TheMovieDb";
 
         public bool Supports(BaseItem item)
         {
@@ -124,10 +118,7 @@ namespace MediaBrowser.Providers.People
             return profile.iso_639_1 == null ? null : profile.iso_639_1.ToString();
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/People/MovieDbPersonProvider.cs b/MediaBrowser.Providers/People/MovieDbPersonProvider.cs
index ed4f7dcea0..8fc5f40f84 100644
--- a/MediaBrowser.Providers/People/MovieDbPersonProvider.cs
+++ b/MediaBrowser.Providers/People/MovieDbPersonProvider.cs
@@ -44,10 +44,7 @@ namespace MediaBrowser.Providers.People
             Current = this;
         }
 
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
         public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(PersonLookupInfo searchInfo, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/People/TvdbPersonImageProvider.cs b/MediaBrowser.Providers/People/TvdbPersonImageProvider.cs
index a282053cee..cf2acdf492 100644
--- a/MediaBrowser.Providers/People/TvdbPersonImageProvider.cs
+++ b/MediaBrowser.Providers/People/TvdbPersonImageProvider.cs
@@ -38,15 +38,9 @@ namespace MediaBrowser.Providers.People
             _xmlSettings = xmlSettings;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "TheTVDB"; }
-        }
+        public static string ProviderName => "TheTVDB";
 
         public bool Supports(BaseItem item)
         {
@@ -224,10 +218,7 @@ namespace MediaBrowser.Providers.People
             return null;
         }
 
-        public int Order
-        {
-            get { return 1; }
-        }
+        public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs b/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
index 3558353adc..2f2d8eaeb1 100644
--- a/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
+++ b/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
@@ -29,10 +29,7 @@ namespace MediaBrowser.Providers.Playlists
             _logger = logger;
         }
 
-        public string Name
-        {
-            get { return "Playlist Reader"; }
-        }
+        public string Name => "Playlist Reader";
 
         public Task<ItemUpdateType> FetchAsync(Playlist item, MetadataRefreshOptions options, CancellationToken cancellationToken)
         {
@@ -161,13 +158,6 @@ namespace MediaBrowser.Providers.Playlists
             return false;
         }
 
-        public int Order
-        {
-            get
-            {
-                // Run last
-                return 100;
-            }
-        }
+        public int Order => 100;
     }
 }
diff --git a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
index 7752bd03db..b28d2a5489 100644
--- a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
+++ b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
@@ -37,28 +37,10 @@ namespace MediaBrowser.Providers.Playlists
         {
         }
 
-        protected override bool EnableUpdatingGenresFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingGenresFromChildren => true;
 
-        protected override bool EnableUpdatingOfficialRatingFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingOfficialRatingFromChildren => true;
 
-        protected override bool EnableUpdatingStudiosFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingStudiosFromChildren => true;
     }
 }
diff --git a/MediaBrowser.Providers/Studios/StudiosImageProvider.cs b/MediaBrowser.Providers/Studios/StudiosImageProvider.cs
index 0d9341257b..481f0d01f5 100644
--- a/MediaBrowser.Providers/Studios/StudiosImageProvider.cs
+++ b/MediaBrowser.Providers/Studios/StudiosImageProvider.cs
@@ -28,10 +28,7 @@ namespace MediaBrowser.Providers.Studios
             _fileSystem = fileSystem;
         }
 
-        public string Name
-        {
-            get { return "Emby Designs"; }
-        }
+        public string Name => "Emby Designs";
 
         public bool Supports(BaseItem item)
         {
@@ -119,10 +116,7 @@ namespace MediaBrowser.Providers.Studios
             return EnsureList(url, file, _httpClient, _fileSystem, cancellationToken);
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/FanArt/FanArtSeasonProvider.cs b/MediaBrowser.Providers/TV/FanArt/FanArtSeasonProvider.cs
index 0d90aa35af..9d537f3dfd 100644
--- a/MediaBrowser.Providers/TV/FanArt/FanArtSeasonProvider.cs
+++ b/MediaBrowser.Providers/TV/FanArt/FanArtSeasonProvider.cs
@@ -37,15 +37,9 @@ namespace MediaBrowser.Providers.TV
             _json = json;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "FanArt"; }
-        }
+        public static string ProviderName => "FanArt";
 
         public bool Supports(BaseItem item)
         {
@@ -200,10 +194,7 @@ namespace MediaBrowser.Providers.TV
             }).Where(i => i != null));
         }
 
-        public int Order
-        {
-            get { return 1; }
-        }
+        public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs b/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs
index bb929b933b..abdd0c7bf2 100644
--- a/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs
@@ -46,15 +46,9 @@ namespace MediaBrowser.Providers.TV
             Current = this;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "FanArt"; }
-        }
+        public static string ProviderName => "FanArt";
 
         public bool Supports(BaseItem item)
         {
@@ -210,10 +204,7 @@ namespace MediaBrowser.Providers.TV
             }).Where(i => i != null));
         }
 
-        public int Order
-        {
-            get { return 1; }
-        }
+        public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs b/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs
index e79718f503..e37e867e5c 100644
--- a/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs
@@ -69,19 +69,9 @@ namespace MediaBrowser.Providers.TV
             return result;
         }
 
-        public int Order
-        {
-            get
-            {
-                // After TheTvDb
-                return 1;
-            }
-        }
+        public int Order => 1;
 
-        public string Name
-        {
-            get { return "The Open Movie Database"; }
-        }
+        public string Name => "The Open Movie Database";
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/SeasonMetadataService.cs b/MediaBrowser.Providers/TV/SeasonMetadataService.cs
index c21f86b9cd..c575057dee 100644
--- a/MediaBrowser.Providers/TV/SeasonMetadataService.cs
+++ b/MediaBrowser.Providers/TV/SeasonMetadataService.cs
@@ -54,13 +54,7 @@ namespace MediaBrowser.Providers.TV
             return updateType;
         }
 
-        protected override bool EnableUpdatingPremiereDateFromChildren
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool EnableUpdatingPremiereDateFromChildren => true;
 
         protected override IList<BaseItem> GetChildrenForMetadataUpdates(Season item)
         {
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs
index 392fa781c3..775b30d8d3 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs
@@ -117,23 +117,13 @@ namespace MediaBrowser.Providers.TV
             return GetResponse(url, cancellationToken);
         }
 
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
         public bool Supports(BaseItem item)
         {
             return item is Controller.Entities.TV.Episode;
         }
 
-        public int Order
-        {
-            get
-            {
-                // After tvdb
-                return 1;
-            }
-        }
+        public int Order => 1;
     }
 }
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
index 8b9146963b..49f73286d1 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
@@ -210,18 +210,8 @@ namespace MediaBrowser.Providers.TV
             return GetResponse(url, cancellationToken);
         }
 
-        public int Order
-        {
-            get
-            {
-                // After TheTvDb
-                return 1;
-            }
-        }
+        public int Order => 1;
 
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
     }
 }
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbProviderBase.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbProviderBase.cs
index 1ee62b272e..3df3cf8b8f 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbProviderBase.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbProviderBase.cs
@@ -34,10 +34,7 @@ namespace MediaBrowser.Providers.TV
             _logger = loggerFactory.CreateLogger(GetType().Name);
         }
 
-        protected ILogger Logger
-        {
-            get { return _logger; }
-        }
+        protected ILogger Logger => _logger;
 
         protected async Task<RootObject> GetEpisodeInfo(string seriesTmdbId, int season, int episodeNumber, string preferredMetadataLanguage,
             CancellationToken cancellationToken)
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs
index d4884cad9f..a29fd46dfa 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs
@@ -109,10 +109,7 @@ namespace MediaBrowser.Providers.TV
             return result;
         }
 
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
         public Task<IEnumerable<RemoteSearchResult>> GetSearchResults(SeasonInfo searchInfo, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesImageProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesImageProvider.cs
index 4300ff3a03..dc525d0fa7 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesImageProvider.cs
@@ -29,15 +29,9 @@ namespace MediaBrowser.Providers.TV
             _fileSystem = fileSystem;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "TheMovieDb"; }
-        }
+        public static string ProviderName => "TheMovieDb";
 
         public bool Supports(BaseItem item)
         {
@@ -177,14 +171,7 @@ namespace MediaBrowser.Providers.TV
             return null;
         }
 
-        public int Order
-        {
-            get
-            {
-                // After tvdb and fanart
-                return 2;
-            }
-        }
+        public int Order => 2;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
index 899d79c3eb..0844862db9 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
@@ -49,10 +49,7 @@ namespace MediaBrowser.Providers.TV
             Current = this;
         }
 
-        public string Name
-        {
-            get { return "TheMovieDb"; }
-        }
+        public string Name => "TheMovieDb";
 
         public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(SeriesInfo searchInfo, CancellationToken cancellationToken)
         {
@@ -681,14 +678,7 @@ namespace MediaBrowser.Providers.TV
             public string ResultLanguage { get; set; }
         }
 
-        public int Order
-        {
-            get
-            {
-                // After Tvdb
-                return 1;
-            }
-        }
+        public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeImageProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeImageProvider.cs
index 08d968f32b..c594cb923f 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeImageProvider.cs
@@ -30,10 +30,7 @@ namespace MediaBrowser.Providers.TV
             _fileSystem = fileSystem;
         }
 
-        public string Name
-        {
-            get { return "TheTVDB"; }
-        }
+        public string Name => "TheTVDB";
 
         public bool Supports(BaseItem item)
         {
@@ -163,10 +160,7 @@ namespace MediaBrowser.Providers.TV
             };
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
index 8364be2c3a..dc0a785ecb 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
@@ -93,10 +93,7 @@ namespace MediaBrowser.Providers.TV
             return Task.FromResult((IEnumerable<RemoteSearchResult>)list);
         }
 
-        public string Name
-        {
-            get { return "TheTVDB"; }
-        }
+        public string Name => "TheTVDB";
 
         public async Task<MetadataResult<Episode>> GetMetadata(EpisodeInfo searchInfo, CancellationToken cancellationToken)
         {
@@ -916,6 +913,6 @@ namespace MediaBrowser.Providers.TV
             });
         }
 
-        public int Order { get { return 0; } }
+        public int Order => 0;
     }
 }
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs
index 397afe87af..4cdfb4b11b 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs
@@ -38,15 +38,9 @@ namespace MediaBrowser.Providers.TV
             _xmlSettings = xmlSettings;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "TheTVDB"; }
-        }
+        public static string ProviderName => "TheTVDB";
 
         public bool Supports(BaseItem item)
         {
@@ -345,10 +339,7 @@ namespace MediaBrowser.Providers.TV
 
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
index 1bf22309da..3ee1bf7dcf 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
@@ -37,15 +37,9 @@ namespace MediaBrowser.Providers.TV
             _xmlReaderSettingsFactory = xmlReaderSettingsFactory;
         }
 
-        public string Name
-        {
-            get { return ProviderName; }
-        }
+        public string Name => ProviderName;
 
-        public static string ProviderName
-        {
-            get { return "TheTVDB"; }
-        }
+        public static string ProviderName => "TheTVDB";
 
         public bool Supports(BaseItem item)
         {
@@ -339,10 +333,7 @@ namespace MediaBrowser.Providers.TV
 
         }
 
-        public int Order
-        {
-            get { return 0; }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
index 2f3c766a48..f4fe6ee279 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
@@ -1735,10 +1735,7 @@ namespace MediaBrowser.Providers.TV
             return sbOutput.ToString();
         }
 
-        public string Name
-        {
-            get { return "TheTVDB"; }
-        }
+        public string Name => "TheTVDB";
 
         public async Task Identify(SeriesInfo info)
         {
@@ -1758,13 +1755,7 @@ namespace MediaBrowser.Providers.TV
             }
         }
 
-        public int Order
-        {
-            get
-            {
-                return 0;
-            }
-        }
+        public int Order => 0;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
         {
diff --git a/MediaBrowser.Providers/TV/TvExternalIds.cs b/MediaBrowser.Providers/TV/TvExternalIds.cs
index 058e9a762c..001ce14653 100644
--- a/MediaBrowser.Providers/TV/TvExternalIds.cs
+++ b/MediaBrowser.Providers/TV/TvExternalIds.cs
@@ -6,20 +6,11 @@ namespace MediaBrowser.Providers.TV
 {
     public class Zap2ItExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "Zap2It"; }
-        }
+        public string Name => "Zap2It";
 
-        public string Key
-        {
-            get { return MetadataProviders.Zap2It.ToString(); }
-        }
+        public string Key => MetadataProviders.Zap2It.ToString();
 
-        public string UrlFormatString
-        {
-            get { return "http://tvlistings.zap2it.com/overview.html?programSeriesId={0}"; }
-        }
+        public string UrlFormatString => "http://tvlistings.zap2it.com/overview.html?programSeriesId={0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -29,20 +20,11 @@ namespace MediaBrowser.Providers.TV
 
     public class TvdbExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheTVDB"; }
-        }
+        public string Name => "TheTVDB";
 
-        public string Key
-        {
-            get { return MetadataProviders.Tvdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Tvdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return TvdbPrescanTask.TvdbBaseUrl + "?tab=series&id={0}"; }
-        }
+        public string UrlFormatString => TvdbPrescanTask.TvdbBaseUrl + "?tab=series&id={0}";
 
         public bool Supports(IHasProviderIds item)
         {
@@ -52,20 +34,11 @@ namespace MediaBrowser.Providers.TV
 
     public class TvdbSeasonExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheTVDB"; }
-        }
+        public string Name => "TheTVDB";
 
-        public string Key
-        {
-            get { return MetadataProviders.Tvdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Tvdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return null; }
-        }
+        public string UrlFormatString => null;
 
         public bool Supports(IHasProviderIds item)
         {
@@ -75,20 +48,11 @@ namespace MediaBrowser.Providers.TV
 
     public class TvdbEpisodeExternalId : IExternalId
     {
-        public string Name
-        {
-            get { return "TheTVDB"; }
-        }
+        public string Name => "TheTVDB";
 
-        public string Key
-        {
-            get { return MetadataProviders.Tvdb.ToString(); }
-        }
+        public string Key => MetadataProviders.Tvdb.ToString();
 
-        public string UrlFormatString
-        {
-            get { return TvdbPrescanTask.TvdbBaseUrl + "?tab=episode&id={0}"; }
-        }
+        public string UrlFormatString => TvdbPrescanTask.TvdbBaseUrl + "?tab=episode&id={0}";
 
         public bool Supports(IHasProviderIds item)
         {
diff --git a/MediaBrowser.Providers/Videos/VideoMetadataService.cs b/MediaBrowser.Providers/Videos/VideoMetadataService.cs
index 01ca0b2aa7..adaf39c40d 100644
--- a/MediaBrowser.Providers/Videos/VideoMetadataService.cs
+++ b/MediaBrowser.Providers/Videos/VideoMetadataService.cs
@@ -11,14 +11,7 @@ namespace MediaBrowser.Providers.Videos
 {
     public class VideoMetadataService : MetadataService<Video, ItemLookupInfo>
     {
-        public override int Order
-        {
-            get
-            {
-                // Make sure the type-specific services get picked first
-                return 10;
-            }
-        }
+        public override int Order => 10;
 
         protected override void MergeData(MetadataResult<Video> source, MetadataResult<Video> target, MetadataFields[] lockedFields, bool replaceData, bool mergeMetadataSettings)
         {
diff --git a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
index 86691841d6..55b49d2735 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
@@ -95,10 +95,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
             Fetch(item, metadataFile, settings, cancellationToken);
         }
 
-        protected virtual bool SupportsUrlAfterClosingXmlTag
-        {
-            get { return false; }
-        }
+        protected virtual bool SupportsUrlAfterClosingXmlTag => false;
 
         /// <summary>
         /// Fetches the specified item.
@@ -223,10 +220,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
             }
         }
 
-        protected virtual string MovieDbParserSearchString
-        {
-            get { return "themoviedb.org/movie/"; }
-        }
+        protected virtual string MovieDbParserSearchString => "themoviedb.org/movie/";
 
         protected void ParseProviderLinks(T item, string xml)
         {
diff --git a/MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs
index b5a7d5959c..21ee8f92f4 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs
@@ -15,13 +15,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 {
     class MovieNfoParser : BaseNfoParser<Video>
     {
-        protected override bool SupportsUrlAfterClosingXmlTag
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool SupportsUrlAfterClosingXmlTag => true;
 
         /// <summary>
         /// Fetches the data from XML node.
diff --git a/MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs
index 853d14e6a3..571fc50358 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs
@@ -13,18 +13,9 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 {
     public class SeriesNfoParser : BaseNfoParser<Series>
     {
-        protected override bool SupportsUrlAfterClosingXmlTag
-        {
-            get
-            {
-                return true;
-            }
-        }
+        protected override bool SupportsUrlAfterClosingXmlTag => true;
 
-        protected override string MovieDbParserSearchString
-        {
-            get { return "themoviedb.org/tv/"; }
-        }
+        protected override string MovieDbParserSearchString => "themoviedb.org/tv/";
 
         /// <summary>
         /// Fetches the data from XML node.
diff --git a/MediaBrowser.XbmcMetadata/Providers/BaseNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/BaseNfoProvider.cs
index 4bbd953479..0a47ac8e1c 100644
--- a/MediaBrowser.XbmcMetadata/Providers/BaseNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/BaseNfoProvider.cs
@@ -68,12 +68,6 @@ namespace MediaBrowser.XbmcMetadata.Providers
             return file.Exists && FileSystem.GetLastWriteTimeUtc(file) > item.DateLastSaved;
         }
 
-        public string Name
-        {
-            get
-            {
-                return BaseNfoSaver.SaverName;
-            }
-        }
+        public string Name => BaseNfoSaver.SaverName;
     }
 }
diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
index ca376c9ae7..efc6b33583 100644
--- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
@@ -130,21 +130,9 @@ namespace MediaBrowser.XbmcMetadata.Savers
             }
         }
 
-        public string Name
-        {
-            get
-            {
-                return SaverName;
-            }
-        }
+        public string Name => SaverName;
 
-        public static string SaverName
-        {
-            get
-            {
-                return "Nfo";
-            }
-        }
+        public static string SaverName => "Nfo";
 
         public string GetSavePath(BaseItem item)
         {
diff --git a/SocketHttpListener/CloseEventArgs.cs b/SocketHttpListener/CloseEventArgs.cs
index 12a24bb4a4..c6460fd230 100644
--- a/SocketHttpListener/CloseEventArgs.cs
+++ b/SocketHttpListener/CloseEventArgs.cs
@@ -51,13 +51,7 @@ namespace SocketHttpListener
         /// <value>
         /// A <see cref="ushort"/> that represents the status code for the close if any.
         /// </value>
-        public ushort Code
-        {
-            get
-            {
-                return _code;
-            }
-        }
+        public ushort Code => _code;
 
         /// <summary>
         /// Gets the reason for the close.
@@ -65,13 +59,7 @@ namespace SocketHttpListener
         /// <value>
         /// A <see cref="string"/> that represents the reason for the close if any.
         /// </value>
-        public string Reason
-        {
-            get
-            {
-                return _reason;
-            }
-        }
+        public string Reason => _reason;
 
         /// <summary>
         /// Gets a value indicating whether the WebSocket connection has been closed cleanly.
@@ -81,15 +69,9 @@ namespace SocketHttpListener
         /// </value>
         public bool WasClean
         {
-            get
-            {
-                return _clean;
-            }
+            get => _clean;
 
-            internal set
-            {
-                _clean = value;
-            }
+            internal set => _clean = value;
         }
 
         #endregion
diff --git a/SocketHttpListener/ErrorEventArgs.cs b/SocketHttpListener/ErrorEventArgs.cs
index 6a85feb9cc..9502d2a156 100644
--- a/SocketHttpListener/ErrorEventArgs.cs
+++ b/SocketHttpListener/ErrorEventArgs.cs
@@ -35,13 +35,7 @@ namespace SocketHttpListener
         /// <value>
         /// A <see cref="string"/> that represents the error message.
         /// </value>
-        public string Message
-        {
-            get
-            {
-                return _message;
-            }
-        }
+        public string Message => _message;
 
         #endregion
     }
diff --git a/SocketHttpListener/HttpBase.cs b/SocketHttpListener/HttpBase.cs
index cc484ccdab..fea91d84b0 100644
--- a/SocketHttpListener/HttpBase.cs
+++ b/SocketHttpListener/HttpBase.cs
@@ -49,21 +49,9 @@ namespace SocketHttpListener
             }
         }
 
-        public QueryParamCollection Headers
-        {
-            get
-            {
-                return _headers;
-            }
-        }
+        public QueryParamCollection Headers => _headers;
 
-        public Version ProtocolVersion
-        {
-            get
-            {
-                return _version;
-            }
-        }
+        public Version ProtocolVersion => _version;
 
         #endregion
 
diff --git a/SocketHttpListener/HttpResponse.cs b/SocketHttpListener/HttpResponse.cs
index 24befccb34..bcfa4a9062 100644
--- a/SocketHttpListener/HttpResponse.cs
+++ b/SocketHttpListener/HttpResponse.cs
@@ -46,13 +46,7 @@ namespace SocketHttpListener
 
         #region Public Properties
 
-        public CookieCollection Cookies
-        {
-            get
-            {
-                return GetCookies(Headers, true);
-            }
-        }
+        public CookieCollection Cookies => GetCookies(Headers, true);
 
         private static CookieCollection GetCookies(QueryParamCollection headers, bool response)
         {
@@ -62,21 +56,9 @@ namespace SocketHttpListener
                    : CookieHelper.Parse(headers[name], response);
         }
 
-        public bool IsProxyAuthenticationRequired
-        {
-            get
-            {
-                return _code == "407";
-            }
-        }
+        public bool IsProxyAuthenticationRequired => _code == "407";
 
-        public bool IsUnauthorized
-        {
-            get
-            {
-                return _code == "401";
-            }
-        }
+        public bool IsUnauthorized => _code == "401";
 
         public bool IsWebSocketResponse
         {
@@ -90,21 +72,9 @@ namespace SocketHttpListener
             }
         }
 
-        public string Reason
-        {
-            get
-            {
-                return _reason;
-            }
-        }
+        public string Reason => _reason;
 
-        public string StatusCode
-        {
-            get
-            {
-                return _code;
-            }
-        }
+        public string StatusCode => _code;
 
         #endregion
 
diff --git a/SocketHttpListener/MessageEventArgs.cs b/SocketHttpListener/MessageEventArgs.cs
index 5ee4099b86..d9bccbf3f9 100644
--- a/SocketHttpListener/MessageEventArgs.cs
+++ b/SocketHttpListener/MessageEventArgs.cs
@@ -48,13 +48,7 @@ namespace SocketHttpListener
         /// <value>
         /// A <see cref="string"/> that contains the received data.
         /// </value>
-        public string Data
-        {
-            get
-            {
-                return _data;
-            }
-        }
+        public string Data => _data;
 
         /// <summary>
         /// Gets the received data as an array of <see cref="byte"/>.
@@ -62,13 +56,7 @@ namespace SocketHttpListener
         /// <value>
         /// An array of <see cref="byte"/> that contains the received data.
         /// </value>
-        public byte[] RawData
-        {
-            get
-            {
-                return _rawData;
-            }
-        }
+        public byte[] RawData => _rawData;
 
         /// <summary>
         /// Gets the type of the received data.
@@ -76,13 +64,7 @@ namespace SocketHttpListener
         /// <value>
         /// One of the <see cref="Opcode"/> values, indicates the type of the received data.
         /// </value>
-        public Opcode Type
-        {
-            get
-            {
-                return _opcode;
-            }
-        }
+        public Opcode Type => _opcode;
 
         #endregion
 
diff --git a/SocketHttpListener/Net/ChunkStream.cs b/SocketHttpListener/Net/ChunkStream.cs
index b9b5edb381..4bf3a6dea5 100644
--- a/SocketHttpListener/Net/ChunkStream.cs
+++ b/SocketHttpListener/Net/ChunkStream.cs
@@ -180,10 +180,7 @@ namespace SocketHttpListener.Net
                 InternalWrite(buffer, ref offset, size);
         }
 
-        public bool WantMore
-        {
-            get { return (_chunkRead != _chunkSize || _chunkSize != 0 || _state != State.None); }
-        }
+        public bool WantMore => (_chunkRead != _chunkSize || _chunkSize != 0 || _state != State.None);
 
         public bool DataAvailable
         {
@@ -202,15 +199,9 @@ namespace SocketHttpListener.Net
             }
         }
 
-        public int TotalDataSize
-        {
-            get { return _totalWritten; }
-        }
+        public int TotalDataSize => _totalWritten;
 
-        public int ChunkLeft
-        {
-            get { return _chunkSize - _chunkRead; }
-        }
+        public int ChunkLeft => _chunkSize - _chunkRead;
 
         private State ReadBody(byte[] buffer, ref int offset, int size)
         {
diff --git a/SocketHttpListener/Net/ChunkedInputStream.cs b/SocketHttpListener/Net/ChunkedInputStream.cs
index e74c64e549..cdf7ac649b 100644
--- a/SocketHttpListener/Net/ChunkedInputStream.cs
+++ b/SocketHttpListener/Net/ChunkedInputStream.cs
@@ -67,8 +67,8 @@ namespace SocketHttpListener.Net
 
         public ChunkStream Decoder
         {
-            get { return _decoder; }
-            set { _decoder = value; }
+            get => _decoder;
+            set => _decoder = value;
         }
 
         protected override int ReadCore(byte[] buffer, int offset, int count)
diff --git a/SocketHttpListener/Net/HttpConnection.cs b/SocketHttpListener/Net/HttpConnection.cs
index 86f9dc6357..f6db5f0b22 100644
--- a/SocketHttpListener/Net/HttpConnection.cs
+++ b/SocketHttpListener/Net/HttpConnection.cs
@@ -89,13 +89,7 @@ namespace SocketHttpListener.Net
             }
         }
 
-        public Stream Stream
-        {
-            get
-            {
-                return _stream;
-            }
-        }
+        public Stream Stream => _stream;
 
         public async Task Init()
         {
@@ -131,15 +125,9 @@ namespace SocketHttpListener.Net
             _context = new HttpListenerContext(this, _textEncoding);
         }
 
-        public bool IsClosed
-        {
-            get { return (_socket == null); }
-        }
+        public bool IsClosed => (_socket == null);
 
-        public int Reuses
-        {
-            get { return _reuses; }
-        }
+        public int Reuses => _reuses;
 
         public IPEndPoint LocalEndPoint
         {
@@ -153,20 +141,14 @@ namespace SocketHttpListener.Net
             }
         }
 
-        public IPEndPoint RemoteEndPoint
-        {
-            get { return _socket.RemoteEndPoint as IPEndPoint; }
-        }
+        public IPEndPoint RemoteEndPoint => _socket.RemoteEndPoint as IPEndPoint;
 
-        public bool IsSecure
-        {
-            get { return secure; }
-        }
+        public bool IsSecure => secure;
 
         public ListenerPrefix Prefix
         {
-            get { return _prefix; }
-            set { _prefix = value; }
+            get => _prefix;
+            set => _prefix = value;
         }
 
         private void OnTimeout(object unused)
diff --git a/SocketHttpListener/Net/HttpEndPointListener.cs b/SocketHttpListener/Net/HttpEndPointListener.cs
index ee6ddaa84a..0f1ce696f7 100644
--- a/SocketHttpListener/Net/HttpEndPointListener.cs
+++ b/SocketHttpListener/Net/HttpEndPointListener.cs
@@ -58,13 +58,7 @@ namespace SocketHttpListener.Net
             CreateSocket();
         }
 
-        internal HttpListener Listener
-        {
-            get
-            {
-                return _listener;
-            }
-        }
+        internal HttpListener Listener => _listener;
 
         private void CreateSocket()
         {
diff --git a/SocketHttpListener/Net/HttpListener.cs b/SocketHttpListener/Net/HttpListener.cs
index 4e2239a1a0..8ec6b89aab 100644
--- a/SocketHttpListener/Net/HttpListener.cs
+++ b/SocketHttpListener/Net/HttpListener.cs
@@ -70,7 +70,7 @@ namespace SocketHttpListener.Net
         // TODO: Digest, NTLM and Negotiate require ControlPrincipal
         public AuthenticationSchemes AuthenticationSchemes
         {
-            get { return auth_schemes; }
+            get => auth_schemes;
             set
             {
                 CheckDisposed();
@@ -80,7 +80,7 @@ namespace SocketHttpListener.Net
 
         public AuthenticationSchemeSelector AuthenticationSchemeSelectorDelegate
         {
-            get { return auth_selector; }
+            get => auth_selector;
             set
             {
                 CheckDisposed();
@@ -88,15 +88,9 @@ namespace SocketHttpListener.Net
             }
         }
 
-        public bool IsListening
-        {
-            get { return listening; }
-        }
+        public bool IsListening => listening;
 
-        public static bool IsSupported
-        {
-            get { return true; }
-        }
+        public static bool IsSupported => true;
 
         public HttpListenerPrefixCollection Prefixes
         {
@@ -110,7 +104,7 @@ namespace SocketHttpListener.Net
         // TODO: use this
         public string Realm
         {
-            get { return realm; }
+            get => realm;
             set
             {
                 CheckDisposed();
@@ -120,7 +114,7 @@ namespace SocketHttpListener.Net
 
         public bool UnsafeConnectionNtlmAuthentication
         {
-            get { return unsafe_ntlm_auth; }
+            get => unsafe_ntlm_auth;
             set
             {
                 CheckDisposed();
@@ -142,10 +136,7 @@ namespace SocketHttpListener.Net
         //    }
         //}
 
-        internal X509Certificate Certificate
-        {
-            get { return _certificate; }
-        }
+        internal X509Certificate Certificate => _certificate;
 
         public void Abort()
         {
diff --git a/SocketHttpListener/Net/HttpListenerBasicIdentity.cs b/SocketHttpListener/Net/HttpListenerBasicIdentity.cs
index 391fc931ed..5f6ec44b96 100644
--- a/SocketHttpListener/Net/HttpListenerBasicIdentity.cs
+++ b/SocketHttpListener/Net/HttpListenerBasicIdentity.cs
@@ -12,10 +12,7 @@ namespace SocketHttpListener.Net
             this.password = password;
         }
 
-        public virtual string Password
-        {
-            get { return password; }
-        }
+        public virtual string Password => password;
     }
 
     public class GenericIdentity : IIdentity
@@ -43,28 +40,10 @@ namespace SocketHttpListener.Net
             m_type = type;
         }
 
-        public virtual string Name
-        {
-            get
-            {
-                return m_name;
-            }
-        }
+        public virtual string Name => m_name;
 
-        public virtual string AuthenticationType
-        {
-            get
-            {
-                return m_type;
-            }
-        }
+        public virtual string AuthenticationType => m_type;
 
-        public virtual bool IsAuthenticated
-        {
-            get
-            {
-                return !m_name.Equals("");
-            }
-        }
+        public virtual bool IsAuthenticated => !m_name.Equals("");
     }
 }
diff --git a/SocketHttpListener/Net/HttpListenerContext.cs b/SocketHttpListener/Net/HttpListenerContext.cs
index 0bb31ef3e4..8045299c62 100644
--- a/SocketHttpListener/Net/HttpListenerContext.cs
+++ b/SocketHttpListener/Net/HttpListenerContext.cs
@@ -18,13 +18,7 @@ namespace SocketHttpListener.Net
         // This can be used to cache the results of HttpListener.AuthenticationSchemeSelectorDelegate.
         internal AuthenticationSchemes AuthenticationSchemes { get; set; }
 
-        public HttpListenerResponse Response
-        {
-            get
-            {
-                return _response;
-            }
-        }
+        public HttpListenerResponse Response => _response;
 
         public Task<HttpListenerWebSocketContext> AcceptWebSocketAsync(string subProtocol)
         {
@@ -62,13 +56,7 @@ namespace SocketHttpListener.Net
             }
         }
 
-        public virtual IIdentity Identity
-        {
-            get
-            {
-                return m_identity;
-            }
-        }
+        public virtual IIdentity Identity => m_identity;
 
         public virtual bool IsInRole(string role)
         {
diff --git a/SocketHttpListener/Net/HttpListenerPrefixCollection.cs b/SocketHttpListener/Net/HttpListenerPrefixCollection.cs
index f0e496a5a7..97dc6797ce 100644
--- a/SocketHttpListener/Net/HttpListenerPrefixCollection.cs
+++ b/SocketHttpListener/Net/HttpListenerPrefixCollection.cs
@@ -18,20 +18,11 @@ namespace SocketHttpListener.Net
             this.listener = listener;
         }
 
-        public int Count
-        {
-            get { return prefixes.Count; }
-        }
+        public int Count => prefixes.Count;
 
-        public bool IsReadOnly
-        {
-            get { return false; }
-        }
+        public bool IsReadOnly => false;
 
-        public bool IsSynchronized
-        {
-            get { return false; }
-        }
+        public bool IsSynchronized => false;
 
         public void Add(string uriPrefix)
         {
diff --git a/SocketHttpListener/Net/HttpListenerResponse.Managed.cs b/SocketHttpListener/Net/HttpListenerResponse.Managed.cs
index 9097a85f53..198cdcf764 100644
--- a/SocketHttpListener/Net/HttpListenerResponse.Managed.cs
+++ b/SocketHttpListener/Net/HttpListenerResponse.Managed.cs
@@ -38,7 +38,7 @@ namespace SocketHttpListener.Net
 
         public Version ProtocolVersion
         {
-            get { return _version; }
+            get => _version;
             set
             {
                 CheckDisposed();
@@ -57,7 +57,7 @@ namespace SocketHttpListener.Net
 
         public int StatusCode
         {
-            get { return _statusCode; }
+            get => _statusCode;
             set
             {
                 CheckDisposed();
diff --git a/SocketHttpListener/Net/HttpListenerResponse.cs b/SocketHttpListener/Net/HttpListenerResponse.cs
index f9455db727..a32aca0433 100644
--- a/SocketHttpListener/Net/HttpListenerResponse.cs
+++ b/SocketHttpListener/Net/HttpListenerResponse.cs
@@ -15,16 +15,13 @@ namespace SocketHttpListener.Net
         private string _statusDescription;
         private WebHeaderCollection _webHeaders = new WebHeaderCollection();
 
-        public WebHeaderCollection Headers
-        {
-            get { return _webHeaders; }
-        }
+        public WebHeaderCollection Headers => _webHeaders;
 
         public Encoding ContentEncoding { get; set; }
 
         public string ContentType
         {
-            get { return Headers["Content-Type"]; }
+            get => Headers["Content-Type"];
             set
             {
                 CheckDisposed();
@@ -39,13 +36,13 @@ namespace SocketHttpListener.Net
             }
         }
 
-        private HttpListenerContext HttpListenerContext { get { return _httpContext; } }
+        private HttpListenerContext HttpListenerContext => _httpContext;
 
-        private HttpListenerRequest HttpListenerRequest { get { return HttpListenerContext.Request; } }
+        private HttpListenerRequest HttpListenerRequest => HttpListenerContext.Request;
 
         internal EntitySendFormat EntitySendFormat
         {
-            get { return (EntitySendFormat)_boundaryType; }
+            get => (EntitySendFormat)_boundaryType;
             set
             {
                 CheckDisposed();
@@ -64,8 +61,8 @@ namespace SocketHttpListener.Net
 
         public bool SendChunked
         {
-            get { return EntitySendFormat == EntitySendFormat.Chunked; }
-            set { EntitySendFormat = value ? EntitySendFormat.Chunked : EntitySendFormat.ContentLength; }
+            get => EntitySendFormat == EntitySendFormat.Chunked;
+            set => EntitySendFormat = value ? EntitySendFormat.Chunked : EntitySendFormat.ContentLength;
         }
 
         // We MUST NOT send message-body when we send responses with these Status codes
@@ -85,7 +82,7 @@ namespace SocketHttpListener.Net
 
         public long ContentLength64
         {
-            get { return _contentLength; }
+            get => _contentLength;
             set
             {
                 CheckDisposed();
@@ -104,13 +101,13 @@ namespace SocketHttpListener.Net
 
         public CookieCollection Cookies
         {
-            get { return _cookies ?? (_cookies = new CookieCollection()); }
-            set { _cookies = value; }
+            get => _cookies ?? (_cookies = new CookieCollection());
+            set => _cookies = value;
         }
 
         public bool KeepAlive
         {
-            get { return _keepAlive; }
+            get => _keepAlive;
             set
             {
                 CheckDisposed();
@@ -130,7 +127,7 @@ namespace SocketHttpListener.Net
 
         public string RedirectLocation
         {
-            get { return Headers["Location"]; }
+            get => Headers["Location"];
             set
             {
                 // note that this doesn't set the status code to a redirect one
diff --git a/SocketHttpListener/Net/HttpRequestStream.cs b/SocketHttpListener/Net/HttpRequestStream.cs
index ec3ca8d335..1c554df20b 100644
--- a/SocketHttpListener/Net/HttpRequestStream.cs
+++ b/SocketHttpListener/Net/HttpRequestStream.cs
@@ -84,25 +84,13 @@ namespace SocketHttpListener.Net
         public override void Flush() { }
         public override Task FlushAsync(CancellationToken cancellationToken) => Task.CompletedTask;
 
-        public override long Length
-        {
-            get
-            {
-                throw new NotImplementedException();
-            }
-        }
+        public override long Length => throw new NotImplementedException();
 
         public override long Position
         {
-            get
-            {
-                throw new NotImplementedException();
-            }
+            get => throw new NotImplementedException();
 
-            set
-            {
-                throw new NotImplementedException();
-            }
+            set => throw new NotImplementedException();
         }
 
         public override long Seek(long offset, SeekOrigin origin)
diff --git a/SocketHttpListener/Net/HttpResponseStream.cs b/SocketHttpListener/Net/HttpResponseStream.cs
index bfe0199dee..085c2ad0cb 100644
--- a/SocketHttpListener/Net/HttpResponseStream.cs
+++ b/SocketHttpListener/Net/HttpResponseStream.cs
@@ -17,25 +17,13 @@ namespace SocketHttpListener.Net
         public override void Flush() { }
         public override Task FlushAsync(CancellationToken cancellationToken) => Task.CompletedTask;
 
-        public override long Length
-        {
-            get
-            {
-                throw new NotImplementedException();
-            }
-        }
+        public override long Length => throw new NotImplementedException();
 
         public override long Position
         {
-            get
-            {
-                throw new NotImplementedException();
-            }
+            get => throw new NotImplementedException();
 
-            set
-            {
-                throw new NotImplementedException();
-            }
+            set => throw new NotImplementedException();
         }
 
         public override long Seek(long offset, SeekOrigin origin)
diff --git a/SocketHttpListener/Net/HttpStreamAsyncResult.cs b/SocketHttpListener/Net/HttpStreamAsyncResult.cs
index d96988fcef..46944c624a 100644
--- a/SocketHttpListener/Net/HttpStreamAsyncResult.cs
+++ b/SocketHttpListener/Net/HttpStreamAsyncResult.cs
@@ -47,10 +47,7 @@ namespace SocketHttpListener.Net
             }
         }
 
-        public object AsyncState
-        {
-            get { return _state; }
-        }
+        public object AsyncState => _state;
 
         public WaitHandle AsyncWaitHandle
         {
diff --git a/SocketHttpListener/Net/ListenerPrefix.cs b/SocketHttpListener/Net/ListenerPrefix.cs
index b29cc5c6db..3e78752fdb 100644
--- a/SocketHttpListener/Net/ListenerPrefix.cs
+++ b/SocketHttpListener/Net/ListenerPrefix.cs
@@ -26,28 +26,16 @@ namespace SocketHttpListener.Net
 
         public IPAddress[] Addresses
         {
-            get { return _addresses; }
-            set { _addresses = value; }
-        }
-        public bool Secure
-        {
-            get { return _secure; }
+            get => _addresses;
+            set => _addresses = value;
         }
+        public bool Secure => _secure;
 
-        public string Host
-        {
-            get { return _host; }
-        }
+        public string Host => _host;
 
-        public int Port
-        {
-            get { return _port; }
-        }
+        public int Port => _port;
 
-        public string Path
-        {
-            get { return _path; }
-        }
+        public string Path => _path;
 
         // Equals and GetHashCode are required to detect duplicates in HttpListenerPrefixCollection.
         public override bool Equals(object o)
diff --git a/SocketHttpListener/PayloadData.cs b/SocketHttpListener/PayloadData.cs
index 829db63042..6d15a6bcb1 100644
--- a/SocketHttpListener/PayloadData.cs
+++ b/SocketHttpListener/PayloadData.cs
@@ -54,50 +54,21 @@ namespace SocketHttpListener
 
         #region Internal Properties
 
-        internal bool ContainsReservedCloseStatusCode
-        {
-            get
-            {
-                return _applicationData.Length > 1 &&
-                       _applicationData.SubArray(0, 2).ToUInt16(ByteOrder.Big).IsReserved();
-            }
-        }
+        internal bool ContainsReservedCloseStatusCode =>
+            _applicationData.Length > 1 &&
+            _applicationData.SubArray(0, 2).ToUInt16(ByteOrder.Big).IsReserved();
 
         #endregion
 
         #region Public Properties
 
-        public byte[] ApplicationData
-        {
-            get
-            {
-                return _applicationData;
-            }
-        }
+        public byte[] ApplicationData => _applicationData;
 
-        public byte[] ExtensionData
-        {
-            get
-            {
-                return _extensionData;
-            }
-        }
+        public byte[] ExtensionData => _extensionData;
 
-        public bool IsMasked
-        {
-            get
-            {
-                return _masked;
-            }
-        }
+        public bool IsMasked => _masked;
 
-        public ulong Length
-        {
-            get
-            {
-                return (ulong)(_extensionData.Length + _applicationData.Length);
-            }
-        }
+        public ulong Length => (ulong)(_extensionData.Length + _applicationData.Length);
 
         #endregion
 
diff --git a/SocketHttpListener/SocketStream.cs b/SocketHttpListener/SocketStream.cs
index 6631bb267a..f51fde97ef 100644
--- a/SocketHttpListener/SocketStream.cs
+++ b/SocketHttpListener/SocketStream.cs
@@ -17,26 +17,18 @@ namespace SocketHttpListener
         {
         }
 
-        public override bool CanRead
-        {
-            get { return true; }
-        }
-        public override bool CanSeek
-        {
-            get { return false; }
-        }
-        public override bool CanWrite
-        {
-            get { return true; }
-        }
-        public override long Length
-        {
-            get { throw new NotImplementedException(); }
-        }
+        public override bool CanRead => true;
+
+        public override bool CanSeek => false;
+
+        public override bool CanWrite => true;
+
+        public override long Length => throw new NotImplementedException();
+
         public override long Position
         {
-            get { throw new NotImplementedException(); }
-            set { throw new NotImplementedException(); }
+            get => throw new NotImplementedException();
+            set => throw new NotImplementedException();
         }
 
         public override void Write(byte[] buffer, int offset, int count)
diff --git a/SocketHttpListener/WebSocket.cs b/SocketHttpListener/WebSocket.cs
index 98b9c776d5..e5b3f89bc7 100644
--- a/SocketHttpListener/WebSocket.cs
+++ b/SocketHttpListener/WebSocket.cs
@@ -78,11 +78,7 @@ namespace SocketHttpListener
             init();
         }
 
-        public static TimeSpan DefaultKeepAliveInterval
-        {
-            // In the .NET Framework, this pulls the value from a P/Invoke.  Here we just hardcode it to a reasonable default.
-            get { return TimeSpan.FromSeconds(30); }
-        }
+        public static TimeSpan DefaultKeepAliveInterval => TimeSpan.FromSeconds(30);
 
         #endregion
 
@@ -93,13 +89,7 @@ namespace SocketHttpListener
         /// One of the <see cref="WebSocketState"/> enum values, indicates the state of the WebSocket
         /// connection. The default value is <see cref="WebSocketState.Connecting"/>.
         /// </value>
-        public WebSocketState ReadyState
-        {
-            get
-            {
-                return _readyState;
-            }
-        }
+        public WebSocketState ReadyState => _readyState;
 
         #region Public Events
 
diff --git a/SocketHttpListener/WebSocketFrame.cs b/SocketHttpListener/WebSocketFrame.cs
index c695c605c3..74ed23c457 100644
--- a/SocketHttpListener/WebSocketFrame.cs
+++ b/SocketHttpListener/WebSocketFrame.cs
@@ -106,197 +106,53 @@ namespace SocketHttpListener
 
         #region Public Properties
 
-        public byte[] ExtendedPayloadLength
-        {
-            get
-            {
-                return _extPayloadLength;
-            }
-        }
+        public byte[] ExtendedPayloadLength => _extPayloadLength;
 
-        public Fin Fin
-        {
-            get
-            {
-                return _fin;
-            }
-        }
+        public Fin Fin => _fin;
 
-        public bool IsBinary
-        {
-            get
-            {
-                return _opcode == Opcode.Binary;
-            }
-        }
+        public bool IsBinary => _opcode == Opcode.Binary;
 
-        public bool IsClose
-        {
-            get
-            {
-                return _opcode == Opcode.Close;
-            }
-        }
+        public bool IsClose => _opcode == Opcode.Close;
 
-        public bool IsCompressed
-        {
-            get
-            {
-                return _rsv1 == Rsv.On;
-            }
-        }
+        public bool IsCompressed => _rsv1 == Rsv.On;
 
-        public bool IsContinuation
-        {
-            get
-            {
-                return _opcode == Opcode.Cont;
-            }
-        }
+        public bool IsContinuation => _opcode == Opcode.Cont;
 
-        public bool IsControl
-        {
-            get
-            {
-                return _opcode == Opcode.Close || _opcode == Opcode.Ping || _opcode == Opcode.Pong;
-            }
-        }
+        public bool IsControl => _opcode == Opcode.Close || _opcode == Opcode.Ping || _opcode == Opcode.Pong;
 
-        public bool IsData
-        {
-            get
-            {
-                return _opcode == Opcode.Binary || _opcode == Opcode.Text;
-            }
-        }
+        public bool IsData => _opcode == Opcode.Binary || _opcode == Opcode.Text;
 
-        public bool IsFinal
-        {
-            get
-            {
-                return _fin == Fin.Final;
-            }
-        }
+        public bool IsFinal => _fin == Fin.Final;
 
-        public bool IsFragmented
-        {
-            get
-            {
-                return _fin == Fin.More || _opcode == Opcode.Cont;
-            }
-        }
+        public bool IsFragmented => _fin == Fin.More || _opcode == Opcode.Cont;
 
-        public bool IsMasked
-        {
-            get
-            {
-                return _mask == Mask.Mask;
-            }
-        }
+        public bool IsMasked => _mask == Mask.Mask;
 
-        public bool IsPerMessageCompressed
-        {
-            get
-            {
-                return (_opcode == Opcode.Binary || _opcode == Opcode.Text) && _rsv1 == Rsv.On;
-            }
-        }
+        public bool IsPerMessageCompressed => (_opcode == Opcode.Binary || _opcode == Opcode.Text) && _rsv1 == Rsv.On;
 
-        public bool IsPing
-        {
-            get
-            {
-                return _opcode == Opcode.Ping;
-            }
-        }
+        public bool IsPing => _opcode == Opcode.Ping;
 
-        public bool IsPong
-        {
-            get
-            {
-                return _opcode == Opcode.Pong;
-            }
-        }
+        public bool IsPong => _opcode == Opcode.Pong;
 
-        public bool IsText
-        {
-            get
-            {
-                return _opcode == Opcode.Text;
-            }
-        }
+        public bool IsText => _opcode == Opcode.Text;
 
-        public ulong Length
-        {
-            get
-            {
-                return 2 + (ulong)(_extPayloadLength.Length + _maskingKey.Length) + _payloadData.Length;
-            }
-        }
+        public ulong Length => 2 + (ulong)(_extPayloadLength.Length + _maskingKey.Length) + _payloadData.Length;
 
-        public Mask Mask
-        {
-            get
-            {
-                return _mask;
-            }
-        }
+        public Mask Mask => _mask;
 
-        public byte[] MaskingKey
-        {
-            get
-            {
-                return _maskingKey;
-            }
-        }
+        public byte[] MaskingKey => _maskingKey;
 
-        public Opcode Opcode
-        {
-            get
-            {
-                return _opcode;
-            }
-        }
+        public Opcode Opcode => _opcode;
 
-        public PayloadData PayloadData
-        {
-            get
-            {
-                return _payloadData;
-            }
-        }
+        public PayloadData PayloadData => _payloadData;
 
-        public byte PayloadLength
-        {
-            get
-            {
-                return _payloadLength;
-            }
-        }
+        public byte PayloadLength => _payloadLength;
 
-        public Rsv Rsv1
-        {
-            get
-            {
-                return _rsv1;
-            }
-        }
+        public Rsv Rsv1 => _rsv1;
 
-        public Rsv Rsv2
-        {
-            get
-            {
-                return _rsv2;
-            }
-        }
+        public Rsv Rsv2 => _rsv2;
 
-        public Rsv Rsv3
-        {
-            get
-            {
-                return _rsv3;
-            }
-        }
+        public Rsv Rsv3 => _rsv3;
 
         #endregion
 
-- 
cgit v1.2.3


From 65bd052f3e8682d177520af57db1c8ef5cb33262 Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Sun, 13 Jan 2019 21:37:13 +0100
Subject: ReSharper conform to 'var' settings

---
 BDInfo/BDROM.cs                                    |  42 +-
 BDInfo/TSCodecDTSHD.cs                             |   2 +-
 BDInfo/TSPlaylistFile.cs                           |  76 +--
 BDInfo/TSStream.cs                                 |  12 +-
 BDInfo/TSStreamBuffer.cs                           |   2 +-
 BDInfo/TSStreamClip.cs                             |   4 +-
 BDInfo/TSStreamClipFile.cs                         |  12 +-
 BDInfo/TSStreamFile.cs                             |  34 +-
 DvdLib/Ifo/Dvd.cs                                  |  10 +-
 DvdLib/Ifo/ProgramChain.cs                         |   4 +-
 DvdLib/Ifo/Title.cs                                |   2 +-
 Emby.Dlna/Api/DlnaServerService.cs                 |   2 +-
 Emby.Dlna/ContentDirectory/ControlHandler.cs       |   4 +-
 Emby.Dlna/Didl/DidlBuilder.cs                      |   2 +-
 Emby.Dlna/PlayTo/PlayToController.cs               |   2 +-
 Emby.Dlna/Service/BaseControlHandler.cs            |   2 +-
 Emby.Dlna/Service/ControlErrorHandler.cs           |   2 +-
 Emby.Drawing.Skia/StripCollageBuilder.cs           |   4 +-
 Emby.Drawing/Common/ImageHeader.cs                 |   4 +-
 Emby.Drawing/ImageProcessor.cs                     |   8 +-
 Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs     |   2 +-
 Emby.Naming/AudioBook/AudioBookFilePathParser.cs   |   2 +-
 Emby.Naming/TV/EpisodePathParser.cs                |   2 +-
 Emby.Naming/Video/VideoResolver.cs                 |   2 +-
 .../Activity/ActivityLogEntryPoint.cs              |   4 +-
 .../AppBase/BaseConfigurationManager.cs            |   4 +-
 Emby.Server.Implementations/ApplicationHost.cs     |  12 +-
 .../Configuration/ServerConfigurationManager.cs    |   6 +-
 .../Data/ManagedConnection.cs                      |   2 +-
 .../Data/SqliteDisplayPreferencesRepository.cs     |   8 +-
 .../Data/SqliteExtensions.cs                       |   2 +-
 .../Data/SqliteItemRepository.cs                   |  12 +-
 .../Data/SqliteUserDataRepository.cs               |   4 +-
 .../Data/SqliteUserRepository.cs                   |   2 +-
 Emby.Server.Implementations/Data/TypeMapper.cs     |   2 +-
 Emby.Server.Implementations/Dto/DtoService.cs      |   4 +-
 .../EntryPoints/RecordingNotifier.cs               |   2 +-
 .../HttpClientManager/HttpClientManager.cs         |  12 +-
 .../HttpServer/WebSocketConnection.cs              |   4 +-
 Emby.Server.Implementations/IO/IsoManager.cs       |   4 +-
 Emby.Server.Implementations/IO/LibraryMonitor.cs   |   2 +-
 .../IO/ManagedFileSystem.cs                        |  12 +-
 .../Library/LibraryManager.cs                      |  12 +-
 .../Library/MediaSourceManager.cs                  |   2 +-
 .../Library/PathExtensions.cs                      |   2 +-
 .../Library/ResolverHelper.cs                      |   2 +-
 .../Library/Resolvers/BaseVideoResolver.cs         |   2 +-
 .../Library/Resolvers/TV/SeasonResolver.cs         |   2 +-
 .../Library/Resolvers/TV/SeriesResolver.cs         |   4 +-
 .../Library/SearchEngine.cs                        |   2 +-
 .../Library/UserDataManager.cs                     |   2 +-
 Emby.Server.Implementations/Library/UserManager.cs |  18 +-
 .../LiveTv/EmbyTV/EmbyTV.cs                        |   6 +-
 .../LiveTv/Listings/SchedulesDirect.cs             |  24 +-
 .../LiveTv/Listings/XmlTvListingsProvider.cs       |   4 +-
 .../LiveTv/LiveTvManager.cs                        |  10 +-
 .../LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs   |   2 +-
 .../TunerHosts/HdHomerun/HdHomerunManager.cs       |   4 +-
 .../Net/DisposableManagedObjectBase.cs             |   4 +-
 Emby.Server.Implementations/Net/UdpSocket.cs       |   4 +-
 .../Networking/IPNetwork/BigIntegerExt.cs          |   8 +-
 .../Networking/IPNetwork/IPAddressCollection.cs    |   2 +-
 .../Networking/IPNetwork/IPNetwork.cs              | 108 ++---
 .../Networking/IPNetwork/IPNetworkCollection.cs    |  10 +-
 .../Networking/NetworkManager.cs                   |  14 +-
 .../Playlists/PlaylistManager.cs                   |   6 +-
 .../ScheduledTasks/ScheduledTaskWorker.cs          |  12 +-
 .../ScheduledTasks/TaskManager.cs                  |   2 +-
 .../Security/EncryptionManager.cs                  |   4 +-
 .../Serialization/JsonSerializer.cs                |  24 +-
 .../Services/ServiceController.cs                  |   2 +-
 .../Session/SessionManager.cs                      |  22 +-
 .../Sorting/AlphanumComparator.cs                  |   4 +-
 Emby.Server.Implementations/TV/TVSeriesManager.cs  |   4 +-
 .../TextEncoding/NLangDetect/Detector.cs           |  12 +-
 .../TextEncoding/NLangDetect/DetectorFactory.cs    |   2 +-
 .../TextEncoding/NLangDetect/GenProfile.cs         |   6 +-
 .../TextEncoding/NLangDetect/LanguageDetector.cs   |   2 +-
 .../TextEncoding/NLangDetect/Utils/LangProfile.cs  |   6 +-
 .../TextEncoding/NLangDetect/Utils/Messages.cs     |   2 +-
 .../TextEncoding/TextEncodingDetect.cs             |   2 +-
 .../Core/CharDistributionAnalyser.cs               |   4 +-
 .../UniversalDetector/Core/CharsetProber.cs        |   4 +-
 .../UniversalDetector/Core/EscCharsetProber.cs     |   2 +-
 .../UniversalDetector/Core/MBCSGroupProber.cs      |   2 +-
 .../UniversalDetector/Core/SBCSGroupProber.cs      |   4 +-
 .../UniversalDetector/Core/UniversalDetector.cs    |   2 +-
 .../Updates/InstallationManager.cs                 |   4 +-
 Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs       |   2 +-
 Jellyfin.Server/Program.cs                         |  10 +-
 Jellyfin.Server/SocketSharp/RequestMono.cs         |  14 +-
 MediaBrowser.Api/Library/LibraryService.cs         |   2 +-
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |   2 +-
 .../ScheduledTasks/ScheduledTaskService.cs         |   8 +-
 MediaBrowser.Api/SimilarItemsHelper.cs             |   2 +-
 MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs   |   6 +-
 MediaBrowser.Common/Net/IHttpClient.cs             |   2 +-
 MediaBrowser.Common/Plugins/BasePlugin.cs          |   2 +-
 MediaBrowser.Common/Plugins/IPlugin.cs             |   2 +-
 .../Updates/IInstallationManager.cs                |   4 +-
 .../Entities/AggregateFolder.cs                    |   4 +-
 MediaBrowser.Controller/Entities/BaseItem.cs       |  26 +-
 MediaBrowser.Controller/Entities/Folder.cs         |   4 +-
 MediaBrowser.Controller/Entities/Person.cs         |   4 +-
 MediaBrowser.Controller/Entities/TV/Series.cs      |   4 +-
 MediaBrowser.Controller/Entities/User.cs           |   2 +-
 MediaBrowser.Controller/Entities/UserItemData.cs   |   2 +-
 MediaBrowser.Controller/IO/FileData.cs             |   2 +-
 MediaBrowser.Controller/Library/ILibraryManager.cs |   2 +-
 MediaBrowser.Controller/Library/IUserManager.cs    |  18 +-
 MediaBrowser.Controller/Library/ItemResolveArgs.cs |  10 +-
 .../Net/IWebSocketConnection.cs                    |   4 +-
 MediaBrowser.Controller/Session/ISessionManager.cs |   4 +-
 MediaBrowser.Controller/Sorting/SortExtensions.cs  |   4 +-
 .../Images/LocalImageProvider.cs                   |   2 +-
 .../Parsers/BaseItemXmlParser.cs                   |  14 +-
 MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs  |   2 +-
 .../Encoder/EncoderValidator.cs                    |   2 +-
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |   2 +-
 .../Probing/ProbeResultNormalizer.cs               |  14 +-
 MediaBrowser.MediaEncoding/Subtitles/AssParser.cs  |   2 +-
 MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs  |   2 +-
 MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs  |   2 +-
 .../Subtitles/SubtitleEncoder.cs                   |   6 +-
 MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs  |   4 +-
 MediaBrowser.Model/Configuration/LibraryOptions.cs |   4 +-
 MediaBrowser.Model/Dlna/ConditionProcessor.cs      |   2 +-
 MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs   |  16 +-
 MediaBrowser.Model/Dlna/DeviceProfile.cs           |   8 +-
 .../Dlna/MediaFormatProfileResolver.cs             |   2 +-
 MediaBrowser.Model/Dlna/StreamBuilder.cs           | 114 ++---
 MediaBrowser.Model/Dlna/StreamInfo.cs              |  62 +--
 MediaBrowser.Model/Dto/MediaSourceInfo.cs          |  16 +-
 MediaBrowser.Model/Entities/MediaStream.cs         |   6 +-
 MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs  |   2 +-
 MediaBrowser.Model/Net/MimeTypes.cs                |   4 +-
 .../Notifications/NotificationOptions.cs           |  10 +-
 MediaBrowser.Model/Services/HttpUtility.cs         |   6 +-
 MediaBrowser.Model/System/IEnvironmentInfo.cs      |   2 +-
 .../Manager/GenericPriorityQueue.cs                |  12 +-
 MediaBrowser.Providers/Manager/ImageSaver.cs       |  10 +-
 MediaBrowser.Providers/Manager/MetadataService.cs  |   2 +-
 .../Manager/SimplePriorityQueue.cs                 |   8 +-
 MediaBrowser.Providers/Movies/MovieDbProvider.cs   |   4 +-
 .../Music/ArtistMetadataService.cs                 |   2 +-
 MediaBrowser.Providers/Omdb/OmdbImageProvider.cs   |   2 +-
 MediaBrowser.Providers/Omdb/OmdbProvider.cs        |  10 +-
 .../People/MovieDbPersonProvider.cs                |   4 +-
 .../Playlists/PlaylistItemsProvider.cs             |   2 +-
 .../Subtitles/SubtitleManager.cs                   |   4 +-
 .../TV/TheTVDB/TvdbSeriesProvider.cs               |   2 +-
 MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs |   6 +-
 MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs   |   2 +-
 Mono.Nat/Mapping.cs                                |   2 +-
 Mono.Nat/Pmp/PmpNatDevice.cs                       |   2 +-
 Mono.Nat/Pmp/PmpSearcher.cs                        |  20 +-
 .../Messages/Requests/CreatePortMappingMessage.cs  |   6 +-
 Mono.Nat/Upnp/Messages/UpnpMessage.cs              |   2 +-
 Mono.Nat/Upnp/Searchers/UpnpSearcher.cs            |   2 +-
 Mono.Nat/Upnp/UpnpNatDevice.cs                     |  14 +-
 OpenSubtitlesHandler/Console/OSHConsole.cs         |   2 +-
 OpenSubtitlesHandler/MovieHasher.cs                |   2 +-
 OpenSubtitlesHandler/OpenSubtitles.cs              | 526 ++++++++++-----------
 OpenSubtitlesHandler/Utilities.cs                  |   6 +-
 .../XML-RPC/Values/XmlRpcValueArray.cs             |   8 +-
 OpenSubtitlesHandler/XML-RPC/XmlRpcGenerator.cs    |  36 +-
 RSSDP/DeviceAvailableEventArgs.cs                  |  28 +-
 RSSDP/DeviceEventArgs.cs                           |   2 +-
 RSSDP/DeviceUnavailableEventArgs.cs                |   6 +-
 RSSDP/DiscoveredSsdpDevice.cs                      |   2 +-
 RSSDP/DisposableManagedObjectBase.cs               |   4 +-
 RSSDP/HttpParserBase.cs                            |  12 +-
 RSSDP/HttpRequestParser.cs                         |  14 +-
 RSSDP/HttpResponseParser.cs                        |  14 +-
 RSSDP/ISsdpDeviceLocator.cs                        |   2 +-
 RSSDP/ISsdpDevicePublisher.cs                      |   4 +-
 RSSDP/SsdpCommunicationsServer.cs                  |  12 +-
 RSSDP/SsdpDevice.cs                                |   6 +-
 RSSDP/SsdpDeviceLocator.cs                         |   4 +-
 RSSDP/SsdpDevicePublisher.cs                       |  10 +-
 SocketHttpListener/Ext.cs                          |   2 +-
 SocketHttpListener/MessageEventArgs.cs             |   4 +-
 SocketHttpListener/Net/ChunkStream.cs              |   8 +-
 SocketHttpListener/Net/ChunkedInputStream.cs       |  14 +-
 SocketHttpListener/Net/HttpConnection.cs           |   8 +-
 SocketHttpListener/Net/HttpEndPointListener.cs     |  26 +-
 SocketHttpListener/Net/HttpEndPointManager.cs      |  10 +-
 .../Net/HttpListenerContext.Managed.cs             |   2 +-
 .../Net/HttpListenerRequest.Managed.cs             |   4 +-
 SocketHttpListener/Net/HttpListenerRequest.cs      |  10 +-
 .../Net/HttpListenerRequestUriBuilder.cs           |  10 +-
 .../Net/HttpListenerResponse.Managed.cs            |   4 +-
 .../Net/HttpRequestStream.Managed.cs               |   4 +-
 .../Net/HttpResponseStream.Managed.cs              |  12 +-
 SocketHttpListener/Net/ListenerPrefix.cs           |   2 +-
 SocketHttpListener/Net/WebHeaderCollection.cs      |   4 +-
 .../Net/WebSockets/HttpWebSocket.Managed.cs        |  10 +-
 SocketHttpListener/Net/WebSockets/HttpWebSocket.cs |   2 +-
 .../Net/WebSockets/WebSocketValidate.cs            |   2 +-
 199 files changed, 1063 insertions(+), 1063 deletions(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/BDInfo/BDROM.cs b/BDInfo/BDROM.cs
index 0b2eefcc07..2fadf3b77f 100644
--- a/BDInfo/BDROM.cs
+++ b/BDInfo/BDROM.cs
@@ -164,7 +164,7 @@ namespace BDInfo
             if (DirectoryPLAYLIST != null)
             {
                 FileSystemMetadata[] files = GetFiles(DirectoryPLAYLIST.FullName, ".mpls").ToArray();
-                foreach (FileSystemMetadata file in files)
+                foreach (var file in files)
                 {
                     PlaylistFiles.Add(
                         file.Name.ToUpper(), new TSPlaylistFile(this, file, _fileSystem, textEncoding));
@@ -174,7 +174,7 @@ namespace BDInfo
             if (DirectorySTREAM != null)
             {
                 FileSystemMetadata[] files = GetFiles(DirectorySTREAM.FullName, ".m2ts").ToArray();
-                foreach (FileSystemMetadata file in files)
+                foreach (var file in files)
                 {
                     StreamFiles.Add(
                         file.Name.ToUpper(), new TSStreamFile(file, _fileSystem));
@@ -184,7 +184,7 @@ namespace BDInfo
             if (DirectoryCLIPINF != null)
             {
                 FileSystemMetadata[] files = GetFiles(DirectoryCLIPINF.FullName, ".clpi").ToArray();
-                foreach (FileSystemMetadata file in files)
+                foreach (var file in files)
                 {
                     StreamClipFiles.Add(
                         file.Name.ToUpper(), new TSStreamClipFile(file, _fileSystem, textEncoding));
@@ -194,7 +194,7 @@ namespace BDInfo
             if (DirectorySSIF != null)
             {
                 FileSystemMetadata[] files = GetFiles(DirectorySSIF.FullName, ".ssif").ToArray();
-                foreach (FileSystemMetadata file in files)
+                foreach (var file in files)
                 {
                     InterleavedFiles.Add(
                         file.Name.ToUpper(), new TSInterleavedFile(file));
@@ -214,8 +214,8 @@ namespace BDInfo
 
         public void Scan()
         {
-            List<TSStreamClipFile> errorStreamClipFiles = new List<TSStreamClipFile>();
-            foreach (TSStreamClipFile streamClipFile in StreamClipFiles.Values)
+            var errorStreamClipFiles = new List<TSStreamClipFile>();
+            foreach (var streamClipFile in StreamClipFiles.Values)
             {
                 try
                 {
@@ -239,7 +239,7 @@ namespace BDInfo
                 }
             }
 
-            foreach (TSStreamFile streamFile in StreamFiles.Values)
+            foreach (var streamFile in StreamFiles.Values)
             {
                 string ssifName = Path.GetFileNameWithoutExtension(streamFile.Name) + ".SSIF";
                 if (InterleavedFiles.ContainsKey(ssifName))
@@ -252,8 +252,8 @@ namespace BDInfo
             StreamFiles.Values.CopyTo(streamFiles, 0);
             Array.Sort(streamFiles, CompareStreamFiles);
 
-            List<TSPlaylistFile> errorPlaylistFiles = new List<TSPlaylistFile>();
-            foreach (TSPlaylistFile playlistFile in PlaylistFiles.Values)
+            var errorPlaylistFiles = new List<TSPlaylistFile>();
+            foreach (var playlistFile in PlaylistFiles.Values)
             {
                 try
                 {
@@ -277,15 +277,15 @@ namespace BDInfo
                 }
             }
 
-            List<TSStreamFile> errorStreamFiles = new List<TSStreamFile>();
-            foreach (TSStreamFile streamFile in streamFiles)
+            var errorStreamFiles = new List<TSStreamFile>();
+            foreach (var streamFile in streamFiles)
             {
                 try
                 {
-                    List<TSPlaylistFile> playlists = new List<TSPlaylistFile>();
-                    foreach (TSPlaylistFile playlist in PlaylistFiles.Values)
+                    var playlists = new List<TSPlaylistFile>();
+                    foreach (var playlist in PlaylistFiles.Values)
                     {
-                        foreach (TSStreamClip streamClip in playlist.StreamClips)
+                        foreach (var streamClip in playlist.StreamClips)
                         {
                             if (streamClip.Name == streamFile.Name)
                             {
@@ -314,12 +314,12 @@ namespace BDInfo
                 }
             }
 
-            foreach (TSPlaylistFile playlistFile in PlaylistFiles.Values)
+            foreach (var playlistFile in PlaylistFiles.Values)
             {
                 playlistFile.Initialize();
                 if (!Is50Hz)
                 {
-                    foreach (TSVideoStream videoStream in playlistFile.VideoStreams)
+                    foreach (var videoStream in playlistFile.VideoStreams)
                     {
                         if (videoStream.FrameRate == TSFrameRate.FRAMERATE_25 ||
                             videoStream.FrameRate == TSFrameRate.FRAMERATE_50)
@@ -339,7 +339,7 @@ namespace BDInfo
                 throw new ArgumentNullException(nameof(path));
             }
 
-            FileSystemMetadata dir = _fileSystem.GetDirectoryInfo(path);
+            var dir = _fileSystem.GetDirectoryInfo(path);
 
             while (dir != null)
             {
@@ -369,7 +369,7 @@ namespace BDInfo
             if (dir != null)
             {
                 FileSystemMetadata[] children = _fileSystem.GetDirectories(dir.FullName).ToArray();
-                foreach (FileSystemMetadata child in children)
+                foreach (var child in children)
                 {
                     if (string.Equals(child.Name, name, StringComparison.OrdinalIgnoreCase))
                     {
@@ -378,7 +378,7 @@ namespace BDInfo
                 }
                 if (searchDepth > 0)
                 {
-                    foreach (FileSystemMetadata child in children)
+                    foreach (var child in children)
                     {
                         GetDirectory(
                             name, child, searchDepth - 1);
@@ -395,7 +395,7 @@ namespace BDInfo
             //if (!ExcludeDirs.Contains(directoryInfo.Name.ToUpper()))  // TODO: Keep?
             {
                 FileSystemMetadata[] pathFiles = _fileSystem.GetFiles(directoryInfo.FullName).ToArray();
-                foreach (FileSystemMetadata pathFile in pathFiles)
+                foreach (var pathFile in pathFiles)
                 {
                     if (pathFile.Extension.ToUpper() == ".SSIF")
                     {
@@ -405,7 +405,7 @@ namespace BDInfo
                 }
 
                 FileSystemMetadata[] pathChildren = _fileSystem.GetDirectories(directoryInfo.FullName).ToArray();
-                foreach (FileSystemMetadata pathChild in pathChildren)
+                foreach (var pathChild in pathChildren)
                 {
                     size += GetDirectorySize(pathChild);
                 }
diff --git a/BDInfo/TSCodecDTSHD.cs b/BDInfo/TSCodecDTSHD.cs
index f2315d4c5f..57a136d2d5 100644
--- a/BDInfo/TSCodecDTSHD.cs
+++ b/BDInfo/TSCodecDTSHD.cs
@@ -211,7 +211,7 @@ namespace BDInfo
             // TODO
             if (stream.CoreStream != null)
             {
-                TSAudioStream coreStream = (TSAudioStream)stream.CoreStream;
+                var coreStream = (TSAudioStream)stream.CoreStream;
                 if (coreStream.AudioMode == TSAudioMode.Extended &&
                     stream.ChannelCount == 5)
                 {
diff --git a/BDInfo/TSPlaylistFile.cs b/BDInfo/TSPlaylistFile.cs
index aa1f175d3a..ba0b37f00c 100644
--- a/BDInfo/TSPlaylistFile.cs
+++ b/BDInfo/TSPlaylistFile.cs
@@ -85,9 +85,9 @@ namespace BDInfo
             _fileSystem = fileSystem;
             _textEncoding = textEncoding;
             IsCustom = true;
-            foreach (TSStreamClip clip in clips)
+            foreach (var clip in clips)
             {
-                TSStreamClip newClip = new TSStreamClip(
+                var newClip = new TSStreamClip(
                     clip.StreamFile, clip.StreamClipFile);
 
                 newClip.Name = clip.Name;
@@ -123,7 +123,7 @@ namespace BDInfo
             get
             {
                 ulong size = 0;
-                foreach (TSStreamClip clip in StreamClips)
+                foreach (var clip in StreamClips)
                 {
                     size += clip.InterleavedFileSize;
                 }
@@ -135,7 +135,7 @@ namespace BDInfo
             get
             {
                 ulong size = 0;
-                foreach (TSStreamClip clip in StreamClips)
+                foreach (var clip in StreamClips)
                 {
                     size += clip.FileSize;
                 }
@@ -147,7 +147,7 @@ namespace BDInfo
             get
             {
                 double length = 0;
-                foreach (TSStreamClip clip in StreamClips)
+                foreach (var clip in StreamClips)
                 {
                     if (clip.AngleIndex == 0)
                     {
@@ -163,7 +163,7 @@ namespace BDInfo
             get
             {
                 double length = 0;
-                foreach (TSStreamClip clip in StreamClips)
+                foreach (var clip in StreamClips)
                 {
                     length += clip.Length;
                 }
@@ -176,7 +176,7 @@ namespace BDInfo
             get
             {
                 ulong size = 0;
-                foreach (TSStreamClip clip in StreamClips)
+                foreach (var clip in StreamClips)
                 {
                     if (clip.AngleIndex == 0)
                     {
@@ -192,7 +192,7 @@ namespace BDInfo
             get
             {
                 ulong size = 0;
-                foreach (TSStreamClip clip in StreamClips)
+                foreach (var clip in StreamClips)
                 {
                     size += clip.PacketSize;
                 }
@@ -263,7 +263,7 @@ namespace BDInfo
                 int itemCount = ReadInt16(data, ref pos);
                 int subitemCount = ReadInt16(data, ref pos);
 
-                List<TSStreamClip> chapterClips = new List<TSStreamClip>();
+                var chapterClips = new List<TSStreamClip>();
                 for (int itemIndex = 0; itemIndex < itemCount; itemIndex++)
                 {
                     int itemStart = pos;
@@ -310,7 +310,7 @@ namespace BDInfo
                     if (outTime < 0) outTime &= 0x7FFFFFFF;
                     double timeOut = (double)outTime / 45000;
 
-                    TSStreamClip streamClip = new TSStreamClip(
+                    var streamClip = new TSStreamClip(
                         streamFile, streamClipFile);
 
                     streamClip.Name = streamFileName; //TODO
@@ -361,7 +361,7 @@ namespace BDInfo
                                     FileInfo.Name, angleClipFileName));
                             }
 
-                            TSStreamClip angleClip =
+                            var angleClip =
                                 new TSStreamClip(angleFile, angleClipFile);
                             angleClip.AngleIndex = angle + 1;
                             angleClip.TimeIn = streamClip.TimeIn;
@@ -394,33 +394,33 @@ namespace BDInfo
 
                     for (int i = 0; i < streamCountVideo; i++)
                     {
-                        TSStream stream = CreatePlaylistStream(data, ref pos);
+                        var stream = CreatePlaylistStream(data, ref pos);
                         if (stream != null) PlaylistStreams[stream.PID] = stream;
                     }
                     for (int i = 0; i < streamCountAudio; i++)
                     {
-                        TSStream stream = CreatePlaylistStream(data, ref pos);
+                        var stream = CreatePlaylistStream(data, ref pos);
                         if (stream != null) PlaylistStreams[stream.PID] = stream;
                     }
                     for (int i = 0; i < streamCountPG; i++)
                     {
-                        TSStream stream = CreatePlaylistStream(data, ref pos);
+                        var stream = CreatePlaylistStream(data, ref pos);
                         if (stream != null) PlaylistStreams[stream.PID] = stream;
                     }
                     for (int i = 0; i < streamCountIG; i++)
                     {
-                        TSStream stream = CreatePlaylistStream(data, ref pos);
+                        var stream = CreatePlaylistStream(data, ref pos);
                         if (stream != null) PlaylistStreams[stream.PID] = stream;
                     }
                     for (int i = 0; i < streamCountSecondaryAudio; i++)
                     {
-                        TSStream stream = CreatePlaylistStream(data, ref pos);
+                        var stream = CreatePlaylistStream(data, ref pos);
                         if (stream != null) PlaylistStreams[stream.PID] = stream;
                         pos += 2;
                     }
                     for (int i = 0; i < streamCountSecondaryVideo; i++)
                     {
-                        TSStream stream = CreatePlaylistStream(data, ref pos);
+                        var stream = CreatePlaylistStream(data, ref pos);
                         if (stream != null) PlaylistStreams[stream.PID] = stream;
                         pos += 6;
                     }
@@ -458,7 +458,7 @@ namespace BDInfo
                             ((long)data[pos + 6] << 8) +
                             ((long)data[pos + 7]);
 
-                        TSStreamClip streamClip = chapterClips[streamFileIndex];
+                        var streamClip = chapterClips[streamFileIndex];
 
                         double chapterSeconds = (double)chapterTime / 45000;
 
@@ -498,8 +498,8 @@ namespace BDInfo
         {
             LoadStreamClips();
 
-            Dictionary<string, List<double>> clipTimes = new Dictionary<string, List<double>>();
-            foreach (TSStreamClip clip in StreamClips)
+            var clipTimes = new Dictionary<string, List<double>>();
+            foreach (var clip in StreamClips)
             {
                 if (clip.AngleIndex == 0)
                 {
@@ -567,7 +567,7 @@ namespace BDInfo
             int streamLength = data[pos++];
             int streamPos = pos;
 
-            TSStreamType streamType = (TSStreamType)data[pos++];
+            var streamType = (TSStreamType)data[pos++];
             switch (streamType)
             {
                 case TSStreamType.MVC_VIDEO:
@@ -579,11 +579,11 @@ namespace BDInfo
                 case TSStreamType.MPEG2_VIDEO:
                 case TSStreamType.VC1_VIDEO:
 
-                    TSVideoFormat videoFormat = (TSVideoFormat)
+                    var videoFormat = (TSVideoFormat)
                         (data[pos] >> 4);
-                    TSFrameRate frameRate = (TSFrameRate)
+                    var frameRate = (TSFrameRate)
                         (data[pos] & 0xF);
-                    TSAspectRatio aspectRatio = (TSAspectRatio)
+                    var aspectRatio = (TSAspectRatio)
                         (data[pos + 1] >> 4);
 
                     stream = new TSVideoStream();
@@ -617,9 +617,9 @@ namespace BDInfo
 
                     int audioFormat = ReadByte(data, ref pos);
 
-                    TSChannelLayout channelLayout = (TSChannelLayout)
+                    var channelLayout = (TSChannelLayout)
                         (audioFormat >> 4);
-                    TSSampleRate sampleRate = (TSSampleRate)
+                    var sampleRate = (TSSampleRate)
                         (audioFormat & 0xF);
 
                     string audioLanguage = ReadString(data, 3, ref pos);
@@ -712,7 +712,7 @@ namespace BDInfo
             {
                 referenceClip = StreamClips[0];
             }
-            foreach (TSStreamClip clip in StreamClips)
+            foreach (var clip in StreamClips)
             {
                 if (clip.StreamClipFile.Streams.Count > referenceClip.StreamClipFile.Streams.Count)
                 {
@@ -738,12 +738,12 @@ namespace BDInfo
                 }
             }
 
-            foreach (TSStream clipStream
+            foreach (var clipStream
                 in referenceClip.StreamClipFile.Streams.Values)
             {
                 if (!Streams.ContainsKey(clipStream.PID))
                 {
-                    TSStream stream = clipStream.Clone();
+                    var stream = clipStream.Clone();
                     Streams[clipStream.PID] = stream;
 
                     if (!IsCustom && !PlaylistStreams.ContainsKey(stream.PID))
@@ -779,7 +779,7 @@ namespace BDInfo
                     referenceClip.StreamFile.Streams.ContainsKey(4114) &&
                     !Streams.ContainsKey(4114))
                 {
-                    TSStream stream = referenceClip.StreamFile.Streams[4114].Clone();
+                    var stream = referenceClip.StreamFile.Streams[4114].Clone();
                     Streams[4114] = stream;
                     if (stream.IsVideoStream)
                     {
@@ -787,12 +787,12 @@ namespace BDInfo
                     }
                 }
 
-                foreach (TSStream clipStream
+                foreach (var clipStream
                     in referenceClip.StreamFile.Streams.Values)
                 {
                     if (Streams.ContainsKey(clipStream.PID))
                     {
-                        TSStream stream = Streams[clipStream.PID];
+                        var stream = Streams[clipStream.PID];
 
                         if (stream.StreamType != clipStream.StreamType) continue;
 
@@ -811,8 +811,8 @@ namespace BDInfo
                         else if (stream.IsAudioStream &&
                             clipStream.IsAudioStream)
                         {
-                            TSAudioStream audioStream = (TSAudioStream)stream;
-                            TSAudioStream clipAudioStream = (TSAudioStream)clipStream;
+                            var audioStream = (TSAudioStream)stream;
+                            var clipAudioStream = (TSAudioStream)clipStream;
 
                             if (clipAudioStream.ChannelCount > audioStream.ChannelCount)
                             {
@@ -863,7 +863,7 @@ namespace BDInfo
                 SortedStreams.Add(stream);
                 for (int i = 0; i < AngleCount; i++)
                 {
-                    TSStream angleStream = stream.Clone();
+                    var angleStream = stream.Clone();
                     angleStream.AngleIndex = i + 1;
                     AngleStreams[i][angleStream.PID] = angleStream;
                     SortedStreams.Add(angleStream);
@@ -900,7 +900,7 @@ namespace BDInfo
 
         public void ClearBitrates()
         {
-            foreach (TSStreamClip clip in StreamClips)
+            foreach (var clip in StreamClips)
             {
                 clip.PayloadBytes = 0;
                 clip.PacketCount = 0;
@@ -908,7 +908,7 @@ namespace BDInfo
 
                 if (clip.StreamFile != null)
                 {
-                    foreach (TSStream stream in clip.StreamFile.Streams.Values)
+                    foreach (var stream in clip.StreamFile.Streams.Values)
                     {
                         stream.PayloadBytes = 0;
                         stream.PacketCount = 0;
@@ -923,7 +923,7 @@ namespace BDInfo
                 }
             }
 
-            foreach (TSStream stream in SortedStreams)
+            foreach (var stream in SortedStreams)
             {
                 stream.PayloadBytes = 0;
                 stream.PacketCount = 0;
diff --git a/BDInfo/TSStream.cs b/BDInfo/TSStream.cs
index fad3f1acbc..3c30a85971 100644
--- a/BDInfo/TSStream.cs
+++ b/BDInfo/TSStream.cs
@@ -109,7 +109,7 @@ namespace BDInfo
 
         public TSDescriptor Clone()
         {
-            TSDescriptor descriptor =
+            var descriptor =
                 new TSDescriptor(Name, (byte)Value.Length);
             Value.CopyTo(descriptor.Value, 0);
             return descriptor;
@@ -404,7 +404,7 @@ namespace BDInfo
             if (Descriptors != null)
             {
                 stream.Descriptors = new List<TSDescriptor>();
-                foreach (TSDescriptor descriptor in Descriptors)
+                foreach (var descriptor in Descriptors)
                 {
                     stream.Descriptors.Add(descriptor.Clone());
                 }
@@ -553,7 +553,7 @@ namespace BDInfo
 
         public override TSStream Clone()
         {
-            TSVideoStream stream = new TSVideoStream();
+            var stream = new TSVideoStream();
             CopyTo(stream);
 
             stream.VideoFormat = _VideoFormat;
@@ -727,7 +727,7 @@ namespace BDInfo
 
         public override TSStream Clone()
         {
-            TSAudioStream stream = new TSAudioStream();
+            var stream = new TSAudioStream();
             CopyTo(stream);
 
             stream.SampleRate = SampleRate;
@@ -756,7 +756,7 @@ namespace BDInfo
 
         public override TSStream Clone()
         {
-            TSGraphicsStream stream = new TSGraphicsStream();
+            var stream = new TSGraphicsStream();
             CopyTo(stream);
             return stream;
         }
@@ -772,7 +772,7 @@ namespace BDInfo
 
         public override TSStream Clone()
         {
-            TSTextStream stream = new TSTextStream();
+            var stream = new TSTextStream();
             CopyTo(stream);
             return stream;
         }
diff --git a/BDInfo/TSStreamBuffer.cs b/BDInfo/TSStreamBuffer.cs
index 17025c2e31..30bd1a3f44 100644
--- a/BDInfo/TSStreamBuffer.cs
+++ b/BDInfo/TSStreamBuffer.cs
@@ -111,7 +111,7 @@ namespace BDInfo
                 data += (Stream.ReadByte() << shift);
                 shift -= 8;
             }
-            BitVector32 vector = new BitVector32(data);
+            var vector = new BitVector32(data);
 
             int value = 0;
             for (int i = SkipBits; i < SkipBits + bits; i++)
diff --git a/BDInfo/TSStreamClip.cs b/BDInfo/TSStreamClip.cs
index 20f795e536..295eeb6b18 100644
--- a/BDInfo/TSStreamClip.cs
+++ b/BDInfo/TSStreamClip.cs
@@ -90,11 +90,11 @@ namespace BDInfo
 
         public bool IsCompatible(TSStreamClip clip)
         {
-            foreach (TSStream stream1 in StreamFile.Streams.Values)
+            foreach (var stream1 in StreamFile.Streams.Values)
             {
                 if (clip.StreamFile.Streams.ContainsKey(stream1.PID))
                 {
-                    TSStream stream2 = clip.StreamFile.Streams[stream1.PID];
+                    var stream2 = clip.StreamFile.Streams[stream1.PID];
                     if (stream1.StreamType != stream2.StreamType)
                     {
                         return false;
diff --git a/BDInfo/TSStreamClipFile.cs b/BDInfo/TSStreamClipFile.cs
index 6aed7e4d43..be6299e1a8 100644
--- a/BDInfo/TSStreamClipFile.cs
+++ b/BDInfo/TSStreamClipFile.cs
@@ -114,7 +114,7 @@ namespace BDInfo
 
                     streamOffset += 2;
 
-                    TSStreamType streamType = (TSStreamType)
+                    var streamType = (TSStreamType)
                         clipData[streamOffset + 1];
                     switch (streamType)
                     {
@@ -127,11 +127,11 @@ namespace BDInfo
                         case TSStreamType.MPEG2_VIDEO:
                         case TSStreamType.VC1_VIDEO:
                             {
-                                TSVideoFormat videoFormat = (TSVideoFormat)
+                                var videoFormat = (TSVideoFormat)
                                     (clipData[streamOffset + 2] >> 4);
-                                TSFrameRate frameRate = (TSFrameRate)
+                                var frameRate = (TSFrameRate)
                                     (clipData[streamOffset + 2] & 0xF);
-                                TSAspectRatio aspectRatio = (TSAspectRatio)
+                                var aspectRatio = (TSAspectRatio)
                                     (clipData[streamOffset + 3] >> 4);
 
                                 stream = new TSVideoStream();
@@ -168,9 +168,9 @@ namespace BDInfo
                                 string languageCode =
                                     _textEncoding.GetASCIIEncoding().GetString(languageBytes, 0, languageBytes.Length);
 
-                                TSChannelLayout channelLayout = (TSChannelLayout)
+                                var channelLayout = (TSChannelLayout)
                                     (clipData[streamOffset + 2] >> 4);
-                                TSSampleRate sampleRate = (TSSampleRate)
+                                var sampleRate = (TSSampleRate)
                                     (clipData[streamOffset + 2] & 0xF);
 
                                 stream = new TSAudioStream();
diff --git a/BDInfo/TSStreamFile.cs b/BDInfo/TSStreamFile.cs
index 29d105da0e..ecf6609e2e 100644
--- a/BDInfo/TSStreamFile.cs
+++ b/BDInfo/TSStreamFile.cs
@@ -283,7 +283,7 @@ namespace BDInfo
 
             bool isAVC = false;
             bool isMVC = false;
-            foreach (TSStream finishedStream in Streams.Values)
+            foreach (var finishedStream in Streams.Values)
             {
                 if (!finishedStream.IsInitialized)
                 {
@@ -327,10 +327,10 @@ namespace BDInfo
                 UpdateStreamBitrate(PID, PTSPID, PTS, PTSDiff);
             }
 
-            foreach (TSPlaylistFile playlist in Playlists)
+            foreach (var playlist in Playlists)
             {
                 double packetSeconds = 0;
-                foreach (TSStreamClip clip in playlist.StreamClips)
+                foreach (var clip in playlist.StreamClips)
                 {
                     if (clip.AngleIndex == 0)
                     {
@@ -339,7 +339,7 @@ namespace BDInfo
                 }
                 if (packetSeconds > 0)
                 {
-                    foreach (TSStream playlistStream in playlist.SortedStreams)
+                    foreach (var playlistStream in playlist.SortedStreams)
                     {
                         if (playlistStream.IsVBR)
                         {
@@ -366,14 +366,14 @@ namespace BDInfo
         {
             if (Playlists == null) return;
 
-            TSStreamState streamState = StreamStates[PID];
+            var streamState = StreamStates[PID];
             double streamTime = (double)PTS / 90000;
             double streamInterval = (double)PTSDiff / 90000;
             double streamOffset = streamTime + streamInterval;
 
-            foreach (TSPlaylistFile playlist in Playlists)
+            foreach (var playlist in Playlists)
             {
-                foreach (TSStreamClip clip in playlist.StreamClips)
+                foreach (var clip in playlist.StreamClips)
                 {
                     if (clip.Name != this.Name) continue;
 
@@ -390,7 +390,7 @@ namespace BDInfo
                             clip.PacketSeconds = streamOffset - clip.TimeIn;
                         }
 
-                        Dictionary<ushort, TSStream> playlistStreams = playlist.Streams;
+                        var playlistStreams = playlist.Streams;
                         if (clip.AngleIndex > 0 &&
                             clip.AngleIndex < playlist.AngleStreams.Count + 1)
                         {
@@ -398,7 +398,7 @@ namespace BDInfo
                         }
                         if (playlistStreams.ContainsKey(PID))
                         {
-                            TSStream stream = playlistStreams[PID];
+                            var stream = playlistStreams[PID];
 
                             stream.PayloadBytes += streamState.WindowBytes;
                             stream.PacketCount += streamState.WindowPackets;
@@ -425,13 +425,13 @@ namespace BDInfo
 
             if (Streams.ContainsKey(PID))
             {
-                TSStream stream = Streams[PID];
+                var stream = Streams[PID];
                 stream.PayloadBytes += streamState.WindowBytes;
                 stream.PacketCount += streamState.WindowPackets;
 
                 if (stream.IsVideoStream)
                 {
-                    TSStreamDiagnostics diag = new TSStreamDiagnostics();
+                    var diag = new TSStreamDiagnostics();
                     diag.Marker = (double)PTS / 90000;
                     diag.Interval = (double)PTSDiff / 90000;
                     diag.Bytes = streamState.WindowBytes;
@@ -482,7 +482,7 @@ namespace BDInfo
                 StreamStates.Clear();
                 StreamDiagnostics.Clear();
 
-                TSPacketParser parser =
+                var parser =
                     new TSPacketParser();
 
                 long fileLength = (uint)fileStream.Length;
@@ -839,7 +839,7 @@ namespace BDInfo
 
                                                 if (!Streams.ContainsKey(streamPID))
                                                 {
-                                                    List<TSDescriptor> streamDescriptors =
+                                                    var streamDescriptors =
                                                         new List<TSDescriptor>();
 
                                                     /*
@@ -996,7 +996,7 @@ namespace BDInfo
                                     {
                                         --parser.PMTProgramDescriptorLength;
 
-                                        TSDescriptor descriptor = parser.PMTProgramDescriptors[
+                                        var descriptor = parser.PMTProgramDescriptors[
                                             parser.PMTProgramDescriptors.Count - 1];
 
                                         int valueIndex =
@@ -1026,8 +1026,8 @@ namespace BDInfo
                             parser.StreamState != null &&
                             parser.TransportScramblingControl == 0)
                         {
-                            TSStream stream = parser.Stream;
-                            TSStreamState streamState = parser.StreamState;
+                            var stream = parser.Stream;
+                            var streamState = parser.StreamState;
 
                             streamState.Parse =
                                 (streamState.Parse << 8) + buffer[i];
@@ -1461,7 +1461,7 @@ namespace BDInfo
 
                 ulong PTSLast = 0;
                 ulong PTSDiff = 0;
-                foreach (TSStream stream in Streams.Values)
+                foreach (var stream in Streams.Values)
                 {
                     if (!stream.IsVideoStream) continue;
 
diff --git a/DvdLib/Ifo/Dvd.cs b/DvdLib/Ifo/Dvd.cs
index a8f2ab9708..71ba2d5e4f 100644
--- a/DvdLib/Ifo/Dvd.cs
+++ b/DvdLib/Ifo/Dvd.cs
@@ -45,7 +45,7 @@ namespace DvdLib.Ifo
             {
                 using (var vmgFs = _fileSystem.GetFileStream(vmgPath.FullName, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read))
                 {
-                    using (BigEndianBinaryReader vmgRead = new BigEndianBinaryReader(vmgFs))
+                    using (var vmgRead = new BigEndianBinaryReader(vmgFs))
                     {
                         vmgFs.Seek(0x3E, SeekOrigin.Begin);
                         _titleSetCount = vmgRead.ReadUInt16();
@@ -71,7 +71,7 @@ namespace DvdLib.Ifo
             read.BaseStream.Seek(6, SeekOrigin.Current);
             for (uint titleNum = 1; titleNum <= _titleCount; titleNum++)
             {
-                Title t = new Title(titleNum);
+                var t = new Title(titleNum);
                 t.ParseTT_SRPT(read);
                 Titles.Add(t);
             }
@@ -98,7 +98,7 @@ namespace DvdLib.Ifo
 
             using (var vtsFs = _fileSystem.GetFileStream(vtsPath, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read))
             {
-                using (BigEndianBinaryReader vtsRead = new BigEndianBinaryReader(vtsFs))
+                using (var vtsRead = new BigEndianBinaryReader(vtsFs))
                 {
                     // Read VTS_PTT_SRPT
                     vtsFs.Seek(0xC8, SeekOrigin.Begin);
@@ -119,7 +119,7 @@ namespace DvdLib.Ifo
                     {
                         uint chapNum = 1;
                         vtsFs.Seek(baseAddr + offsets[titleNum], SeekOrigin.Begin);
-                        Title t = Titles.FirstOrDefault(vtst => vtst.IsVTSTitle(vtsNum, titleNum + 1));
+                        var t = Titles.FirstOrDefault(vtst => vtst.IsVTSTitle(vtsNum, titleNum + 1));
                         if (t == null) continue;
 
                         do
@@ -149,7 +149,7 @@ namespace DvdLib.Ifo
                         vtsFs.Seek(3, SeekOrigin.Current);
                         uint vtsPgcOffset = vtsRead.ReadUInt32();
 
-                        Title t = Titles.FirstOrDefault(vtst => vtst.IsVTSTitle(vtsNum, titleNum));
+                        var t = Titles.FirstOrDefault(vtst => vtst.IsVTSTitle(vtsNum, titleNum));
                         if (t != null) t.AddPgc(vtsRead, startByte + vtsPgcOffset, entryPgc, pgcNum);
                     }
                 }
diff --git a/DvdLib/Ifo/ProgramChain.cs b/DvdLib/Ifo/ProgramChain.cs
index 0cdaad4ccb..80889738f1 100644
--- a/DvdLib/Ifo/ProgramChain.cs
+++ b/DvdLib/Ifo/ProgramChain.cs
@@ -87,7 +87,7 @@ namespace DvdLib.Ifo
             br.BaseStream.Seek(startPos + _cellPositionOffset, SeekOrigin.Begin);
             for (int cellNum = 0; cellNum < _cellCount; cellNum++)
             {
-                Cell c = new Cell();
+                var c = new Cell();
                 c.ParsePosition(br);
                 Cells.Add(c);
             }
@@ -99,7 +99,7 @@ namespace DvdLib.Ifo
             }
 
             br.BaseStream.Seek(startPos + _programMapOffset, SeekOrigin.Begin);
-            List<int> cellNumbers = new List<int>();
+            var cellNumbers = new List<int>();
             for (int progNum = 0; progNum < _programCount; progNum++) cellNumbers.Add(br.ReadByte() - 1);
 
             for (int i = 0; i < cellNumbers.Count; i++)
diff --git a/DvdLib/Ifo/Title.cs b/DvdLib/Ifo/Title.cs
index 85be9daf10..335e929928 100644
--- a/DvdLib/Ifo/Title.cs
+++ b/DvdLib/Ifo/Title.cs
@@ -50,7 +50,7 @@ namespace DvdLib.Ifo
             long curPos = br.BaseStream.Position;
             br.BaseStream.Seek(startByte, SeekOrigin.Begin);
 
-            ProgramChain pgc = new ProgramChain(pgcNum);
+            var pgc = new ProgramChain(pgcNum);
             pgc.ParseHeader(br);
             ProgramChains.Add(pgc);
             if (entryPgc) EntryProgramChain = pgc;
diff --git a/Emby.Dlna/Api/DlnaServerService.cs b/Emby.Dlna/Api/DlnaServerService.cs
index f4009ee936..01c9fe50f5 100644
--- a/Emby.Dlna/Api/DlnaServerService.cs
+++ b/Emby.Dlna/Api/DlnaServerService.cs
@@ -241,7 +241,7 @@ namespace Emby.Dlna.Api
             var cacheLength = TimeSpan.FromDays(365);
             var cacheKey = Request.RawUrl.GetMD5();
 
-            return _resultFactory.GetStaticResult(Request, cacheKey, null, cacheLength, contentType, () => Task.FromResult<Stream>(_dlnaManager.GetIcon(request.Filename).Stream));
+            return _resultFactory.GetStaticResult(Request, cacheKey, null, cacheLength, contentType, () => Task.FromResult(_dlnaManager.GetIcon(request.Filename).Stream));
         }
 
         public object Subscribe(ProcessContentDirectoryEventRequest request)
diff --git a/Emby.Dlna/ContentDirectory/ControlHandler.cs b/Emby.Dlna/ContentDirectory/ControlHandler.cs
index 61ee45f740..5a8fd40685 100644
--- a/Emby.Dlna/ContentDirectory/ControlHandler.cs
+++ b/Emby.Dlna/ContentDirectory/ControlHandler.cs
@@ -242,7 +242,7 @@ namespace Emby.Dlna.ContentDirectory
 
             var dlnaOptions = _config.GetDlnaConfiguration();
 
-            using (XmlWriter writer = XmlWriter.Create(builder, settings))
+            using (var writer = XmlWriter.Create(builder, settings))
             {
                 //writer.WriteStartDocument();
 
@@ -358,7 +358,7 @@ namespace Emby.Dlna.ContentDirectory
             int totalCount = 0;
             int provided = 0;
 
-            using (XmlWriter writer = XmlWriter.Create(builder, settings))
+            using (var writer = XmlWriter.Create(builder, settings))
             {
                 //writer.WriteStartDocument();
 
diff --git a/Emby.Dlna/Didl/DidlBuilder.cs b/Emby.Dlna/Didl/DidlBuilder.cs
index 6ecb9f3b47..d2f635e567 100644
--- a/Emby.Dlna/Didl/DidlBuilder.cs
+++ b/Emby.Dlna/Didl/DidlBuilder.cs
@@ -78,7 +78,7 @@ namespace Emby.Dlna.Didl
 
             using (StringWriter builder = new StringWriterWithEncoding(Encoding.UTF8))
             {
-                using (XmlWriter writer = XmlWriter.Create(builder, settings))
+                using (var writer = XmlWriter.Create(builder, settings))
                 {
                     //writer.WriteStartDocument();
 
diff --git a/Emby.Dlna/PlayTo/PlayToController.cs b/Emby.Dlna/PlayTo/PlayToController.cs
index 95be02ff43..85a37d7f8f 100644
--- a/Emby.Dlna/PlayTo/PlayToController.cs
+++ b/Emby.Dlna/PlayTo/PlayToController.cs
@@ -854,7 +854,7 @@ namespace Emby.Dlna.PlayTo
                 if (index == -1) return request;
 
                 var query = url.Substring(index + 1);
-                QueryParamCollection values = MyHttpUtility.ParseQueryString(query);
+                var values = MyHttpUtility.ParseQueryString(query);
 
                 request.DeviceProfileId = values.Get("DeviceProfileId");
                 request.DeviceId = values.Get("DeviceId");
diff --git a/Emby.Dlna/Service/BaseControlHandler.cs b/Emby.Dlna/Service/BaseControlHandler.cs
index d65f8972bc..5f78674b88 100644
--- a/Emby.Dlna/Service/BaseControlHandler.cs
+++ b/Emby.Dlna/Service/BaseControlHandler.cs
@@ -85,7 +85,7 @@ namespace Emby.Dlna.Service
 
             StringWriter builder = new StringWriterWithEncoding(Encoding.UTF8);
 
-            using (XmlWriter writer = XmlWriter.Create(builder, settings))
+            using (var writer = XmlWriter.Create(builder, settings))
             {
                 writer.WriteStartDocument(true);
 
diff --git a/Emby.Dlna/Service/ControlErrorHandler.cs b/Emby.Dlna/Service/ControlErrorHandler.cs
index e9c2c67b9e..d5eb4a8879 100644
--- a/Emby.Dlna/Service/ControlErrorHandler.cs
+++ b/Emby.Dlna/Service/ControlErrorHandler.cs
@@ -20,7 +20,7 @@ namespace Emby.Dlna.Service
 
             StringWriter builder = new StringWriterWithEncoding(Encoding.UTF8);
 
-            using (XmlWriter writer = XmlWriter.Create(builder, settings))
+            using (var writer = XmlWriter.Create(builder, settings))
             {
                 writer.WriteStartDocument(true);
 
diff --git a/Emby.Drawing.Skia/StripCollageBuilder.cs b/Emby.Drawing.Skia/StripCollageBuilder.cs
index 36d00669ab..8d984de116 100644
--- a/Emby.Drawing.Skia/StripCollageBuilder.cs
+++ b/Emby.Drawing.Skia/StripCollageBuilder.cs
@@ -164,7 +164,7 @@ namespace Emby.Drawing.Skia
 
         private SKBitmap GetNextValidImage(string[] paths, int currentIndex, out int newIndex)
         {
-            Dictionary<int, int> imagesTested = new Dictionary<int, int>();
+            var imagesTested = new Dictionary<int, int>();
             SKBitmap bitmap = null;
 
             while (imagesTested.Count < paths.Length)
@@ -174,7 +174,7 @@ namespace Emby.Drawing.Skia
                     currentIndex = 0;
                 }
 
-                bitmap = SkiaEncoder.Decode(paths[currentIndex], false, _fileSystem, null, out SKEncodedOrigin origin);
+                bitmap = SkiaEncoder.Decode(paths[currentIndex], false, _fileSystem, null, out var origin);
 
                 imagesTested[currentIndex] = 0;
 
diff --git a/Emby.Drawing/Common/ImageHeader.cs b/Emby.Drawing/Common/ImageHeader.cs
index 6b604bc15e..3939a16641 100644
--- a/Emby.Drawing/Common/ImageHeader.cs
+++ b/Emby.Drawing/Common/ImageHeader.cs
@@ -73,7 +73,7 @@ namespace Emby.Drawing.Common
         /// </summary>
         /// <param name="binaryReader">The binary reader.</param>
         /// <returns>Size.</returns>
-        /// <exception cref="System.ArgumentException">binaryReader</exception>
+        /// <exception cref="ArgumentException">binaryReader</exception>
         /// <exception cref="ArgumentException">The image was of an unrecognized format.</exception>
         private static ImageSize GetDimensions(BinaryReader binaryReader)
         {
@@ -200,7 +200,7 @@ namespace Emby.Drawing.Common
         /// </summary>
         /// <param name="binaryReader">The binary reader.</param>
         /// <returns>Size.</returns>
-        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="ArgumentException"></exception>
         private static ImageSize DecodeJfif(BinaryReader binaryReader)
         {
             // A JPEG image consists of a sequence of segments,
diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index 57a6eb148c..a88c720a70 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -491,7 +491,7 @@ namespace Emby.Drawing
         /// <param name="item">The item.</param>
         /// <param name="image">The image.</param>
         /// <returns>Guid.</returns>
-        /// <exception cref="System.ArgumentNullException">item</exception>
+        /// <exception cref="ArgumentNullException">item</exception>
         public string GetImageCacheTag(BaseItem item, ItemImageInfo image)
         {
             var supportedEnhancers = GetSupportedEnhancers(item, image.Type);
@@ -523,7 +523,7 @@ namespace Emby.Drawing
         /// <param name="image">The image.</param>
         /// <param name="imageEnhancers">The image enhancers.</param>
         /// <returns>Guid.</returns>
-        /// <exception cref="System.ArgumentNullException">item</exception>
+        /// <exception cref="ArgumentNullException">item</exception>
         public string GetImageCacheTag(BaseItem item, ItemImageInfo image, IImageEnhancer[] imageEnhancers)
         {
             var originalImagePath = image.Path;
@@ -744,7 +744,7 @@ namespace Emby.Drawing
         /// <param name="uniqueName">Name of the unique.</param>
         /// <param name="fileExtension">The file extension.</param>
         /// <returns>System.String.</returns>
-        /// <exception cref="System.ArgumentNullException">
+        /// <exception cref="ArgumentNullException">
         /// path
         /// or
         /// uniqueName
@@ -778,7 +778,7 @@ namespace Emby.Drawing
         /// <param name="path">The path.</param>
         /// <param name="filename">The filename.</param>
         /// <returns>System.String.</returns>
-        /// <exception cref="System.ArgumentNullException">
+        /// <exception cref="ArgumentNullException">
         /// path
         /// or
         /// filename
diff --git a/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs b/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs
index ac486f1675..4729b5b5a6 100644
--- a/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs
+++ b/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs
@@ -141,7 +141,7 @@ namespace IsoMounter
 
         public Task<IIsoMount> Mount(string isoPath, CancellationToken cancellationToken)
         {
-            if (MountISO(isoPath, out LinuxMount mountedISO))
+            if (MountISO(isoPath, out var mountedISO))
             {
                 return Task.FromResult<IIsoMount>(mountedISO);
             }
diff --git a/Emby.Naming/AudioBook/AudioBookFilePathParser.cs b/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
index 8c52fd9b9f..b386593e72 100644
--- a/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
+++ b/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
@@ -16,7 +16,7 @@ namespace Emby.Naming.AudioBook
 
         public AudioBookFilePathParserResult Parse(string path, bool IsDirectory)
         {
-            AudioBookFilePathParserResult result = Parse(path);
+            var result = Parse(path);
             return !result.Success ? new AudioBookFilePathParserResult() : result;
         }
 
diff --git a/Emby.Naming/TV/EpisodePathParser.cs b/Emby.Naming/TV/EpisodePathParser.cs
index 76c59d38ec..260cb505c3 100644
--- a/Emby.Naming/TV/EpisodePathParser.cs
+++ b/Emby.Naming/TV/EpisodePathParser.cs
@@ -133,7 +133,7 @@ namespace Emby.Naming.TV
                         result.EpisodeNumber = num;
                     }
 
-                    Group endingNumberGroup = match.Groups["endingepnumber"];
+                    var endingNumberGroup = match.Groups["endingepnumber"];
                     if (endingNumberGroup.Success)
                     {
                         // Will only set EndingEpsiodeNumber if the captured number is not followed by additional numbers
diff --git a/Emby.Naming/Video/VideoResolver.cs b/Emby.Naming/Video/VideoResolver.cs
index de8f96965f..9bd0cb3dfb 100644
--- a/Emby.Naming/Video/VideoResolver.cs
+++ b/Emby.Naming/Video/VideoResolver.cs
@@ -40,7 +40,7 @@ namespace Emby.Naming.Video
         /// <param name="path">The path.</param>
         /// <param name="IsDirectory">if set to <c>true</c> [is folder].</param>
         /// <returns>VideoFileInfo.</returns>
-        /// <exception cref="System.ArgumentNullException">path</exception>
+        /// <exception cref="ArgumentNullException">path</exception>
         public VideoFileInfo Resolve(string path, bool IsDirectory, bool parseName = true)
         {
             if (string.IsNullOrEmpty(path))
diff --git a/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs b/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
index 90a0671f28..a8e8f815a0 100644
--- a/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
+++ b/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
@@ -527,7 +527,7 @@ namespace Emby.Server.Implementations.Activity
             const int DaysInMonth = 30;
 
             // Get each non-zero value from TimeSpan component
-            List<string> values = new List<string>();
+            var values = new List<string>();
 
             // Number of years
             int days = span.Days;
@@ -558,7 +558,7 @@ namespace Emby.Server.Implementations.Activity
                 values.Add(CreateValueString(span.Seconds, "second"));
 
             // Combine values into string
-            StringBuilder builder = new StringBuilder();
+            var builder = new StringBuilder();
             for (int i = 0; i < values.Count; i++)
             {
                 if (builder.Length > 0)
diff --git a/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs b/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
index 6f393a03c3..59c7c655f1 100644
--- a/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
+++ b/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
@@ -151,7 +151,7 @@ namespace Emby.Server.Implementations.AppBase
         /// Replaces the configuration.
         /// </summary>
         /// <param name="newConfiguration">The new configuration.</param>
-        /// <exception cref="System.ArgumentNullException">newConfiguration</exception>
+        /// <exception cref="ArgumentNullException">newConfiguration</exception>
         public virtual void ReplaceConfiguration(BaseApplicationConfiguration newConfiguration)
         {
             if (newConfiguration == null)
@@ -188,7 +188,7 @@ namespace Emby.Server.Implementations.AppBase
         /// Replaces the cache path.
         /// </summary>
         /// <param name="newConfig">The new configuration.</param>
-        /// <exception cref="System.IO.DirectoryNotFoundException"></exception>
+        /// <exception cref="DirectoryNotFoundException"></exception>
         private void ValidateCachePath(BaseApplicationConfiguration newConfig)
         {
             var newPath = newConfig.CachePath;
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 61b88345f2..5f3508441c 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -822,7 +822,7 @@ namespace Emby.Server.Implementations
             RegisterSingleInstance(ServerConfigurationManager);
 
             IAssemblyInfo assemblyInfo = new AssemblyInfo();
-            RegisterSingleInstance<IAssemblyInfo>(assemblyInfo);
+            RegisterSingleInstance(assemblyInfo);
 
             LocalizationManager = new LocalizationManager(ServerConfigurationManager, FileSystemManager, JsonSerializer, LoggerFactory.CreateLogger("LocalizationManager"), assemblyInfo, new TextLocalizer());
             StringExtensions.LocalizationManager = LocalizationManager;
@@ -920,7 +920,7 @@ namespace Emby.Server.Implementations
             RegisterSingleInstance(CollectionManager);
 
             PlaylistManager = new PlaylistManager(LibraryManager, FileSystemManager, LibraryMonitor, LoggerFactory.CreateLogger("PlaylistManager"), UserManager, ProviderManager);
-            RegisterSingleInstance<IPlaylistManager>(PlaylistManager);
+            RegisterSingleInstance(PlaylistManager);
 
             LiveTvManager = new LiveTvManager(this, HttpClient, ServerConfigurationManager, Logger, ItemRepository, ImageProcessor, UserDataManager, DtoService, UserManager, LibraryManager, TaskManager, LocalizationManager, JsonSerializer, ProviderManager, FileSystemManager, SecurityManager, () => ChannelManager);
             RegisterSingleInstance(LiveTvManager);
@@ -938,7 +938,7 @@ namespace Emby.Server.Implementations
 
             RegisterMediaEncoder(assemblyInfo);
 
-            EncodingManager = new Emby.Server.Implementations.MediaEncoder.EncodingManager(FileSystemManager, Logger, MediaEncoder, ChapterManager, LibraryManager);
+            EncodingManager = new MediaEncoder.EncodingManager(FileSystemManager, Logger, MediaEncoder, ChapterManager, LibraryManager);
             RegisterSingleInstance(EncodingManager);
 
             var activityLogRepo = GetActivityLogRepository();
@@ -950,7 +950,7 @@ namespace Emby.Server.Implementations
             RegisterSingleInstance<ISessionContext>(new SessionContext(UserManager, authContext, SessionManager));
 
             AuthService = new AuthService(UserManager, authContext, ServerConfigurationManager, SessionManager, NetworkManager);
-            RegisterSingleInstance<IAuthService>(AuthService);
+            RegisterSingleInstance(AuthService);
 
             SubtitleEncoder = new MediaBrowser.MediaEncoding.Subtitles.SubtitleEncoder(LibraryManager, LoggerFactory.CreateLogger("SubtitleEncoder"), ApplicationPaths, FileSystemManager, MediaEncoder, JsonSerializer, HttpClient, MediaSourceManager, ProcessFactory, TextEncoding);
             RegisterSingleInstance(SubtitleEncoder);
@@ -1023,7 +1023,7 @@ namespace Emby.Server.Implementations
         {
             var arr = str.ToCharArray();
 
-            arr = Array.FindAll<char>(arr, (c => (char.IsLetterOrDigit(c)
+            arr = Array.FindAll(arr, (c => (char.IsLetterOrDigit(c)
                                                   || char.IsWhiteSpace(c))));
 
             var result = new string(arr);
@@ -1057,7 +1057,7 @@ namespace Emby.Server.Implementations
                 // Don't use an empty string password
                 var password = string.IsNullOrWhiteSpace(info.Password) ? null : info.Password;
 
-                X509Certificate2 localCert = new X509Certificate2(certificateLocation, password);
+                var localCert = new X509Certificate2(certificateLocation, password);
                 //localCert.PrivateKey = PrivateKey.CreateFromFile(pvk_file).RSA;
                 if (!localCert.HasPrivateKey)
                 {
diff --git a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
index 55f40db8f9..ab2e1c9a96 100644
--- a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -119,7 +119,7 @@ namespace Emby.Server.Implementations.Configuration
         /// Replaces the configuration.
         /// </summary>
         /// <param name="newConfiguration">The new configuration.</param>
-        /// <exception cref="System.IO.DirectoryNotFoundException"></exception>
+        /// <exception cref="DirectoryNotFoundException"></exception>
         public override void ReplaceConfiguration(BaseApplicationConfiguration newConfiguration)
         {
             var newConfig = (ServerConfiguration)newConfiguration;
@@ -137,7 +137,7 @@ namespace Emby.Server.Implementations.Configuration
         /// Validates the SSL certificate.
         /// </summary>
         /// <param name="newConfig">The new configuration.</param>
-        /// <exception cref="System.IO.DirectoryNotFoundException"></exception>
+        /// <exception cref="DirectoryNotFoundException"></exception>
         private void ValidateSslCertificate(BaseApplicationConfiguration newConfig)
         {
             var serverConfig = (ServerConfiguration)newConfig;
@@ -159,7 +159,7 @@ namespace Emby.Server.Implementations.Configuration
         /// Validates the metadata path.
         /// </summary>
         /// <param name="newConfig">The new configuration.</param>
-        /// <exception cref="System.IO.DirectoryNotFoundException"></exception>
+        /// <exception cref="DirectoryNotFoundException"></exception>
         private void ValidateMetadataPath(ServerConfiguration newConfig)
         {
             var newPath = newConfig.MetadataPath;
diff --git a/Emby.Server.Implementations/Data/ManagedConnection.cs b/Emby.Server.Implementations/Data/ManagedConnection.cs
index 2f3dfc4d1c..b8f1e581ab 100644
--- a/Emby.Server.Implementations/Data/ManagedConnection.cs
+++ b/Emby.Server.Implementations/Data/ManagedConnection.cs
@@ -47,7 +47,7 @@ namespace Emby.Server.Implementations.Data
 
         public T RunInTransaction<T>(Func<IDatabaseConnection, T> action, TransactionMode mode)
         {
-            return db.RunInTransaction<T>(action, mode);
+            return db.RunInTransaction(action, mode);
         }
 
         public IEnumerable<IReadOnlyList<IResultSetValue>> Query(string sql)
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index 822573f20b..9ed2b49e58 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -83,7 +83,7 @@ namespace Emby.Server.Implementations.Data
         /// <param name="client">The client.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">item</exception>
+        /// <exception cref="ArgumentNullException">item</exception>
         public void SaveDisplayPreferences(DisplayPreferences displayPreferences, Guid userId, string client, CancellationToken cancellationToken)
         {
             if (displayPreferences == null)
@@ -131,7 +131,7 @@ namespace Emby.Server.Implementations.Data
         /// <param name="userId">The user id.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">item</exception>
+        /// <exception cref="ArgumentNullException">item</exception>
         public void SaveAllDisplayPreferences(IEnumerable<DisplayPreferences> displayPreferences, Guid userId, CancellationToken cancellationToken)
         {
             if (displayPreferences == null)
@@ -163,7 +163,7 @@ namespace Emby.Server.Implementations.Data
         /// <param name="userId">The user id.</param>
         /// <param name="client">The client.</param>
         /// <returns>Task{DisplayPreferences}.</returns>
-        /// <exception cref="System.ArgumentNullException">item</exception>
+        /// <exception cref="ArgumentNullException">item</exception>
         public DisplayPreferences GetDisplayPreferences(string displayPreferencesId, Guid userId, string client)
         {
             if (string.IsNullOrEmpty(displayPreferencesId))
@@ -202,7 +202,7 @@ namespace Emby.Server.Implementations.Data
         /// </summary>
         /// <param name="userId">The user id.</param>
         /// <returns>Task{DisplayPreferences}.</returns>
-        /// <exception cref="System.ArgumentNullException">item</exception>
+        /// <exception cref="ArgumentNullException">item</exception>
         public IEnumerable<DisplayPreferences> GetAllDisplayPreferences(Guid userId)
         {
             var list = new List<DisplayPreferences>();
diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs
index 5ff61d37c3..edb73d2a15 100644
--- a/Emby.Server.Implementations/Data/SqliteExtensions.cs
+++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs
@@ -128,7 +128,7 @@ namespace Emby.Server.Implementations.Data
         /// Serializes to bytes.
         /// </summary>
         /// <returns>System.Byte[][].</returns>
-        /// <exception cref="System.ArgumentNullException">obj</exception>
+        /// <exception cref="ArgumentNullException">obj</exception>
         public static byte[] SerializeToBytes(this IJsonSerializer json, object obj)
         {
             if (obj == null)
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 325bad501e..7e72713714 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -531,7 +531,7 @@ namespace Emby.Server.Implementations.Data
         /// </summary>
         /// <param name="item">The item.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        /// <exception cref="System.ArgumentNullException">item</exception>
+        /// <exception cref="ArgumentNullException">item</exception>
         public void SaveItem(BaseItem item, CancellationToken cancellationToken)
         {
             if (item == null)
@@ -574,7 +574,7 @@ namespace Emby.Server.Implementations.Data
         /// </summary>
         /// <param name="items">The items.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        /// <exception cref="System.ArgumentNullException">
+        /// <exception cref="ArgumentNullException">
         /// items
         /// or
         /// cancellationToken
@@ -1198,8 +1198,8 @@ namespace Emby.Server.Implementations.Data
         /// </summary>
         /// <param name="id">The id.</param>
         /// <returns>BaseItem.</returns>
-        /// <exception cref="System.ArgumentNullException">id</exception>
-        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="ArgumentNullException">id</exception>
+        /// <exception cref="ArgumentException"></exception>
         public BaseItem RetrieveItem(Guid id)
         {
             if (id.Equals(Guid.Empty))
@@ -1945,7 +1945,7 @@ namespace Emby.Server.Implementations.Data
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>IEnumerable{ChapterInfo}.</returns>
-        /// <exception cref="System.ArgumentNullException">id</exception>
+        /// <exception cref="ArgumentNullException">id</exception>
         public List<ChapterInfo> GetChapters(BaseItem item)
         {
             CheckDisposed();
@@ -1977,7 +1977,7 @@ namespace Emby.Server.Implementations.Data
         /// <param name="item">The item.</param>
         /// <param name="index">The index.</param>
         /// <returns>ChapterInfo.</returns>
-        /// <exception cref="System.ArgumentNullException">id</exception>
+        /// <exception cref="ArgumentNullException">id</exception>
         public ChapterInfo GetChapter(BaseItem item, int index)
         {
             CheckDisposed();
diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index 469927f637..48ff9ded80 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -110,7 +110,7 @@ namespace Emby.Server.Implementations.Data
 
         private List<Guid> GetAllUserIdsWithUserData(IDatabaseConnection db)
         {
-            List<Guid> list = new List<Guid>();
+            var list = new List<Guid>();
 
             using (var statement = PrepareStatement(db, "select DISTINCT UserId from UserData where UserId not null"))
             {
@@ -271,7 +271,7 @@ namespace Emby.Server.Implementations.Data
         /// <param name="internalUserId">The user id.</param>
         /// <param name="key">The key.</param>
         /// <returns>Task{UserItemData}.</returns>
-        /// <exception cref="System.ArgumentNullException">
+        /// <exception cref="ArgumentNullException">
         /// userId
         /// or
         /// key
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index bf00f2e657..ad37a02753 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -200,7 +200,7 @@ namespace Emby.Server.Implementations.Data
         /// </summary>
         /// <param name="user">The user.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">user</exception>
+        /// <exception cref="ArgumentNullException">user</exception>
         public void DeleteUser(User user)
         {
             if (user == null)
diff --git a/Emby.Server.Implementations/Data/TypeMapper.cs b/Emby.Server.Implementations/Data/TypeMapper.cs
index fa6a29aa3d..37c952e88e 100644
--- a/Emby.Server.Implementations/Data/TypeMapper.cs
+++ b/Emby.Server.Implementations/Data/TypeMapper.cs
@@ -27,7 +27,7 @@ namespace Emby.Server.Implementations.Data
         /// </summary>
         /// <param name="typeName">Name of the type.</param>
         /// <returns>Type.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         public Type GetType(string typeName)
         {
             if (string.IsNullOrEmpty(typeName))
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 68bff962fd..8877fc051f 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -71,7 +71,7 @@ namespace Emby.Server.Implementations.Dto
         /// <param name="user">The user.</param>
         /// <param name="owner">The owner.</param>
         /// <returns>Task{DtoBaseItem}.</returns>
-        /// <exception cref="System.ArgumentNullException">item</exception>
+        /// <exception cref="ArgumentNullException">item</exception>
         public BaseItemDto GetBaseItemDto(BaseItem item, ItemFields[] fields, User user = null, BaseItem owner = null)
         {
             var options = new DtoOptions
@@ -463,7 +463,7 @@ namespace Emby.Server.Implementations.Dto
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>System.String.</returns>
-        /// <exception cref="System.ArgumentNullException">item</exception>
+        /// <exception cref="ArgumentNullException">item</exception>
         public string GetDtoId(BaseItem item)
         {
             return item.Id.ToString("N");
diff --git a/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs b/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
index c7bd03960d..e37ea96a12 100644
--- a/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
@@ -58,7 +58,7 @@ namespace Emby.Server.Implementations.EntryPoints
 
             try
             {
-                await _sessionManager.SendMessageToUserSessions<TimerEventInfo>(users, name, info, CancellationToken.None);
+                await _sessionManager.SendMessageToUserSessions(users, name, info, CancellationToken.None);
             }
             catch (ObjectDisposedException)
             {
diff --git a/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs b/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
index 72828f0d4b..255e1476f5 100644
--- a/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
+++ b/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
@@ -82,7 +82,7 @@ namespace Emby.Server.Implementations.HttpClientManager
         /// <param name="host">The host.</param>
         /// <param name="enableHttpCompression">if set to <c>true</c> [enable HTTP compression].</param>
         /// <returns>HttpClient.</returns>
-        /// <exception cref="System.ArgumentNullException">host</exception>
+        /// <exception cref="ArgumentNullException">host</exception>
         private HttpClientInfo GetHttpClient(string host, bool enableHttpCompression)
         {
             if (string.IsNullOrEmpty(host))
@@ -125,7 +125,7 @@ namespace Emby.Server.Implementations.HttpClientManager
         {
             string url = options.Url;
 
-            Uri uriAddress = new Uri(url);
+            var uriAddress = new Uri(url);
             string userInfo = uriAddress.UserInfo;
             if (!string.IsNullOrWhiteSpace(userInfo))
             {
@@ -133,7 +133,7 @@ namespace Emby.Server.Implementations.HttpClientManager
                 url = url.Replace(userInfo + "@", string.Empty);
             }
 
-            WebRequest request = CreateWebRequest(url);
+            var request = CreateWebRequest(url);
 
             if (request is HttpWebRequest httpWebRequest)
             {
@@ -188,7 +188,7 @@ namespace Emby.Server.Implementations.HttpClientManager
         private static CredentialCache GetCredential(string url, string username, string password)
         {
             //ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3;
-            CredentialCache credentialCache = new CredentialCache();
+            var credentialCache = new CredentialCache();
             credentialCache.Add(new Uri(url), "Basic", new NetworkCredential(username, password));
             return credentialCache;
         }
@@ -807,7 +807,7 @@ namespace Emby.Server.Implementations.HttpClientManager
         {
             var taskCompletion = new TaskCompletionSource<WebResponse>();
 
-            Task<WebResponse> asyncTask = Task.Factory.FromAsync<WebResponse>(request.BeginGetResponse, request.EndGetResponse, null);
+            var asyncTask = Task.Factory.FromAsync(request.BeginGetResponse, request.EndGetResponse, null);
 
             ThreadPool.RegisterWaitForSingleObject((asyncTask as IAsyncResult).AsyncWaitHandle, TimeoutCallback, request, timeout, true);
             var callback = new TaskCallback { taskCompletion = taskCompletion };
@@ -823,7 +823,7 @@ namespace Emby.Server.Implementations.HttpClientManager
         {
             if (timedOut && state != null)
             {
-                WebRequest request = (WebRequest)state;
+                var request = (WebRequest)state;
                 request.Abort();
             }
         }
diff --git a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
index 1ad92a83fb..b9146d0076 100644
--- a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
+++ b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
@@ -77,7 +77,7 @@ namespace Emby.Server.Implementations.HttpServer
         /// <param name="remoteEndPoint">The remote end point.</param>
         /// <param name="jsonSerializer">The json serializer.</param>
         /// <param name="logger">The logger.</param>
-        /// <exception cref="System.ArgumentNullException">socket</exception>
+        /// <exception cref="ArgumentNullException">socket</exception>
         public WebSocketConnection(IWebSocket socket, string remoteEndPoint, IJsonSerializer jsonSerializer, ILogger logger, ITextEncoding textEncoding)
         {
             if (socket == null)
@@ -215,7 +215,7 @@ namespace Emby.Server.Implementations.HttpServer
         /// <param name="message">The message.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">message</exception>
+        /// <exception cref="ArgumentNullException">message</exception>
         public Task SendAsync<T>(WebSocketMessage<T> message, CancellationToken cancellationToken)
         {
             if (message == null)
diff --git a/Emby.Server.Implementations/IO/IsoManager.cs b/Emby.Server.Implementations/IO/IsoManager.cs
index e82335d65e..f0a15097c9 100644
--- a/Emby.Server.Implementations/IO/IsoManager.cs
+++ b/Emby.Server.Implementations/IO/IsoManager.cs
@@ -23,8 +23,8 @@ namespace Emby.Server.Implementations.IO
         /// <param name="isoPath">The iso path.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>IsoMount.</returns>
-        /// <exception cref="System.ArgumentNullException">isoPath</exception>
-        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="ArgumentNullException">isoPath</exception>
+        /// <exception cref="ArgumentException"></exception>
         public Task<IIsoMount> Mount(string isoPath, CancellationToken cancellationToken)
         {
             if (string.IsNullOrEmpty(isoPath))
diff --git a/Emby.Server.Implementations/IO/LibraryMonitor.cs b/Emby.Server.Implementations/IO/LibraryMonitor.cs
index 39ed1afa79..2c92e65432 100644
--- a/Emby.Server.Implementations/IO/LibraryMonitor.cs
+++ b/Emby.Server.Implementations/IO/LibraryMonitor.cs
@@ -263,7 +263,7 @@ namespace Emby.Server.Implementations.IO
         /// <param name="lst">The LST.</param>
         /// <param name="path">The path.</param>
         /// <returns><c>true</c> if [contains parent folder] [the specified LST]; otherwise, <c>false</c>.</returns>
-        /// <exception cref="System.ArgumentNullException">path</exception>
+        /// <exception cref="ArgumentNullException">path</exception>
         private static bool ContainsParentFolder(IEnumerable<string> lst, string path)
         {
             if (string.IsNullOrEmpty(path))
diff --git a/Emby.Server.Implementations/IO/ManagedFileSystem.cs b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
index 7574eb0e98..ae14701908 100644
--- a/Emby.Server.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
@@ -101,7 +101,7 @@ namespace Emby.Server.Implementations.IO
         /// </summary>
         /// <param name="filename">The filename.</param>
         /// <returns><c>true</c> if the specified filename is shortcut; otherwise, <c>false</c>.</returns>
-        /// <exception cref="System.ArgumentNullException">filename</exception>
+        /// <exception cref="ArgumentNullException">filename</exception>
         public virtual bool IsShortcut(string filename)
         {
             if (string.IsNullOrEmpty(filename))
@@ -118,7 +118,7 @@ namespace Emby.Server.Implementations.IO
         /// </summary>
         /// <param name="filename">The filename.</param>
         /// <returns>System.String.</returns>
-        /// <exception cref="System.ArgumentNullException">filename</exception>
+        /// <exception cref="ArgumentNullException">filename</exception>
         public virtual string ResolveShortcut(string filename)
         {
             if (string.IsNullOrEmpty(filename))
@@ -185,7 +185,7 @@ namespace Emby.Server.Implementations.IO
         /// </summary>
         /// <param name="shortcutPath">The shortcut path.</param>
         /// <param name="target">The target.</param>
-        /// <exception cref="System.ArgumentNullException">
+        /// <exception cref="ArgumentNullException">
         /// shortcutPath
         /// or
         /// target
@@ -344,7 +344,7 @@ namespace Emby.Server.Implementations.IO
         /// </summary>
         /// <param name="filename">The filename.</param>
         /// <returns>System.String.</returns>
-        /// <exception cref="System.ArgumentNullException">filename</exception>
+        /// <exception cref="ArgumentNullException">filename</exception>
         public string GetValidFilename(string filename)
         {
             var builder = new StringBuilder(filename);
@@ -526,7 +526,7 @@ namespace Emby.Server.Implementations.IO
                 }
                 else
                 {
-                    FileAttributes attributes = File.GetAttributes(path);
+                    var attributes = File.GetAttributes(path);
                     attributes = RemoveAttribute(attributes, FileAttributes.Hidden);
                     File.SetAttributes(path, attributes);
                 }
@@ -550,7 +550,7 @@ namespace Emby.Server.Implementations.IO
                 }
                 else
                 {
-                    FileAttributes attributes = File.GetAttributes(path);
+                    var attributes = File.GetAttributes(path);
                     attributes = RemoveAttribute(attributes, FileAttributes.ReadOnly);
                     File.SetAttributes(path, attributes);
                 }
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 9c2759f133..0d25cbc92c 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -711,7 +711,7 @@ namespace Emby.Server.Implementations.Library
         /// Creates the root media folder
         /// </summary>
         /// <returns>AggregateFolder.</returns>
-        /// <exception cref="System.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;
@@ -905,7 +905,7 @@ namespace Emby.Server.Implementations.Library
         /// </summary>
         /// <param name="value">The value.</param>
         /// <returns>Task{Year}.</returns>
-        /// <exception cref="System.ArgumentOutOfRangeException"></exception>
+        /// <exception cref="ArgumentOutOfRangeException"></exception>
         public Year GetYear(int value)
         {
             if (value <= 0)
@@ -1233,7 +1233,7 @@ namespace Emby.Server.Implementations.Library
         /// </summary>
         /// <param name="id">The id.</param>
         /// <returns>BaseItem.</returns>
-        /// <exception cref="System.ArgumentNullException">id</exception>
+        /// <exception cref="ArgumentNullException">id</exception>
         public BaseItem GetItemById(Guid id)
         {
             if (id.Equals(Guid.Empty))
@@ -2075,7 +2075,7 @@ namespace Emby.Server.Implementations.Library
 
         public string GetConfiguredContentType(BaseItem item, bool inheritConfiguredPath)
         {
-            ICollectionFolder collectionFolder = item as ICollectionFolder;
+            var collectionFolder = item as ICollectionFolder;
             if (collectionFolder != null)
             {
                 return collectionFolder.CollectionType;
@@ -2417,11 +2417,11 @@ namespace Emby.Server.Implementations.Library
 
             var episodeInfo = episode.IsFileProtocol ?
                 resolver.Resolve(episode.Path, isFolder, null, null, isAbsoluteNaming) :
-                new Emby.Naming.TV.EpisodeInfo();
+                new Naming.TV.EpisodeInfo();
 
             if (episodeInfo == null)
             {
-                episodeInfo = new Emby.Naming.TV.EpisodeInfo();
+                episodeInfo = new Naming.TV.EpisodeInfo();
             }
 
             var changed = false;
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index dcda957421..fb0f33a2f6 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -127,7 +127,7 @@ namespace Emby.Server.Implementations.Library
 
             if (allowMediaProbe && mediaSources[0].Type != MediaSourceType.Placeholder && !mediaSources[0].MediaStreams.Any(i => i.Type == MediaStreamType.Audio || i.Type == MediaStreamType.Video))
             {
-                await item.RefreshMetadata(new MediaBrowser.Controller.Providers.MetadataRefreshOptions(new DirectoryService(_logger, _fileSystem))
+                await item.RefreshMetadata(new MetadataRefreshOptions(new DirectoryService(_logger, _fileSystem))
                 {
                     EnableRemoteContentProbe = true,
                     MetadataRefreshMode = MediaBrowser.Controller.Providers.MetadataRefreshMode.FullRefresh
diff --git a/Emby.Server.Implementations/Library/PathExtensions.cs b/Emby.Server.Implementations/Library/PathExtensions.cs
index 6a3adda5a8..d3a81f6228 100644
--- a/Emby.Server.Implementations/Library/PathExtensions.cs
+++ b/Emby.Server.Implementations/Library/PathExtensions.cs
@@ -11,7 +11,7 @@ namespace Emby.Server.Implementations.Library
         /// <param name="str">The STR.</param>
         /// <param name="attrib">The attrib.</param>
         /// <returns>System.String.</returns>
-        /// <exception cref="System.ArgumentNullException">attrib</exception>
+        /// <exception cref="ArgumentNullException">attrib</exception>
         public static string GetAttributeValue(this string str, string attrib)
         {
             if (string.IsNullOrEmpty(str))
diff --git a/Emby.Server.Implementations/Library/ResolverHelper.cs b/Emby.Server.Implementations/Library/ResolverHelper.cs
index 7484fc7430..96d1bff92c 100644
--- a/Emby.Server.Implementations/Library/ResolverHelper.cs
+++ b/Emby.Server.Implementations/Library/ResolverHelper.cs
@@ -21,7 +21,7 @@ namespace Emby.Server.Implementations.Library
         /// <param name="fileSystem">The file system.</param>
         /// <param name="libraryManager">The library manager.</param>
         /// <param name="directoryService">The directory service.</param>
-        /// <exception cref="System.ArgumentException">Item must have a path</exception>
+        /// <exception cref="ArgumentException">Item must have a path</exception>
         public static void SetInitialItemValues(BaseItem item, Folder parent, IFileSystem fileSystem, ILibraryManager libraryManager, IDirectoryService directoryService)
         {
             // This version of the below method has no ItemResolveArgs, so we have to require the path already being set
diff --git a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
index bd5132c4b3..d992f8d030 100644
--- a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
@@ -49,7 +49,7 @@ namespace Emby.Server.Implementations.Library.Resolvers
             var namingOptions = ((LibraryManager)LibraryManager).GetNamingOptions();
 
             // If the path is a file check for a matching extensions
-            var parser = new Emby.Naming.Video.VideoResolver(namingOptions);
+            var parser = new VideoResolver(namingOptions);
 
             if (args.IsDirectory)
             {
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
index a806c842fe..ce1386e91a 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
@@ -63,7 +63,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
 
                 if (!season.IndexNumber.HasValue || !seasonParserResult.IsSeasonFolder)
                 {
-                    var resolver = new Emby.Naming.TV.EpisodeResolver(namingOptions);
+                    var resolver = new Naming.TV.EpisodeResolver(namingOptions);
 
                     var folderName = System.IO.Path.GetFileName(path);
                     var testPath = "\\\\test\\" + folderName;
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index 3bd5b78a5c..16b5a2d3ae 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -151,7 +151,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
 
                         var namingOptions = ((LibraryManager)libraryManager).GetNamingOptions();
 
-                        var episodeResolver = new Emby.Naming.TV.EpisodeResolver(namingOptions);
+                        var episodeResolver = new Naming.TV.EpisodeResolver(namingOptions);
                         bool? isNamed = null;
                         bool? isOptimistic = null;
 
@@ -179,7 +179,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
         /// </summary>
         /// <param name="path">The path.</param>
         /// <returns><c>true</c> if [is place holder] [the specified path]; otherwise, <c>false</c>.</returns>
-        /// <exception cref="System.ArgumentNullException">path</exception>
+        /// <exception cref="ArgumentNullException">path</exception>
         private static bool IsVideoPlaceHolder(string path)
         {
             if (string.IsNullOrEmpty(path))
diff --git a/Emby.Server.Implementations/Library/SearchEngine.cs b/Emby.Server.Implementations/Library/SearchEngine.cs
index 06f76311ce..71638b1978 100644
--- a/Emby.Server.Implementations/Library/SearchEngine.cs
+++ b/Emby.Server.Implementations/Library/SearchEngine.cs
@@ -76,7 +76,7 @@ namespace Emby.Server.Implementations.Library
         /// <param name="query">The query.</param>
         /// <param name="user">The user.</param>
         /// <returns>IEnumerable{SearchHintResult}.</returns>
-        /// <exception cref="System.ArgumentNullException">searchTerm</exception>
+        /// <exception cref="ArgumentNullException">searchTerm</exception>
         private List<SearchHintInfo> GetSearchHints(SearchQuery query, User user)
         {
             var searchTerm = query.SearchTerm;
diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs
index f2921e3543..dfa1edaffd 100644
--- a/Emby.Server.Implementations/Library/UserDataManager.cs
+++ b/Emby.Server.Implementations/Library/UserDataManager.cs
@@ -193,7 +193,7 @@ namespace Emby.Server.Implementations.Library
         /// </summary>
         /// <param name="data">The data.</param>
         /// <returns>DtoUserItemData.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         private UserItemDataDto GetUserItemDataDto(UserItemData data)
         {
             if (data == null)
diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs
index e4c9f775ea..f06c713866 100644
--- a/Emby.Server.Implementations/Library/UserManager.cs
+++ b/Emby.Server.Implementations/Library/UserManager.cs
@@ -158,7 +158,7 @@ namespace Emby.Server.Implementations.Library
         /// </summary>
         /// <param name="id">The id.</param>
         /// <returns>User.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         public User GetUserById(Guid id)
         {
             if (id.Equals(Guid.Empty))
@@ -619,8 +619,8 @@ namespace Emby.Server.Implementations.Library
         /// <param name="user">The user.</param>
         /// <param name="newName">The new name.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">user</exception>
-        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="ArgumentNullException">user</exception>
+        /// <exception cref="ArgumentException"></exception>
         public async Task RenameUser(User user, string newName)
         {
             if (user == null)
@@ -652,8 +652,8 @@ namespace Emby.Server.Implementations.Library
         /// Updates the user.
         /// </summary>
         /// <param name="user">The user.</param>
-        /// <exception cref="System.ArgumentNullException">user</exception>
-        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="ArgumentNullException">user</exception>
+        /// <exception cref="ArgumentException"></exception>
         public void UpdateUser(User user)
         {
             if (user == null)
@@ -683,8 +683,8 @@ namespace Emby.Server.Implementations.Library
         /// </summary>
         /// <param name="name">The name.</param>
         /// <returns>User.</returns>
-        /// <exception cref="System.ArgumentNullException">name</exception>
-        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="ArgumentNullException">name</exception>
+        /// <exception cref="ArgumentException"></exception>
         public async Task<User> CreateUser(string name)
         {
             if (string.IsNullOrWhiteSpace(name))
@@ -731,8 +731,8 @@ namespace Emby.Server.Implementations.Library
         /// </summary>
         /// <param name="user">The user.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">user</exception>
-        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="ArgumentNullException">user</exception>
+        /// <exception cref="ArgumentException"></exception>
         public async Task DeleteUser(User user)
         {
             if (user == null)
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 909e6eaeed..0ee53281df 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -478,7 +478,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         private static string GetMappedChannel(string channelId, NameValuePair[] mappings)
         {
-            foreach (NameValuePair mapping in mappings)
+            foreach (var mapping in mappings)
             {
                 if (StringHelper.EqualsIgnoreCase(mapping.Name, channelId))
                 {
@@ -2002,7 +2002,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     CloseOutput = false
                 };
 
-                using (XmlWriter writer = XmlWriter.Create(stream, settings))
+                using (var writer = XmlWriter.Create(stream, settings))
                 {
                     writer.WriteStartDocument(true);
                     writer.WriteStartElement("tvshow");
@@ -2069,7 +2069,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                 var isSeriesEpisode = timer.IsProgramSeries;
 
-                using (XmlWriter writer = XmlWriter.Create(stream, settings))
+                using (var writer = XmlWriter.Create(stream, settings))
                 {
                     writer.WriteStartDocument(true);
 
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index 25ad02e5d5..05d92dfcb8 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -42,7 +42,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
         private static List<string> GetScheduleRequestDates(DateTime startDateUtc, DateTime endDateUtc)
         {
-            List<string> dates = new List<string>();
+            var dates = new List<string>();
 
             var start = new List<DateTime> { startDateUtc, startDateUtc.ToLocalTime() }.Min().Date;
             var end = new List<DateTime> { endDateUtc, endDateUtc.ToLocalTime() }.Max().Date;
@@ -104,7 +104,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             httpOptions.RequestHeaders["token"] = token;
 
             using (var response = await Post(httpOptions, true, info).ConfigureAwait(false))
-            using (StreamReader reader = new StreamReader(response.Content))
+            using (var reader = new StreamReader(response.Content))
             {
                 var dailySchedules = await _jsonSerializer.DeserializeFromStreamAsync<List<ScheduleDirect.Day>>(response.Content).ConfigureAwait(false);
                 _logger.LogDebug("Found {ScheduleCount} programs on {ChannelID} ScheduleDirect", dailySchedules.Count, channelId);
@@ -125,7 +125,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                 httpOptions.RequestContent = "[\"" + string.Join("\", \"", programsID) + "\"]";
 
                 using (var innerResponse = await Post(httpOptions, true, info).ConfigureAwait(false))
-                using (StreamReader innerReader = new StreamReader(innerResponse.Content))
+                using (var innerReader = new StreamReader(innerResponse.Content))
                 {
                     var programDetails = await _jsonSerializer.DeserializeFromStreamAsync<List<ScheduleDirect.ProgramDetails>>(innerResponse.Content).ConfigureAwait(false);
                     var programDict = programDetails.ToDictionary(p => p.programID, y => y);
@@ -136,8 +136,8 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
                     var images = await GetImageForPrograms(info, programIdsWithImages, cancellationToken).ConfigureAwait(false);
 
-                    List<ProgramInfo> programsInfo = new List<ProgramInfo>();
-                    foreach (ScheduleDirect.Program schedule in dailySchedules.SelectMany(d => d.programs))
+                    var programsInfo = new List<ProgramInfo>();
+                    foreach (var schedule in dailySchedules.SelectMany(d => d.programs))
                     {
                         //_logger.LogDebug("Proccesing Schedule for statio ID " + stationID +
                         //              " which corresponds to channel " + channelNumber + " and program id " +
@@ -222,9 +222,9 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
         private ProgramInfo GetProgram(string channelId, ScheduleDirect.Program programInfo, ScheduleDirect.ProgramDetails details)
         {
-            DateTime startAt = GetDate(programInfo.airDateTime);
-            DateTime endAt = startAt.AddSeconds(programInfo.duration);
-            ProgramAudio audioType = ProgramAudio.Stereo;
+            var startAt = GetDate(programInfo.airDateTime);
+            var endAt = startAt.AddSeconds(programInfo.duration);
+            var audioType = ProgramAudio.Stereo;
 
             var programId = programInfo.programID ?? string.Empty;
 
@@ -526,15 +526,15 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             try
             {
                 using (var httpResponse = await Get(options, false, info).ConfigureAwait(false))
-                using (Stream responce = httpResponse.Content)
+                using (var responce = httpResponse.Content)
                 {
                     var root = await _jsonSerializer.DeserializeFromStreamAsync<List<ScheduleDirect.Headends>>(responce).ConfigureAwait(false);
 
                     if (root != null)
                     {
-                        foreach (ScheduleDirect.Headends headend in root)
+                        foreach (var headend in root)
                         {
-                            foreach (ScheduleDirect.Lineup lineup in headend.lineups)
+                            foreach (var lineup in headend.lineups)
                             {
                                 lineups.Add(new NameIdPair
                                 {
@@ -887,7 +887,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
 
                 var allStations = root.stations ?? Enumerable.Empty<ScheduleDirect.Station>();
 
-                foreach (ScheduleDirect.Map map in root.map)
+                foreach (var map in root.map)
                 {
                     var channelNumber = GetChannelNumber(map);
 
diff --git a/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs b/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
index 2b1ee84a8a..0cbfbe0b40 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
@@ -269,7 +269,7 @@ namespace Jellyfin.Server.Implementations.LiveTv.Listings
             string path = await GetXml(info.Path, CancellationToken.None).ConfigureAwait(false);
             _logger.LogDebug("Opening XmlTvReader for {path}", path);
             var reader = new XmlTvReader(path, GetLanguage(info));
-            IEnumerable<XmlTvChannel> results = reader.GetChannels();
+            var results = reader.GetChannels();
 
             // Should this method be async?
             return results.Select(c => new NameIdPair() { Id = c.Id, Name = c.DisplayName }).ToList();
@@ -281,7 +281,7 @@ namespace Jellyfin.Server.Implementations.LiveTv.Listings
             string path = await GetXml(info.Path, cancellationToken).ConfigureAwait(false);
             _logger.LogDebug("Opening XmlTvReader for {path}", path);
             var reader = new XmlTvReader(path, GetLanguage(info));
-            IEnumerable<XmlTvChannel> results = reader.GetChannels();
+            var results = reader.GetChannels();
 
             // Should this method be async?
             return results.Select(c => new ChannelInfo
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index 4ad58c7e47..3799271919 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -242,7 +242,7 @@ namespace Emby.Server.Implementations.LiveTv
             var channel = (LiveTvChannel)_libraryManager.GetItemById(id);
 
             bool isVideo = channel.ChannelType == ChannelType.TV;
-            ILiveTvService service = GetService(channel);
+            var service = GetService(channel);
             _logger.LogInformation("Opening channel stream from {0}, external channel Id: {1}", service.Name, channel.ExternalId);
 
             MediaSourceInfo info;
@@ -892,7 +892,7 @@ namespace Emby.Server.Implementations.LiveTv
             var programList = _libraryManager.QueryItems(internalQuery).Items;
             var totalCount = programList.Length;
 
-            IOrderedEnumerable<LiveTvProgram> orderedPrograms = programList.Cast<LiveTvProgram>().OrderBy(i => i.StartDate.Date);
+            var orderedPrograms = programList.Cast<LiveTvProgram>().OrderBy(i => i.StartDate.Date);
 
             if (query.IsAiring ?? false)
             {
@@ -2302,7 +2302,7 @@ namespace Emby.Server.Implementations.LiveTv
             // ServerConfiguration.SaveConfiguration crashes during xml serialization for AddListingProvider
             info = _jsonSerializer.DeserializeFromString<ListingsProviderInfo>(_jsonSerializer.SerializeToString(info));
 
-            IListingsProvider provider = _listingProviders.FirstOrDefault(i => string.Equals(info.Type, i.Type, StringComparison.OrdinalIgnoreCase));
+            var provider = _listingProviders.FirstOrDefault(i => string.Equals(info.Type, i.Type, StringComparison.OrdinalIgnoreCase));
 
             if (provider == null)
             {
@@ -2313,9 +2313,9 @@ namespace Emby.Server.Implementations.LiveTv
 
             await provider.Validate(info, validateLogin, validateListings).ConfigureAwait(false);
 
-            LiveTvOptions config = GetConfiguration();
+            var config = GetConfiguration();
 
-            List<ListingsProviderInfo> list = config.ListingProviders.ToList();
+            var list = config.ListingProviders.ToList();
             int index = list.FindIndex(i => string.Equals(i.Id, info.Id, StringComparison.OrdinalIgnoreCase));
 
             if (index == -1 || string.IsNullOrWhiteSpace(info.Id))
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index 3714a03210..36f688c43a 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -262,7 +262,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                     var name = string.Format("Tuner {0}", i + 1);
                     var currentChannel = "none"; /// @todo Get current channel and map back to Station Id
                     var isAvailable = await manager.CheckTunerAvailability(ipInfo, i, cancellationToken).ConfigureAwait(false);
-                    LiveTvTunerStatus status = isAvailable ? LiveTvTunerStatus.Available : LiveTvTunerStatus.LiveTv;
+                    var status = isAvailable ? LiveTvTunerStatus.Available : LiveTvTunerStatus.LiveTv;
                     tuners.Add(new LiveTvTunerInfo
                     {
                         Name = name,
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
index 1ec5894d06..67eeec21dd 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
@@ -173,7 +173,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                     continue;
 
                 var commandList = commands.GetCommands();
-                foreach (Tuple<string, string> command in commandList)
+                foreach (var command in commandList)
                 {
                     var channelMsg = CreateSetMessage(i, command.Item1, command.Item2, lockKeyValue);
                     await tcpClient.SendToAsync(channelMsg, 0, channelMsg.Length, ipEndPoint, cancellationToken).ConfigureAwait(false);
@@ -216,7 +216,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 var commandList = commands.GetCommands();
                 var receiveBuffer = new byte[8192];
 
-                foreach (Tuple<string, string> command in commandList)
+                foreach (var command in commandList)
                 {
                     var channelMsg = CreateSetMessage(_activeTuner, command.Item1, command.Item2, _lockkey);
                     await tcpClient.SendToAsync(channelMsg, 0, channelMsg.Length, new IpEndPointInfo(_remoteIp, HdHomeRunPort), cancellationToken).ConfigureAwait(false);
diff --git a/Emby.Server.Implementations/Net/DisposableManagedObjectBase.cs b/Emby.Server.Implementations/Net/DisposableManagedObjectBase.cs
index 9d880b0c95..304b445651 100644
--- a/Emby.Server.Implementations/Net/DisposableManagedObjectBase.cs
+++ b/Emby.Server.Implementations/Net/DisposableManagedObjectBase.cs
@@ -19,10 +19,10 @@ namespace Emby.Server.Implementations.Net
 
         //TODO Remove and reimplement using the IsDisposed property directly.
         /// <summary>
-        /// Throws an <see cref="System.ObjectDisposedException"/> if the <see cref="IsDisposed"/> property is true.
+        /// Throws an <see cref="ObjectDisposedException"/> if the <see cref="IsDisposed"/> property is true.
         /// </summary>
         /// <seealso cref="IsDisposed"/>
-        /// <exception cref="System.ObjectDisposedException">Thrown if the <see cref="IsDisposed"/> property is true.</exception>
+        /// <exception cref="ObjectDisposedException">Thrown if the <see cref="IsDisposed"/> property is true.</exception>
         /// <seealso cref="Dispose()"/>
         protected virtual void ThrowIfDisposed()
         {
diff --git a/Emby.Server.Implementations/Net/UdpSocket.cs b/Emby.Server.Implementations/Net/UdpSocket.cs
index cdfdb72108..d488554860 100644
--- a/Emby.Server.Implementations/Net/UdpSocket.cs
+++ b/Emby.Server.Implementations/Net/UdpSocket.cs
@@ -133,8 +133,8 @@ namespace Emby.Server.Implementations.Net
         {
             ThrowIfDisposed();
 
-            IPEndPoint sender = new IPEndPoint(IPAddress.Any, 0);
-            EndPoint remoteEndPoint = (EndPoint)sender;
+            var sender = new IPEndPoint(IPAddress.Any, 0);
+            var remoteEndPoint = (EndPoint)sender;
 
             var receivedBytes = _Socket.EndReceiveFrom(result, ref remoteEndPoint);
 
diff --git a/Emby.Server.Implementations/Networking/IPNetwork/BigIntegerExt.cs b/Emby.Server.Implementations/Networking/IPNetwork/BigIntegerExt.cs
index 1a2ad665ba..447cbf4034 100644
--- a/Emby.Server.Implementations/Networking/IPNetwork/BigIntegerExt.cs
+++ b/Emby.Server.Implementations/Networking/IPNetwork/BigIntegerExt.cs
@@ -7,7 +7,7 @@ namespace System.Net
     using System.Text;
 
     /// <summary>
-    /// Extension methods to convert <see cref="System.Numerics.BigInteger"/>
+    /// Extension methods to convert <see cref="BigInteger"/>
     /// instances to hexadecimal, octal, and binary strings.
     /// </summary>
     public static class BigIntegerExtensions
@@ -17,7 +17,7 @@ namespace System.Net
         /// </summary>
         /// <param name="bigint">A <see cref="BigInteger"/>.</param>
         /// <returns>
-        /// A <see cref="System.String"/> containing a binary
+        /// A <see cref="string"/> containing a binary
         /// representation of the supplied <see cref="BigInteger"/>.
         /// </returns>
         public static string ToBinaryString(this BigInteger bigint)
@@ -54,7 +54,7 @@ namespace System.Net
         /// </summary>
         /// <param name="bigint">A <see cref="BigInteger"/>.</param>
         /// <returns>
-        /// A <see cref="System.String"/> containing a hexadecimal
+        /// A <see cref="string"/> containing a hexadecimal
         /// representation of the supplied <see cref="BigInteger"/>.
         /// </returns>
         public static string ToHexadecimalString(this BigInteger bigint)
@@ -67,7 +67,7 @@ namespace System.Net
         /// </summary>
         /// <param name="bigint">A <see cref="BigInteger"/>.</param>
         /// <returns>
-        /// A <see cref="System.String"/> containing an octal
+        /// A <see cref="string"/> containing an octal
         /// representation of the supplied <see cref="BigInteger"/>.
         /// </returns>
         public static string ToOctalString(this BigInteger bigint)
diff --git a/Emby.Server.Implementations/Networking/IPNetwork/IPAddressCollection.cs b/Emby.Server.Implementations/Networking/IPNetwork/IPAddressCollection.cs
index c2a6305f6f..c5853135cd 100644
--- a/Emby.Server.Implementations/Networking/IPNetwork/IPAddressCollection.cs
+++ b/Emby.Server.Implementations/Networking/IPNetwork/IPAddressCollection.cs
@@ -30,7 +30,7 @@ namespace System.Net
                     throw new ArgumentOutOfRangeException(nameof(i));
                 }
                 byte width = this._ipnetwork.AddressFamily == Sockets.AddressFamily.InterNetwork ? (byte)32 : (byte)128;
-                IPNetworkCollection ipn = this._ipnetwork.Subnet(width);
+                var ipn = this._ipnetwork.Subnet(width);
                 return ipn[i].Network;
             }
         }
diff --git a/Emby.Server.Implementations/Networking/IPNetwork/IPNetwork.cs b/Emby.Server.Implementations/Networking/IPNetwork/IPNetwork.cs
index 321d4a3c52..21feaea33d 100644
--- a/Emby.Server.Implementations/Networking/IPNetwork/IPNetwork.cs
+++ b/Emby.Server.Implementations/Networking/IPNetwork/IPNetwork.cs
@@ -33,7 +33,7 @@ namespace System.Net
         {
             get
             {
-                BigInteger uintNetwork = this._ipaddress & this._netmask;
+                var uintNetwork = this._ipaddress & this._netmask;
                 return uintNetwork;
             }
         }
@@ -61,7 +61,7 @@ namespace System.Net
             {
 
                 int width = this._family == Sockets.AddressFamily.InterNetwork ? 4 : 16;
-                BigInteger uintBroadcast = this._network + this._netmask.PositiveReverse(width);
+                var uintBroadcast = this._network + this._netmask.PositiveReverse(width);
                 return uintBroadcast;
             }
         }
@@ -88,7 +88,7 @@ namespace System.Net
         {
             get
             {
-                BigInteger fisrt = this._family == Sockets.AddressFamily.InterNetworkV6
+                var fisrt = this._family == Sockets.AddressFamily.InterNetworkV6
                     ? this._network
                     : (this.Usable <= 0) ? this._network : this._network + 1;
                 return IPNetwork.ToIPAddress(fisrt, this._family);
@@ -102,7 +102,7 @@ namespace System.Net
         {
             get
             {
-                BigInteger last = this._family == Sockets.AddressFamily.InterNetworkV6
+                var last = this._family == Sockets.AddressFamily.InterNetworkV6
                     ? this._broadcast
                     : (this.Usable <= 0) ? this._network : this._broadcast - 1;
                 return IPNetwork.ToIPAddress(last, this._family);
@@ -122,8 +122,8 @@ namespace System.Net
                     return this.Total;
                 }
                 byte[] mask = new byte[] { 0xff, 0xff, 0xff, 0xff, 0x00 };
-                BigInteger bmask = new BigInteger(mask);
-                BigInteger usableIps = (_cidr > 30) ? 0 : ((bmask >> _cidr) - 1);
+                var bmask = new BigInteger(mask);
+                var usableIps = (_cidr > 30) ? 0 : ((bmask >> _cidr) - 1);
                 return usableIps;
             }
         }
@@ -137,7 +137,7 @@ namespace System.Net
             {
 
                 int max = this._family == Sockets.AddressFamily.InterNetwork ? 32 : 128;
-                BigInteger count = BigInteger.Pow(2, (max - _cidr));
+                var count = BigInteger.Pow(2, (max - _cidr));
                 return count;
             }
         }
@@ -523,7 +523,7 @@ namespace System.Net
                 return;
             }
 
-            BigInteger uintIpAddress = IPNetwork.ToBigInteger(ipaddress);
+            var uintIpAddress = IPNetwork.ToBigInteger(ipaddress);
             byte? cidr2 = null;
             bool parsed = IPNetwork.TryToCidr(netmask, out cidr2);
             if (parsed == false)
@@ -537,7 +537,7 @@ namespace System.Net
             }
             byte cidr = (byte)cidr2;
 
-            IPNetwork ipnet = new IPNetwork(uintIpAddress, ipaddress.AddressFamily, cidr);
+            var ipnet = new IPNetwork(uintIpAddress, ipaddress.AddressFamily, cidr);
             ipnetwork = ipnet;
 
             return;
@@ -754,7 +754,7 @@ namespace System.Net
                 return;
             }
 
-            BigInteger mask = new BigInteger(new byte[] {
+            var mask = new BigInteger(new byte[] {
                 0xff, 0xff, 0xff, 0xff,
                 0xff, 0xff, 0xff, 0xff,
                 0xff, 0xff, 0xff, 0xff,
@@ -762,7 +762,7 @@ namespace System.Net
                 0x00
             });
 
-            BigInteger masked = cidr == 0 ? 0 : mask << (128 - cidr);
+            var masked = cidr == 0 ? 0 : mask << (128 - cidr);
             byte[] m = masked.ToByteArray();
             byte[] bmask = new byte[17];
             int copy = m.Length > 16 ? 16 : m.Length;
@@ -858,7 +858,7 @@ namespace System.Net
             ///     cidr = null;
             ///     return;
             /// }
-            BigInteger uintNetmask = (BigInteger)uintNetmask2;
+            var uintNetmask = (BigInteger)uintNetmask2;
 
             byte? cidr2 = null;
             IPNetwork.InternalToCidr(tryParse, uintNetmask, netmask.AddressFamily, out cidr2);
@@ -951,8 +951,8 @@ namespace System.Net
                 return;
             }
 
-            BigInteger mask = IPNetwork.ToUint(cidr, family);
-            IPAddress netmask2 = IPNetwork.ToIPAddress(mask, family);
+            var mask = IPNetwork.ToUint(cidr, family);
+            var netmask2 = IPNetwork.ToIPAddress(mask, family);
             netmask = netmask2;
 
             return;
@@ -990,7 +990,7 @@ namespace System.Net
         /// <returns></returns>
         public static uint BitsSet(IPAddress netmask)
         {
-            BigInteger uintNetmask = IPNetwork.ToBigInteger(netmask);
+            var uintNetmask = IPNetwork.ToBigInteger(netmask);
             uint bits = IPNetwork.BitsSet(uintNetmask, netmask.AddressFamily);
             return bits;
         }
@@ -1013,7 +1013,7 @@ namespace System.Net
             {
                 throw new ArgumentNullException(nameof(netmask));
             }
-            BigInteger uintNetmask = IPNetwork.ToBigInteger(netmask);
+            var uintNetmask = IPNetwork.ToBigInteger(netmask);
             bool valid = IPNetwork.InternalValidNetmask(uintNetmask, netmask.AddressFamily);
             return valid;
         }
@@ -1042,7 +1042,7 @@ namespace System.Net
                     0x00
                 });
 
-            BigInteger neg = ((~netmask) & (mask));
+            var neg = ((~netmask) & (mask));
             bool isNetmask = ((neg + 1) & neg) == 0;
             return isNetmask;
 
@@ -1068,7 +1068,7 @@ namespace System.Net
             Array.Reverse(bytes2);
 
             byte[] sized = Resize(bytes2, family);
-            IPAddress ip = new IPAddress(sized);
+            var ip = new IPAddress(sized);
             return ip;
         }
 
@@ -1122,9 +1122,9 @@ namespace System.Net
                 return false;
             }
 
-            BigInteger uintNetwork = _network;
-            BigInteger uintBroadcast = _broadcast;
-            BigInteger uintAddress = IPNetwork.ToBigInteger(ipaddress);
+            var uintNetwork = _network;
+            var uintBroadcast = _broadcast;
+            var uintAddress = IPNetwork.ToBigInteger(ipaddress);
 
             bool contains = (uintAddress >= uintNetwork
                 && uintAddress <= uintBroadcast);
@@ -1146,11 +1146,11 @@ namespace System.Net
                 throw new ArgumentNullException(nameof(network2));
             }
 
-            BigInteger uintNetwork = _network;
-            BigInteger uintBroadcast = _broadcast;
+            var uintNetwork = _network;
+            var uintBroadcast = _broadcast;
 
-            BigInteger uintFirst = network2._network;
-            BigInteger uintLast = network2._broadcast;
+            var uintFirst = network2._network;
+            var uintLast = network2._broadcast;
 
             bool contains = (uintFirst >= uintNetwork
                 && uintLast <= uintBroadcast);
@@ -1175,11 +1175,11 @@ namespace System.Net
                 throw new ArgumentNullException(nameof(network2));
             }
 
-            BigInteger uintNetwork = _network;
-            BigInteger uintBroadcast = _broadcast;
+            var uintNetwork = _network;
+            var uintBroadcast = _broadcast;
 
-            BigInteger uintFirst = network2._network;
-            BigInteger uintLast = network2._broadcast;
+            var uintFirst = network2._network;
+            var uintLast = network2._broadcast;
 
             bool overlap =
                 (uintFirst >= uintNetwork && uintFirst <= uintBroadcast)
@@ -1428,8 +1428,8 @@ namespace System.Net
                 return;
             }
 
-            IPNetwork first = (network1._network < network2._network) ? network1 : network2;
-            IPNetwork last = (network1._network > network2._network) ? network1 : network2;
+            var first = (network1._network < network2._network) ? network1 : network2;
+            var last = (network1._network > network2._network) ? network1 : network2;
 
             /// Starting from here :
             /// network1 and network2 have the same cidr,
@@ -1449,10 +1449,10 @@ namespace System.Net
                 return;
             }
 
-            BigInteger uintSupernet = first._network;
+            var uintSupernet = first._network;
             byte cidrSupernet = (byte)(first._cidr - 1);
 
-            IPNetwork networkSupernet = new IPNetwork(uintSupernet, first._family, cidrSupernet);
+            var networkSupernet = new IPNetwork(uintSupernet, first._family, cidrSupernet);
             if (networkSupernet._network != first._network)
             {
                 if (trySupernet == false)
@@ -1535,9 +1535,9 @@ namespace System.Net
                 return true;
             }
 
-            List<IPNetwork> supernetted = new List<IPNetwork>();
-            List<IPNetwork> ipns = IPNetwork.Array2List(ipnetworks);
-            Stack<IPNetwork> current = IPNetwork.List2Stack(ipns);
+            var supernetted = new List<IPNetwork>();
+            var ipns = IPNetwork.Array2List(ipnetworks);
+            var current = IPNetwork.List2Stack(ipns);
             int previousCount = 0;
             int currentCount = current.Count;
 
@@ -1547,8 +1547,8 @@ namespace System.Net
                 supernetted.Clear();
                 while (current.Count > 1)
                 {
-                    IPNetwork ipn1 = current.Pop();
-                    IPNetwork ipn2 = current.Peek();
+                    var ipn1 = current.Pop();
+                    var ipn2 = current.Peek();
 
                     IPNetwork outNetwork = null;
                     bool success = ipn1.TrySupernet(ipn2, out outNetwork);
@@ -1578,7 +1578,7 @@ namespace System.Net
 
         private static Stack<IPNetwork> List2Stack(List<IPNetwork> list)
         {
-            Stack<IPNetwork> stack = new Stack<IPNetwork>();
+            var stack = new Stack<IPNetwork>();
             list.ForEach(new Action<IPNetwork>(
                 delegate (IPNetwork ipn)
                 {
@@ -1590,7 +1590,7 @@ namespace System.Net
 
         private static List<IPNetwork> Array2List(IPNetwork[] array)
         {
-            List<IPNetwork> ipns = new List<IPNetwork>();
+            var ipns = new List<IPNetwork>();
             ipns.AddRange(array);
             IPNetwork.RemoveNull(ipns);
             ipns.Sort(new Comparison<IPNetwork>(
@@ -1659,10 +1659,10 @@ namespace System.Net
                 throw new NotSupportedException("MixedAddressFamily");
             }
 
-            IPNetwork ipnetwork = new IPNetwork(0, startIP.AddressFamily, 0);
+            var ipnetwork = new IPNetwork(0, startIP.AddressFamily, 0);
             for (byte cidr = 32; cidr >= 0; cidr--)
             {
-                IPNetwork wideSubnet = IPNetwork.Parse(start, cidr);
+                var wideSubnet = IPNetwork.Parse(start, cidr);
                 if (wideSubnet.Contains(endIP))
                 {
                     ipnetwork = wideSubnet;
@@ -1707,7 +1707,7 @@ namespace System.Net
             }
 
 
-            IPNetwork[] nnin = Array.FindAll<IPNetwork>(ipnetworks, new Predicate<IPNetwork>(
+            IPNetwork[] nnin = Array.FindAll(ipnetworks, new Predicate<IPNetwork>(
                 delegate (IPNetwork ipnet)
                 {
                     return ipnet != null;
@@ -1726,19 +1726,19 @@ namespace System.Net
 
             if (nnin.Length == 1)
             {
-                IPNetwork ipn0 = nnin[0];
+                var ipn0 = nnin[0];
                 ipnetwork = ipn0;
                 return;
             }
 
-            Array.Sort<IPNetwork>(nnin);
-            IPNetwork nnin0 = nnin[0];
-            BigInteger uintNnin0 = nnin0._ipaddress;
+            Array.Sort(nnin);
+            var nnin0 = nnin[0];
+            var uintNnin0 = nnin0._ipaddress;
 
-            IPNetwork nninX = nnin[nnin.Length - 1];
-            IPAddress ipaddressX = nninX.Broadcast;
+            var nninX = nnin[nnin.Length - 1];
+            var ipaddressX = nninX.Broadcast;
 
-            AddressFamily family = ipnetworks[0]._family;
+            var family = ipnetworks[0]._family;
             foreach (var ipnx in ipnetworks)
             {
                 if (ipnx._family != family)
@@ -1747,10 +1747,10 @@ namespace System.Net
                 }
             }
 
-            IPNetwork ipn = new IPNetwork(0, family, 0);
+            var ipn = new IPNetwork(0, family, 0);
             for (byte cidr = nnin0._cidr; cidr >= 0; cidr--)
             {
-                IPNetwork wideSubnet = new IPNetwork(uintNnin0, family, cidr);
+                var wideSubnet = new IPNetwork(uintNnin0, family, cidr);
                 if (wideSubnet.Contains(ipaddressX))
                 {
                     ipn = wideSubnet;
@@ -1773,7 +1773,7 @@ namespace System.Net
         public string Print()
         {
 
-            StringWriter sw = new StringWriter();
+            var sw = new StringWriter();
 
             sw.WriteLine("IPNetwork   : {0}", ToString());
             sw.WriteLine("Network     : {0}", Network);
@@ -1819,7 +1819,7 @@ namespace System.Net
                 cidr = 64;
                 return true;
             }
-            BigInteger uintIPAddress = IPNetwork.ToBigInteger(ipaddress);
+            var uintIPAddress = IPNetwork.ToBigInteger(ipaddress);
             uintIPAddress = uintIPAddress >> 29;
             if (uintIPAddress <= 3)
             {
diff --git a/Emby.Server.Implementations/Networking/IPNetwork/IPNetworkCollection.cs b/Emby.Server.Implementations/Networking/IPNetwork/IPNetworkCollection.cs
index 1827af77aa..7d3106624a 100644
--- a/Emby.Server.Implementations/Networking/IPNetwork/IPNetworkCollection.cs
+++ b/Emby.Server.Implementations/Networking/IPNetwork/IPNetworkCollection.cs
@@ -47,7 +47,7 @@ namespace System.Net
         {
             get
             {
-                BigInteger count = BigInteger.Pow(2, this._cidrSubnet - this._cidr);
+                var count = BigInteger.Pow(2, this._cidrSubnet - this._cidr);
                 return count;
             }
         }
@@ -61,11 +61,11 @@ namespace System.Net
                     throw new ArgumentOutOfRangeException(nameof(i));
                 }
 
-                BigInteger last = this._ipnetwork.AddressFamily == Sockets.AddressFamily.InterNetworkV6
+                var last = this._ipnetwork.AddressFamily == Sockets.AddressFamily.InterNetworkV6
                     ? this._lastUsable : this._broadcast;
-                BigInteger increment = (last - this._network) / this.Count;
-                BigInteger uintNetwork = this._network + ((increment + 1) * i);
-                IPNetwork ipn = new IPNetwork(uintNetwork, this._ipnetwork.AddressFamily, this._cidrSubnet);
+                var increment = (last - this._network) / this.Count;
+                var uintNetwork = this._network + ((increment + 1) * i);
+                var ipn = new IPNetwork(uintNetwork, this._ipnetwork.AddressFamily, this._cidrSubnet);
                 return ipn;
             }
         }
diff --git a/Emby.Server.Implementations/Networking/NetworkManager.cs b/Emby.Server.Implementations/Networking/NetworkManager.cs
index 568981abbe..70d8376a97 100644
--- a/Emby.Server.Implementations/Networking/NetworkManager.cs
+++ b/Emby.Server.Implementations/Networking/NetworkManager.cs
@@ -214,9 +214,9 @@ namespace Emby.Server.Implementations.Networking
 
                 subnets = new List<string>();
 
-                foreach (NetworkInterface adapter in NetworkInterface.GetAllNetworkInterfaces())
+                foreach (var adapter in NetworkInterface.GetAllNetworkInterfaces())
                 {
-                    foreach (UnicastIPAddressInformation unicastIPAddressInformation in adapter.GetIPProperties().UnicastAddresses)
+                    foreach (var unicastIPAddressInformation in adapter.GetIPProperties().UnicastAddresses)
                     {
                         if (unicastIPAddressInformation.Address.AddressFamily == AddressFamily.InterNetwork && endpointFirstPart == unicastIPAddressInformation.Address.ToString().Split('.')[0])
                         {
@@ -461,7 +461,7 @@ namespace Emby.Server.Implementations.Networking
 
         public int GetRandomUnusedUdpPort()
         {
-            IPEndPoint localEndPoint = new IPEndPoint(IPAddress.Any, 0);
+            var localEndPoint = new IPEndPoint(IPAddress.Any, 0);
             using (var udpClient = new UdpClient(localEndPoint))
             {
                 var port = ((IPEndPoint)(udpClient.Client.LocalEndPoint)).Port;
@@ -522,8 +522,8 @@ namespace Emby.Server.Implementations.Networking
         /// <param name="endpointstring">The endpointstring.</param>
         /// <param name="defaultport">The defaultport.</param>
         /// <returns>IPEndPoint.</returns>
-        /// <exception cref="System.ArgumentException">Endpoint descriptor may not be empty.</exception>
-        /// <exception cref="System.FormatException"></exception>
+        /// <exception cref="ArgumentException">Endpoint descriptor may not be empty.</exception>
+        /// <exception cref="FormatException"></exception>
         private static async Task<IPEndPoint> Parse(string endpointstring, int defaultport)
         {
             if (string.IsNullOrEmpty(endpointstring)
@@ -585,7 +585,7 @@ namespace Emby.Server.Implementations.Networking
         /// </summary>
         /// <param name="p">The p.</param>
         /// <returns>System.Int32.</returns>
-        /// <exception cref="System.FormatException"></exception>
+        /// <exception cref="FormatException"></exception>
         private static int GetPort(string p)
         {
             int port;
@@ -605,7 +605,7 @@ namespace Emby.Server.Implementations.Networking
         /// </summary>
         /// <param name="p">The p.</param>
         /// <returns>IPAddress.</returns>
-        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="ArgumentException"></exception>
         private static async Task<IPAddress> GetIPfromHost(string p)
         {
             var hosts = await Dns.GetHostAddressesAsync(p).ConfigureAwait(false);
diff --git a/Emby.Server.Implementations/Playlists/PlaylistManager.cs b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
index 6dbefa9103..c39897b53e 100644
--- a/Emby.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
@@ -469,12 +469,12 @@ namespace Emby.Server.Implementations.Playlists
                 folderPath = folderPath + Path.DirectorySeparatorChar;
             }
 
-            Uri folderUri = new Uri(folderPath);
-            Uri fileAbsoluteUri = new Uri(fileAbsolutePath);
+            var folderUri = new Uri(folderPath);
+            var fileAbsoluteUri = new Uri(fileAbsolutePath);
 
             if (folderUri.Scheme != fileAbsoluteUri.Scheme) { return fileAbsolutePath; } // path can't be made relative.
 
-            Uri relativeUri = folderUri.MakeRelativeUri(fileAbsoluteUri);
+            var relativeUri = folderUri.MakeRelativeUri(fileAbsoluteUri);
             string relativePath = Uri.UnescapeDataString(relativeUri.ToString());
 
             if (fileAbsoluteUri.Scheme.Equals("file", StringComparison.CurrentCultureIgnoreCase))
diff --git a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
index dc60b9990f..44f6e2d7b3 100644
--- a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
@@ -63,7 +63,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
         /// <param name="taskManager">The task manager.</param>
         /// <param name="jsonSerializer">The json serializer.</param>
         /// <param name="logger">The logger.</param>
-        /// <exception cref="System.ArgumentNullException">
+        /// <exception cref="ArgumentNullException">
         /// scheduledTask
         /// or
         /// applicationPaths
@@ -256,7 +256,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
         /// Gets the triggers that define when the task will run
         /// </summary>
         /// <value>The triggers.</value>
-        /// <exception cref="System.ArgumentNullException">value</exception>
+        /// <exception cref="ArgumentNullException">value</exception>
         public TaskTriggerInfo[] Triggers
         {
             get
@@ -365,7 +365,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
         /// </summary>
         /// <param name="options">Task options.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.InvalidOperationException">Cannot execute a Task that is already running</exception>
+        /// <exception cref="InvalidOperationException">Cannot execute a Task that is already running</exception>
         public async Task Execute(TaskOptions options)
         {
             var task = Task.Run(async () => await ExecuteInternal(options).ConfigureAwait(false));
@@ -461,7 +461,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
         /// <summary>
         /// Stops the task if it is currently executing
         /// </summary>
-        /// <exception cref="System.InvalidOperationException">Cannot cancel a Task unless it is in the Running state.</exception>
+        /// <exception cref="InvalidOperationException">Cannot cancel a Task unless it is in the Running state.</exception>
         public void Cancel()
         {
             if (State != TaskState.Running)
@@ -705,8 +705,8 @@ namespace Emby.Server.Implementations.ScheduledTasks
         /// </summary>
         /// <param name="info">The info.</param>
         /// <returns>BaseTaskTrigger.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
-        /// <exception cref="System.ArgumentException">Invalid trigger type:  + info.Type</exception>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <exception cref="ArgumentException">Invalid trigger type:  + info.Type</exception>
         private ITaskTrigger GetTrigger(TaskTriggerInfo info)
         {
             var options = new TaskOptions
diff --git a/Emby.Server.Implementations/ScheduledTasks/TaskManager.cs b/Emby.Server.Implementations/ScheduledTasks/TaskManager.cs
index 754fb16336..ac47c9625b 100644
--- a/Emby.Server.Implementations/ScheduledTasks/TaskManager.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/TaskManager.cs
@@ -61,7 +61,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
         /// <param name="applicationPaths">The application paths.</param>
         /// <param name="jsonSerializer">The json serializer.</param>
         /// <param name="logger">The logger.</param>
-        /// <exception cref="System.ArgumentException">kernel</exception>
+        /// <exception cref="ArgumentException">kernel</exception>
         public TaskManager(IApplicationPaths applicationPaths, IJsonSerializer jsonSerializer, ILogger logger, IFileSystem fileSystem, ISystemEvents systemEvents)
         {
             ApplicationPaths = applicationPaths;
diff --git a/Emby.Server.Implementations/Security/EncryptionManager.cs b/Emby.Server.Implementations/Security/EncryptionManager.cs
index c608723461..fa8872ccc3 100644
--- a/Emby.Server.Implementations/Security/EncryptionManager.cs
+++ b/Emby.Server.Implementations/Security/EncryptionManager.cs
@@ -11,7 +11,7 @@ namespace Emby.Server.Implementations.Security
         /// </summary>
         /// <param name="value">The value.</param>
         /// <returns>System.String.</returns>
-        /// <exception cref="System.ArgumentNullException">value</exception>
+        /// <exception cref="ArgumentNullException">value</exception>
         public string EncryptString(string value)
         {
             if (value == null)
@@ -27,7 +27,7 @@ namespace Emby.Server.Implementations.Security
         /// </summary>
         /// <param name="value">The value.</param>
         /// <returns>System.String.</returns>
-        /// <exception cref="System.ArgumentNullException">value</exception>
+        /// <exception cref="ArgumentNullException">value</exception>
         public string DecryptString(string value)
         {
             if (value == null)
diff --git a/Emby.Server.Implementations/Serialization/JsonSerializer.cs b/Emby.Server.Implementations/Serialization/JsonSerializer.cs
index 26c648d729..60bf2d5a9d 100644
--- a/Emby.Server.Implementations/Serialization/JsonSerializer.cs
+++ b/Emby.Server.Implementations/Serialization/JsonSerializer.cs
@@ -27,7 +27,7 @@ namespace Emby.Common.Implementations.Serialization
         /// </summary>
         /// <param name="obj">The obj.</param>
         /// <param name="stream">The stream.</param>
-        /// <exception cref="System.ArgumentNullException">obj</exception>
+        /// <exception cref="ArgumentNullException">obj</exception>
         public void SerializeToStream(object obj, Stream stream)
         {
             if (obj == null)
@@ -48,7 +48,7 @@ namespace Emby.Common.Implementations.Serialization
         /// </summary>
         /// <param name="obj">The obj.</param>
         /// <param name="file">The file.</param>
-        /// <exception cref="System.ArgumentNullException">obj</exception>
+        /// <exception cref="ArgumentNullException">obj</exception>
         public void SerializeToFile(object obj, string file)
         {
             if (obj == null)
@@ -61,7 +61,7 @@ namespace Emby.Common.Implementations.Serialization
                 throw new ArgumentNullException(nameof(file));
             }
 
-            using (Stream stream = _fileSystem.GetFileStream(file, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read))
+            using (var stream = _fileSystem.GetFileStream(file, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read))
             {
                 SerializeToStream(obj, stream);
             }
@@ -79,7 +79,7 @@ namespace Emby.Common.Implementations.Serialization
         /// <param name="type">The type.</param>
         /// <param name="file">The file.</param>
         /// <returns>System.Object.</returns>
-        /// <exception cref="System.ArgumentNullException">type</exception>
+        /// <exception cref="ArgumentNullException">type</exception>
         public object DeserializeFromFile(Type type, string file)
         {
             if (type == null)
@@ -92,7 +92,7 @@ namespace Emby.Common.Implementations.Serialization
                 throw new ArgumentNullException(nameof(file));
             }
 
-            using (Stream stream = OpenFile(file))
+            using (var stream = OpenFile(file))
             {
                 return DeserializeFromStream(stream, type);
             }
@@ -104,7 +104,7 @@ namespace Emby.Common.Implementations.Serialization
         /// <typeparam name="T"></typeparam>
         /// <param name="file">The file.</param>
         /// <returns>``0.</returns>
-        /// <exception cref="System.ArgumentNullException">file</exception>
+        /// <exception cref="ArgumentNullException">file</exception>
         public T DeserializeFromFile<T>(string file)
             where T : class
         {
@@ -113,7 +113,7 @@ namespace Emby.Common.Implementations.Serialization
                 throw new ArgumentNullException(nameof(file));
             }
 
-            using (Stream stream = OpenFile(file))
+            using (var stream = OpenFile(file))
             {
                 return DeserializeFromStream<T>(stream);
             }
@@ -125,7 +125,7 @@ namespace Emby.Common.Implementations.Serialization
         /// <typeparam name="T"></typeparam>
         /// <param name="stream">The stream.</param>
         /// <returns>``0.</returns>
-        /// <exception cref="System.ArgumentNullException">stream</exception>
+        /// <exception cref="ArgumentNullException">stream</exception>
         public T DeserializeFromStream<T>(Stream stream)
         {
             if (stream == null)
@@ -153,7 +153,7 @@ namespace Emby.Common.Implementations.Serialization
         /// <typeparam name="T"></typeparam>
         /// <param name="text">The text.</param>
         /// <returns>``0.</returns>
-        /// <exception cref="System.ArgumentNullException">text</exception>
+        /// <exception cref="ArgumentNullException">text</exception>
         public T DeserializeFromString<T>(string text)
         {
             if (string.IsNullOrEmpty(text))
@@ -170,7 +170,7 @@ namespace Emby.Common.Implementations.Serialization
         /// <param name="stream">The stream.</param>
         /// <param name="type">The type.</param>
         /// <returns>System.Object.</returns>
-        /// <exception cref="System.ArgumentNullException">stream</exception>
+        /// <exception cref="ArgumentNullException">stream</exception>
         public object DeserializeFromStream(Stream stream, Type type)
         {
             if (stream == null)
@@ -236,7 +236,7 @@ namespace Emby.Common.Implementations.Serialization
         /// <param name="json">The json.</param>
         /// <param name="type">The type.</param>
         /// <returns>System.Object.</returns>
-        /// <exception cref="System.ArgumentNullException">json</exception>
+        /// <exception cref="ArgumentNullException">json</exception>
         public object DeserializeFromString(string json, Type type)
         {
             if (string.IsNullOrEmpty(json))
@@ -257,7 +257,7 @@ namespace Emby.Common.Implementations.Serialization
         /// </summary>
         /// <param name="obj">The obj.</param>
         /// <returns>System.String.</returns>
-        /// <exception cref="System.ArgumentNullException">obj</exception>
+        /// <exception cref="ArgumentNullException">obj</exception>
         public string SerializeToString(object obj)
         {
             if (obj == null)
diff --git a/Emby.Server.Implementations/Services/ServiceController.cs b/Emby.Server.Implementations/Services/ServiceController.cs
index f82c648238..b34832f45e 100644
--- a/Emby.Server.Implementations/Services/ServiceController.cs
+++ b/Emby.Server.Implementations/Services/ServiceController.cs
@@ -72,7 +72,7 @@ namespace Emby.Server.Implementations.Services
         public void RegisterRestPaths(HttpListenerHost appHost, Type requestType, Type serviceType)
         {
             var attrs = appHost.GetRouteAttributes(requestType);
-            foreach (RouteAttribute attr in attrs)
+            foreach (var attr in attrs)
             {
                 var restPath = new RestPath(appHost.CreateInstance, appHost.GetParseFn, requestType, serviceType, attr.Path, attr.Verbs, attr.IsHidden, attr.Summary, attr.Description);
 
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index d991302280..e398b58cc9 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -201,8 +201,8 @@ namespace Emby.Server.Implementations.Session
         /// <param name="remoteEndPoint">The remote end point.</param>
         /// <param name="user">The user.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">user</exception>
-        /// <exception cref="System.UnauthorizedAccessException"></exception>
+        /// <exception cref="ArgumentNullException">user</exception>
+        /// <exception cref="UnauthorizedAccessException"></exception>
         public SessionInfo LogSessionActivity(string appName,
             string appVersion,
             string deviceId,
@@ -365,7 +365,7 @@ namespace Emby.Server.Implementations.Session
         /// Removes the now playing item id.
         /// </summary>
         /// <param name="session">The session.</param>
-        /// <exception cref="System.ArgumentNullException">item</exception>
+        /// <exception cref="ArgumentNullException">item</exception>
         private void RemoveNowPlayingItem(SessionInfo session)
         {
             session.NowPlayingItem = null;
@@ -404,7 +404,7 @@ namespace Emby.Server.Implementations.Session
 
             CheckDisposed();
 
-            SessionInfo sessionInfo = _activeConnections.GetOrAdd(key, k =>
+            var sessionInfo = _activeConnections.GetOrAdd(key, k =>
             {
                 return CreateSession(k, appName, appVersion, deviceId, deviceName, remoteEndPoint, user);
             });
@@ -571,7 +571,7 @@ namespace Emby.Server.Implementations.Session
         /// </summary>
         /// <param name="info">The info.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">info</exception>
+        /// <exception cref="ArgumentNullException">info</exception>
         public async Task OnPlaybackStart(PlaybackStartInfo info)
         {
             CheckDisposed();
@@ -784,8 +784,8 @@ namespace Emby.Server.Implementations.Session
         /// </summary>
         /// <param name="info">The info.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">info</exception>
-        /// <exception cref="System.ArgumentOutOfRangeException">positionTicks</exception>
+        /// <exception cref="ArgumentNullException">info</exception>
+        /// <exception cref="ArgumentOutOfRangeException">positionTicks</exception>
         public async Task OnPlaybackStopped(PlaybackStopInfo info)
         {
             CheckDisposed();
@@ -1284,8 +1284,8 @@ namespace Emby.Server.Implementations.Session
         /// </summary>
         /// <param name="sessionId">The session identifier.</param>
         /// <param name="userId">The user identifier.</param>
-        /// <exception cref="System.UnauthorizedAccessException">Cannot modify additional users without authenticating first.</exception>
-        /// <exception cref="System.ArgumentException">The requested user is already the primary user of the session.</exception>
+        /// <exception cref="UnauthorizedAccessException">Cannot modify additional users without authenticating first.</exception>
+        /// <exception cref="ArgumentException">The requested user is already the primary user of the session.</exception>
         public void AddAdditionalUser(string sessionId, Guid userId)
         {
             CheckDisposed();
@@ -1318,8 +1318,8 @@ namespace Emby.Server.Implementations.Session
         /// </summary>
         /// <param name="sessionId">The session identifier.</param>
         /// <param name="userId">The user identifier.</param>
-        /// <exception cref="System.UnauthorizedAccessException">Cannot modify additional users without authenticating first.</exception>
-        /// <exception cref="System.ArgumentException">The requested user is already the primary user of the session.</exception>
+        /// <exception cref="UnauthorizedAccessException">Cannot modify additional users without authenticating first.</exception>
+        /// <exception cref="ArgumentException">The requested user is already the primary user of the session.</exception>
         public void RemoveAdditionalUser(string sessionId, Guid userId)
         {
             CheckDisposed();
diff --git a/Emby.Server.Implementations/Sorting/AlphanumComparator.cs b/Emby.Server.Implementations/Sorting/AlphanumComparator.cs
index f21f905df7..2e00c24d75 100644
--- a/Emby.Server.Implementations/Sorting/AlphanumComparator.cs
+++ b/Emby.Server.Implementations/Sorting/AlphanumComparator.cs
@@ -29,8 +29,8 @@ namespace Emby.Server.Implementations.Sorting
                 char thisCh = s1[thisMarker];
                 char thatCh = s2[thatMarker];
 
-                StringBuilder thisChunk = new StringBuilder();
-                StringBuilder thatChunk = new StringBuilder();
+                var thisChunk = new StringBuilder();
+                var thatChunk = new StringBuilder();
 
                 while ((thisMarker < s1.Length) && (thisChunk.Length == 0 || SortHelper.InChunk(thisCh, thisChunk[0])))
                 {
diff --git a/Emby.Server.Implementations/TV/TVSeriesManager.cs b/Emby.Server.Implementations/TV/TVSeriesManager.cs
index 3a9d99aa16..630ef4893b 100644
--- a/Emby.Server.Implementations/TV/TVSeriesManager.cs
+++ b/Emby.Server.Implementations/TV/TVSeriesManager.cs
@@ -118,7 +118,7 @@ namespace Emby.Server.Implementations.TV
                 OrderBy = new[] { new ValueTuple<string, SortOrder>(ItemSortBy.DatePlayed, SortOrder.Descending) },
                 SeriesPresentationUniqueKey = presentationUniqueKey,
                 Limit = limit,
-                DtoOptions = new MediaBrowser.Controller.Dto.DtoOptions
+                DtoOptions = new DtoOptions
                 {
                     Fields = new ItemFields[]
                     {
@@ -196,7 +196,7 @@ namespace Emby.Server.Implementations.TV
                 IsPlayed = true,
                 Limit = 1,
                 ParentIndexNumberNotEquals = 0,
-                DtoOptions = new MediaBrowser.Controller.Dto.DtoOptions
+                DtoOptions = new DtoOptions
                 {
                     Fields = new ItemFields[]
                     {
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/Detector.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/Detector.cs
index 507dd5e42d..097c7b8b75 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/Detector.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/Detector.cs
@@ -164,7 +164,7 @@ namespace NLangDetect.Core
 
         public string Detect()
         {
-            List<Language> probabilities = GetProbabilities();
+            var probabilities = GetProbabilities();
 
             return
               probabilities.Count > 0
@@ -179,7 +179,7 @@ namespace NLangDetect.Core
                 DetectBlock();
             }
 
-            List<Language> list = SortProbability(_langprob);
+            var list = SortProbability(_langprob);
 
             return list;
         }
@@ -241,7 +241,7 @@ namespace NLangDetect.Core
         {
             CleanText();
 
-            List<string> ngrams = ExtractNGrams();
+            var ngrams = ExtractNGrams();
 
             if (ngrams.Count == 0)
             {
@@ -250,7 +250,7 @@ namespace NLangDetect.Core
 
             _langprob = new double[_langlist.Count];
 
-            Random rand = (_seed.HasValue ? new Random(_seed.Value) : new Random());
+            var rand = (_seed.HasValue ? new Random(_seed.Value) : new Random());
 
             for (int t = 0; t < _trialsCount; t++)
             {
@@ -305,7 +305,7 @@ namespace NLangDetect.Core
         private List<string> ExtractNGrams()
         {
             var list = new List<string>();
-            NGram ngram = new NGram();
+            var ngram = new NGram();
 
             for (int i = 0; i < _text.Length; i++)
             {
@@ -332,7 +332,7 @@ namespace NLangDetect.Core
                 return;
             }
 
-            ProbVector langProbMap = _wordLangProbMap[word];
+            var langProbMap = _wordLangProbMap[word];
             double weight = alpha / _BaseFreq;
 
             for (int i = 0; i < prob.Length; i++)
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/DetectorFactory.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/DetectorFactory.cs
index c80757e682..08e98d62ec 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/DetectorFactory.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/DetectorFactory.cs
@@ -54,7 +54,7 @@ namespace NLangDetect.Core
 
         public static Detector Create(double alpha)
         {
-            Detector detector = CreateDetector();
+            var detector = CreateDetector();
 
             detector.SetAlpha(alpha);
 
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/GenProfile.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/GenProfile.cs
index c2b007c052..26157483b6 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/GenProfile.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/GenProfile.cs
@@ -13,8 +13,8 @@ namespace NLangDetect.Core
 
         public static LangProfile load(string lang, string file)
         {
-            LangProfile profile = new LangProfile(lang);
-            TagExtractor tagextractor = new TagExtractor("abstract", 100);
+            var profile = new LangProfile(lang);
+            var tagextractor = new TagExtractor("abstract", 100);
             Stream inputStream = null;
 
             try
@@ -28,7 +28,7 @@ namespace NLangDetect.Core
                     inputStream = new GZipStream(inputStream, CompressionMode.Decompress);
                 }
 
-                using (XmlReader xmlReader = XmlReader.Create(inputStream))
+                using (var xmlReader = XmlReader.Create(inputStream))
                 {
                     while (xmlReader.Read())
                     {
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/LanguageDetector.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/LanguageDetector.cs
index 98c4f623c4..a26f236a81 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/LanguageDetector.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/LanguageDetector.cs
@@ -25,7 +25,7 @@ namespace NLangDetect.Core
         {
             if (string.IsNullOrEmpty(plainText)) { throw new ArgumentException("Argument can't be null nor empty.", nameof(plainText)); }
 
-            Detector detector = DetectorFactory.Create(_DefaultAlpha);
+            var detector = DetectorFactory.Create(_DefaultAlpha);
 
             detector.Append(plainText);
 
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/Utils/LangProfile.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/Utils/LangProfile.cs
index 0413edfadc..78b44e1fcc 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/Utils/LangProfile.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/Utils/LangProfile.cs
@@ -59,8 +59,8 @@ namespace NLangDetect.Core.Utils
             ICollection<string> keys = freq.Keys;
             int roman = 0;
             // TODO IMM HI: move up?
-            Regex regex1 = new Regex("^[A-Za-z]$", RegexOptions.Compiled);
-            List<string> keysToRemove = new List<string>();
+            var regex1 = new Regex("^[A-Za-z]$", RegexOptions.Compiled);
+            var keysToRemove = new List<string>();
 
             foreach (string key in keys)
             {
@@ -93,7 +93,7 @@ namespace NLangDetect.Core.Utils
                 ICollection<string> keys2 = freq.Keys;
 
                 // TODO IMM HI: move up?
-                Regex regex2 = new Regex(".*[A-Za-z].*", RegexOptions.Compiled);
+                var regex2 = new Regex(".*[A-Za-z].*", RegexOptions.Compiled);
 
                 foreach (string key in keys2)
                 {
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/Utils/Messages.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/Utils/Messages.cs
index 058f350b2c..d7dab85281 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/Utils/Messages.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/Utils/Messages.cs
@@ -30,7 +30,7 @@ namespace NLangDetect.Core.Utils
         {
             var manifestName = typeof(Messages).Assembly.GetManifestResourceNames().FirstOrDefault(i => i.IndexOf("messages.properties", StringComparison.Ordinal) != -1);
 
-            Stream messagesStream =
+            var messagesStream =
               typeof(Messages).Assembly
                 .GetManifestResourceStream(manifestName);
 
diff --git a/Emby.Server.Implementations/TextEncoding/TextEncodingDetect.cs b/Emby.Server.Implementations/TextEncoding/TextEncodingDetect.cs
index 49a371efad..03ff0863f2 100644
--- a/Emby.Server.Implementations/TextEncoding/TextEncodingDetect.cs
+++ b/Emby.Server.Implementations/TextEncoding/TextEncodingDetect.cs
@@ -150,7 +150,7 @@ namespace Emby.Server.Implementations.TextEncoding
         public CharacterEncoding DetectEncoding(byte[] buffer, int size)
         {
             // First check if we have a BOM and return that if so
-            CharacterEncoding encoding = CheckBom(buffer, size);
+            var encoding = CheckBom(buffer, size);
             if (encoding != CharacterEncoding.None)
             {
                 return encoding;
diff --git a/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/CharDistributionAnalyser.cs b/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/CharDistributionAnalyser.cs
index 472dfdc51d..601b4906a4 100644
--- a/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/CharDistributionAnalyser.cs
+++ b/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/CharDistributionAnalyser.cs
@@ -83,7 +83,7 @@ namespace UniversalDetector.Core
         /// convert this encoding string to a number, here called order.
         /// This allow multiple encoding of a language to share one frequency table
         /// </summary>
-        /// <param name="buf">A <see cref="System.Byte"/></param>
+        /// <param name="buf">A <see cref="byte"/></param>
         /// <param name="offset"></param>
         /// <returns></returns>
         public abstract int GetOrder(byte[] buf, int offset);
@@ -91,7 +91,7 @@ namespace UniversalDetector.Core
         /// <summary>
         /// Feed a character with known length
         /// </summary>
-        /// <param name="buf">A <see cref="System.Byte"/></param>
+        /// <param name="buf">A <see cref="byte"/></param>
         /// <param name="offset">buf offset</param>
         public void HandleOneChar(byte[] buf, int offset, int charLen)
         {
diff --git a/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/CharsetProber.cs b/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/CharsetProber.cs
index 158dc89696..e61e5848d7 100644
--- a/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/CharsetProber.cs
+++ b/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/CharsetProber.cs
@@ -108,7 +108,7 @@ namespace UniversalDetector.Core
         {
             byte[] result = null;
 
-            using (MemoryStream ms = new MemoryStream(buf.Length))
+            using (var ms = new MemoryStream(buf.Length))
             {
 
                 bool meetMSB = false;
@@ -156,7 +156,7 @@ namespace UniversalDetector.Core
         {
             byte[] result = null;
 
-            using (MemoryStream ms = new MemoryStream(buf.Length))
+            using (var ms = new MemoryStream(buf.Length))
             {
 
                 bool inTag = false;
diff --git a/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/EscCharsetProber.cs b/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/EscCharsetProber.cs
index e8da73c1c7..b10c41c77f 100644
--- a/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/EscCharsetProber.cs
+++ b/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/EscCharsetProber.cs
@@ -84,7 +84,7 @@ namespace UniversalDetector.Core
                         }
                         else if (j != activeSM)
                         {
-                            CodingStateMachine t = codingSM[activeSM];
+                            var t = codingSM[activeSM];
                             codingSM[activeSM] = codingSM[j];
                             codingSM[j] = t;
                         }
diff --git a/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/MBCSGroupProber.cs b/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/MBCSGroupProber.cs
index e7fa2d7192..b23e499c37 100644
--- a/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/MBCSGroupProber.cs
+++ b/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/MBCSGroupProber.cs
@@ -122,7 +122,7 @@ namespace UniversalDetector.Core
                 }
             }
 
-            ProbingState st = ProbingState.NotMe;
+            var st = ProbingState.NotMe;
 
             for (int i = 0; i < probers.Length; i++)
             {
diff --git a/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/SBCSGroupProber.cs b/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/SBCSGroupProber.cs
index 336726aab2..cdbc168915 100644
--- a/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/SBCSGroupProber.cs
+++ b/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/SBCSGroupProber.cs
@@ -59,7 +59,7 @@ namespace UniversalDetector.Core
             probers[7] = new SingleByteCharSetProber(new Win1253Model());
             probers[8] = new SingleByteCharSetProber(new Latin5BulgarianModel());
             probers[9] = new SingleByteCharSetProber(new Win1251BulgarianModel());
-            HebrewProber hebprober = new HebrewProber();
+            var hebprober = new HebrewProber();
             probers[10] = hebprober;
             // Logical
             probers[11] = new SingleByteCharSetProber(new Win1255Model(), false, hebprober);
@@ -75,7 +75,7 @@ namespace UniversalDetector.Core
 
         public override ProbingState HandleData(byte[] buf, int offset, int len)
         {
-            ProbingState st = ProbingState.NotMe;
+            var st = ProbingState.NotMe;
 
             //apply filter to original buffer, and we got new buffer back
             //depend on what script it is, we will feed them the new buffer
diff --git a/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/UniversalDetector.cs b/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/UniversalDetector.cs
index 28a50ea3ea..812a9a7931 100644
--- a/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/UniversalDetector.cs
+++ b/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/UniversalDetector.cs
@@ -168,7 +168,7 @@ namespace UniversalDetector.Core
                 }
             }
 
-            ProbingState st = ProbingState.NotMe;
+            var st = ProbingState.NotMe;
 
             switch (inputState)
             {
diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index 74d66fd416..68cb7821d6 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -415,7 +415,7 @@ namespace Emby.Server.Implementations.Updates
         /// <param name="progress">The progress.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">package</exception>
+        /// <exception cref="ArgumentNullException">package</exception>
         public async Task InstallPackage(PackageVersionInfo package, bool isPlugin, IProgress<double> progress, CancellationToken cancellationToken)
         {
             if (package == null)
@@ -626,7 +626,7 @@ namespace Emby.Server.Implementations.Updates
         /// Uninstalls a plugin
         /// </summary>
         /// <param name="plugin">The plugin.</param>
-        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="ArgumentException"></exception>
         public void UninstallPlugin(IPlugin plugin)
         {
             plugin.OnUninstalling();
diff --git a/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs b/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs
index aa48406649..8234393c2c 100644
--- a/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs
+++ b/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs
@@ -34,7 +34,7 @@ namespace Emby.XmlTv.Classes
 
         private static XmlReader CreateXmlTextReader(string path)
         {
-            XmlReaderSettings settings = new XmlReaderSettings();
+            var settings = new XmlReaderSettings();
 
             // https://msdn.microsoft.com/en-us/library/system.xml.xmlreadersettings.xmlresolver(v=vs.110).aspx
             // Looks like we don't need this anyway?
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs
index 15a01ec3c8..62c65d32eb 100644
--- a/Jellyfin.Server/Program.cs
+++ b/Jellyfin.Server/Program.cs
@@ -36,8 +36,8 @@ namespace Jellyfin.Server
 
         public static async Task<int> Main(string[] args)
         {
-            StartupOptions options = new StartupOptions(args);
-            Version version = Assembly.GetEntryAssembly().GetName().Version;
+            var options = new StartupOptions(args);
+            var version = Assembly.GetEntryAssembly().GetName().Version;
 
             if (options.ContainsOption("-v") || options.ContainsOption("--version"))
             {
@@ -45,7 +45,7 @@ namespace Jellyfin.Server
                 return 0;
             }
 
-            ServerApplicationPaths appPaths = createApplicationPaths(options);
+            var appPaths = createApplicationPaths(options);
             // $JELLYFIN_LOG_DIR needs to be set for the logger configuration manager
             Environment.SetEnvironmentVariable("JELLYFIN_LOG_DIR", appPaths.LogDirectoryPath);
             await createLogger(appPaths);
@@ -57,7 +57,7 @@ namespace Jellyfin.Server
 
             _logger.LogInformation("Jellyfin version: {Version}", version);
 
-            EnvironmentInfo environmentInfo = new EnvironmentInfo(getOperatingSystem());
+            var environmentInfo = new EnvironmentInfo(getOperatingSystem());
             ApplicationHost.LogEnvironmentInfo(_logger, appPaths, environmentInfo);
 
             SQLitePCL.Batteries_V2.Init();
@@ -173,7 +173,7 @@ namespace Jellyfin.Server
                 if (!File.Exists(configPath))
                 {
                     // For some reason the csproj name is used instead of the assembly name
-                    using (Stream rscstr = typeof(Program).Assembly
+                    using (var rscstr = typeof(Program).Assembly
                         .GetManifestResourceStream("Jellyfin.Server.Resources.Configuration.logging.json"))
                     using (Stream fstr = File.Open(configPath, FileMode.CreateNew))
                     {
diff --git a/Jellyfin.Server/SocketSharp/RequestMono.cs b/Jellyfin.Server/SocketSharp/RequestMono.cs
index 6e5a4e75a3..0e3d2ad657 100644
--- a/Jellyfin.Server/SocketSharp/RequestMono.cs
+++ b/Jellyfin.Server/SocketSharp/RequestMono.cs
@@ -75,7 +75,7 @@ namespace Jellyfin.SocketSharp
                         //
                         // We use a substream, as in 2.x we will support large uploads streamed to disk,
                         //
-                        HttpPostedFile sub = new HttpPostedFile(e.Filename, e.ContentType, input, e.Start, e.Length);
+                        var sub = new HttpPostedFile(e.Filename, e.ContentType, input, e.Start, e.Length);
                         files[e.Name] = sub;
                     }
                 }
@@ -207,17 +207,17 @@ namespace Jellyfin.SocketSharp
 
         async Task LoadWwwForm(WebROCollection form)
         {
-            using (Stream input = InputStream)
+            using (var input = InputStream)
             {
                 using (var ms = new MemoryStream())
                 {
                     await input.CopyToAsync(ms).ConfigureAwait(false);
                     ms.Position = 0;
 
-                    using (StreamReader s = new StreamReader(ms, ContentEncoding))
+                    using (var s = new StreamReader(ms, ContentEncoding))
                     {
-                        StringBuilder key = new StringBuilder();
-                        StringBuilder value = new StringBuilder();
+                        var key = new StringBuilder();
+                        var value = new StringBuilder();
                         int c;
 
                         while ((c = s.Read()) != -1)
@@ -269,7 +269,7 @@ namespace Jellyfin.SocketSharp
         {
             public override string ToString()
             {
-                StringBuilder result = new StringBuilder();
+                var result = new StringBuilder();
                 foreach (var pair in this)
                 {
                     if (result.Length > 0)
@@ -715,7 +715,7 @@ namespace Jellyfin.SocketSharp
                 if (at_eof || ReadBoundary())
                     return null;
 
-                Element elem = new Element();
+                var elem = new Element();
                 string header;
                 while ((header = ReadHeaders()) != null)
                 {
diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index 12d807a7e2..1248f7316f 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -902,7 +902,7 @@ namespace MediaBrowser.Api.Library
 
             var dtoOptions = GetDtoOptions(_authContext, request);
 
-            BaseItem parent = item.GetParent();
+            var parent = item.GetParent();
 
             while (parent != null)
             {
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index cdf9c7d0b4..6d4af16e73 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -751,7 +751,7 @@ namespace MediaBrowser.Api.Playback
             MediaSourceInfo mediaSource = null;
             if (string.IsNullOrWhiteSpace(request.LiveStreamId))
             {
-                TranscodingJob currentJob = !string.IsNullOrWhiteSpace(request.PlaySessionId) ?
+                var currentJob = !string.IsNullOrWhiteSpace(request.PlaySessionId) ?
                     ApiEntryPoint.Instance.GetTranscodingJob(request.PlaySessionId)
                     : null;
 
diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
index 502403cfeb..16b036912c 100644
--- a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
@@ -168,7 +168,7 @@ namespace MediaBrowser.Api.ScheduledTasks
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns>IEnumerable{TaskInfo}.</returns>
-        /// <exception cref="MediaBrowser.Common.Extensions.ResourceNotFoundException">Task not found</exception>
+        /// <exception cref="ResourceNotFoundException">Task not found</exception>
         public object Get(GetScheduledTask request)
         {
             var task = TaskManager.ScheduledTasks.FirstOrDefault(i => string.Equals(i.Id, request.Id));
@@ -187,7 +187,7 @@ namespace MediaBrowser.Api.ScheduledTasks
         /// Posts the specified request.
         /// </summary>
         /// <param name="request">The request.</param>
-        /// <exception cref="MediaBrowser.Common.Extensions.ResourceNotFoundException">Task not found</exception>
+        /// <exception cref="ResourceNotFoundException">Task not found</exception>
         public void Post(StartScheduledTask request)
         {
             var task = TaskManager.ScheduledTasks.FirstOrDefault(i => string.Equals(i.Id, request.Id));
@@ -214,7 +214,7 @@ namespace MediaBrowser.Api.ScheduledTasks
         /// Posts the specified request.
         /// </summary>
         /// <param name="request">The request.</param>
-        /// <exception cref="MediaBrowser.Common.Extensions.ResourceNotFoundException">Task not found</exception>
+        /// <exception cref="ResourceNotFoundException">Task not found</exception>
         public void Delete(StopScheduledTask request)
         {
             var task = TaskManager.ScheduledTasks.FirstOrDefault(i => string.Equals(i.Id, request.Id));
@@ -231,7 +231,7 @@ namespace MediaBrowser.Api.ScheduledTasks
         /// Posts the specified request.
         /// </summary>
         /// <param name="request">The request.</param>
-        /// <exception cref="MediaBrowser.Common.Extensions.ResourceNotFoundException">Task not found</exception>
+        /// <exception cref="ResourceNotFoundException">Task not found</exception>
         public void Post(UpdateScheduledTaskTriggers request)
         {
             // We need to parse this manually because we told service stack not to with IRequiresRequestStream
diff --git a/MediaBrowser.Api/SimilarItemsHelper.cs b/MediaBrowser.Api/SimilarItemsHelper.cs
index 20a6969df0..44bb24ef2d 100644
--- a/MediaBrowser.Api/SimilarItemsHelper.cs
+++ b/MediaBrowser.Api/SimilarItemsHelper.cs
@@ -95,7 +95,7 @@ namespace MediaBrowser.Api
             var items = GetSimilaritems(item, libraryManager, inputItems, getSimilarityScore)
                 .ToList();
 
-            List<BaseItem> returnItems = items;
+            var returnItems = items;
 
             if (request.Limit.HasValue)
             {
diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
index 3daa5779cc..4cccc0cb5a 100644
--- a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
+++ b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
@@ -459,7 +459,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             if (string.IsNullOrEmpty(val))
             {
-                return Array.Empty<ValueTuple<string, Model.Entities.SortOrder>>();
+                return Array.Empty<ValueTuple<string, SortOrder>>();
             }
 
             var vals = val.Split(',');
@@ -470,7 +470,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             var sortOrders = requestedSortOrder.Split(',');
 
-            var result = new ValueTuple<string, Model.Entities.SortOrder>[vals.Length];
+            var result = new ValueTuple<string, SortOrder>[vals.Length];
 
             for (var i = 0; i < vals.Length; i++)
             {
@@ -479,7 +479,7 @@ namespace MediaBrowser.Api.UserLibrary
                 var sortOrderValue = sortOrders.Length > sortOrderIndex ? sortOrders[sortOrderIndex] : null;
                 var sortOrder = string.Equals(sortOrderValue, "Descending", StringComparison.OrdinalIgnoreCase) ? MediaBrowser.Model.Entities.SortOrder.Descending : MediaBrowser.Model.Entities.SortOrder.Ascending;
 
-                result[i] = new ValueTuple<string, Model.Entities.SortOrder>(vals[i], sortOrder);
+                result[i] = new ValueTuple<string, SortOrder>(vals[i], sortOrder);
             }
 
             return result;
diff --git a/MediaBrowser.Common/Net/IHttpClient.cs b/MediaBrowser.Common/Net/IHttpClient.cs
index 5f4e3e5d1e..5aaf7e0be6 100644
--- a/MediaBrowser.Common/Net/IHttpClient.cs
+++ b/MediaBrowser.Common/Net/IHttpClient.cs
@@ -43,7 +43,7 @@ namespace MediaBrowser.Common.Net
         /// <param name="options">The options.</param>
         /// <returns>Task{System.String}.</returns>
         /// <exception cref="System.ArgumentNullException">progress</exception>
-        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
+        /// <exception cref="Model.Net.HttpException"></exception>
         Task<string> GetTempFile(HttpRequestOptions options);
 
         /// <summary>
diff --git a/MediaBrowser.Common/Plugins/BasePlugin.cs b/MediaBrowser.Common/Plugins/BasePlugin.cs
index a14c9fb34b..1ff2e98ef7 100644
--- a/MediaBrowser.Common/Plugins/BasePlugin.cs
+++ b/MediaBrowser.Common/Plugins/BasePlugin.cs
@@ -212,7 +212,7 @@ namespace MediaBrowser.Common.Plugins
         /// Returns true or false indicating success or failure
         /// </summary>
         /// <param name="configuration">The configuration.</param>
-        /// <exception cref="System.ArgumentNullException">configuration</exception>
+        /// <exception cref="ArgumentNullException">configuration</exception>
         public virtual void UpdateConfiguration(BasePluginConfiguration configuration)
         {
             if (configuration == null)
diff --git a/MediaBrowser.Common/Plugins/IPlugin.cs b/MediaBrowser.Common/Plugins/IPlugin.cs
index 037e11ce89..32527c2997 100644
--- a/MediaBrowser.Common/Plugins/IPlugin.cs
+++ b/MediaBrowser.Common/Plugins/IPlugin.cs
@@ -69,7 +69,7 @@ namespace MediaBrowser.Common.Plugins
         /// Returns true or false indicating success or failure
         /// </summary>
         /// <param name="configuration">The configuration.</param>
-        /// <exception cref="System.ArgumentNullException">configuration</exception>
+        /// <exception cref="ArgumentNullException">configuration</exception>
         void UpdateConfiguration(BasePluginConfiguration configuration);
 
         /// <summary>
diff --git a/MediaBrowser.Common/Updates/IInstallationManager.cs b/MediaBrowser.Common/Updates/IInstallationManager.cs
index 52d5d7dcbb..8bef784009 100644
--- a/MediaBrowser.Common/Updates/IInstallationManager.cs
+++ b/MediaBrowser.Common/Updates/IInstallationManager.cs
@@ -108,14 +108,14 @@ namespace MediaBrowser.Common.Updates
         /// <param name="progress">The progress.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">package</exception>
+        /// <exception cref="ArgumentNullException">package</exception>
         Task InstallPackage(PackageVersionInfo package, bool isPlugin, IProgress<double> progress, CancellationToken cancellationToken);
 
         /// <summary>
         /// Uninstalls a plugin
         /// </summary>
         /// <param name="plugin">The plugin.</param>
-        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="ArgumentException"></exception>
         void UninstallPlugin(IPlugin plugin);
     }
 }
diff --git a/MediaBrowser.Controller/Entities/AggregateFolder.cs b/MediaBrowser.Controller/Entities/AggregateFolder.cs
index 522b3e33e9..054df21e52 100644
--- a/MediaBrowser.Controller/Entities/AggregateFolder.cs
+++ b/MediaBrowser.Controller/Entities/AggregateFolder.cs
@@ -164,7 +164,7 @@ namespace MediaBrowser.Controller.Entities
         /// Adds the virtual child.
         /// </summary>
         /// <param name="child">The child.</param>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         public void AddVirtualChild(BaseItem child)
         {
             if (child == null)
@@ -180,7 +180,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <param name="id">The id.</param>
         /// <returns>BaseItem.</returns>
-        /// <exception cref="System.ArgumentNullException">id</exception>
+        /// <exception cref="ArgumentNullException">id</exception>
         public BaseItem FindVirtualChild(Guid id)
         {
             if (id.Equals(Guid.Empty))
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 995f394834..68374c8df9 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -367,7 +367,7 @@ namespace MediaBrowser.Controller.Entities
                 }
                 char thisCh = s1[thisMarker];
 
-                StringBuilder thisChunk = new StringBuilder();
+                var thisChunk = new StringBuilder();
 
                 while ((thisMarker < s1.Length) && (thisChunk.Length == 0 || SortHelper.InChunk(thisCh, thisChunk[0])))
                 {
@@ -548,9 +548,9 @@ namespace MediaBrowser.Controller.Entities
         public static IMediaSourceManager MediaSourceManager { get; set; }
 
         /// <summary>
-        /// Returns a <see cref="System.String" /> that represents this instance.
+        /// Returns a <see cref="string" /> that represents this instance.
         /// </summary>
-        /// <returns>A <see cref="System.String" /> that represents this instance.</returns>
+        /// <returns>A <see cref="string" /> that represents this instance.</returns>
         public override string ToString()
         {
             return Name;
@@ -1661,7 +1661,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <param name="user">The user.</param>
         /// <returns><c>true</c> if [is parental allowed] [the specified user]; otherwise, <c>false</c>.</returns>
-        /// <exception cref="System.ArgumentNullException">user</exception>
+        /// <exception cref="ArgumentNullException">user</exception>
         public bool IsParentalAllowed(User user)
         {
             if (user == null)
@@ -1811,7 +1811,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <param name="user">The user.</param>
         /// <returns><c>true</c> if the specified user is visible; otherwise, <c>false</c>.</returns>
-        /// <exception cref="System.ArgumentNullException">user</exception>
+        /// <exception cref="ArgumentNullException">user</exception>
         public virtual bool IsVisible(User user)
         {
             if (user == null)
@@ -1971,7 +1971,7 @@ namespace MediaBrowser.Controller.Entities
         /// Adds a studio to the item
         /// </summary>
         /// <param name="name">The name.</param>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         public void AddStudio(string name)
         {
             if (string.IsNullOrEmpty(name))
@@ -2004,7 +2004,7 @@ namespace MediaBrowser.Controller.Entities
         /// Adds a genre to the item
         /// </summary>
         /// <param name="name">The name.</param>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         public void AddGenre(string name)
         {
             if (string.IsNullOrEmpty(name))
@@ -2028,7 +2028,7 @@ namespace MediaBrowser.Controller.Entities
         /// <param name="datePlayed">The date played.</param>
         /// <param name="resetPosition">if set to <c>true</c> [reset position].</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         public virtual void MarkPlayed(User user,
             DateTime? datePlayed,
             bool resetPosition)
@@ -2065,7 +2065,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <param name="user">The user.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         public virtual void MarkUnplayed(User user)
         {
             if (user == null)
@@ -2104,7 +2104,7 @@ namespace MediaBrowser.Controller.Entities
         /// <param name="type">The type.</param>
         /// <param name="imageIndex">Index of the image.</param>
         /// <returns><c>true</c> if the specified type has image; otherwise, <c>false</c>.</returns>
-        /// <exception cref="System.ArgumentException">Backdrops should be accessed using Item.Backdrops</exception>
+        /// <exception cref="ArgumentException">Backdrops should be accessed using Item.Backdrops</exception>
         public bool HasImage(ImageType type, int imageIndex)
         {
             return GetImageInfo(type, imageIndex) != null;
@@ -2232,9 +2232,9 @@ namespace MediaBrowser.Controller.Entities
         /// <param name="imageType">Type of the image.</param>
         /// <param name="imageIndex">Index of the image.</param>
         /// <returns>System.String.</returns>
-        /// <exception cref="System.InvalidOperationException">
+        /// <exception cref="InvalidOperationException">
         /// </exception>
-        /// <exception cref="System.ArgumentNullException">item</exception>
+        /// <exception cref="ArgumentNullException">item</exception>
         public string GetImagePath(ImageType imageType, int imageIndex)
         {
             var info = GetImageInfo(imageType, imageIndex);
@@ -2294,7 +2294,7 @@ namespace MediaBrowser.Controller.Entities
         /// <param name="imageType">Type of the image.</param>
         /// <param name="images">The images.</param>
         /// <returns><c>true</c> if XXXX, <c>false</c> otherwise.</returns>
-        /// <exception cref="System.ArgumentException">Cannot call AddImages with chapter images</exception>
+        /// <exception cref="ArgumentException">Cannot call AddImages with chapter images</exception>
         public bool AddImages(ImageType imageType, List<FileSystemMetadata> images)
         {
             if (imageType == ImageType.Chapter)
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index fe53d2f051..bbee594f6a 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -135,7 +135,7 @@ namespace MediaBrowser.Controller.Entities
         /// <param name="item">The item.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.InvalidOperationException">Unable to add  + item.Name</exception>
+        /// <exception cref="InvalidOperationException">Unable to add  + item.Name</exception>
         public void AddChild(BaseItem item, CancellationToken cancellationToken)
         {
             item.SetParent(this);
@@ -1261,7 +1261,7 @@ namespace MediaBrowser.Controller.Entities
         /// <param name="user">The user.</param>
         /// <param name="includeLinkedChildren">if set to <c>true</c> [include linked children].</param>
         /// <returns>IEnumerable{BaseItem}.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         public IEnumerable<BaseItem> GetRecursiveChildren(User user, bool includeLinkedChildren = true)
         {
             return GetRecursiveChildren(user, null);
diff --git a/MediaBrowser.Controller/Entities/Person.cs b/MediaBrowser.Controller/Entities/Person.cs
index 0ba8b3b48f..dd01834898 100644
--- a/MediaBrowser.Controller/Entities/Person.cs
+++ b/MediaBrowser.Controller/Entities/Person.cs
@@ -175,9 +175,9 @@ namespace MediaBrowser.Controller.Entities
         public Dictionary<string, string> ProviderIds { get; set; }
 
         /// <summary>
-        /// Returns a <see cref="System.String" /> that represents this instance.
+        /// Returns a <see cref="string" /> that represents this instance.
         /// </summary>
-        /// <returns>A <see cref="System.String" /> that represents this instance.</returns>
+        /// <returns>A <see cref="string" /> that represents this instance.</returns>
         public override string ToString()
         {
             return Name;
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index 5ba4613c06..4539ab0f26 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -119,7 +119,7 @@ namespace MediaBrowser.Controller.Entities.TV
                 IncludeItemTypes = new[] { typeof(Season).Name },
                 IsVirtualItem = false,
                 Limit = 0,
-                DtoOptions = new Dto.DtoOptions(false)
+                DtoOptions = new DtoOptions(false)
                 {
                     EnableImages = false
                 }
@@ -136,7 +136,7 @@ namespace MediaBrowser.Controller.Entities.TV
             {
                 AncestorWithPresentationUniqueKey = null,
                 SeriesPresentationUniqueKey = seriesKey,
-                DtoOptions = new Dto.DtoOptions(false)
+                DtoOptions = new DtoOptions(false)
                 {
                     EnableImages = false
                 }
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index 16fef9a824..10fe096a46 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -149,7 +149,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <param name="newName">The new name.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         public Task Rename(string newName)
         {
             if (string.IsNullOrEmpty(newName))
diff --git a/MediaBrowser.Controller/Entities/UserItemData.cs b/MediaBrowser.Controller/Entities/UserItemData.cs
index 8a87aff5f5..f7136bdf2e 100644
--- a/MediaBrowser.Controller/Entities/UserItemData.cs
+++ b/MediaBrowser.Controller/Entities/UserItemData.cs
@@ -28,7 +28,7 @@ namespace MediaBrowser.Controller.Entities
         /// Gets or sets the users 0-10 rating
         /// </summary>
         /// <value>The rating.</value>
-        /// <exception cref="System.ArgumentOutOfRangeException">Rating;A 0 to 10 rating is required for UserItemData.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Rating;A 0 to 10 rating is required for UserItemData.</exception>
         public double? Rating
         {
             get => _rating;
diff --git a/MediaBrowser.Controller/IO/FileData.cs b/MediaBrowser.Controller/IO/FileData.cs
index e7c27d8464..4bbb60283e 100644
--- a/MediaBrowser.Controller/IO/FileData.cs
+++ b/MediaBrowser.Controller/IO/FileData.cs
@@ -34,7 +34,7 @@ namespace MediaBrowser.Controller.IO
         /// <param name="flattenFolderDepth">The flatten folder depth.</param>
         /// <param name="resolveShortcuts">if set to <c>true</c> [resolve shortcuts].</param>
         /// <returns>Dictionary{System.StringFileSystemInfo}.</returns>
-        /// <exception cref="System.ArgumentNullException">path</exception>
+        /// <exception cref="ArgumentNullException">path</exception>
         public static FileSystemMetadata[] GetFilteredFileSystemEntries(IDirectoryService directoryService,
             string path,
             IFileSystem fileSystem,
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 0ada91b2e9..9d404ba1a6 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -100,7 +100,7 @@ namespace MediaBrowser.Controller.Library
         /// </summary>
         /// <param name="value">The value.</param>
         /// <returns>Task{Year}.</returns>
-        /// <exception cref="System.ArgumentOutOfRangeException"></exception>
+        /// <exception cref="ArgumentOutOfRangeException"></exception>
         Year GetYear(int value);
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index bf60aa25ad..925d91a375 100644
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -43,7 +43,7 @@ namespace MediaBrowser.Controller.Library
         /// </summary>
         /// <param name="id">The id.</param>
         /// <returns>User.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         User GetUserById(Guid id);
 
         /// <summary>
@@ -73,16 +73,16 @@ namespace MediaBrowser.Controller.Library
         /// <param name="user">The user.</param>
         /// <param name="newName">The new name.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">user</exception>
-        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="ArgumentNullException">user</exception>
+        /// <exception cref="ArgumentException"></exception>
         Task RenameUser(User user, string newName);
 
         /// <summary>
         /// Updates the user.
         /// </summary>
         /// <param name="user">The user.</param>
-        /// <exception cref="System.ArgumentNullException">user</exception>
-        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="ArgumentNullException">user</exception>
+        /// <exception cref="ArgumentException"></exception>
         void UpdateUser(User user);
 
         /// <summary>
@@ -90,8 +90,8 @@ namespace MediaBrowser.Controller.Library
         /// </summary>
         /// <param name="name">The name.</param>
         /// <returns>User.</returns>
-        /// <exception cref="System.ArgumentNullException">name</exception>
-        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="ArgumentNullException">name</exception>
+        /// <exception cref="ArgumentException"></exception>
         Task<User> CreateUser(string name);
 
         /// <summary>
@@ -99,8 +99,8 @@ namespace MediaBrowser.Controller.Library
         /// </summary>
         /// <param name="user">The user.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">user</exception>
-        /// <exception cref="System.ArgumentException"></exception>
+        /// <exception cref="ArgumentNullException">user</exception>
+        /// <exception cref="ArgumentException"></exception>
         Task DeleteUser(User user);
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
index eb459e8904..7bb8325f8c 100644
--- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs
+++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
@@ -138,7 +138,7 @@ namespace MediaBrowser.Controller.Library
         /// Adds the additional location.
         /// </summary>
         /// <param name="path">The path.</param>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         public void AddAdditionalLocation(string path)
         {
             if (string.IsNullOrEmpty(path))
@@ -173,7 +173,7 @@ namespace MediaBrowser.Controller.Library
         /// </summary>
         /// <param name="name">The name.</param>
         /// <returns>FileSystemInfo.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         public FileSystemMetadata GetFileSystemEntryByName(string name)
         {
             if (string.IsNullOrEmpty(name))
@@ -189,7 +189,7 @@ namespace MediaBrowser.Controller.Library
         /// </summary>
         /// <param name="path">The path.</param>
         /// <returns>FileSystemInfo.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         public FileSystemMetadata GetFileSystemEntryByPath(string path)
         {
             if (string.IsNullOrEmpty(path))
@@ -228,10 +228,10 @@ namespace MediaBrowser.Controller.Library
         #region Equality Overrides
 
         /// <summary>
-        /// Determines whether the specified <see cref="System.Object" /> is equal to this instance.
+        /// Determines whether the specified <see cref="object" /> is equal to this instance.
         /// </summary>
         /// <param name="obj">The object to compare with the current object.</param>
-        /// <returns><c>true</c> if the specified <see cref="System.Object" /> is equal to this instance; otherwise, <c>false</c>.</returns>
+        /// <returns><c>true</c> if the specified <see cref="object" /> is equal to this instance; otherwise, <c>false</c>.</returns>
         public override bool Equals(object obj)
         {
             return Equals(obj as ItemResolveArgs);
diff --git a/MediaBrowser.Controller/Net/IWebSocketConnection.cs b/MediaBrowser.Controller/Net/IWebSocketConnection.cs
index 6d31c6dbb6..a09b2f7a22 100644
--- a/MediaBrowser.Controller/Net/IWebSocketConnection.cs
+++ b/MediaBrowser.Controller/Net/IWebSocketConnection.cs
@@ -62,7 +62,7 @@ namespace MediaBrowser.Controller.Net
         /// <param name="message">The message.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">message</exception>
+        /// <exception cref="ArgumentNullException">message</exception>
         Task SendAsync<T>(WebSocketMessage<T> message, CancellationToken cancellationToken);
 
         /// <summary>
@@ -79,7 +79,7 @@ namespace MediaBrowser.Controller.Net
         /// <param name="text">The text.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">buffer</exception>
+        /// <exception cref="ArgumentNullException">buffer</exception>
         Task SendAsync(string text, CancellationToken cancellationToken);
     }
 }
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index 6a4f0aa083..771027103b 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -90,7 +90,7 @@ namespace MediaBrowser.Controller.Session
         /// </summary>
         /// <param name="info">The info.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         Task OnPlaybackProgress(PlaybackProgressInfo info);
 
         Task OnPlaybackProgress(PlaybackProgressInfo info, bool isAutomated);
@@ -100,7 +100,7 @@ namespace MediaBrowser.Controller.Session
         /// </summary>
         /// <param name="info">The info.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         Task OnPlaybackStopped(PlaybackStopInfo info);
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Sorting/SortExtensions.cs b/MediaBrowser.Controller/Sorting/SortExtensions.cs
index 56d9c1a64c..111f4f17fc 100644
--- a/MediaBrowser.Controller/Sorting/SortExtensions.cs
+++ b/MediaBrowser.Controller/Sorting/SortExtensions.cs
@@ -72,8 +72,8 @@ namespace MediaBrowser.Controller.Sorting
                     char thisCh = s1[thisMarker];
                     char thatCh = s2[thatMarker];
 
-                    StringBuilder thisChunk = new StringBuilder();
-                    StringBuilder thatChunk = new StringBuilder();
+                    var thisChunk = new StringBuilder();
+                    var thatChunk = new StringBuilder();
 
                     while ((thisMarker < s1.Length) && (thisChunk.Length == 0 || InChunk(thisCh, thisChunk[0])))
                     {
diff --git a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
index 0a4928ed7f..e4efa2c351 100644
--- a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
@@ -96,7 +96,7 @@ namespace MediaBrowser.LocalMetadata.Images
 
         public List<LocalImageInfo> GetImages(BaseItem item, IEnumerable<string> paths, bool arePathsInMediaFolders, IDirectoryService directoryService)
         {
-            IEnumerable<FileSystemMetadata> files = paths.SelectMany(i => _fileSystem.GetFiles(i, BaseItem.SupportedImageExtensions, true, false));
+            var files = paths.SelectMany(i => _fileSystem.GetFiles(i, BaseItem.SupportedImageExtensions, true, false));
 
             files = files
                 .OrderBy(i => Array.IndexOf(BaseItem.SupportedImageExtensions, i.Extension ?? string.Empty));
diff --git a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
index fef673bfd2..0ee283325b 100644
--- a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
@@ -51,7 +51,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
         /// <param name="item">The item.</param>
         /// <param name="metadataFile">The metadata file.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        /// <exception cref="System.ArgumentNullException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
         public void Fetch(MetadataResult<T> item, string metadataFile, CancellationToken cancellationToken)
         {
             if (item == null)
@@ -102,7 +102,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
         {
             item.ResetPeople();
 
-            using (Stream fileStream = FileSystem.OpenRead(metadataFile))
+            using (var fileStream = FileSystem.OpenRead(metadataFile))
             {
                 using (var streamReader = new StreamReader(fileStream, encoding))
                 {
@@ -263,7 +263,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
                             {
                                 MetadataFields field;
 
-                                if (Enum.TryParse<MetadataFields>(i, true, out field))
+                                if (Enum.TryParse(i, true, out field))
                                 {
                                     return (MetadataFields?)field;
                                 }
@@ -384,7 +384,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
 
                 case "Director":
                     {
-                        foreach (var p in SplitNames(reader.ReadElementContentAsString()).Select(v => new Controller.Entities.PersonInfo { Name = v.Trim(), Type = PersonType.Director }))
+                        foreach (var p in SplitNames(reader.ReadElementContentAsString()).Select(v => new PersonInfo { Name = v.Trim(), Type = PersonType.Director }))
                         {
                             if (string.IsNullOrWhiteSpace(p.Name))
                             {
@@ -396,7 +396,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
                     }
                 case "Writer":
                     {
-                        foreach (var p in SplitNames(reader.ReadElementContentAsString()).Select(v => new Controller.Entities.PersonInfo { Name = v.Trim(), Type = PersonType.Writer }))
+                        foreach (var p in SplitNames(reader.ReadElementContentAsString()).Select(v => new PersonInfo { Name = v.Trim(), Type = PersonType.Writer }))
                         {
                             if (string.IsNullOrWhiteSpace(p.Name))
                             {
@@ -421,7 +421,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
                         else
                         {
                             // Old-style piped string
-                            foreach (var p in SplitNames(actors).Select(v => new Controller.Entities.PersonInfo { Name = v.Trim(), Type = PersonType.Actor }))
+                            foreach (var p in SplitNames(actors).Select(v => new PersonInfo { Name = v.Trim(), Type = PersonType.Actor }))
                             {
                                 if (string.IsNullOrWhiteSpace(p.Name))
                                 {
@@ -435,7 +435,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
 
                 case "GuestStars":
                     {
-                        foreach (var p in SplitNames(reader.ReadElementContentAsString()).Select(v => new Controller.Entities.PersonInfo { Name = v.Trim(), Type = PersonType.GuestStar }))
+                        foreach (var p in SplitNames(reader.ReadElementContentAsString()).Select(v => new PersonInfo { Name = v.Trim(), Type = PersonType.GuestStar }))
                         {
                             if (string.IsNullOrWhiteSpace(p.Name))
                             {
diff --git a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
index 2ddf922f96..2eac35f282 100644
--- a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
@@ -130,7 +130,7 @@ namespace MediaBrowser.LocalMetadata.Savers
                 CloseOutput = false
             };
 
-            using (XmlWriter writer = XmlWriter.Create(stream, settings))
+            using (var writer = XmlWriter.Create(stream, settings))
             {
                 var root = GetRootElementName(item);
 
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
index 262772959a..c0578aad1c 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
@@ -152,7 +152,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         private string GetProcessOutput(string path, string arguments)
         {
-            IProcess process = _processFactory.Create(new ProcessOptions
+            var process = _processFactory.Create(new ProcessOptions
             {
                 CreateNoWindow = true,
                 UseShellExecute = false,
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 8489cc9b17..63642b571e 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -457,7 +457,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         /// <param name="inputFiles">The input files.</param>
         /// <param name="protocol">The protocol.</param>
         /// <returns>System.String.</returns>
-        /// <exception cref="System.ArgumentException">Unrecognized InputType</exception>
+        /// <exception cref="ArgumentException">Unrecognized InputType</exception>
         public string GetInputArgument(string[] inputFiles, MediaProtocol protocol)
         {
             return EncodingUtils.GetInputArgument(inputFiles.ToList(), protocol);
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index 51d2bcba7e..7b89647071 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -300,7 +300,7 @@ namespace MediaBrowser.MediaEncoding.Probing
         private void ReadFromDictNode(XmlReader reader, MediaInfo info)
         {
             string currentKey = null;
-            List<NameValuePair> pairs = new List<NameValuePair>();
+            var pairs = new List<NameValuePair>();
 
             reader.MoveToContent();
             reader.Read();
@@ -360,7 +360,7 @@ namespace MediaBrowser.MediaEncoding.Probing
         private List<NameValuePair> ReadValueArray(XmlReader reader)
         {
 
-            List<NameValuePair> pairs = new List<NameValuePair>();
+            var pairs = new List<NameValuePair>();
 
             reader.MoveToContent();
             reader.Read();
@@ -881,7 +881,7 @@ namespace MediaBrowser.MediaEncoding.Probing
             }
         }
 
-        private void SetSize(InternalMediaInfoResult data, Model.MediaInfo.MediaInfo info)
+        private void SetSize(InternalMediaInfoResult data, MediaInfo info)
         {
             if (data.format != null)
             {
@@ -901,7 +901,7 @@ namespace MediaBrowser.MediaEncoding.Probing
             var composer = FFProbeHelpers.GetDictionaryValue(tags, "composer");
             if (!string.IsNullOrWhiteSpace(composer))
             {
-                List<BaseItemPerson> peoples = new List<BaseItemPerson>();
+                var peoples = new List<BaseItemPerson>();
                 foreach (var person in Split(composer, false))
                 {
                     peoples.Add(new BaseItemPerson { Name = person, Type = PersonType.Composer });
@@ -932,7 +932,7 @@ namespace MediaBrowser.MediaEncoding.Probing
 
             if (!string.IsNullOrWhiteSpace(writer))
             {
-                List<BaseItemPerson> peoples = new List<BaseItemPerson>();
+                var peoples = new List<BaseItemPerson>();
                 foreach (var person in Split(writer, false))
                 {
                     peoples.Add(new BaseItemPerson { Name = person, Type = PersonType.Writer });
@@ -1125,7 +1125,7 @@ namespace MediaBrowser.MediaEncoding.Probing
             if (!string.IsNullOrEmpty(val))
             {
                 var studios = Split(val, true);
-                List<string> studioList = new List<string>();
+                var studioList = new List<string>();
 
                 foreach (var studio in studios)
                 {
@@ -1160,7 +1160,7 @@ namespace MediaBrowser.MediaEncoding.Probing
 
             if (!string.IsNullOrEmpty(val))
             {
-                List<string> genres = new List<string>(info.Genres);
+                var genres = new List<string>(info.Genres);
                 foreach (var genre in Split(val, true))
                 {
                     genres.Add(genre);
diff --git a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
index 0aa6a3e443..7f312eaecb 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         public SubtitleTrackInfo Parse(Stream stream, CancellationToken cancellationToken)
         {
             var trackInfo = new SubtitleTrackInfo();
-            List<SubtitleTrackEvent> trackEvents = new List<SubtitleTrackEvent>();
+            var trackEvents = new List<SubtitleTrackEvent>();
             var eventIndex = 1;
             using (var reader = new StreamReader(stream))
             {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
index c3f6d49475..02ce71ec38 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
@@ -24,7 +24,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         public SubtitleTrackInfo Parse(Stream stream, CancellationToken cancellationToken)
         {
             var trackInfo = new SubtitleTrackInfo();
-            List<SubtitleTrackEvent> trackEvents = new List<SubtitleTrackEvent>();
+            var trackEvents = new List<SubtitleTrackEvent>();
             using (var reader = new StreamReader(stream))
             {
                 string line;
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
index 1cd714f327..8281de7643 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
@@ -16,7 +16,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         public SubtitleTrackInfo Parse(Stream stream, CancellationToken cancellationToken)
         {
             var trackInfo = new SubtitleTrackInfo();
-            List<SubtitleTrackEvent> trackEvents = new List<SubtitleTrackEvent>();
+            var trackEvents = new List<SubtitleTrackEvent>();
 
             using (var reader = new StreamReader(stream))
             {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 3b75146136..4f424d39bd 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -408,7 +408,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         /// <param name="outputPath">The output path.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">
+        /// <exception cref="ArgumentNullException">
         /// inputPath
         /// or
         /// outputPath
@@ -525,7 +525,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         /// <param name="outputPath">The output path.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentException">Must use inputPath list overload</exception>
+        /// <exception cref="ArgumentException">Must use inputPath list overload</exception>
         private async Task ExtractTextSubtitle(
             string[] inputFiles,
             MediaProtocol protocol,
@@ -734,7 +734,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         {
             if (protocol == MediaProtocol.Http)
             {
-                HttpRequestOptions opts = new HttpRequestOptions()
+                var opts = new HttpRequestOptions()
                 {
                     Url = path,
                     CancellationToken = cancellationToken
diff --git a/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
index d67d1dad84..2e328ba63e 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
@@ -19,8 +19,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 {
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    TimeSpan startTime = TimeSpan.FromTicks(trackEvent.StartPositionTicks);
-                    TimeSpan endTime = TimeSpan.FromTicks(trackEvent.EndPositionTicks);
+                    var startTime = TimeSpan.FromTicks(trackEvent.StartPositionTicks);
+                    var endTime = TimeSpan.FromTicks(trackEvent.EndPositionTicks);
 
                     // make sure the start and end times are different and seqential
                     if (endTime.TotalMilliseconds <= startTime.TotalMilliseconds)
diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs
index ec9b276a0b..b3d035be21 100644
--- a/MediaBrowser.Model/Configuration/LibraryOptions.cs
+++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs
@@ -100,7 +100,7 @@ namespace MediaBrowser.Model.Configuration
 
         public ImageOption GetImageOptions(ImageType type)
         {
-            foreach (ImageOption i in ImageOptions)
+            foreach (var i in ImageOptions)
             {
                 if (i.Type == type)
                 {
@@ -111,7 +111,7 @@ namespace MediaBrowser.Model.Configuration
             ImageOption[] options;
             if (DefaultImageOptions.TryGetValue(Type, out options))
             {
-                foreach (ImageOption i in options)
+                foreach (var i in options)
                 {
                     if (i.Type == type)
                     {
diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
index fe89267351..ae7d17275b 100644
--- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs
+++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -267,7 +267,7 @@ namespace MediaBrowser.Model.Dlna
                 return !condition.IsRequired;
             }
 
-            TransportStreamTimestamp expected = (TransportStreamTimestamp)Enum.Parse(typeof(TransportStreamTimestamp), condition.Value, true);
+            var expected = (TransportStreamTimestamp)Enum.Parse(typeof(TransportStreamTimestamp), condition.Value, true);
 
             switch (condition.Condition)
             {
diff --git a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
index ecca415d3d..b71531bf1b 100644
--- a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
+++ b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
@@ -24,14 +24,14 @@ namespace MediaBrowser.Model.Dlna
             // 0 = native, 1 = transcoded
             var orgCi = isDirectStream ? ";DLNA.ORG_CI=0" : ";DLNA.ORG_CI=1";
 
-            DlnaFlags flagValue = DlnaFlags.BackgroundTransferMode |
+            var flagValue = DlnaFlags.BackgroundTransferMode |
                             DlnaFlags.InteractiveTransferMode |
                             DlnaFlags.DlnaV15;
 
             string dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}",
              DlnaMaps.FlagsToString(flagValue));
 
-            ResponseProfile mediaProfile = _profile.GetImageMediaProfile(container,
+            var mediaProfile = _profile.GetImageMediaProfile(container,
                 width,
                 height);
 
@@ -66,7 +66,7 @@ namespace MediaBrowser.Model.Dlna
             // 0 = native, 1 = transcoded
             string orgCi = isDirectStream ? ";DLNA.ORG_CI=0" : ";DLNA.ORG_CI=1";
 
-            DlnaFlags flagValue = DlnaFlags.StreamingTransferMode |
+            var flagValue = DlnaFlags.StreamingTransferMode |
                             DlnaFlags.BackgroundTransferMode |
                             DlnaFlags.InteractiveTransferMode |
                             DlnaFlags.DlnaV15;
@@ -83,7 +83,7 @@ namespace MediaBrowser.Model.Dlna
             string dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}",
              DlnaMaps.FlagsToString(flagValue));
 
-            ResponseProfile mediaProfile = _profile.GetAudioMediaProfile(container,
+            var mediaProfile = _profile.GetAudioMediaProfile(container,
                 audioCodec,
                 audioChannels,
                 audioBitrate,
@@ -131,7 +131,7 @@ namespace MediaBrowser.Model.Dlna
             // 0 = native, 1 = transcoded
             string orgCi = isDirectStream ? ";DLNA.ORG_CI=0" : ";DLNA.ORG_CI=1";
 
-            DlnaFlags flagValue = DlnaFlags.StreamingTransferMode |
+            var flagValue = DlnaFlags.StreamingTransferMode |
                             DlnaFlags.BackgroundTransferMode |
                             DlnaFlags.InteractiveTransferMode |
                             DlnaFlags.DlnaV15;
@@ -148,7 +148,7 @@ namespace MediaBrowser.Model.Dlna
             string dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}",
              DlnaMaps.FlagsToString(flagValue));
 
-            ResponseProfile mediaProfile = _profile.GetVideoMediaProfile(container,
+            var mediaProfile = _profile.GetVideoMediaProfile(container,
                 audioCodec,
                 videoCodec,
                 width,
@@ -168,7 +168,7 @@ namespace MediaBrowser.Model.Dlna
                 videoCodecTag,
                 isAvc);
 
-            List<string> orgPnValues = new List<string>();
+            var orgPnValues = new List<string>();
 
             if (mediaProfile != null && !string.IsNullOrEmpty(mediaProfile.OrgPn))
             {
@@ -183,7 +183,7 @@ namespace MediaBrowser.Model.Dlna
                 }
             }
 
-            List<string> contentFeatureList = new List<string>();
+            var contentFeatureList = new List<string>();
 
             foreach (string orgPn in orgPnValues)
             {
diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs
index 3a626deaa0..8124cf5289 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs
@@ -21,7 +21,7 @@ namespace MediaBrowser.Model.Dlna
         /// Gets or sets the identification.
         /// </summary>
         /// <value>The identification.</value>
-        public MediaBrowser.Model.Dlna.DeviceIdentification Identification { get; set; }
+        public DeviceIdentification Identification { get; set; }
 
         public string FriendlyName { get; set; }
         public string Manufacturer { get; set; }
@@ -191,7 +191,7 @@ namespace MediaBrowser.Model.Dlna
                 var conditionProcessor = new ConditionProcessor();
 
                 var anyOff = false;
-                foreach (ProfileCondition c in i.Conditions)
+                foreach (var c in i.Conditions)
                 {
                     if (!conditionProcessor.IsAudioConditionSatisfied(GetModelProfileCondition(c), audioChannels, audioBitrate, audioSampleRate, audioBitDepth))
                     {
@@ -238,7 +238,7 @@ namespace MediaBrowser.Model.Dlna
                 var conditionProcessor = new ConditionProcessor();
 
                 var anyOff = false;
-                foreach (ProfileCondition c in i.Conditions)
+                foreach (var c in i.Conditions)
                 {
                     if (!conditionProcessor.IsImageConditionSatisfied(GetModelProfileCondition(c), width, height))
                     {
@@ -304,7 +304,7 @@ namespace MediaBrowser.Model.Dlna
                 var conditionProcessor = new ConditionProcessor();
 
                 var anyOff = false;
-                foreach (ProfileCondition c in i.Conditions)
+                foreach (var c in i.Conditions)
                 {
                     if (!conditionProcessor.IsVideoConditionSatisfied(GetModelProfileCondition(c), width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                     {
diff --git a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
index 42c78e335f..672784589f 100644
--- a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
+++ b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
@@ -91,7 +91,7 @@ namespace MediaBrowser.Model.Dlna
 
             if (StringHelper.EqualsIgnoreCase(videoCodec, "mpeg2video"))
             {
-                List<MediaFormatProfile> list = new List<MediaFormatProfile>();
+                var list = new List<MediaFormatProfile>();
 
                 list.Add(ValueOf("MPEG_TS_SD_NA" + suffix));
                 list.Add(ValueOf("MPEG_TS_SD_EU" + suffix));
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index f1ec71d1d9..2335f0553e 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -32,7 +32,7 @@ namespace MediaBrowser.Model.Dlna
             ValidateAudioInput(options);
 
             var mediaSources = new List<MediaSourceInfo>();
-            foreach (MediaSourceInfo i in options.MediaSources)
+            foreach (var i in options.MediaSources)
             {
                 if (string.IsNullOrEmpty(options.MediaSourceId) ||
                     StringHelper.EqualsIgnoreCase(i.Id, options.MediaSourceId))
@@ -42,16 +42,16 @@ namespace MediaBrowser.Model.Dlna
             }
 
             var streams = new List<StreamInfo>();
-            foreach (MediaSourceInfo i in mediaSources)
+            foreach (var i in mediaSources)
             {
-                StreamInfo streamInfo = BuildAudioItem(i, options);
+                var streamInfo = BuildAudioItem(i, options);
                 if (streamInfo != null)
                 {
                     streams.Add(streamInfo);
                 }
             }
 
-            foreach (StreamInfo stream in streams)
+            foreach (var stream in streams)
             {
                 stream.DeviceId = options.DeviceId;
                 stream.DeviceProfileId = options.Profile.Id;
@@ -65,7 +65,7 @@ namespace MediaBrowser.Model.Dlna
             ValidateInput(options);
 
             var mediaSources = new List<MediaSourceInfo>();
-            foreach (MediaSourceInfo i in options.MediaSources)
+            foreach (var i in options.MediaSources)
             {
                 if (string.IsNullOrEmpty(options.MediaSourceId) ||
                     StringHelper.EqualsIgnoreCase(i.Id, options.MediaSourceId))
@@ -75,16 +75,16 @@ namespace MediaBrowser.Model.Dlna
             }
 
             var streams = new List<StreamInfo>();
-            foreach (MediaSourceInfo i in mediaSources)
+            foreach (var i in mediaSources)
             {
-                StreamInfo streamInfo = BuildVideoItem(i, options);
+                var streamInfo = BuildVideoItem(i, options);
                 if (streamInfo != null)
                 {
                     streams.Add(streamInfo);
                 }
             }
 
-            foreach (StreamInfo stream in streams)
+            foreach (var stream in streams)
             {
                 stream.DeviceId = options.DeviceId;
                 stream.DeviceProfileId = options.Profile.Id;
@@ -97,7 +97,7 @@ namespace MediaBrowser.Model.Dlna
         {
             var sorted = SortMediaSources(streams, maxBitrate);
 
-            foreach (StreamInfo stream in sorted)
+            foreach (var stream in sorted)
             {
                 return stream;
             }
@@ -284,7 +284,7 @@ namespace MediaBrowser.Model.Dlna
         {
             var transcodeReasons = new List<TranscodeReason>();
 
-            StreamInfo playlistItem = new StreamInfo
+            var playlistItem = new StreamInfo
             {
                 ItemId = options.ItemId,
                 MediaType = DlnaProfileType.Audio,
@@ -308,14 +308,14 @@ namespace MediaBrowser.Model.Dlna
                 return playlistItem;
             }
 
-            MediaStream audioStream = item.GetDefaultAudioStream(null);
+            var audioStream = item.GetDefaultAudioStream(null);
 
             var directPlayInfo = GetAudioDirectPlayMethods(item, audioStream, options);
 
             var directPlayMethods = directPlayInfo.Item1;
             transcodeReasons.AddRange(directPlayInfo.Item2);
 
-            ConditionProcessor conditionProcessor = new ConditionProcessor();
+            var conditionProcessor = new ConditionProcessor();
 
             int? inputAudioChannels = audioStream == null ? null : audioStream.Channels;
             int? inputAudioBitrate = audioStream == null ? null : audioStream.BitDepth;
@@ -328,12 +328,12 @@ namespace MediaBrowser.Model.Dlna
 
                 // Make sure audio codec profiles are satisfied
                 var conditions = new List<ProfileCondition>();
-                foreach (CodecProfile i in options.Profile.CodecProfiles)
+                foreach (var i in options.Profile.CodecProfiles)
                 {
                     if (i.Type == CodecType.Audio && i.ContainsAnyCodec(audioCodec, item.Container))
                     {
                         bool applyConditions = true;
-                        foreach (ProfileCondition applyCondition in i.ApplyConditions)
+                        foreach (var applyCondition in i.ApplyConditions)
                         {
                             if (!conditionProcessor.IsAudioConditionSatisfied(applyCondition, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth))
                             {
@@ -345,7 +345,7 @@ namespace MediaBrowser.Model.Dlna
 
                         if (applyConditions)
                         {
-                            foreach (ProfileCondition c in i.Conditions)
+                            foreach (var c in i.Conditions)
                             {
                                 conditions.Add(c);
                             }
@@ -354,7 +354,7 @@ namespace MediaBrowser.Model.Dlna
                 }
 
                 bool all = true;
-                foreach (ProfileCondition c in conditions)
+                foreach (var c in conditions)
                 {
                     if (!conditionProcessor.IsAudioConditionSatisfied(c, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth))
                     {
@@ -383,7 +383,7 @@ namespace MediaBrowser.Model.Dlna
             }
 
             TranscodingProfile transcodingProfile = null;
-            foreach (TranscodingProfile i in options.Profile.TranscodingProfiles)
+            foreach (var i in options.Profile.TranscodingProfiles)
             {
                 if (i.Type == playlistItem.MediaType && i.Context == options.Context)
                 {
@@ -405,7 +405,7 @@ namespace MediaBrowser.Model.Dlna
                 SetStreamInfoOptionsFromTranscodingProfile(playlistItem, transcodingProfile);
 
                 var audioCodecProfiles = new List<CodecProfile>();
-                foreach (CodecProfile i in options.Profile.CodecProfiles)
+                foreach (var i in options.Profile.CodecProfiles)
                 {
                     if (i.Type == CodecType.Audio && i.ContainsAnyCodec(transcodingProfile.AudioCodec, transcodingProfile.Container))
                     {
@@ -416,10 +416,10 @@ namespace MediaBrowser.Model.Dlna
                 }
 
                 var audioTranscodingConditions = new List<ProfileCondition>();
-                foreach (CodecProfile i in audioCodecProfiles)
+                foreach (var i in audioCodecProfiles)
                 {
                     bool applyConditions = true;
-                    foreach (ProfileCondition applyCondition in i.ApplyConditions)
+                    foreach (var applyCondition in i.ApplyConditions)
                     {
                         if (!conditionProcessor.IsAudioConditionSatisfied(applyCondition, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth))
                         {
@@ -431,7 +431,7 @@ namespace MediaBrowser.Model.Dlna
 
                     if (applyConditions)
                     {
-                        foreach (ProfileCondition c in i.Conditions)
+                        foreach (var c in i.Conditions)
                         {
                             audioTranscodingConditions.Add(c);
                         }
@@ -478,7 +478,7 @@ namespace MediaBrowser.Model.Dlna
             var transcodeReasons = new List<TranscodeReason>();
 
             DirectPlayProfile directPlayProfile = null;
-            foreach (DirectPlayProfile i in options.Profile.DirectPlayProfiles)
+            foreach (var i in options.Profile.DirectPlayProfiles)
             {
                 if (i.Type == DlnaProfileType.Audio && IsAudioDirectPlaySupported(i, item, audioStream))
                 {
@@ -607,7 +607,7 @@ namespace MediaBrowser.Model.Dlna
         {
             int highestScore = -1;
 
-            foreach (MediaStream stream in item.MediaStreams)
+            foreach (var stream in item.MediaStreams)
             {
                 if (stream.Type == MediaStreamType.Subtitle && stream.Score.HasValue)
                 {
@@ -619,7 +619,7 @@ namespace MediaBrowser.Model.Dlna
             }
 
             var topStreams = new List<MediaStream>();
-            foreach (MediaStream stream in item.MediaStreams)
+            foreach (var stream in item.MediaStreams)
             {
                 if (stream.Type == MediaStreamType.Subtitle && stream.Score.HasValue && stream.Score.Value == highestScore)
                 {
@@ -630,9 +630,9 @@ namespace MediaBrowser.Model.Dlna
             // If multiple streams have an equal score, try to pick the most efficient one
             if (topStreams.Count > 1)
             {
-                foreach (MediaStream stream in topStreams)
+                foreach (var stream in topStreams)
                 {
-                    foreach (SubtitleProfile profile in subtitleProfiles)
+                    foreach (var profile in subtitleProfiles)
                     {
                         if (profile.Method == SubtitleDeliveryMethod.External && StringHelper.EqualsIgnoreCase(profile.Format, stream.Codec))
                         {
@@ -705,7 +705,7 @@ namespace MediaBrowser.Model.Dlna
 
             var transcodeReasons = new List<TranscodeReason>();
 
-            StreamInfo playlistItem = new StreamInfo
+            var playlistItem = new StreamInfo
             {
                 ItemId = options.ItemId,
                 MediaType = DlnaProfileType.Video,
@@ -716,15 +716,15 @@ namespace MediaBrowser.Model.Dlna
             };
 
             playlistItem.SubtitleStreamIndex = options.SubtitleStreamIndex ?? GetDefaultSubtitleStreamIndex(item, options.Profile.SubtitleProfiles);
-            MediaStream subtitleStream = playlistItem.SubtitleStreamIndex.HasValue ? item.GetMediaStream(MediaStreamType.Subtitle, playlistItem.SubtitleStreamIndex.Value) : null;
+            var subtitleStream = playlistItem.SubtitleStreamIndex.HasValue ? item.GetMediaStream(MediaStreamType.Subtitle, playlistItem.SubtitleStreamIndex.Value) : null;
 
-            MediaStream audioStream = item.GetDefaultAudioStream(options.AudioStreamIndex ?? item.DefaultAudioStreamIndex);
+            var audioStream = item.GetDefaultAudioStream(options.AudioStreamIndex ?? item.DefaultAudioStreamIndex);
             if (audioStream != null)
             {
                 playlistItem.AudioStreamIndex = audioStream.Index;
             }
 
-            MediaStream videoStream = item.VideoStream;
+            var videoStream = item.VideoStream;
 
             // TODO: This doesn't accout for situation of device being able to handle media bitrate, but wifi connection not fast enough
             var directPlayEligibilityResult = IsEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options, true) ?? 0, subtitleStream, options, PlayMethod.DirectPlay);
@@ -751,7 +751,7 @@ namespace MediaBrowser.Model.Dlna
 
                     if (subtitleStream != null)
                     {
-                        SubtitleProfile subtitleProfile = GetSubtitleProfile(item, subtitleStream, options.Profile.SubtitleProfiles, directPlay.Value, _transcoderSupport, item.Container, null);
+                        var subtitleProfile = GetSubtitleProfile(item, subtitleStream, options.Profile.SubtitleProfiles, directPlay.Value, _transcoderSupport, item.Container, null);
 
                         playlistItem.SubtitleDeliveryMethod = subtitleProfile.Method;
                         playlistItem.SubtitleFormat = subtitleProfile.Format;
@@ -775,7 +775,7 @@ namespace MediaBrowser.Model.Dlna
 
             // Can't direct play, find the transcoding profile
             TranscodingProfile transcodingProfile = null;
-            foreach (TranscodingProfile i in options.Profile.TranscodingProfiles)
+            foreach (var i in options.Profile.TranscodingProfiles)
             {
                 if (i.Type == playlistItem.MediaType && i.Context == options.Context)
                 {
@@ -793,7 +793,7 @@ namespace MediaBrowser.Model.Dlna
 
                 if (subtitleStream != null)
                 {
-                    SubtitleProfile subtitleProfile = GetSubtitleProfile(item, subtitleStream, options.Profile.SubtitleProfiles, PlayMethod.Transcode, _transcoderSupport, transcodingProfile.Container, transcodingProfile.Protocol);
+                    var subtitleProfile = GetSubtitleProfile(item, subtitleStream, options.Profile.SubtitleProfiles, PlayMethod.Transcode, _transcoderSupport, transcodingProfile.Container, transcodingProfile.Protocol);
 
                     playlistItem.SubtitleDeliveryMethod = subtitleProfile.Method;
                     playlistItem.SubtitleFormat = subtitleProfile.Format;
@@ -804,15 +804,15 @@ namespace MediaBrowser.Model.Dlna
 
                 SetStreamInfoOptionsFromTranscodingProfile(playlistItem, transcodingProfile);
 
-                ConditionProcessor conditionProcessor = new ConditionProcessor();
+                var conditionProcessor = new ConditionProcessor();
 
                 var isFirstAppliedCodecProfile = true;
-                foreach (CodecProfile i in options.Profile.CodecProfiles)
+                foreach (var i in options.Profile.CodecProfiles)
                 {
                     if (i.Type == CodecType.Video && i.ContainsAnyCodec(transcodingProfile.VideoCodec, transcodingProfile.Container))
                     {
                         bool applyConditions = true;
-                        foreach (ProfileCondition applyCondition in i.ApplyConditions)
+                        foreach (var applyCondition in i.ApplyConditions)
                         {
                             int? width = videoStream == null ? null : videoStream.Width;
                             int? height = videoStream == null ? null : videoStream.Height;
@@ -863,12 +863,12 @@ namespace MediaBrowser.Model.Dlna
                 playlistItem.AudioBitrate = Math.Min(playlistItem.AudioBitrate ?? audioBitrate, audioBitrate);
 
                 isFirstAppliedCodecProfile = true;
-                foreach (CodecProfile i in options.Profile.CodecProfiles)
+                foreach (var i in options.Profile.CodecProfiles)
                 {
                     if (i.Type == CodecType.VideoAudio && i.ContainsAnyCodec(transcodingProfile.AudioCodec, transcodingProfile.Container))
                     {
                         bool applyConditions = true;
-                        foreach (ProfileCondition applyCondition in i.ApplyConditions)
+                        foreach (var applyCondition in i.ApplyConditions)
                         {
                             bool? isSecondaryAudio = audioStream == null ? null : item.IsSecondaryAudio(audioStream);
                             int? inputAudioBitrate = audioStream == null ? null : audioStream.BitRate;
@@ -998,7 +998,7 @@ namespace MediaBrowser.Model.Dlna
             bool isEligibleForDirectPlay,
             bool isEligibleForDirectStream)
         {
-            DeviceProfile profile = options.Profile;
+            var profile = options.Profile;
 
             if (options.ForceDirectPlay)
             {
@@ -1011,7 +1011,7 @@ namespace MediaBrowser.Model.Dlna
 
             // See if it can be direct played
             DirectPlayProfile directPlay = null;
-            foreach (DirectPlayProfile i in profile.DirectPlayProfiles)
+            foreach (var i in profile.DirectPlayProfiles)
             {
                 if (i.Type == DlnaProfileType.Video && IsVideoDirectPlaySupported(i, mediaSource, videoStream, audioStream))
                 {
@@ -1032,19 +1032,19 @@ namespace MediaBrowser.Model.Dlna
             string container = mediaSource.Container;
 
             var conditions = new List<ProfileCondition>();
-            foreach (ContainerProfile i in profile.ContainerProfiles)
+            foreach (var i in profile.ContainerProfiles)
             {
                 if (i.Type == DlnaProfileType.Video &&
                     i.ContainsContainer(container))
                 {
-                    foreach (ProfileCondition c in i.Conditions)
+                    foreach (var c in i.Conditions)
                     {
                         conditions.Add(c);
                     }
                 }
             }
 
-            ConditionProcessor conditionProcessor = new ConditionProcessor();
+            var conditionProcessor = new ConditionProcessor();
 
             int? width = videoStream == null ? null : videoStream.Width;
             int? height = videoStream == null ? null : videoStream.Height;
@@ -1072,7 +1072,7 @@ namespace MediaBrowser.Model.Dlna
             int? numVideoStreams = mediaSource.GetStreamCount(MediaStreamType.Video);
 
             // Check container conditions
-            foreach (ProfileCondition i in conditions)
+            foreach (var i in conditions)
             {
                 if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                 {
@@ -1090,12 +1090,12 @@ namespace MediaBrowser.Model.Dlna
             string videoCodec = videoStream == null ? null : videoStream.Codec;
 
             conditions = new List<ProfileCondition>();
-            foreach (CodecProfile i in profile.CodecProfiles)
+            foreach (var i in profile.CodecProfiles)
             {
                 if (i.Type == CodecType.Video && i.ContainsAnyCodec(videoCodec, container))
                 {
                     bool applyConditions = true;
-                    foreach (ProfileCondition applyCondition in i.ApplyConditions)
+                    foreach (var applyCondition in i.ApplyConditions)
                     {
                         if (!conditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                         {
@@ -1107,7 +1107,7 @@ namespace MediaBrowser.Model.Dlna
 
                     if (applyConditions)
                     {
-                        foreach (ProfileCondition c in i.Conditions)
+                        foreach (var c in i.Conditions)
                         {
                             conditions.Add(c);
                         }
@@ -1115,7 +1115,7 @@ namespace MediaBrowser.Model.Dlna
                 }
             }
 
-            foreach (ProfileCondition i in conditions)
+            foreach (var i in conditions)
             {
                 if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                 {
@@ -1137,12 +1137,12 @@ namespace MediaBrowser.Model.Dlna
                 conditions = new List<ProfileCondition>();
                 bool? isSecondaryAudio = audioStream == null ? null : mediaSource.IsSecondaryAudio(audioStream);
 
-                foreach (CodecProfile i in profile.CodecProfiles)
+                foreach (var i in profile.CodecProfiles)
                 {
                     if (i.Type == CodecType.VideoAudio && i.ContainsAnyCodec(audioCodec, container))
                     {
                         bool applyConditions = true;
-                        foreach (ProfileCondition applyCondition in i.ApplyConditions)
+                        foreach (var applyCondition in i.ApplyConditions)
                         {
                             if (!conditionProcessor.IsVideoAudioConditionSatisfied(applyCondition, audioChannels, audioBitrate, audioSampleRate, audioBitDepth, audioProfile, isSecondaryAudio))
                             {
@@ -1154,7 +1154,7 @@ namespace MediaBrowser.Model.Dlna
 
                         if (applyConditions)
                         {
-                            foreach (ProfileCondition c in i.Conditions)
+                            foreach (var c in i.Conditions)
                             {
                                 conditions.Add(c);
                             }
@@ -1162,7 +1162,7 @@ namespace MediaBrowser.Model.Dlna
                     }
                 }
 
-                foreach (ProfileCondition i in conditions)
+                foreach (var i in conditions)
                 {
                     if (!conditionProcessor.IsVideoAudioConditionSatisfied(i, audioChannels, audioBitrate, audioSampleRate, audioBitDepth, audioProfile, isSecondaryAudio))
                     {
@@ -1206,7 +1206,7 @@ namespace MediaBrowser.Model.Dlna
         {
             if (subtitleStream != null)
             {
-                SubtitleProfile subtitleProfile = GetSubtitleProfile(item, subtitleStream, options.Profile.SubtitleProfiles, playMethod, _transcoderSupport, item.Container, null);
+                var subtitleProfile = GetSubtitleProfile(item, subtitleStream, options.Profile.SubtitleProfiles, playMethod, _transcoderSupport, item.Container, null);
 
                 if (subtitleProfile.Method != SubtitleDeliveryMethod.External && subtitleProfile.Method != SubtitleDeliveryMethod.Embed)
                 {
@@ -1230,7 +1230,7 @@ namespace MediaBrowser.Model.Dlna
             if (!subtitleStream.IsExternal && (playMethod != PlayMethod.Transcode || !string.Equals(transcodingSubProtocol, "hls", StringComparison.OrdinalIgnoreCase)))
             {
                 // Look for supported embedded subs of the same format
-                foreach (SubtitleProfile profile in subtitleProfiles)
+                foreach (var profile in subtitleProfiles)
                 {
                     if (!profile.SupportsLanguage(subtitleStream.Language))
                     {
@@ -1259,7 +1259,7 @@ namespace MediaBrowser.Model.Dlna
                 }
 
                 // Look for supported embedded subs of a convertible format
-                foreach (SubtitleProfile profile in subtitleProfiles)
+                foreach (var profile in subtitleProfiles)
                 {
                     if (!profile.SupportsLanguage(subtitleStream.Language))
                     {
@@ -1328,7 +1328,7 @@ namespace MediaBrowser.Model.Dlna
 
         private static SubtitleProfile GetExternalSubtitleProfile(MediaSourceInfo mediaSource, MediaStream subtitleStream, SubtitleProfile[] subtitleProfiles, PlayMethod playMethod, ITranscoderSupport transcoderSupport, bool allowConversion)
         {
-            foreach (SubtitleProfile profile in subtitleProfiles)
+            foreach (var profile in subtitleProfiles)
             {
                 if (profile.Method != SubtitleDeliveryMethod.External && profile.Method != SubtitleDeliveryMethod.Hls)
                 {
@@ -1467,7 +1467,7 @@ namespace MediaBrowser.Model.Dlna
 
         private void ApplyTranscodingConditions(StreamInfo item, IEnumerable<ProfileCondition> conditions, string qualifier, bool enableQualifiedConditions, bool enableNonQualifiedConditions)
         {
-            foreach (ProfileCondition condition in conditions)
+            foreach (var condition in conditions)
             {
                 string value = condition.Value;
 
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 86d7c9d621..84bd1f4299 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -145,8 +145,8 @@ namespace MediaBrowser.Model.Dlna
                 throw new ArgumentNullException(nameof(baseUrl));
             }
 
-            List<string> list = new List<string>();
-            foreach (NameValuePair pair in BuildParams(this, accessToken))
+            var list = new List<string>();
+            foreach (var pair in BuildParams(this, accessToken))
             {
                 if (string.IsNullOrEmpty(pair.Value))
                 {
@@ -211,7 +211,7 @@ namespace MediaBrowser.Model.Dlna
 
         private static List<NameValuePair> BuildParams(StreamInfo item, string accessToken)
         {
-            List<NameValuePair> list = new List<NameValuePair>();
+            var list = new List<NameValuePair>();
 
             string audioCodecs = item.AudioCodecs.Length == 0 ?
                 string.Empty :
@@ -346,11 +346,11 @@ namespace MediaBrowser.Model.Dlna
 
         public List<SubtitleStreamInfo> GetExternalSubtitles(ITranscoderSupport transcoderSupport, bool includeSelectedTrackOnly, bool enableAllProfiles, string baseUrl, string accessToken)
         {
-            List<SubtitleStreamInfo> list = GetSubtitleProfiles(transcoderSupport, includeSelectedTrackOnly, enableAllProfiles, baseUrl, accessToken);
-            List<SubtitleStreamInfo> newList = new List<SubtitleStreamInfo>();
+            var list = GetSubtitleProfiles(transcoderSupport, includeSelectedTrackOnly, enableAllProfiles, baseUrl, accessToken);
+            var newList = new List<SubtitleStreamInfo>();
 
             // First add the selected track
-            foreach (SubtitleStreamInfo stream in list)
+            foreach (var stream in list)
             {
                 if (stream.DeliveryMethod == SubtitleDeliveryMethod.External)
                 {
@@ -368,7 +368,7 @@ namespace MediaBrowser.Model.Dlna
 
         public List<SubtitleStreamInfo> GetSubtitleProfiles(ITranscoderSupport transcoderSupport, bool includeSelectedTrackOnly, bool enableAllProfiles, string baseUrl, string accessToken)
         {
-            List<SubtitleStreamInfo> list = new List<SubtitleStreamInfo>();
+            var list = new List<SubtitleStreamInfo>();
 
             // HLS will preserve timestamps so we can just grab the full subtitle stream
             long startPositionTicks = StringHelper.EqualsIgnoreCase(SubProtocol, "hls")
@@ -378,7 +378,7 @@ namespace MediaBrowser.Model.Dlna
             // First add the selected track
             if (SubtitleStreamIndex.HasValue)
             {
-                foreach (MediaStream stream in MediaSource.MediaStreams)
+                foreach (var stream in MediaSource.MediaStreams)
                 {
                     if (stream.Type == MediaStreamType.Subtitle && stream.Index == SubtitleStreamIndex.Value)
                     {
@@ -389,7 +389,7 @@ namespace MediaBrowser.Model.Dlna
 
             if (!includeSelectedTrackOnly)
             {
-                foreach (MediaStream stream in MediaSource.MediaStreams)
+                foreach (var stream in MediaSource.MediaStreams)
                 {
                     if (stream.Type == MediaStreamType.Subtitle && (!SubtitleStreamIndex.HasValue || stream.Index != SubtitleStreamIndex.Value))
                     {
@@ -405,16 +405,16 @@ namespace MediaBrowser.Model.Dlna
         {
             if (enableAllProfiles)
             {
-                foreach (SubtitleProfile profile in DeviceProfile.SubtitleProfiles)
+                foreach (var profile in DeviceProfile.SubtitleProfiles)
                 {
-                    SubtitleStreamInfo info = GetSubtitleStreamInfo(stream, baseUrl, accessToken, startPositionTicks, new[] { profile }, transcoderSupport);
+                    var info = GetSubtitleStreamInfo(stream, baseUrl, accessToken, startPositionTicks, new[] { profile }, transcoderSupport);
 
                     list.Add(info);
                 }
             }
             else
             {
-                SubtitleStreamInfo info = GetSubtitleStreamInfo(stream, baseUrl, accessToken, startPositionTicks, DeviceProfile.SubtitleProfiles, transcoderSupport);
+                var info = GetSubtitleStreamInfo(stream, baseUrl, accessToken, startPositionTicks, DeviceProfile.SubtitleProfiles, transcoderSupport);
 
                 list.Add(info);
             }
@@ -422,8 +422,8 @@ namespace MediaBrowser.Model.Dlna
 
         private SubtitleStreamInfo GetSubtitleStreamInfo(MediaStream stream, string baseUrl, string accessToken, long startPositionTicks, SubtitleProfile[] subtitleProfiles, ITranscoderSupport transcoderSupport)
         {
-            SubtitleProfile subtitleProfile = StreamBuilder.GetSubtitleProfile(MediaSource, stream, subtitleProfiles, PlayMethod, transcoderSupport, Container, SubProtocol);
-            SubtitleStreamInfo info = new SubtitleStreamInfo
+            var subtitleProfile = StreamBuilder.GetSubtitleProfile(MediaSource, stream, subtitleProfiles, PlayMethod, transcoderSupport, Container, SubProtocol);
+            var info = new SubtitleStreamInfo
             {
                 IsForced = stream.IsForced,
                 Language = stream.Language,
@@ -502,7 +502,7 @@ namespace MediaBrowser.Model.Dlna
         {
             get
             {
-                MediaStream stream = TargetAudioStream;
+                var stream = TargetAudioStream;
                 return stream == null ? null : stream.SampleRate;
             }
         }
@@ -584,7 +584,7 @@ namespace MediaBrowser.Model.Dlna
         {
             get
             {
-                MediaStream stream = TargetVideoStream;
+                var stream = TargetVideoStream;
                 return MaxFramerate.HasValue && !IsDirectStream
                     ? MaxFramerate
                     : stream == null ? null : stream.AverageFrameRate ?? stream.RealFrameRate;
@@ -689,7 +689,7 @@ namespace MediaBrowser.Model.Dlna
         {
             get
             {
-                MediaStream stream = TargetVideoStream;
+                var stream = TargetVideoStream;
                 return !IsDirectStream
                     ? null
                     : stream == null ? null : stream.PacketLength;
@@ -727,7 +727,7 @@ namespace MediaBrowser.Model.Dlna
         {
             get
             {
-                MediaStream stream = TargetVideoStream;
+                var stream = TargetVideoStream;
                 return !IsDirectStream
                     ? null
                     : stream == null ? null : stream.CodecTag;
@@ -741,7 +741,7 @@ namespace MediaBrowser.Model.Dlna
         {
             get
             {
-                MediaStream stream = TargetAudioStream;
+                var stream = TargetAudioStream;
                 return AudioBitrate.HasValue && !IsDirectStream
                     ? AudioBitrate
                     : stream == null ? null : stream.BitRate;
@@ -797,7 +797,7 @@ namespace MediaBrowser.Model.Dlna
         {
             get
             {
-                MediaStream stream = TargetAudioStream;
+                var stream = TargetAudioStream;
 
                 string inputCodec = stream == null ? null : stream.Codec;
 
@@ -822,7 +822,7 @@ namespace MediaBrowser.Model.Dlna
         {
             get
             {
-                MediaStream stream = TargetVideoStream;
+                var stream = TargetVideoStream;
 
                 string inputCodec = stream == null ? null : stream.Codec;
 
@@ -878,7 +878,7 @@ namespace MediaBrowser.Model.Dlna
         {
             get
             {
-                MediaStream stream = TargetVideoStream;
+                var stream = TargetVideoStream;
 
                 return VideoBitrate.HasValue && !IsDirectStream
                     ? VideoBitrate
@@ -890,7 +890,7 @@ namespace MediaBrowser.Model.Dlna
         {
             get
             {
-                TransportStreamTimestamp defaultValue = StringHelper.EqualsIgnoreCase(Container, "m2ts")
+                var defaultValue = StringHelper.EqualsIgnoreCase(Container, "m2ts")
                     ? TransportStreamTimestamp.Valid
                     : TransportStreamTimestamp.None;
 
@@ -955,11 +955,11 @@ namespace MediaBrowser.Model.Dlna
         {
             get
             {
-                MediaStream videoStream = TargetVideoStream;
+                var videoStream = TargetVideoStream;
 
                 if (videoStream != null && videoStream.Width.HasValue && videoStream.Height.HasValue)
                 {
-                    ImageSize size = new ImageSize
+                    var size = new ImageSize
                     {
                         Width = videoStream.Width.Value,
                         Height = videoStream.Height.Value
@@ -968,7 +968,7 @@ namespace MediaBrowser.Model.Dlna
                     double? maxWidth = MaxWidth.HasValue ? (double)MaxWidth.Value : (double?)null;
                     double? maxHeight = MaxHeight.HasValue ? (double)MaxHeight.Value : (double?)null;
 
-                    ImageSize newSize = DrawingUtils.Resize(size,
+                    var newSize = DrawingUtils.Resize(size,
                         0,
                         0,
                         maxWidth ?? 0,
@@ -985,11 +985,11 @@ namespace MediaBrowser.Model.Dlna
         {
             get
             {
-                MediaStream videoStream = TargetVideoStream;
+                var videoStream = TargetVideoStream;
 
                 if (videoStream != null && videoStream.Width.HasValue && videoStream.Height.HasValue)
                 {
-                    ImageSize size = new ImageSize
+                    var size = new ImageSize
                     {
                         Width = videoStream.Width.Value,
                         Height = videoStream.Height.Value
@@ -998,7 +998,7 @@ namespace MediaBrowser.Model.Dlna
                     double? maxWidth = MaxWidth.HasValue ? (double)MaxWidth.Value : (double?)null;
                     double? maxHeight = MaxHeight.HasValue ? (double)MaxHeight.Value : (double?)null;
 
-                    ImageSize newSize = DrawingUtils.Resize(size,
+                    var newSize = DrawingUtils.Resize(size,
                         0,
                         0,
                         maxWidth ?? 0,
@@ -1059,9 +1059,9 @@ namespace MediaBrowser.Model.Dlna
 
         public List<MediaStream> GetSelectableStreams(MediaStreamType type)
         {
-            List<MediaStream> list = new List<MediaStream>();
+            var list = new List<MediaStream>();
 
-            foreach (MediaStream stream in MediaSource.MediaStreams)
+            foreach (var stream in MediaSource.MediaStreams)
             {
                 if (type == stream.Type)
                 {
diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
index c2219dc332..92e40fb01f 100644
--- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs
+++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
@@ -120,7 +120,7 @@ namespace MediaBrowser.Model.Dto
             {
                 var val = defaultIndex.Value;
 
-                foreach (MediaStream i in MediaStreams)
+                foreach (var i in MediaStreams)
                 {
                     if (i.Type == MediaStreamType.Audio && i.Index == val)
                     {
@@ -129,7 +129,7 @@ namespace MediaBrowser.Model.Dto
                 }
             }
 
-            foreach (MediaStream i in MediaStreams)
+            foreach (var i in MediaStreams)
             {
                 if (i.Type == MediaStreamType.Audio && i.IsDefault)
                 {
@@ -137,7 +137,7 @@ namespace MediaBrowser.Model.Dto
                 }
             }
 
-            foreach (MediaStream i in MediaStreams)
+            foreach (var i in MediaStreams)
             {
                 if (i.Type == MediaStreamType.Audio)
                 {
@@ -153,7 +153,7 @@ namespace MediaBrowser.Model.Dto
         {
             get
             {
-                foreach (MediaStream i in MediaStreams)
+                foreach (var i in MediaStreams)
                 {
                     if (i.Type == MediaStreamType.Video)
                     {
@@ -167,7 +167,7 @@ namespace MediaBrowser.Model.Dto
 
         public MediaStream GetMediaStream(MediaStreamType type, int index)
         {
-            foreach (MediaStream i in MediaStreams)
+            foreach (var i in MediaStreams)
             {
                 if (i.Type == type && i.Index == index)
                 {
@@ -183,7 +183,7 @@ namespace MediaBrowser.Model.Dto
             int numMatches = 0;
             int numStreams = 0;
 
-            foreach (MediaStream i in MediaStreams)
+            foreach (var i in MediaStreams)
             {
                 numStreams++;
                 if (i.Type == type)
@@ -203,7 +203,7 @@ namespace MediaBrowser.Model.Dto
         public bool? IsSecondaryAudio(MediaStream stream)
         {
             // Look for the first audio track marked as default
-            foreach (MediaStream currentStream in MediaStreams)
+            foreach (var currentStream in MediaStreams)
             {
                 if (currentStream.Type == MediaStreamType.Audio && currentStream.IsDefault)
                 {
@@ -215,7 +215,7 @@ namespace MediaBrowser.Model.Dto
             }
 
             // Look for the first audio track
-            foreach (MediaStream currentStream in MediaStreams)
+            foreach (var currentStream in MediaStreams)
             {
                 if (currentStream.Type == MediaStreamType.Audio)
                 {
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index b51942af85..e0c3bead1d 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -76,7 +76,7 @@ namespace MediaBrowser.Model.Entities
                     //    return AddLanguageIfNeeded(Title);
                     //}
 
-                    List<string> attributes = new List<string>();
+                    var attributes = new List<string>();
 
                     if (!string.IsNullOrEmpty(Language))
                     {
@@ -109,7 +109,7 @@ namespace MediaBrowser.Model.Entities
 
                 if (Type == MediaStreamType.Video)
                 {
-                    List<string> attributes = new List<string>();
+                    var attributes = new List<string>();
 
                     var resolutionText = GetResolutionText();
 
@@ -133,7 +133,7 @@ namespace MediaBrowser.Model.Entities
                     //    return AddLanguageIfNeeded(Title);
                     //}
 
-                    List<string> attributes = new List<string>();
+                    var attributes = new List<string>();
 
                     if (!string.IsNullOrEmpty(Language))
                     {
diff --git a/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs b/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
index edede8ba93..a5ae7c7a51 100644
--- a/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
+++ b/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
@@ -36,7 +36,7 @@ namespace MediaBrowser.Model.MediaInfo
 
             DirectPlayProtocols = new MediaProtocol[] { MediaProtocol.Http };
 
-            VideoOptions videoOptions = options as VideoOptions;
+            var videoOptions = options as VideoOptions;
             if (videoOptions != null)
             {
                 AudioStreamIndex = videoOptions.AudioStreamIndex;
diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index e5d1ab462a..77cba0f716 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -48,7 +48,7 @@ namespace MediaBrowser.Model.Net
 
         private static Dictionary<string, string> GetVideoFileExtensionsDictionary()
         {
-            Dictionary<string, string> dict = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            var dict = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
             foreach (string ext in VideoFileExtensions)
             {
@@ -65,7 +65,7 @@ namespace MediaBrowser.Model.Net
 
         private static Dictionary<string, string> GetMimeTypeLookup()
         {
-            Dictionary<string, string> dict = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            var dict = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
             dict.Add(".jpg", "image/jpeg");
             dict.Add(".jpeg", "image/jpeg");
diff --git a/MediaBrowser.Model/Notifications/NotificationOptions.cs b/MediaBrowser.Model/Notifications/NotificationOptions.cs
index f48b5ee7fc..cf85554233 100644
--- a/MediaBrowser.Model/Notifications/NotificationOptions.cs
+++ b/MediaBrowser.Model/Notifications/NotificationOptions.cs
@@ -77,7 +77,7 @@ namespace MediaBrowser.Model.Notifications
 
         public NotificationOption GetOptions(string type)
         {
-            foreach (NotificationOption i in Options)
+            foreach (var i in Options)
             {
                 if (StringHelper.EqualsIgnoreCase(type, i.Type)) return i;
             }
@@ -86,14 +86,14 @@ namespace MediaBrowser.Model.Notifications
 
         public bool IsEnabled(string type)
         {
-            NotificationOption opt = GetOptions(type);
+            var opt = GetOptions(type);
 
             return opt != null && opt.Enabled;
         }
 
         public bool IsServiceEnabled(string service, string notificationType)
         {
-            NotificationOption opt = GetOptions(notificationType);
+            var opt = GetOptions(notificationType);
 
             return opt == null ||
                    !ListHelper.ContainsIgnoreCase(opt.DisabledServices, service);
@@ -101,7 +101,7 @@ namespace MediaBrowser.Model.Notifications
 
         public bool IsEnabledToMonitorUser(string type, Guid userId)
         {
-            NotificationOption opt = GetOptions(type);
+            var opt = GetOptions(type);
 
             return opt != null && opt.Enabled &&
                    !ListHelper.ContainsIgnoreCase(opt.DisabledMonitorUsers, userId.ToString(""));
@@ -109,7 +109,7 @@ namespace MediaBrowser.Model.Notifications
 
         public bool IsEnabledToSendToUser(string type, string userId, UserPolicy userPolicy)
         {
-            NotificationOption opt = GetOptions(type);
+            var opt = GetOptions(type);
 
             if (opt != null && opt.Enabled)
             {
diff --git a/MediaBrowser.Model/Services/HttpUtility.cs b/MediaBrowser.Model/Services/HttpUtility.cs
index 98882e1146..be180334c6 100644
--- a/MediaBrowser.Model/Services/HttpUtility.cs
+++ b/MediaBrowser.Model/Services/HttpUtility.cs
@@ -445,8 +445,8 @@ namespace MediaBrowser.Model.Services
             if (s.IndexOf('&') == -1)
                 return s;
 
-            StringBuilder entity = new StringBuilder();
-            StringBuilder output = new StringBuilder();
+            var entity = new StringBuilder();
+            var output = new StringBuilder();
             int len = s.Length;
             // 0 -> nothing,
             // 1 -> right after '&'
@@ -623,7 +623,7 @@ namespace MediaBrowser.Model.Services
             if (query[0] == '?')
                 query = query.Substring(1);
 
-            QueryParamCollection result = new QueryParamCollection();
+            var result = new QueryParamCollection();
             ParseQueryString(query, encoding, result);
             return result;
         }
diff --git a/MediaBrowser.Model/System/IEnvironmentInfo.cs b/MediaBrowser.Model/System/IEnvironmentInfo.cs
index 757d3c949c..3ffcc7de14 100644
--- a/MediaBrowser.Model/System/IEnvironmentInfo.cs
+++ b/MediaBrowser.Model/System/IEnvironmentInfo.cs
@@ -4,7 +4,7 @@ namespace MediaBrowser.Model.System
 {
     public interface IEnvironmentInfo
     {
-        MediaBrowser.Model.System.OperatingSystem OperatingSystem { get; }
+        OperatingSystem OperatingSystem { get; }
         string OperatingSystemName { get; }
         string OperatingSystemVersion { get; }
         Architecture SystemArchitecture { get; }
diff --git a/MediaBrowser.Providers/Manager/GenericPriorityQueue.cs b/MediaBrowser.Providers/Manager/GenericPriorityQueue.cs
index 2b73fdcd37..b87f688e16 100644
--- a/MediaBrowser.Providers/Manager/GenericPriorityQueue.cs
+++ b/MediaBrowser.Providers/Manager/GenericPriorityQueue.cs
@@ -132,7 +132,7 @@ namespace Priority_Queue
             int parent = node.QueueIndex / 2;
             while (parent >= 1)
             {
-                TItem parentNode = _nodes[parent];
+                var parentNode = _nodes[parent];
                 if (HasHigherPriority(parentNode, node))
                     break;
 
@@ -163,7 +163,7 @@ namespace Priority_Queue
                     break;
                 }
 
-                TItem childLeft = _nodes[childLeftIndex];
+                var childLeft = _nodes[childLeftIndex];
                 if (HasHigherPriority(childLeft, newParent))
                 {
                     newParent = childLeft;
@@ -173,7 +173,7 @@ namespace Priority_Queue
                 int childRightIndex = childLeftIndex + 1;
                 if (childRightIndex <= _numNodes)
                 {
-                    TItem childRight = _nodes[childRightIndex];
+                    var childRight = _nodes[childRightIndex];
                     if (HasHigherPriority(childRight, newParent))
                     {
                         newParent = childRight;
@@ -234,7 +234,7 @@ namespace Priority_Queue
             }
 #endif
 
-            TItem returnMe = _nodes[1];
+            var returnMe = _nodes[1];
             Remove(returnMe);
             item = returnMe;
             return true;
@@ -316,7 +316,7 @@ namespace Priority_Queue
         {
             //Bubble the updated node up or down as appropriate
             int parentIndex = node.QueueIndex / 2;
-            TItem parentNode = _nodes[parentIndex];
+            var parentNode = _nodes[parentIndex];
 
             if (parentIndex > 0 && HasHigherPriority(node, parentNode))
             {
@@ -356,7 +356,7 @@ namespace Priority_Queue
             }
 
             //Swap the node with the last node
-            TItem formerLastNode = _nodes[_numNodes];
+            var formerLastNode = _nodes[_numNodes];
             Swap(node, formerLastNode);
             _nodes[_numNodes] = null;
             _numNodes--;
diff --git a/MediaBrowser.Providers/Manager/ImageSaver.cs b/MediaBrowser.Providers/Manager/ImageSaver.cs
index 6160864068..d0d00ef127 100644
--- a/MediaBrowser.Providers/Manager/ImageSaver.cs
+++ b/MediaBrowser.Providers/Manager/ImageSaver.cs
@@ -63,7 +63,7 @@ namespace MediaBrowser.Providers.Manager
         /// <param name="imageIndex">Index of the image.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">mimeType</exception>
+        /// <exception cref="ArgumentNullException">mimeType</exception>
         public Task SaveImage(BaseItem item, Stream source, string mimeType, ImageType type, int? imageIndex, CancellationToken cancellationToken)
         {
             return SaveImage(item, source, mimeType, type, imageIndex, null, cancellationToken);
@@ -299,7 +299,7 @@ namespace MediaBrowser.Providers.Manager
         /// <param name="type">The type.</param>
         /// <param name="imageIndex">Index of the image.</param>
         /// <returns>System.String.</returns>
-        /// <exception cref="System.ArgumentNullException">
+        /// <exception cref="ArgumentNullException">
         /// imageIndex
         /// or
         /// imageIndex
@@ -316,7 +316,7 @@ namespace MediaBrowser.Providers.Manager
         /// <param name="type">The type.</param>
         /// <param name="imageIndex">Index of the image.</param>
         /// <param name="path">The path.</param>
-        /// <exception cref="System.ArgumentNullException">imageIndex
+        /// <exception cref="ArgumentNullException">imageIndex
         /// or
         /// imageIndex</exception>
         private void SetImagePath(BaseItem item, ImageType type, int? imageIndex, string path)
@@ -333,7 +333,7 @@ namespace MediaBrowser.Providers.Manager
         /// <param name="mimeType">Type of the MIME.</param>
         /// <param name="saveLocally">if set to <c>true</c> [save locally].</param>
         /// <returns>System.String.</returns>
-        /// <exception cref="System.ArgumentNullException">
+        /// <exception cref="ArgumentNullException">
         /// imageIndex
         /// or
         /// imageIndex
@@ -490,7 +490,7 @@ namespace MediaBrowser.Providers.Manager
         /// <param name="imageIndex">Index of the image.</param>
         /// <param name="mimeType">Type of the MIME.</param>
         /// <returns>IEnumerable{System.String}.</returns>
-        /// <exception cref="System.ArgumentNullException">imageIndex</exception>
+        /// <exception cref="ArgumentNullException">imageIndex</exception>
         private string[] GetCompatibleSavePaths(BaseItem item, ImageType type, int? imageIndex, string mimeType)
         {
             var season = item as Season;
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index 3322582cc8..1972ad290c 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -415,7 +415,7 @@ namespace MediaBrowser.Providers.Manager
             var folder = item as Folder;
             if (folder != null && folder.SupportsDateLastMediaAdded)
             {
-                DateTime dateLastMediaAdded = DateTime.MinValue;
+                var dateLastMediaAdded = DateTime.MinValue;
                 var any = false;
 
                 foreach (var child in children)
diff --git a/MediaBrowser.Providers/Manager/SimplePriorityQueue.cs b/MediaBrowser.Providers/Manager/SimplePriorityQueue.cs
index 9cfd5ab5cb..71e979e2c9 100644
--- a/MediaBrowser.Providers/Manager/SimplePriorityQueue.cs
+++ b/MediaBrowser.Providers/Manager/SimplePriorityQueue.cs
@@ -80,7 +80,7 @@ namespace Priority_Queue
                         throw new InvalidOperationException("Cannot call .First on an empty queue");
                     }
 
-                    SimpleNode first = _queue.First;
+                    var first = _queue.First;
                     return (first != null ? first.Data : default(TItem));
                 }
             }
@@ -155,7 +155,7 @@ namespace Priority_Queue
         {
             lock (_queue)
             {
-                SimpleNode node = new SimpleNode(item);
+                var node = new SimpleNode(item);
                 if (_queue.Count == _queue.MaxSize)
                 {
                     _queue.Resize(_queue.MaxSize * 2 + 1);
@@ -199,7 +199,7 @@ namespace Priority_Queue
             {
                 try
                 {
-                    SimpleNode updateMe = GetExistingNode(item);
+                    var updateMe = GetExistingNode(item);
                     _queue.UpdatePriority(updateMe, priority);
                 }
                 catch (InvalidOperationException ex)
@@ -211,7 +211,7 @@ namespace Priority_Queue
 
         public IEnumerator<TItem> GetEnumerator()
         {
-            List<TItem> queueData = new List<TItem>();
+            var queueData = new List<TItem>();
             lock (_queue)
             {
                 //Copy to a separate list because we don't want to 'yield return' inside a lock
diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
index ef5c781dc0..88d9a346b3 100644
--- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
@@ -140,7 +140,7 @@ namespace MediaBrowser.Providers.Movies
                 return _tmdbSettings;
             }
 
-            using (HttpResponseInfo response = await GetMovieDbResponse(new HttpRequestOptions
+            using (var response = await GetMovieDbResponse(new HttpRequestOptions
             {
                 Url = string.Format(TmdbConfigUrl, ApiKey),
                 CancellationToken = cancellationToken,
@@ -148,7 +148,7 @@ namespace MediaBrowser.Providers.Movies
 
             }).ConfigureAwait(false))
             {
-                using (Stream json = response.Content)
+                using (var json = response.Content)
                 {
                     _tmdbSettings = await _jsonSerializer.DeserializeFromStreamAsync<TmdbSettingsResult>(json).ConfigureAwait(false);
 
diff --git a/MediaBrowser.Providers/Music/ArtistMetadataService.cs b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
index de9551f83c..5b87825542 100644
--- a/MediaBrowser.Providers/Music/ArtistMetadataService.cs
+++ b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
@@ -16,7 +16,7 @@ namespace MediaBrowser.Providers.Music
         protected override IList<BaseItem> GetChildrenForMetadataUpdates(MusicArtist item)
         {
             return item.IsAccessedByName ?
-                item.GetTaggedItems(new Controller.Entities.InternalItemsQuery
+                item.GetTaggedItems(new InternalItemsQuery
                 {
                     Recursive = true,
                     IsFolder = false
diff --git a/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs b/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs
index 8592b5c67d..4e6d223a71 100644
--- a/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs
+++ b/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs
@@ -50,7 +50,7 @@ namespace MediaBrowser.Providers.Omdb
 
             if (!string.IsNullOrWhiteSpace(imdbId))
             {
-                OmdbProvider.RootObject rootObject = await provider.GetRootObject(imdbId, cancellationToken).ConfigureAwait(false);
+                var rootObject = await provider.GetRootObject(imdbId, cancellationToken).ConfigureAwait(false);
 
                 if (!string.IsNullOrEmpty(rootObject.Poster))
                 {
diff --git a/MediaBrowser.Providers/Omdb/OmdbProvider.cs b/MediaBrowser.Providers/Omdb/OmdbProvider.cs
index c9018a42cf..618e5eb2d0 100644
--- a/MediaBrowser.Providers/Omdb/OmdbProvider.cs
+++ b/MediaBrowser.Providers/Omdb/OmdbProvider.cs
@@ -43,7 +43,7 @@ namespace MediaBrowser.Providers.Omdb
                 throw new ArgumentNullException(nameof(imdbId));
             }
 
-            T item = itemResult.Item;
+            var item = itemResult.Item;
 
             var result = await GetRootObject(imdbId, cancellationToken).ConfigureAwait(false);
 
@@ -113,7 +113,7 @@ namespace MediaBrowser.Providers.Omdb
                 throw new ArgumentNullException(nameof(seriesImdbId));
             }
 
-            T item = itemResult.Item;
+            var item = itemResult.Item;
 
             var seasonResult = await GetSeasonRootObject(seriesImdbId, seasonNumber, cancellationToken).ConfigureAwait(false);
 
@@ -220,7 +220,7 @@ namespace MediaBrowser.Providers.Omdb
 
             string resultString;
 
-            using (Stream stream = _fileSystem.GetFileStream(path, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read))
+            using (var stream = _fileSystem.GetFileStream(path, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read))
             {
                 using (var reader = new StreamReader(stream, new UTF8Encoding(false)))
                 {
@@ -239,7 +239,7 @@ namespace MediaBrowser.Providers.Omdb
 
             string resultString;
 
-            using (Stream stream = _fileSystem.GetFileStream(path, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read))
+            using (var stream = _fileSystem.GetFileStream(path, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read))
             {
                 using (var reader = new StreamReader(stream, new UTF8Encoding(false)))
                 {
@@ -394,7 +394,7 @@ namespace MediaBrowser.Providers.Omdb
         private void ParseAdditionalMetadata<T>(MetadataResult<T> itemResult, RootObject result)
             where T : BaseItem
         {
-            T item = itemResult.Item;
+            var item = itemResult.Item;
 
             var isConfiguredForEnglish = IsConfiguredForEnglish(item) || _configurationManager.Configuration.EnableNewOmdbSupport;
 
diff --git a/MediaBrowser.Providers/People/MovieDbPersonProvider.cs b/MediaBrowser.Providers/People/MovieDbPersonProvider.cs
index 8fc5f40f84..9d9d8fef3b 100644
--- a/MediaBrowser.Providers/People/MovieDbPersonProvider.cs
+++ b/MediaBrowser.Providers/People/MovieDbPersonProvider.cs
@@ -265,7 +265,7 @@ namespace MediaBrowser.Providers.People
         public class PersonSearchResult
         {
             /// <summary>
-            /// Gets or sets a value indicating whether this <see cref="MovieDbPersonProvider.PersonSearchResult" /> is adult.
+            /// Gets or sets a value indicating whether this <see cref="PersonSearchResult" /> is adult.
             /// </summary>
             /// <value><c>true</c> if adult; otherwise, <c>false</c>.</value>
             public bool Adult { get; set; }
@@ -300,7 +300,7 @@ namespace MediaBrowser.Providers.People
             /// Gets or sets the results.
             /// </summary>
             /// <value>The results.</value>
-            public List<MovieDbPersonProvider.PersonSearchResult> Results { get; set; }
+            public List<PersonSearchResult> Results { get; set; }
             /// <summary>
             /// Gets or sets the total_ pages.
             /// </summary>
diff --git a/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs b/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
index 2f2d8eaeb1..89c4acf041 100644
--- a/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
+++ b/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
@@ -131,7 +131,7 @@ namespace MediaBrowser.Providers.Playlists
 
         private IEnumerable<LinkedChild> GetWplItems(Stream stream)
         {
-            WplContent content = new WplContent();
+            var content = new WplContent();
             var playlist = content.GetFromStream(stream);
 
             return playlist.PlaylistEntries.Select(i => new LinkedChild
diff --git a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
index 0c7fe1e0fc..544cfba0d3 100644
--- a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
+++ b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
@@ -245,7 +245,7 @@ namespace MediaBrowser.Providers.Subtitles
         {
             if (video.VideoType != VideoType.VideoFile)
             {
-                return Task.FromResult<RemoteSubtitleInfo[]>(new RemoteSubtitleInfo[] { });
+                return Task.FromResult(new RemoteSubtitleInfo[] { });
             }
 
             VideoContentType mediaType;
@@ -261,7 +261,7 @@ namespace MediaBrowser.Providers.Subtitles
             else
             {
                 // These are the only supported types
-                return Task.FromResult<RemoteSubtitleInfo[]>(new RemoteSubtitleInfo[] { });
+                return Task.FromResult(new RemoteSubtitleInfo[] { });
             }
 
             var request = new SubtitleSearchRequest
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
index f4fe6ee279..958312633e 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
@@ -1118,7 +1118,7 @@ namespace MediaBrowser.Providers.TV
 
         private void FetchDataFromSeriesNode(MetadataResult<Series> result, XmlReader reader, CancellationToken cancellationToken)
         {
-            Series item = result.Item;
+            var item = result.Item;
 
             reader.MoveToContent();
             reader.Read();
diff --git a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
index 55b49d2735..3744df9b4c 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
@@ -54,7 +54,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
         /// <param name="item">The item.</param>
         /// <param name="metadataFile">The metadata file.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        /// <exception cref="System.ArgumentNullException">
+        /// <exception cref="ArgumentNullException">
         /// </exception>
         public void Fetch(MetadataResult<T> item, string metadataFile, CancellationToken cancellationToken)
         {
@@ -225,7 +225,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
         protected void ParseProviderLinks(T item, string xml)
         {
             //Look for a match for the Regex pattern "tt" followed by 7 digits
-            Match m = Regex.Match(xml, @"tt([0-9]{7})", RegexOptions.IgnoreCase);
+            var m = Regex.Match(xml, @"tt([0-9]{7})", RegexOptions.IgnoreCase);
             if (m.Success)
             {
                 item.SetProviderId(MetadataProviders.Imdb, m.Value);
@@ -379,7 +379,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                             {
                                 MetadataFields field;
 
-                                if (Enum.TryParse<MetadataFields>(i, true, out field))
+                                if (Enum.TryParse(i, true, out field))
                                 {
                                     return (MetadataFields?)field;
                                 }
diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
index efc6b33583..1efffff3dc 100644
--- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
@@ -229,7 +229,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
                 CloseOutput = false
             };
 
-            using (XmlWriter writer = XmlWriter.Create(stream, settings))
+            using (var writer = XmlWriter.Create(stream, settings))
             {
                 var root = GetRootElementName(item);
 
diff --git a/Mono.Nat/Mapping.cs b/Mono.Nat/Mapping.cs
index 4380689343..5b15d4e14f 100644
--- a/Mono.Nat/Mapping.cs
+++ b/Mono.Nat/Mapping.cs
@@ -102,7 +102,7 @@ namespace Mono.Nat
 
         public override bool Equals(object obj)
         {
-            Mapping other = obj as Mapping;
+            var other = obj as Mapping;
             return other == null ? false : this.protocol == other.protocol &&
             this.privatePort == other.privatePort && this.publicPort == other.publicPort;
         }
diff --git a/Mono.Nat/Pmp/PmpNatDevice.cs b/Mono.Nat/Pmp/PmpNatDevice.cs
index 9398e2bf9c..95bd72a6cc 100644
--- a/Mono.Nat/Pmp/PmpNatDevice.cs
+++ b/Mono.Nat/Pmp/PmpNatDevice.cs
@@ -66,7 +66,7 @@ namespace Mono.Nat.Pmp
 
         public override bool Equals(object obj)
         {
-            PmpNatDevice device = obj as PmpNatDevice;
+            var device = obj as PmpNatDevice;
             return (device == null) ? false : this.Equals(device);
         }
 
diff --git a/Mono.Nat/Pmp/PmpSearcher.cs b/Mono.Nat/Pmp/PmpSearcher.cs
index 5e41558419..cbd0d36860 100644
--- a/Mono.Nat/Pmp/PmpSearcher.cs
+++ b/Mono.Nat/Pmp/PmpSearcher.cs
@@ -81,14 +81,14 @@ namespace Mono.Nat
 
             try
             {
-                foreach (NetworkInterface n in NetworkInterface.GetAllNetworkInterfaces())
+                foreach (var n in NetworkInterface.GetAllNetworkInterfaces())
                 {
                     if (n.OperationalStatus != OperationalStatus.Up && n.OperationalStatus != OperationalStatus.Unknown)
                         continue;
-                    IPInterfaceProperties properties = n.GetIPProperties();
-                    List<IPEndPoint> gatewayList = new List<IPEndPoint>();
+                    var properties = n.GetIPProperties();
+                    var gatewayList = new List<IPEndPoint>();
 
-                    foreach (GatewayIPAddressInformation gateway in properties.GatewayAddresses)
+                    foreach (var gateway in properties.GatewayAddresses)
                     {
                         if (gateway.Address.AddressFamily == AddressFamily.InterNetwork)
                         {
@@ -120,7 +120,7 @@ namespace Mono.Nat
 
                     if (gatewayList.Count > 0)
                     {
-                        foreach (UnicastIPAddressInformation address in properties.UnicastAddresses)
+                        foreach (var address in properties.UnicastAddresses)
                         {
                             if (address.Address.AddressFamily == AddressFamily.InterNetwork)
                             {
@@ -150,7 +150,7 @@ namespace Mono.Nat
 
         public async void Search()
         {
-            foreach (UdpClient s in sockets)
+            foreach (var s in sockets)
             {
                 try
                 {
@@ -181,7 +181,7 @@ namespace Mono.Nat
 
             // The nat-pmp search message. Must be sent to GatewayIP:53531
             byte[] buffer = new byte[] { PmpConstants.Version, PmpConstants.OperationCode };
-            foreach (IPEndPoint gatewayEndpoint in gatewayLists[client])
+            foreach (var gatewayEndpoint in gatewayLists[client])
             {
                 await client.SendAsync(buffer, buffer.Length, gatewayEndpoint).ConfigureAwait(false);
             }
@@ -189,8 +189,8 @@ namespace Mono.Nat
 
         bool IsSearchAddress(IPAddress address)
         {
-            foreach (List<IPEndPoint> gatewayList in gatewayLists.Values)
-                foreach (IPEndPoint gatewayEndpoint in gatewayList)
+            foreach (var gatewayList in gatewayLists.Values)
+                foreach (var gatewayEndpoint in gatewayList)
                     if (gatewayEndpoint.Address.Equals(address))
                         return true;
             return false;
@@ -210,7 +210,7 @@ namespace Mono.Nat
             if (errorcode != 0)
                 _logger.LogDebug("Non zero error: {0}", errorcode);
 
-            IPAddress publicIp = new IPAddress(new byte[] { response[8], response[9], response[10], response[11] });
+            var publicIp = new IPAddress(new byte[] { response[8], response[9], response[10], response[11] });
             nextSearch = DateTime.Now.AddMinutes(5);
             timeout = 250;
 
diff --git a/Mono.Nat/Upnp/Messages/Requests/CreatePortMappingMessage.cs b/Mono.Nat/Upnp/Messages/Requests/CreatePortMappingMessage.cs
index 5a2ab009aa..217095e492 100644
--- a/Mono.Nat/Upnp/Messages/Requests/CreatePortMappingMessage.cs
+++ b/Mono.Nat/Upnp/Messages/Requests/CreatePortMappingMessage.cs
@@ -54,10 +54,10 @@ namespace Mono.Nat.Upnp
 
         public override HttpRequestOptions Encode()
         {
-            CultureInfo culture = CultureInfo.InvariantCulture;
+            var culture = CultureInfo.InvariantCulture;
 
-            StringBuilder builder = new StringBuilder(256);
-            XmlWriter writer = CreateWriter(builder);
+            var builder = new StringBuilder(256);
+            var writer = CreateWriter(builder);
 
             WriteFullElement(writer, "NewRemoteHost", string.Empty);
             WriteFullElement(writer, "NewExternalPort", this.mapping.PublicPort.ToString(culture));
diff --git a/Mono.Nat/Upnp/Messages/UpnpMessage.cs b/Mono.Nat/Upnp/Messages/UpnpMessage.cs
index e734db8f4d..1151dd997d 100644
--- a/Mono.Nat/Upnp/Messages/UpnpMessage.cs
+++ b/Mono.Nat/Upnp/Messages/UpnpMessage.cs
@@ -91,7 +91,7 @@ namespace Mono.Nat.Upnp
 
         protected XmlWriter CreateWriter(StringBuilder sb)
         {
-            XmlWriterSettings settings = new XmlWriterSettings();
+            var settings = new XmlWriterSettings();
             settings.ConformanceLevel = ConformanceLevel.Fragment;
             return XmlWriter.Create(sb, settings);
         }
diff --git a/Mono.Nat/Upnp/Searchers/UpnpSearcher.cs b/Mono.Nat/Upnp/Searchers/UpnpSearcher.cs
index 57ecdeca9b..b70768b6ff 100644
--- a/Mono.Nat/Upnp/Searchers/UpnpSearcher.cs
+++ b/Mono.Nat/Upnp/Searchers/UpnpSearcher.cs
@@ -82,7 +82,7 @@ namespace Mono.Nat
                  * prefix. */
 
                 // We have an internet gateway device now
-                UpnpNatDevice d = new UpnpNatDevice(localAddress, deviceInfo, endpoint, string.Empty, _logger, _httpClient);
+                var d = new UpnpNatDevice(localAddress, deviceInfo, endpoint, string.Empty, _logger, _httpClient);
 
                 await d.GetServicesList().ConfigureAwait(false);
 
diff --git a/Mono.Nat/Upnp/UpnpNatDevice.cs b/Mono.Nat/Upnp/UpnpNatDevice.cs
index f37d6dd0c7..63a28ebdc0 100644
--- a/Mono.Nat/Upnp/UpnpNatDevice.cs
+++ b/Mono.Nat/Upnp/UpnpNatDevice.cs
@@ -109,8 +109,8 @@ namespace Mono.Nat.Upnp
             int abortCount = 0;
             int bytesRead = 0;
             byte[] buffer = new byte[10240];
-            StringBuilder servicesXml = new StringBuilder();
-            XmlDocument xmldoc = new XmlDocument();
+            var servicesXml = new StringBuilder();
+            var xmldoc = new XmlDocument();
 
             using (var s = response.Content)
             {
@@ -144,9 +144,9 @@ namespace Mono.Nat.Upnp
                     }
                 }
 
-                XmlNamespaceManager ns = new XmlNamespaceManager(xmldoc.NameTable);
+                var ns = new XmlNamespaceManager(xmldoc.NameTable);
                 ns.AddNamespace("ns", "urn:schemas-upnp-org:device-1-0");
-                XmlNodeList nodes = xmldoc.SelectNodes("//*/ns:serviceList", ns);
+                var nodes = xmldoc.SelectNodes("//*/ns:serviceList", ns);
 
                 foreach (XmlNode node in nodes)
                 {
@@ -169,7 +169,7 @@ namespace Mono.Nat.Upnp
                             {
                                 if (u.IsAbsoluteUri)
                                 {
-                                    EndPoint old = hostEndPoint;
+                                    var old = hostEndPoint;
                                     IPAddress parsedHostIpAddress;
                                     if (IPAddress.TryParse(u.Host, out parsedHostIpAddress))
                                     {
@@ -228,7 +228,7 @@ namespace Mono.Nat.Upnp
 
         public override async Task CreatePortMap(Mapping mapping)
         {
-            CreatePortMappingMessage message = new CreatePortMappingMessage(mapping, localAddress, this);
+            var message = new CreatePortMappingMessage(mapping, localAddress, this);
             using (await _httpClient.SendAsync(message.Encode(), message.Method).ConfigureAwait(false))
             {
 
@@ -237,7 +237,7 @@ namespace Mono.Nat.Upnp
 
         public override bool Equals(object obj)
         {
-            UpnpNatDevice device = obj as UpnpNatDevice;
+            var device = obj as UpnpNatDevice;
             return (device == null) ? false : this.Equals((device));
         }
 
diff --git a/OpenSubtitlesHandler/Console/OSHConsole.cs b/OpenSubtitlesHandler/Console/OSHConsole.cs
index 586377e53e..396b28cbc6 100644
--- a/OpenSubtitlesHandler/Console/OSHConsole.cs
+++ b/OpenSubtitlesHandler/Console/OSHConsole.cs
@@ -58,7 +58,7 @@ namespace OpenSubtitlesHandler.Console
     /// <summary>
     /// Console Debug Args
     /// </summary>
-    public class DebugEventArgs : System.EventArgs
+    public class DebugEventArgs : EventArgs
     {
         public DebugCode Code { get; private set; }
         public string Text { get; private set; }
diff --git a/OpenSubtitlesHandler/MovieHasher.cs b/OpenSubtitlesHandler/MovieHasher.cs
index 5a93edd5cf..25d91c1aca 100644
--- a/OpenSubtitlesHandler/MovieHasher.cs
+++ b/OpenSubtitlesHandler/MovieHasher.cs
@@ -37,7 +37,7 @@ namespace OpenSubtitlesHandler
 
         public static string ToHexadecimal(byte[] bytes)
         {
-            StringBuilder hexBuilder = new StringBuilder();
+            var hexBuilder = new StringBuilder();
             for (int i = 0; i < bytes.Length; i++)
             {
                 hexBuilder.Append(bytes[i].ToString("x2"));
diff --git a/OpenSubtitlesHandler/OpenSubtitles.cs b/OpenSubtitlesHandler/OpenSubtitles.cs
index 4a44ccde3b..ddf2e83e8c 100644
--- a/OpenSubtitlesHandler/OpenSubtitles.cs
+++ b/OpenSubtitlesHandler/OpenSubtitles.cs
@@ -57,12 +57,12 @@ namespace OpenSubtitlesHandler
         public static IMethodResponse LogIn(string userName, string password, string language)
         {
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(userName));
             parms.Add(new XmlRpcValueBasic(password));
             parms.Add(new XmlRpcValueBasic(language));
             parms.Add(new XmlRpcValueBasic(XML_PRC_USERAGENT));
-            XmlRpcMethodCall call = new XmlRpcMethodCall("LogIn", parms);
+            var call = new XmlRpcMethodCall("LogIn", parms);
             OSHConsole.WriteLine("Sending LogIn request to the server ...", DebugCode.Good);
 
             //File.WriteAllText(".\\request.txt", Encoding.UTF8.GetString(XmlRpcGenerator.Generate(call)));
@@ -77,9 +77,9 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
-                        MethodResponseLogIn re = new MethodResponseLogIn("Success", "Log in successful.");
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var re = new MethodResponseLogIn("Success", "Log in successful.");
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
@@ -103,12 +103,12 @@ namespace OpenSubtitlesHandler
         public static async Task<IMethodResponse> LogInAsync(string userName, string password, string language, CancellationToken cancellationToken)
         {
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(userName));
             parms.Add(new XmlRpcValueBasic(password));
             parms.Add(new XmlRpcValueBasic(language));
             parms.Add(new XmlRpcValueBasic(XML_PRC_USERAGENT));
-            XmlRpcMethodCall call = new XmlRpcMethodCall("LogIn", parms);
+            var call = new XmlRpcMethodCall("LogIn", parms);
             OSHConsole.WriteLine("Sending LogIn request to the server ...", DebugCode.Good);
 
             //File.WriteAllText(".\\request.txt", Encoding.UTF8.GetString(XmlRpcGenerator.Generate(call)));
@@ -126,9 +126,9 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
-                        MethodResponseLogIn re = new MethodResponseLogIn("Success", "Log in successful.");
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var re = new MethodResponseLogIn("Success", "Log in successful.");
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
@@ -170,9 +170,9 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
-            XmlRpcMethodCall call = new XmlRpcMethodCall("LogOut", parms);
+            var call = new XmlRpcMethodCall("LogOut", parms);
 
             OSHConsole.WriteLine("Sending LogOut request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -185,10 +185,10 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct strct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var strct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         OSHConsole.WriteLine("STATUS=" + ((XmlRpcValueBasic)strct.Members[0].Data).Data.ToString());
                         OSHConsole.WriteLine("SECONDS=" + ((XmlRpcValueBasic)strct.Members[1].Data).Data.ToString());
-                        MethodResponseLogIn re = new MethodResponseLogIn("Success", "Log out successful.");
+                        var re = new MethodResponseLogIn("Success", "Log out successful.");
                         re.Status = ((XmlRpcValueBasic)strct.Members[0].Data).Data.ToString();
                         re.Seconds = (double)((XmlRpcValueBasic)strct.Members[1].Data).Data;
                         return re;
@@ -214,10 +214,10 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
             parms.Add(new XmlRpcValueBasic(XML_PRC_USERAGENT, XmlRpcBasicValueType.String));
-            XmlRpcMethodCall call = new XmlRpcMethodCall("NoOperation", parms);
+            var call = new XmlRpcMethodCall("NoOperation", parms);
 
             OSHConsole.WriteLine("Sending NoOperation request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -230,18 +230,18 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        MethodResponseNoOperation R = new MethodResponseNoOperation();
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var R = new MethodResponseNoOperation();
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
                                 case "status": R.Status = (string)MEMBER.Data.Data; OSHConsole.WriteLine(MEMBER.Name + "= " + MEMBER.Data.Data); break;
                                 case "seconds": R.Seconds = (double)MEMBER.Data.Data; OSHConsole.WriteLine(MEMBER.Name + "= " + MEMBER.Data.Data); break;
                                 case "download_limits":
-                                    XmlRpcValueStruct dlStruct = (XmlRpcValueStruct)MEMBER.Data;
-                                    foreach (XmlRpcStructMember dlmember in dlStruct.Members)
+                                    var dlStruct = (XmlRpcValueStruct)MEMBER.Data;
+                                    foreach (var dlmember in dlStruct.Members)
                                     {
                                         OSHConsole.WriteLine(" >" + dlmember.Name + "= " + dlmember.Data.Data.ToString());
                                         switch (dlmember.Name)
@@ -292,16 +292,16 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "No subtitle search parameter passed");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             // Add token param
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
             // Add subtitle search parameters. Each one will be like 'array' of structs.
-            XmlRpcValueArray array = new XmlRpcValueArray();
-            foreach (SubtitleSearchParameters param in parameters)
+            var array = new XmlRpcValueArray();
+            foreach (var param in parameters)
             {
-                XmlRpcValueStruct strct = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
+                var strct = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
                 // sublanguageid member
-                XmlRpcStructMember member = new XmlRpcStructMember("sublanguageid",
+                var member = new XmlRpcStructMember("sublanguageid",
                     new XmlRpcValueBasic(param.SubLangaugeID, XmlRpcBasicValueType.String));
                 strct.Members.Add(member);
                 // moviehash member
@@ -345,7 +345,7 @@ namespace OpenSubtitlesHandler
             // Add the array to the parameters
             parms.Add(array);
             // Call !
-            XmlRpcMethodCall call = new XmlRpcMethodCall("SearchSubtitles", parms);
+            var call = new XmlRpcMethodCall("SearchSubtitles", parms);
             OSHConsole.WriteLine("Sending SearchSubtitles request to the server ...", DebugCode.Good);
             // Send the request to the server
             string response = Utilities.GetStreamString(Utilities.SendRequest(XmlRpcGenerator.Generate(call), XML_PRC_USERAGENT));
@@ -362,11 +362,11 @@ namespace OpenSubtitlesHandler
                         //* the first is status
                         //* the second is [array of structs, each one includes subtitle file].
                         //* the third is [double basic value] represent seconds token by server.
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseSubtitleSearch R = new MethodResponseSubtitleSearch();
+                        var R = new MethodResponseSubtitleSearch();
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             if (MEMBER.Name == "status")
                             {
@@ -384,14 +384,14 @@ namespace OpenSubtitlesHandler
                                 {
                                     OSHConsole.WriteLine("Search results: ");
 
-                                    XmlRpcValueArray rarray = (XmlRpcValueArray)MEMBER.Data;
-                                    foreach (IXmlRpcValue subStruct in rarray.Values)
+                                    var rarray = (XmlRpcValueArray)MEMBER.Data;
+                                    foreach (var subStruct in rarray.Values)
                                     {
                                         if (subStruct == null) continue;
                                         if (!(subStruct is XmlRpcValueStruct)) continue;
 
-                                        SubtitleSearchResult result = new SubtitleSearchResult();
-                                        foreach (XmlRpcStructMember submember in ((XmlRpcValueStruct)subStruct).Members)
+                                        var result = new SubtitleSearchResult();
+                                        foreach (var submember in ((XmlRpcValueStruct)subStruct).Members)
                                         {
                                             // To avoid errors of arranged info or missing ones, let's do it with switch..
                                             switch (submember.Name)
@@ -472,16 +472,16 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "No subtitle search parameter passed");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             // Add token param
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
             // Add subtitle search parameters. Each one will be like 'array' of structs.
-            XmlRpcValueArray array = new XmlRpcValueArray();
-            foreach (SubtitleSearchParameters param in parameters)
+            var array = new XmlRpcValueArray();
+            foreach (var param in parameters)
             {
-                XmlRpcValueStruct strct = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
+                var strct = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
                 // sublanguageid member
-                XmlRpcStructMember member = new XmlRpcStructMember("sublanguageid",
+                var member = new XmlRpcStructMember("sublanguageid",
                     new XmlRpcValueBasic(param.SubLangaugeID, XmlRpcBasicValueType.String));
                 strct.Members.Add(member);
                 // moviehash member
@@ -525,7 +525,7 @@ namespace OpenSubtitlesHandler
             // Add the array to the parameters
             parms.Add(array);
             // Call !
-            XmlRpcMethodCall call = new XmlRpcMethodCall("SearchSubtitles", parms);
+            var call = new XmlRpcMethodCall("SearchSubtitles", parms);
             OSHConsole.WriteLine("Sending SearchSubtitles request to the server ...", DebugCode.Good);
             // Send the request to the server
             string response = Utilities.GetStreamString(await Utilities.SendRequestAsync(XmlRpcGenerator.Generate(call), XML_PRC_USERAGENT, cancellationToken).ConfigureAwait(false));
@@ -542,11 +542,11 @@ namespace OpenSubtitlesHandler
                         //* the first is status
                         //* the second is [array of structs, each one includes subtitle file].
                         //* the third is [double basic value] represent seconds token by server.
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseSubtitleSearch R = new MethodResponseSubtitleSearch();
+                        var R = new MethodResponseSubtitleSearch();
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             if (MEMBER.Name == "status")
                             {
@@ -564,14 +564,14 @@ namespace OpenSubtitlesHandler
                                 {
                                     OSHConsole.WriteLine("Search results: ");
 
-                                    XmlRpcValueArray rarray = (XmlRpcValueArray)MEMBER.Data;
-                                    foreach (IXmlRpcValue subStruct in rarray.Values)
+                                    var rarray = (XmlRpcValueArray)MEMBER.Data;
+                                    foreach (var subStruct in rarray.Values)
                                     {
                                         if (subStruct == null) continue;
                                         if (!(subStruct is XmlRpcValueStruct)) continue;
 
-                                        SubtitleSearchResult result = new SubtitleSearchResult();
-                                        foreach (XmlRpcStructMember submember in ((XmlRpcValueStruct)subStruct).Members)
+                                        var result = new SubtitleSearchResult();
+                                        foreach (var submember in ((XmlRpcValueStruct)subStruct).Members)
                                         {
                                             // To avoid errors of arranged info or missing ones, let's do it with switch..
                                             switch (submember.Name)
@@ -657,11 +657,11 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "No subtitle id passed");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             // Add token param
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
             // Add subtitle search parameters. Each one will be like 'array' of structs.
-            XmlRpcValueArray array = new XmlRpcValueArray();
+            var array = new XmlRpcValueArray();
             foreach (int id in subIDS)
             {
                 array.Values.Add(new XmlRpcValueBasic(id, XmlRpcBasicValueType.Int));
@@ -669,7 +669,7 @@ namespace OpenSubtitlesHandler
             // Add the array to the parameters
             parms.Add(array);
             // Call !
-            XmlRpcMethodCall call = new XmlRpcMethodCall("DownloadSubtitles", parms);
+            var call = new XmlRpcMethodCall("DownloadSubtitles", parms);
             OSHConsole.WriteLine("Sending DownloadSubtitles request to the server ...", DebugCode.Good);
             // Send the request to the server
             string response = Utilities.GetStreamString(Utilities.SendRequest(XmlRpcGenerator.Generate(call), XML_PRC_USERAGENT));
@@ -685,12 +685,12 @@ namespace OpenSubtitlesHandler
                         //* the first is status
                         //* the second is [array of structs, each one includes subtitle file].
                         //* the third is [double basic value] represent seconds token by server.
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseSubtitleDownload R = new MethodResponseSubtitleDownload();
+                        var R = new MethodResponseSubtitleDownload();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             if (MEMBER.Name == "status")
                             {
@@ -707,14 +707,14 @@ namespace OpenSubtitlesHandler
                                 if (MEMBER.Data is XmlRpcValueArray)
                                 {
                                     OSHConsole.WriteLine("Download results:");
-                                    XmlRpcValueArray rarray = (XmlRpcValueArray)MEMBER.Data;
-                                    foreach (IXmlRpcValue subStruct in rarray.Values)
+                                    var rarray = (XmlRpcValueArray)MEMBER.Data;
+                                    foreach (var subStruct in rarray.Values)
                                     {
                                         if (subStruct == null) continue;
                                         if (!(subStruct is XmlRpcValueStruct)) continue;
 
-                                        SubtitleDownloadResult result = new SubtitleDownloadResult();
-                                        foreach (XmlRpcStructMember submember in ((XmlRpcValueStruct)subStruct).Members)
+                                        var result = new SubtitleDownloadResult();
+                                        foreach (var submember in ((XmlRpcValueStruct)subStruct).Members)
                                         {
                                             // To avoid errors of arranged info or missing ones, let's do it with switch..
                                             switch (submember.Name)
@@ -764,11 +764,11 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "No subtitle id passed");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             // Add token param
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
             // Add subtitle search parameters. Each one will be like 'array' of structs.
-            XmlRpcValueArray array = new XmlRpcValueArray();
+            var array = new XmlRpcValueArray();
             foreach (int id in subIDS)
             {
                 array.Values.Add(new XmlRpcValueBasic(id, XmlRpcBasicValueType.Int));
@@ -776,7 +776,7 @@ namespace OpenSubtitlesHandler
             // Add the array to the parameters
             parms.Add(array);
             // Call !
-            XmlRpcMethodCall call = new XmlRpcMethodCall("DownloadSubtitles", parms);
+            var call = new XmlRpcMethodCall("DownloadSubtitles", parms);
             OSHConsole.WriteLine("Sending DownloadSubtitles request to the server ...", DebugCode.Good);
             // Send the request to the server
 
@@ -795,12 +795,12 @@ namespace OpenSubtitlesHandler
                         //* the first is status
                         //* the second is [array of structs, each one includes subtitle file].
                         //* the third is [double basic value] represent seconds token by server.
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseSubtitleDownload R = new MethodResponseSubtitleDownload();
+                        var R = new MethodResponseSubtitleDownload();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             if (MEMBER.Name == "status")
                             {
@@ -817,14 +817,14 @@ namespace OpenSubtitlesHandler
                                 if (MEMBER.Data is XmlRpcValueArray)
                                 {
                                     OSHConsole.WriteLine("Download results:");
-                                    XmlRpcValueArray rarray = (XmlRpcValueArray)MEMBER.Data;
-                                    foreach (IXmlRpcValue subStruct in rarray.Values)
+                                    var rarray = (XmlRpcValueArray)MEMBER.Data;
+                                    foreach (var subStruct in rarray.Values)
                                     {
                                         if (subStruct == null) continue;
                                         if (!(subStruct is XmlRpcValueStruct)) continue;
 
-                                        SubtitleDownloadResult result = new SubtitleDownloadResult();
-                                        foreach (XmlRpcStructMember submember in ((XmlRpcValueStruct)subStruct).Members)
+                                        var result = new SubtitleDownloadResult();
+                                        foreach (var submember in ((XmlRpcValueStruct)subStruct).Members)
                                         {
                                             // To avoid errors of arranged info or missing ones, let's do it with switch..
                                             switch (submember.Name)
@@ -879,15 +879,15 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "No subtitle id passed");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             // Add token param
             parms.Add(new XmlRpcValueBasic(TOKEN));
             // Add subtitle search parameters. Each one will be like 'array' of structs.
-            XmlRpcValueArray array = new XmlRpcValueArray(subIDS);
+            var array = new XmlRpcValueArray(subIDS);
             // Add the array to the parameters
             parms.Add(array);
             // Call !
-            XmlRpcMethodCall call = new XmlRpcMethodCall("GetComments", parms);
+            var call = new XmlRpcMethodCall("GetComments", parms);
             OSHConsole.WriteLine("Sending GetComments request to the server ...", DebugCode.Good);
             // Send the request to the server
             string response = Utilities.GetStreamString(Utilities.SendRequest(XmlRpcGenerator.Generate(call), XML_PRC_USERAGENT));
@@ -899,12 +899,12 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseGetComments R = new MethodResponseGetComments();
+                        var R = new MethodResponseGetComments();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             if (MEMBER.Name == "status")
                             {
@@ -921,14 +921,14 @@ namespace OpenSubtitlesHandler
                                 if (MEMBER.Data is XmlRpcValueArray)
                                 {
                                     OSHConsole.WriteLine("Comments results:");
-                                    XmlRpcValueArray rarray = (XmlRpcValueArray)MEMBER.Data;
-                                    foreach (IXmlRpcValue commentStruct in rarray.Values)
+                                    var rarray = (XmlRpcValueArray)MEMBER.Data;
+                                    foreach (var commentStruct in rarray.Values)
                                     {
                                         if (commentStruct == null) continue;
                                         if (!(commentStruct is XmlRpcValueStruct)) continue;
 
-                                        GetCommentsResult result = new GetCommentsResult();
-                                        foreach (XmlRpcStructMember commentmember in ((XmlRpcValueStruct)commentStruct).Members)
+                                        var result = new GetCommentsResult();
+                                        foreach (var commentmember in ((XmlRpcValueStruct)commentStruct).Members)
                                         {
                                             // To avoid errors of arranged info or missing ones, let's do it with switch..
                                             switch (commentmember.Name)
@@ -977,22 +977,22 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
             // Array of sub langs
-            XmlRpcValueArray a = new XmlRpcValueArray(languageIDS);
+            var a = new XmlRpcValueArray(languageIDS);
             parms.Add(a);
             // Array of video parameters
             a = new XmlRpcValueArray();
-            foreach (SearchToMailMovieParameter p in movies)
+            foreach (var p in movies)
             {
-                XmlRpcValueStruct str = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
+                var str = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
                 str.Members.Add(new XmlRpcStructMember("moviehash", new XmlRpcValueBasic(p.moviehash)));
                 str.Members.Add(new XmlRpcStructMember("moviesize", new XmlRpcValueBasic(p.moviesize)));
                 a.Values.Add(str);
             }
             parms.Add(a);
-            XmlRpcMethodCall call = new XmlRpcMethodCall("SearchToMail", parms);
+            var call = new XmlRpcMethodCall("SearchToMail", parms);
 
             OSHConsole.WriteLine("Sending SearchToMail request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -1005,12 +1005,12 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseSearchToMail R = new MethodResponseSearchToMail();
+                        var R = new MethodResponseSearchToMail();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
@@ -1044,13 +1044,13 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             // Add token param
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
             // Add query param
             parms.Add(new XmlRpcValueBasic(query, XmlRpcBasicValueType.String));
             // Call !
-            XmlRpcMethodCall call = new XmlRpcMethodCall("SearchMoviesOnIMDB", parms);
+            var call = new XmlRpcMethodCall("SearchMoviesOnIMDB", parms);
             OSHConsole.WriteLine("Sending SearchMoviesOnIMDB request to the server ...", DebugCode.Good);
             // Send the request to the server
             string response = Utilities.GetStreamString(Utilities.SendRequest(XmlRpcGenerator.Generate(call), XML_PRC_USERAGENT));
@@ -1062,12 +1062,12 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseMovieSearch R = new MethodResponseMovieSearch();
+                        var R = new MethodResponseMovieSearch();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             if (MEMBER.Name == "status")
                             {
@@ -1084,14 +1084,14 @@ namespace OpenSubtitlesHandler
                                 if (MEMBER.Data is XmlRpcValueArray)
                                 {
                                     OSHConsole.WriteLine("Search results:");
-                                    XmlRpcValueArray rarray = (XmlRpcValueArray)MEMBER.Data;
-                                    foreach (IXmlRpcValue subStruct in rarray.Values)
+                                    var rarray = (XmlRpcValueArray)MEMBER.Data;
+                                    foreach (var subStruct in rarray.Values)
                                     {
                                         if (subStruct == null) continue;
                                         if (!(subStruct is XmlRpcValueStruct)) continue;
 
-                                        MovieSearchResult result = new MovieSearchResult();
-                                        foreach (XmlRpcStructMember submember in ((XmlRpcValueStruct)subStruct).Members)
+                                        var result = new MovieSearchResult();
+                                        foreach (var submember in ((XmlRpcValueStruct)subStruct).Members)
                                         {
                                             // To avoid errors of arranged info or missing ones, let's do it with switch..
                                             switch (submember.Name)
@@ -1135,13 +1135,13 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             // Add token param
             parms.Add(new XmlRpcValueBasic(TOKEN));
             // Add query param
             parms.Add(new XmlRpcValueBasic(imdbid));
             // Call !
-            XmlRpcMethodCall call = new XmlRpcMethodCall("GetIMDBMovieDetails", parms);
+            var call = new XmlRpcMethodCall("GetIMDBMovieDetails", parms);
             OSHConsole.WriteLine("Sending GetIMDBMovieDetails request to the server ...", DebugCode.Good);
             // Send the request to the server
             string response = Utilities.GetStreamString(Utilities.SendRequest(XmlRpcGenerator.Generate(call), XML_PRC_USERAGENT));
@@ -1153,12 +1153,12 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseMovieDetails R = new MethodResponseMovieDetails();
+                        var R = new MethodResponseMovieDetails();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             if (MEMBER.Name == "status")
                             {
@@ -1176,8 +1176,8 @@ namespace OpenSubtitlesHandler
                                 if (MEMBER.Data is XmlRpcValueStruct)
                                 {
                                     OSHConsole.WriteLine("Details result:");
-                                    XmlRpcValueStruct detailsStruct = (XmlRpcValueStruct)MEMBER.Data;
-                                    foreach (XmlRpcStructMember dmem in detailsStruct.Members)
+                                    var detailsStruct = (XmlRpcValueStruct)MEMBER.Data;
+                                    foreach (var dmem in detailsStruct.Members)
                                     {
                                         switch (dmem.Name)
                                         {
@@ -1193,8 +1193,8 @@ namespace OpenSubtitlesHandler
                                             case "cast":
                                                 // this is another struct with cast members...
                                                 OSHConsole.WriteLine(">" + dmem.Name + "= ");
-                                                XmlRpcValueStruct castStruct = (XmlRpcValueStruct)dmem.Data;
-                                                foreach (XmlRpcStructMember castMemeber in castStruct.Members)
+                                                var castStruct = (XmlRpcValueStruct)dmem.Data;
+                                                foreach (var castMemeber in castStruct.Members)
                                                 {
                                                     R.Cast.Add(castMemeber.Data.Data.ToString());
                                                     OSHConsole.WriteLine("  >" + castMemeber.Data.Data.ToString());
@@ -1203,8 +1203,8 @@ namespace OpenSubtitlesHandler
                                             case "directors":
                                                 OSHConsole.WriteLine(">" + dmem.Name + "= ");
                                                 // this is another struct with directors members...
-                                                XmlRpcValueStruct directorsStruct = (XmlRpcValueStruct)dmem.Data;
-                                                foreach (XmlRpcStructMember directorsMember in directorsStruct.Members)
+                                                var directorsStruct = (XmlRpcValueStruct)dmem.Data;
+                                                foreach (var directorsMember in directorsStruct.Members)
                                                 {
                                                     R.Directors.Add(directorsMember.Data.Data.ToString());
                                                     OSHConsole.WriteLine("  >" + directorsMember.Data.Data.ToString());
@@ -1213,8 +1213,8 @@ namespace OpenSubtitlesHandler
                                             case "writers":
                                                 OSHConsole.WriteLine(">" + dmem.Name + "= ");
                                                 // this is another struct with writers members...
-                                                XmlRpcValueStruct writersStruct = (XmlRpcValueStruct)dmem.Data;
-                                                foreach (XmlRpcStructMember writersMember in writersStruct.Members)
+                                                var writersStruct = (XmlRpcValueStruct)dmem.Data;
+                                                foreach (var writersMember in writersStruct.Members)
                                                 {
                                                     R.Writers.Add(writersMember.Data.Data.ToString());
                                                     OSHConsole.WriteLine("+->" + writersMember.Data.Data.ToString());
@@ -1222,7 +1222,7 @@ namespace OpenSubtitlesHandler
                                                 break;
                                             case "awards":
                                                 // this is an array of genres...
-                                                XmlRpcValueArray awardsArray = (XmlRpcValueArray)dmem.Data;
+                                                var awardsArray = (XmlRpcValueArray)dmem.Data;
                                                 foreach (XmlRpcValueBasic award in awardsArray.Values)
                                                 {
                                                     R.Awards.Add(award.Data.ToString());
@@ -1232,7 +1232,7 @@ namespace OpenSubtitlesHandler
                                             case "genres":
                                                 OSHConsole.WriteLine(">" + dmem.Name + "= ");
                                                 // this is an array of genres...
-                                                XmlRpcValueArray genresArray = (XmlRpcValueArray)dmem.Data;
+                                                var genresArray = (XmlRpcValueArray)dmem.Data;
                                                 foreach (XmlRpcValueBasic genre in genresArray.Values)
                                                 {
                                                     R.Genres.Add(genre.Data.ToString());
@@ -1242,7 +1242,7 @@ namespace OpenSubtitlesHandler
                                             case "country":
                                                 OSHConsole.WriteLine(">" + dmem.Name + "= ");
                                                 // this is an array of country...
-                                                XmlRpcValueArray countryArray = (XmlRpcValueArray)dmem.Data;
+                                                var countryArray = (XmlRpcValueArray)dmem.Data;
                                                 foreach (XmlRpcValueBasic country in countryArray.Values)
                                                 {
                                                     R.Country.Add(country.Data.ToString());
@@ -1252,7 +1252,7 @@ namespace OpenSubtitlesHandler
                                             case "language":
                                                 OSHConsole.WriteLine(">" + dmem.Name + "= ");
                                                 // this is an array of language...
-                                                XmlRpcValueArray languageArray = (XmlRpcValueArray)dmem.Data;
+                                                var languageArray = (XmlRpcValueArray)dmem.Data;
                                                 foreach (XmlRpcValueBasic language in languageArray.Values)
                                                 {
                                                     R.Language.Add(language.Data.ToString());
@@ -1262,7 +1262,7 @@ namespace OpenSubtitlesHandler
                                             case "certification":
                                                 OSHConsole.WriteLine(">" + dmem.Name + "= ");
                                                 // this is an array of certification...
-                                                XmlRpcValueArray certificationArray = (XmlRpcValueArray)dmem.Data;
+                                                var certificationArray = (XmlRpcValueArray)dmem.Data;
                                                 foreach (XmlRpcValueBasic certification in certificationArray.Values)
                                                 {
                                                     R.Certification.Add(certification.Data.ToString());
@@ -1304,16 +1304,16 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             // Add token param
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
             // Add movieinfo struct
-            XmlRpcValueStruct movieinfo = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
+            var movieinfo = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
             movieinfo.Members.Add(new XmlRpcStructMember("moviename", new XmlRpcValueBasic(movieName)));
             movieinfo.Members.Add(new XmlRpcStructMember("movieyear", new XmlRpcValueBasic(movieyear)));
             parms.Add(movieinfo);
             // Call !
-            XmlRpcMethodCall call = new XmlRpcMethodCall("InsertMovie", parms);
+            var call = new XmlRpcMethodCall("InsertMovie", parms);
             OSHConsole.WriteLine("Sending InsertMovie request to the server ...", DebugCode.Good);
             // Send the request to the server
             string response = Utilities.GetStreamString(Utilities.SendRequest(XmlRpcGenerator.Generate(call), XML_PRC_USERAGENT));
@@ -1325,12 +1325,12 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseInsertMovie R = new MethodResponseInsertMovie();
+                        var R = new MethodResponseInsertMovie();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             if (MEMBER.Name == "status")
                             {
@@ -1373,11 +1373,11 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
-            foreach (InsertMovieHashParameters p in parameters)
+            foreach (var p in parameters)
             {
-                XmlRpcValueStruct pstruct = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
+                var pstruct = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
                 pstruct.Members.Add(new XmlRpcStructMember("moviehash", new XmlRpcValueBasic(p.moviehash)));
                 pstruct.Members.Add(new XmlRpcStructMember("moviebytesize", new XmlRpcValueBasic(p.moviebytesize)));
                 pstruct.Members.Add(new XmlRpcStructMember("imdbid", new XmlRpcValueBasic(p.imdbid)));
@@ -1386,7 +1386,7 @@ namespace OpenSubtitlesHandler
                 pstruct.Members.Add(new XmlRpcStructMember("moviefilename", new XmlRpcValueBasic(p.moviefilename)));
                 parms.Add(pstruct);
             }
-            XmlRpcMethodCall call = new XmlRpcMethodCall("InsertMovieHash", parms);
+            var call = new XmlRpcMethodCall("InsertMovieHash", parms);
 
             OSHConsole.WriteLine("Sending InsertMovieHash request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -1399,12 +1399,12 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseInsertMovieHash R = new MethodResponseInsertMovieHash();
+                        var R = new MethodResponseInsertMovieHash();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
@@ -1417,14 +1417,14 @@ namespace OpenSubtitlesHandler
                                     OSHConsole.WriteLine(">" + MEMBER.Name + "= " + MEMBER.Data.Data.ToString());
                                     break;
                                 case "data":
-                                    XmlRpcValueStruct dataStruct = (XmlRpcValueStruct)MEMBER.Data;
-                                    foreach (XmlRpcStructMember dataMember in dataStruct.Members)
+                                    var dataStruct = (XmlRpcValueStruct)MEMBER.Data;
+                                    foreach (var dataMember in dataStruct.Members)
                                     {
                                         switch (dataMember.Name)
                                         {
                                             case "accepted_moviehashes":
-                                                XmlRpcValueArray mh = (XmlRpcValueArray)dataMember.Data;
-                                                foreach (IXmlRpcValue val in mh.Values)
+                                                var mh = (XmlRpcValueArray)dataMember.Data;
+                                                foreach (var val in mh.Values)
                                                 {
                                                     if (val is XmlRpcValueBasic)
                                                     {
@@ -1433,8 +1433,8 @@ namespace OpenSubtitlesHandler
                                                 }
                                                 break;
                                             case "new_imdbs":
-                                                XmlRpcValueArray mi = (XmlRpcValueArray)dataMember.Data;
-                                                foreach (IXmlRpcValue val in mi.Values)
+                                                var mi = (XmlRpcValueArray)dataMember.Data;
+                                                foreach (var val in mi.Values)
                                                 {
                                                     if (val is XmlRpcValueBasic)
                                                     {
@@ -1472,10 +1472,10 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
             parms.Add(new XmlRpcValueBasic(XML_PRC_USERAGENT, XmlRpcBasicValueType.String));
-            XmlRpcMethodCall call = new XmlRpcMethodCall("ServerInfo", parms);
+            var call = new XmlRpcMethodCall("ServerInfo", parms);
 
             OSHConsole.WriteLine("Sending ServerInfo request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -1488,12 +1488,12 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseServerInfo R = new MethodResponseServerInfo();
+                        var R = new MethodResponseServerInfo();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
@@ -1568,8 +1568,8 @@ namespace OpenSubtitlesHandler
                                 case "last_update_strings":
                                     //R.total_subtitles_languages = (string)MEMBER.Data.Data;
                                     OSHConsole.WriteLine(">" + MEMBER.Name + ":");
-                                    XmlRpcValueStruct luStruct = (XmlRpcValueStruct)MEMBER.Data;
-                                    foreach (XmlRpcStructMember luMemeber in luStruct.Members)
+                                    var luStruct = (XmlRpcValueStruct)MEMBER.Data;
+                                    foreach (var luMemeber in luStruct.Members)
                                     {
                                         R.last_update_strings.Add(luMemeber.Name + " [" + luMemeber.Data.Data.ToString() + "]");
                                         OSHConsole.WriteLine("  >" + luMemeber.Name + "= " + luMemeber.Data.Data.ToString());
@@ -1602,10 +1602,10 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
             parms.Add(new XmlRpcValueBasic(IDSubMovieFile, XmlRpcBasicValueType.String));
-            XmlRpcMethodCall call = new XmlRpcMethodCall("ReportWrongMovieHash", parms);
+            var call = new XmlRpcMethodCall("ReportWrongMovieHash", parms);
 
             OSHConsole.WriteLine("Sending ReportWrongMovieHash request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -1618,12 +1618,12 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseReportWrongMovieHash R = new MethodResponseReportWrongMovieHash();
+                        var R = new MethodResponseReportWrongMovieHash();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
@@ -1666,14 +1666,14 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
-            XmlRpcValueStruct s = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
+            var s = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
             s.Members.Add(new XmlRpcStructMember("moviehash", new XmlRpcValueBasic(moviehash)));
             s.Members.Add(new XmlRpcStructMember("moviebytesize", new XmlRpcValueBasic(moviebytesize)));
             s.Members.Add(new XmlRpcStructMember("imdbid", new XmlRpcValueBasic(imdbid)));
             parms.Add(s);
-            XmlRpcMethodCall call = new XmlRpcMethodCall("ReportWrongImdbMovie", parms);
+            var call = new XmlRpcMethodCall("ReportWrongImdbMovie", parms);
 
             OSHConsole.WriteLine("Sending ReportWrongImdbMovie request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -1686,12 +1686,12 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseAddComment R = new MethodResponseAddComment();
+                        var R = new MethodResponseAddComment();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
@@ -1725,13 +1725,13 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
-            XmlRpcValueStruct s = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
+            var s = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
             s.Members.Add(new XmlRpcStructMember("idsubtitle", new XmlRpcValueBasic(idsubtitle)));
             s.Members.Add(new XmlRpcStructMember("score", new XmlRpcValueBasic(score)));
             parms.Add(s);
-            XmlRpcMethodCall call = new XmlRpcMethodCall("SubtitlesVote", parms);
+            var call = new XmlRpcMethodCall("SubtitlesVote", parms);
 
             OSHConsole.WriteLine("Sending SubtitlesVote request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -1744,20 +1744,20 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseSubtitlesVote R = new MethodResponseSubtitlesVote();
+                        var R = new MethodResponseSubtitlesVote();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
                                 case "status": R.Status = (string)MEMBER.Data.Data; OSHConsole.WriteLine(">" + MEMBER.Name + "= " + MEMBER.Data.Data.ToString()); break;
                                 case "seconds": R.Seconds = (double)MEMBER.Data.Data; OSHConsole.WriteLine(">" + MEMBER.Name + "= " + MEMBER.Data.Data.ToString()); break;
                                 case "data":
-                                    XmlRpcValueStruct dataStruct = (XmlRpcValueStruct)MEMBER.Data;
-                                    foreach (XmlRpcStructMember dataMemeber in dataStruct.Members)
+                                    var dataStruct = (XmlRpcValueStruct)MEMBER.Data;
+                                    foreach (var dataMemeber in dataStruct.Members)
                                     {
                                         OSHConsole.WriteLine("  >" + dataMemeber.Name + "= " + dataMemeber.Data.Data.ToString());
                                         switch (dataMemeber.Name)
@@ -1797,14 +1797,14 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
-            XmlRpcValueStruct s = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
+            var s = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
             s.Members.Add(new XmlRpcStructMember("idsubtitle", new XmlRpcValueBasic(idsubtitle)));
             s.Members.Add(new XmlRpcStructMember("comment", new XmlRpcValueBasic(comment)));
             s.Members.Add(new XmlRpcStructMember("badsubtitle", new XmlRpcValueBasic(badsubtitle)));
             parms.Add(s);
-            XmlRpcMethodCall call = new XmlRpcMethodCall("AddComment", parms);
+            var call = new XmlRpcMethodCall("AddComment", parms);
 
             OSHConsole.WriteLine("Sending AddComment request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -1817,12 +1817,12 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseAddComment R = new MethodResponseAddComment();
+                        var R = new MethodResponseAddComment();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
@@ -1857,14 +1857,14 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
-            XmlRpcValueStruct s = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
+            var s = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
             s.Members.Add(new XmlRpcStructMember("sublanguageid", new XmlRpcValueBasic(sublanguageid)));
             s.Members.Add(new XmlRpcStructMember("idmovieimdb", new XmlRpcValueBasic(idmovieimdb)));
             s.Members.Add(new XmlRpcStructMember("comment", new XmlRpcValueBasic(comment)));
             parms.Add(s);
-            XmlRpcMethodCall call = new XmlRpcMethodCall("AddRequest", parms);
+            var call = new XmlRpcMethodCall("AddRequest", parms);
 
             OSHConsole.WriteLine("Sending AddRequest request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -1877,20 +1877,20 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseAddRequest R = new MethodResponseAddRequest();
+                        var R = new MethodResponseAddRequest();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
                                 case "status": R.Status = (string)MEMBER.Data.Data; OSHConsole.WriteLine(">" + MEMBER.Name + "= " + MEMBER.Data.Data.ToString()); break;
                                 case "seconds": R.Seconds = (double)MEMBER.Data.Data; OSHConsole.WriteLine(">" + MEMBER.Name + "= " + MEMBER.Data.Data.ToString()); break;
                                 case "data":
-                                    XmlRpcValueStruct dataStruct = (XmlRpcValueStruct)MEMBER.Data;
-                                    foreach (XmlRpcStructMember dataMemeber in dataStruct.Members)
+                                    var dataStruct = (XmlRpcValueStruct)MEMBER.Data;
+                                    foreach (var dataMemeber in dataStruct.Members)
                                     {
                                         switch (dataMemeber.Name)
                                         {
@@ -1926,10 +1926,10 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN));
             parms.Add(new XmlRpcValueBasic(language));
-            XmlRpcMethodCall call = new XmlRpcMethodCall("GetSubLanguages", parms);
+            var call = new XmlRpcMethodCall("GetSubLanguages", parms);
 
             OSHConsole.WriteLine("Sending GetSubLanguages request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -1942,27 +1942,27 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseGetSubLanguages R = new MethodResponseGetSubLanguages();
+                        var R = new MethodResponseGetSubLanguages();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
                                 case "status": R.Status = (string)MEMBER.Data.Data; OSHConsole.WriteLine(">" + MEMBER.Name + "= " + MEMBER.Data.Data.ToString()); break;
                                 case "seconds": R.Seconds = (double)MEMBER.Data.Data; OSHConsole.WriteLine(">" + MEMBER.Name + "= " + MEMBER.Data.Data.ToString()); break;
                                 case "data":// array of structs
-                                    XmlRpcValueArray array = (XmlRpcValueArray)MEMBER.Data;
-                                    foreach (IXmlRpcValue value in array.Values)
+                                    var array = (XmlRpcValueArray)MEMBER.Data;
+                                    foreach (var value in array.Values)
                                     {
                                         if (value is XmlRpcValueStruct)
                                         {
-                                            XmlRpcValueStruct valueStruct = (XmlRpcValueStruct)value;
-                                            SubtitleLanguage lang = new SubtitleLanguage();
+                                            var valueStruct = (XmlRpcValueStruct)value;
+                                            var lang = new SubtitleLanguage();
                                             OSHConsole.WriteLine(">SubLanguage:");
-                                            foreach (XmlRpcStructMember langMemeber in valueStruct.Members)
+                                            foreach (var langMemeber in valueStruct.Members)
                                             {
                                                 OSHConsole.WriteLine("  >" + langMemeber.Name + "= " + langMemeber.Data.Data.ToString());
                                                 switch (langMemeber.Name)
@@ -2009,10 +2009,10 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
             // We need to gzip texts then code them with base 24
-            List<string> decodedTexts = new List<string>();
+            var decodedTexts = new List<string>();
             foreach (string text in texts)
             {
                 // compress
@@ -2025,7 +2025,7 @@ namespace OpenSubtitlesHandler
                 decodedTexts.Add(Convert.ToBase64String(data));
             }
             parms.Add(new XmlRpcValueArray(decodedTexts.ToArray()));
-            XmlRpcMethodCall call = new XmlRpcMethodCall("DetectLanguage", parms);
+            var call = new XmlRpcMethodCall("DetectLanguage", parms);
 
             OSHConsole.WriteLine("Sending DetectLanguage request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -2038,12 +2038,12 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseDetectLanguage R = new MethodResponseDetectLanguage();
+                        var R = new MethodResponseDetectLanguage();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
@@ -2053,10 +2053,10 @@ namespace OpenSubtitlesHandler
                                     if (MEMBER.Data is XmlRpcValueStruct)
                                     {
                                         OSHConsole.WriteLine(">Languages:");
-                                        XmlRpcValueStruct dataStruct = (XmlRpcValueStruct)MEMBER.Data;
-                                        foreach (XmlRpcStructMember dataMember in dataStruct.Members)
+                                        var dataStruct = (XmlRpcValueStruct)MEMBER.Data;
+                                        foreach (var dataMember in dataStruct.Members)
                                         {
-                                            DetectLanguageResult lang = new DetectLanguageResult();
+                                            var lang = new DetectLanguageResult();
                                             lang.InputSample = dataMember.Name;
                                             lang.LanguageID = dataMember.Data.Data.ToString();
                                             R.Results.Add(lang);
@@ -2095,10 +2095,10 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN));
             parms.Add(new XmlRpcValueBasic(program));
-            XmlRpcMethodCall call = new XmlRpcMethodCall("GetAvailableTranslations", parms);
+            var call = new XmlRpcMethodCall("GetAvailableTranslations", parms);
 
             OSHConsole.WriteLine("Sending GetAvailableTranslations request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -2111,29 +2111,29 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseGetAvailableTranslations R = new MethodResponseGetAvailableTranslations();
+                        var R = new MethodResponseGetAvailableTranslations();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
                                 case "status": R.Status = (string)MEMBER.Data.Data; OSHConsole.WriteLine(">" + MEMBER.Name + "= " + MEMBER.Data.Data.ToString()); break;
                                 case "seconds": R.Seconds = (double)MEMBER.Data.Data; OSHConsole.WriteLine(">" + MEMBER.Name + "= " + MEMBER.Data.Data.ToString()); break;
                                 case "data":
-                                    XmlRpcValueStruct dataStruct = (XmlRpcValueStruct)MEMBER.Data;
+                                    var dataStruct = (XmlRpcValueStruct)MEMBER.Data;
                                     OSHConsole.WriteLine(">data:");
-                                    foreach (XmlRpcStructMember dataMember in dataStruct.Members)
+                                    foreach (var dataMember in dataStruct.Members)
                                     {
                                         if (dataMember.Data is XmlRpcValueStruct)
                                         {
-                                            XmlRpcValueStruct resStruct = (XmlRpcValueStruct)dataMember.Data;
-                                            GetAvailableTranslationsResult res = new GetAvailableTranslationsResult();
+                                            var resStruct = (XmlRpcValueStruct)dataMember.Data;
+                                            var res = new GetAvailableTranslationsResult();
                                             res.LanguageID = dataMember.Name;
                                             OSHConsole.WriteLine("  >LanguageID: " + dataMember.Name);
-                                            foreach (XmlRpcStructMember resMember in resStruct.Members)
+                                            foreach (var resMember in resStruct.Members)
                                             {
                                                 switch (resMember.Name)
                                                 {
@@ -2178,12 +2178,12 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN));
             parms.Add(new XmlRpcValueBasic(iso639));
             parms.Add(new XmlRpcValueBasic(format));
             parms.Add(new XmlRpcValueBasic(program));
-            XmlRpcMethodCall call = new XmlRpcMethodCall("GetTranslation", parms);
+            var call = new XmlRpcMethodCall("GetTranslation", parms);
 
             OSHConsole.WriteLine("Sending GetTranslation request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -2197,12 +2197,12 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseGetTranslation R = new MethodResponseGetTranslation();
+                        var R = new MethodResponseGetTranslation();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
@@ -2236,12 +2236,12 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }*/
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             // parms.Add(new XmlRpcValueBasic(TOKEN));
             parms.Add(new XmlRpcValueBasic(program));
             // parms.Add(new XmlRpcValueBasic(XML_PRC_USERAGENT));
 
-            XmlRpcMethodCall call = new XmlRpcMethodCall("AutoUpdate", parms);
+            var call = new XmlRpcMethodCall("AutoUpdate", parms);
             OSHConsole.WriteLine("Sending AutoUpdate request to the server ...", DebugCode.Good);
             // Send the request to the server
             string response = Utilities.GetStreamString(Utilities.SendRequest(XmlRpcGenerator.Generate(call), XML_PRC_USERAGENT));
@@ -2253,12 +2253,12 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseAutoUpdate R = new MethodResponseAutoUpdate();
+                        var R = new MethodResponseAutoUpdate();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
@@ -2296,10 +2296,10 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN));
             parms.Add(new XmlRpcValueArray(hashes));
-            XmlRpcMethodCall call = new XmlRpcMethodCall("CheckMovieHash", parms);
+            var call = new XmlRpcMethodCall("CheckMovieHash", parms);
 
             OSHConsole.WriteLine("Sending CheckMovieHash request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -2312,27 +2312,27 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseCheckMovieHash R = new MethodResponseCheckMovieHash();
+                        var R = new MethodResponseCheckMovieHash();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
                                 case "status": R.Status = (string)MEMBER.Data.Data; OSHConsole.WriteLine(">" + MEMBER.Name + "= " + MEMBER.Data.Data.ToString()); break;
                                 case "seconds": R.Seconds = (double)MEMBER.Data.Data; OSHConsole.WriteLine(">" + MEMBER.Name + "= " + MEMBER.Data.Data.ToString()); break;
                                 case "data":
-                                    XmlRpcValueStruct dataStruct = (XmlRpcValueStruct)MEMBER.Data;
+                                    var dataStruct = (XmlRpcValueStruct)MEMBER.Data;
                                     OSHConsole.WriteLine(">Data:");
-                                    foreach (XmlRpcStructMember dataMember in dataStruct.Members)
+                                    foreach (var dataMember in dataStruct.Members)
                                     {
-                                        CheckMovieHashResult res = new CheckMovieHashResult();
+                                        var res = new CheckMovieHashResult();
                                         res.Name = dataMember.Name;
                                         OSHConsole.WriteLine("  >" + res.Name + ":");
-                                        XmlRpcValueStruct movieStruct = (XmlRpcValueStruct)dataMember.Data;
-                                        foreach (XmlRpcStructMember movieMember in movieStruct.Members)
+                                        var movieStruct = (XmlRpcValueStruct)dataMember.Data;
+                                        foreach (var movieMember in movieStruct.Members)
                                         {
                                             switch (movieMember.Name)
                                             {
@@ -2373,10 +2373,10 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN));
             parms.Add(new XmlRpcValueArray(hashes));
-            XmlRpcMethodCall call = new XmlRpcMethodCall("CheckMovieHash2", parms);
+            var call = new XmlRpcMethodCall("CheckMovieHash2", parms);
 
             OSHConsole.WriteLine("Sending CheckMovieHash2 request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -2389,31 +2389,31 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseCheckMovieHash2 R = new MethodResponseCheckMovieHash2();
+                        var R = new MethodResponseCheckMovieHash2();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
                                 case "status": R.Status = (string)MEMBER.Data.Data; OSHConsole.WriteLine(">" + MEMBER.Name + "= " + MEMBER.Data.Data.ToString()); break;
                                 case "seconds": R.Seconds = (double)MEMBER.Data.Data; OSHConsole.WriteLine(">" + MEMBER.Name + "= " + MEMBER.Data.Data.ToString()); break;
                                 case "data":
-                                    XmlRpcValueStruct dataStruct = (XmlRpcValueStruct)MEMBER.Data;
+                                    var dataStruct = (XmlRpcValueStruct)MEMBER.Data;
                                     OSHConsole.WriteLine(">Data:");
-                                    foreach (XmlRpcStructMember dataMember in dataStruct.Members)
+                                    foreach (var dataMember in dataStruct.Members)
                                     {
-                                        CheckMovieHash2Result res = new CheckMovieHash2Result();
+                                        var res = new CheckMovieHash2Result();
                                         res.Name = dataMember.Name;
                                         OSHConsole.WriteLine("  >" + res.Name + ":");
 
-                                        XmlRpcValueArray dataArray = (XmlRpcValueArray)dataMember.Data;
+                                        var dataArray = (XmlRpcValueArray)dataMember.Data;
                                         foreach (XmlRpcValueStruct movieStruct in dataArray.Values)
                                         {
-                                            CheckMovieHash2Data d = new CheckMovieHash2Data();
-                                            foreach (XmlRpcStructMember movieMember in movieStruct.Members)
+                                            var d = new CheckMovieHash2Data();
+                                            foreach (var movieMember in movieStruct.Members)
                                             {
                                                 switch (movieMember.Name)
                                                 {
@@ -2459,10 +2459,10 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN));
             parms.Add(new XmlRpcValueArray(hashes));
-            XmlRpcMethodCall call = new XmlRpcMethodCall("CheckSubHash", parms);
+            var call = new XmlRpcMethodCall("CheckSubHash", parms);
 
             OSHConsole.WriteLine("Sending CheckSubHash request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -2475,12 +2475,12 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseCheckSubHash R = new MethodResponseCheckSubHash();
+                        var R = new MethodResponseCheckSubHash();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
@@ -2488,11 +2488,11 @@ namespace OpenSubtitlesHandler
                                 case "seconds": R.Seconds = (double)MEMBER.Data.Data; OSHConsole.WriteLine(">" + MEMBER.Name + "= " + MEMBER.Data.Data.ToString()); break;
                                 case "data":
                                     OSHConsole.WriteLine(">Data:");
-                                    XmlRpcValueStruct dataStruct = (XmlRpcValueStruct)MEMBER.Data;
-                                    foreach (XmlRpcStructMember dataMember in dataStruct.Members)
+                                    var dataStruct = (XmlRpcValueStruct)MEMBER.Data;
+                                    foreach (var dataMember in dataStruct.Members)
                                     {
                                         OSHConsole.WriteLine("  >" + dataMember.Name + "= " + dataMember.Data.Data.ToString());
-                                        CheckSubHashResult r = new CheckSubHashResult();
+                                        var r = new CheckSubHashResult();
                                         r.Hash = dataMember.Name;
                                         r.SubID = dataMember.Data.Data.ToString();
                                         R.Results.Add(r);
@@ -2526,14 +2526,14 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN, XmlRpcBasicValueType.String));
-            XmlRpcValueStruct s = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
+            var s = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
             int i = 1;
-            foreach (TryUploadSubtitlesParameters cd in subs)
+            foreach (var cd in subs)
             {
-                XmlRpcStructMember member = new XmlRpcStructMember("cd" + i, null);
-                XmlRpcValueStruct memberStruct = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
+                var member = new XmlRpcStructMember("cd" + i, null);
+                var memberStruct = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
                 memberStruct.Members.Add(new XmlRpcStructMember("subhash", new XmlRpcValueBasic(cd.subhash)));
                 memberStruct.Members.Add(new XmlRpcStructMember("subfilename", new XmlRpcValueBasic(cd.subfilename)));
                 memberStruct.Members.Add(new XmlRpcStructMember("moviehash", new XmlRpcValueBasic(cd.moviehash)));
@@ -2547,7 +2547,7 @@ namespace OpenSubtitlesHandler
                 i++;
             }
             parms.Add(s);
-            XmlRpcMethodCall call = new XmlRpcMethodCall("TryUploadSubtitles", parms);
+            var call = new XmlRpcMethodCall("TryUploadSubtitles", parms);
 
             OSHConsole.WriteLine("Sending TryUploadSubtitles request to the server ...", DebugCode.Good);
             // Send the request to the server
@@ -2560,12 +2560,12 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseTryUploadSubtitles R = new MethodResponseTryUploadSubtitles();
+                        var R = new MethodResponseTryUploadSubtitles();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
@@ -2577,14 +2577,14 @@ namespace OpenSubtitlesHandler
                                     {
                                         OSHConsole.WriteLine("Results: ");
 
-                                        XmlRpcValueArray rarray = (XmlRpcValueArray)MEMBER.Data;
-                                        foreach (IXmlRpcValue subStruct in rarray.Values)
+                                        var rarray = (XmlRpcValueArray)MEMBER.Data;
+                                        foreach (var subStruct in rarray.Values)
                                         {
                                             if (subStruct == null) continue;
                                             if (!(subStruct is XmlRpcValueStruct)) continue;
 
-                                            SubtitleSearchResult result = new SubtitleSearchResult();
-                                            foreach (XmlRpcStructMember submember in ((XmlRpcValueStruct)subStruct).Members)
+                                            var result = new SubtitleSearchResult();
+                                            foreach (var submember in ((XmlRpcValueStruct)subStruct).Members)
                                             {
                                                 // To avoid errors of arranged info or missing ones, let's do it with switch..
                                                 switch (submember.Name)
@@ -2658,14 +2658,14 @@ namespace OpenSubtitlesHandler
                 return new MethodResponseError("Fail", "Can't do this call, 'token' value not set. Please use Log In method first.");
             }
             // Method call ..
-            List<IXmlRpcValue> parms = new List<IXmlRpcValue>();
+            var parms = new List<IXmlRpcValue>();
             parms.Add(new XmlRpcValueBasic(TOKEN));
             // Main struct
-            XmlRpcValueStruct s = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
+            var s = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
 
             // Base info member as struct
-            XmlRpcStructMember member = new XmlRpcStructMember("baseinfo", null);
-            XmlRpcValueStruct memberStruct = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
+            var member = new XmlRpcStructMember("baseinfo", null);
+            var memberStruct = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
             memberStruct.Members.Add(new XmlRpcStructMember("idmovieimdb", new XmlRpcValueBasic(info.idmovieimdb)));
             memberStruct.Members.Add(new XmlRpcStructMember("sublanguageid", new XmlRpcValueBasic(info.sublanguageid)));
             memberStruct.Members.Add(new XmlRpcStructMember("moviereleasename", new XmlRpcValueBasic(info.moviereleasename)));
@@ -2679,10 +2679,10 @@ namespace OpenSubtitlesHandler
 
             // CDS members
             int i = 1;
-            foreach (UploadSubtitleParameters cd in info.CDS)
+            foreach (var cd in info.CDS)
             {
-                XmlRpcStructMember member2 = new XmlRpcStructMember("cd" + i, null);
-                XmlRpcValueStruct memberStruct2 = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
+                var member2 = new XmlRpcStructMember("cd" + i, null);
+                var memberStruct2 = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
                 memberStruct2.Members.Add(new XmlRpcStructMember("subhash", new XmlRpcValueBasic(cd.subhash)));
                 memberStruct2.Members.Add(new XmlRpcStructMember("subfilename", new XmlRpcValueBasic(cd.subfilename)));
                 memberStruct2.Members.Add(new XmlRpcStructMember("moviehash", new XmlRpcValueBasic(cd.moviehash)));
@@ -2701,7 +2701,7 @@ namespace OpenSubtitlesHandler
             parms.Add(s);
             // add user agent
             //parms.Add(new XmlRpcValueBasic(XML_PRC_USERAGENT));
-            XmlRpcMethodCall call = new XmlRpcMethodCall("UploadSubtitles", parms);
+            var call = new XmlRpcMethodCall("UploadSubtitles", parms);
             OSHConsole.WriteLine("Sending UploadSubtitles request to the server ...", DebugCode.Good);
             // Send the request to the server
             string response = Utilities.GetStreamString(Utilities.SendRequest(XmlRpcGenerator.Generate(call), XML_PRC_USERAGENT));
@@ -2713,12 +2713,12 @@ namespace OpenSubtitlesHandler
                 {
                     if (calls[0].Parameters.Count > 0)
                     {
-                        XmlRpcValueStruct mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
+                        var mainStruct = (XmlRpcValueStruct)calls[0].Parameters[0];
                         // Create the response, we'll need it later
-                        MethodResponseUploadSubtitles R = new MethodResponseUploadSubtitles();
+                        var R = new MethodResponseUploadSubtitles();
 
                         // To make sure response is not currepted by server, do it in loop
-                        foreach (XmlRpcStructMember MEMBER in mainStruct.Members)
+                        foreach (var MEMBER in mainStruct.Members)
                         {
                             switch (MEMBER.Name)
                             {
diff --git a/OpenSubtitlesHandler/Utilities.cs b/OpenSubtitlesHandler/Utilities.cs
index 468fdd2543..8ea0c546d6 100644
--- a/OpenSubtitlesHandler/Utilities.cs
+++ b/OpenSubtitlesHandler/Utilities.cs
@@ -56,9 +56,9 @@ namespace OpenSubtitlesHandler
         /// <returns>Bytes array of decompressed data</returns>
         public static byte[] Decompress(Stream dataToDecompress)
         {
-            using (MemoryStream target = new MemoryStream())
+            using (var target = new MemoryStream())
             {
-                using (System.IO.Compression.GZipStream decompressionStream = new System.IO.Compression.GZipStream(dataToDecompress, System.IO.Compression.CompressionMode.Decompress))
+                using (var decompressionStream = new System.IO.Compression.GZipStream(dataToDecompress, System.IO.Compression.CompressionMode.Decompress))
                 {
                     decompressionStream.CopyTo(target);
                 }
@@ -116,7 +116,7 @@ namespace OpenSubtitlesHandler
             using (responseStream)
             {
                 // Handle response, should be XML text.
-                List<byte> data = new List<byte>();
+                var data = new List<byte>();
                 while (true)
                 {
                     int r = responseStream.ReadByte();
diff --git a/OpenSubtitlesHandler/XML-RPC/Values/XmlRpcValueArray.cs b/OpenSubtitlesHandler/XML-RPC/Values/XmlRpcValueArray.cs
index 3303e38487..d10a80175b 100644
--- a/OpenSubtitlesHandler/XML-RPC/Values/XmlRpcValueArray.cs
+++ b/OpenSubtitlesHandler/XML-RPC/Values/XmlRpcValueArray.cs
@@ -82,7 +82,7 @@ namespace XmlRpcHandler
             base()
         {
             values = new List<IXmlRpcValue>();
-            foreach (DateTime val in dates)
+            foreach (var val in dates)
             {
                 values.Add(new XmlRpcValueBasic(val));
             }
@@ -91,7 +91,7 @@ namespace XmlRpcHandler
             base()
         {
             values = new List<IXmlRpcValue>();
-            foreach (XmlRpcValueBasic val in basicValues)
+            foreach (var val in basicValues)
             {
                 values.Add(val);
             }
@@ -100,7 +100,7 @@ namespace XmlRpcHandler
             base()
         {
             values = new List<IXmlRpcValue>();
-            foreach (XmlRpcValueStruct val in structs)
+            foreach (var val in structs)
             {
                 values.Add(val);
             }
@@ -109,7 +109,7 @@ namespace XmlRpcHandler
             base()
         {
             values = new List<IXmlRpcValue>();
-            foreach (XmlRpcValueArray val in arrays)
+            foreach (var val in arrays)
             {
                 values.Add(val);
             }
diff --git a/OpenSubtitlesHandler/XML-RPC/XmlRpcGenerator.cs b/OpenSubtitlesHandler/XML-RPC/XmlRpcGenerator.cs
index 3d02622da8..b1351f9e3a 100644
--- a/OpenSubtitlesHandler/XML-RPC/XmlRpcGenerator.cs
+++ b/OpenSubtitlesHandler/XML-RPC/XmlRpcGenerator.cs
@@ -50,17 +50,17 @@ namespace XmlRpcHandler
             if (methods.Length == 0)
                 throw new Exception("No method to write !");
             // Create xml
-            XmlWriterSettings sett = new XmlWriterSettings();
+            var sett = new XmlWriterSettings();
             sett.Indent = true;
 
             sett.Encoding = Encoding.UTF8;
 
             using (var ms = new MemoryStream())
             {
-                using (XmlWriter XMLwrt = XmlWriter.Create(ms, sett))
+                using (var XMLwrt = XmlWriter.Create(ms, sett))
                 {
                     // Let's write the methods
-                    foreach (XmlRpcMethodCall method in methods)
+                    foreach (var method in methods)
                     {
                         XMLwrt.WriteStartElement("methodCall");//methodCall
                         XMLwrt.WriteStartElement("methodName");//methodName
@@ -68,7 +68,7 @@ namespace XmlRpcHandler
                         XMLwrt.WriteEndElement();//methodName
                         XMLwrt.WriteStartElement("params");//params
                                                            // Write values
-                        foreach (IXmlRpcValue p in method.Parameters)
+                        foreach (var p in method.Parameters)
                         {
                             XMLwrt.WriteStartElement("param");//param
                             if (p is XmlRpcValueBasic)
@@ -101,8 +101,8 @@ namespace XmlRpcHandler
         /// <returns></returns>
         public static XmlRpcMethodCall[] DecodeMethodResponse(string xmlResponse)
         {
-            List<XmlRpcMethodCall> methods = new List<XmlRpcMethodCall>();
-            XmlReaderSettings sett = new XmlReaderSettings();
+            var methods = new List<XmlRpcMethodCall>();
+            var sett = new XmlReaderSettings();
             sett.DtdProcessing = DtdProcessing.Ignore;
             sett.IgnoreWhitespace = true;
             MemoryStream str;
@@ -116,15 +116,15 @@ namespace XmlRpcHandler
             }
             using (str)
             {
-                using (XmlReader XMLread = XmlReader.Create(str, sett))
+                using (var XMLread = XmlReader.Create(str, sett))
                 {
-                    XmlRpcMethodCall call = new XmlRpcMethodCall("methodResponse");
+                    var call = new XmlRpcMethodCall("methodResponse");
                     // Read parameters
                     while (XMLread.Read())
                     {
                         if (XMLread.Name == "param" && XMLread.IsStartElement())
                         {
-                            IXmlRpcValue val = ReadValue(XMLread);
+                            var val = ReadValue(XMLread);
                             if (val != null)
                                 call.Parameters.Add(val);
                         }
@@ -169,7 +169,7 @@ namespace XmlRpcHandler
                     // Get date time format
                     if (val.Data != null)
                     {
-                        DateTime time = (DateTime)val.Data;
+                        var time = (DateTime)val.Data;
                         string dt = time.Year + time.Month.ToString("D2") + time.Day.ToString("D2") +
                             "T" + time.Hour.ToString("D2") + ":" + time.Minute.ToString("D2") + ":" +
                             time.Second.ToString("D2");
@@ -190,7 +190,7 @@ namespace XmlRpcHandler
         {
             XMLwrt.WriteStartElement("value");//value
             XMLwrt.WriteStartElement("struct");//struct
-            foreach (XmlRpcStructMember member in val.Members)
+            foreach (var member in val.Members)
             {
                 XMLwrt.WriteStartElement("member");//member
 
@@ -221,7 +221,7 @@ namespace XmlRpcHandler
             XMLwrt.WriteStartElement("value");//value
             XMLwrt.WriteStartElement("array");//array
             XMLwrt.WriteStartElement("data");//data
-            foreach (IXmlRpcValue o in val.Values)
+            foreach (var o in val.Values)
             {
                 if (o is XmlRpcValueBasic)
                 {
@@ -283,7 +283,7 @@ namespace XmlRpcHandler
                         int hour = int.Parse(date.Substring(9, 2), UsCulture);
                         int minute = int.Parse(date.Substring(12, 2), UsCulture);//19980717T14:08:55
                         int sec = int.Parse(date.Substring(15, 2), UsCulture);
-                        DateTime time = new DateTime(year, month, day, hour, minute, sec);
+                        var time = new DateTime(year, month, day, hour, minute, sec);
                         return new XmlRpcValueBasic(time, XmlRpcBasicValueType.dateTime_iso8601);
                     }
                     else if (xmlReader.Name == "base64" && xmlReader.IsStartElement())
@@ -293,17 +293,17 @@ namespace XmlRpcHandler
                     }
                     else if (xmlReader.Name == "struct" && xmlReader.IsStartElement())
                     {
-                        XmlRpcValueStruct strct = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
+                        var strct = new XmlRpcValueStruct(new List<XmlRpcStructMember>());
                         // Read members...
                         while (xmlReader.Read())
                         {
                             if (xmlReader.Name == "member" && xmlReader.IsStartElement())
                             {
-                                XmlRpcStructMember member = new XmlRpcStructMember("", null);
+                                var member = new XmlRpcStructMember("", null);
                                 xmlReader.Read();// read name
                                 member.Name = ReadString(xmlReader);
 
-                                IXmlRpcValue val = ReadValue(xmlReader, true);
+                                var val = ReadValue(xmlReader, true);
                                 if (val != null)
                                 {
                                     member.Data = val;
@@ -319,7 +319,7 @@ namespace XmlRpcHandler
                     }
                     else if (xmlReader.Name == "array" && xmlReader.IsStartElement())
                     {
-                        XmlRpcValueArray array = new XmlRpcValueArray();
+                        var array = new XmlRpcValueArray();
                         // Read members...
                         while (xmlReader.Read())
                         {
@@ -329,7 +329,7 @@ namespace XmlRpcHandler
                             }
                             else
                             {
-                                IXmlRpcValue val = ReadValue(xmlReader);
+                                var val = ReadValue(xmlReader);
                                 if (val != null)
                                     array.Values.Add(val);
                             }
diff --git a/RSSDP/DeviceAvailableEventArgs.cs b/RSSDP/DeviceAvailableEventArgs.cs
index e52e801c49..9106e27e53 100644
--- a/RSSDP/DeviceAvailableEventArgs.cs
+++ b/RSSDP/DeviceAvailableEventArgs.cs
@@ -7,7 +7,7 @@ using MediaBrowser.Model.Net;
 namespace Rssdp
 {
     /// <summary>
-    /// Event arguments for the <see cref="Rssdp.Infrastructure.SsdpDeviceLocatorBase.DeviceAvailable"/> event.
+    /// Event arguments for the <see cref="Infrastructure.SsdpDeviceLocatorBase.DeviceAvailable"/> event.
     /// </summary>
     public sealed class DeviceAvailableEventArgs : EventArgs
     {
@@ -18,17 +18,17 @@ namespace Rssdp
         private readonly DiscoveredSsdpDevice _DiscoveredDevice;
 		private readonly bool _IsNewlyDiscovered;
 
-		#endregion
+        #endregion
 
-		#region Constructors
+        #region Constructors
 
-		/// <summary>
-		/// Full constructor.
-		/// </summary>
-		/// <param name="discoveredDevice">A <see cref="DiscoveredSsdpDevice"/> instance representing the available device.</param>
-		/// <param name="isNewlyDiscovered">A boolean value indicating whether or not this device came from the cache. See <see cref="IsNewlyDiscovered"/> for more detail.</param>
-		/// <exception cref="System.ArgumentNullException">Thrown if the <paramref name="discoveredDevice"/> parameter is null.</exception>
-		public DeviceAvailableEventArgs(DiscoveredSsdpDevice discoveredDevice, bool isNewlyDiscovered)
+        /// <summary>
+        /// Full constructor.
+        /// </summary>
+        /// <param name="discoveredDevice">A <see cref="DiscoveredSsdpDevice"/> instance representing the available device.</param>
+        /// <param name="isNewlyDiscovered">A boolean value indicating whether or not this device came from the cache. See <see cref="IsNewlyDiscovered"/> for more detail.</param>
+        /// <exception cref="ArgumentNullException">Thrown if the <paramref name="discoveredDevice"/> parameter is null.</exception>
+        public DeviceAvailableEventArgs(DiscoveredSsdpDevice discoveredDevice, bool isNewlyDiscovered)
 		{
 			if (discoveredDevice == null) throw new ArgumentNullException(nameof(discoveredDevice));
 
@@ -48,10 +48,10 @@ namespace Rssdp
 			get { return _IsNewlyDiscovered; }
 		}
 
-		/// <summary>
-		/// A reference to a <see cref="Rssdp.DiscoveredSsdpDevice"/> instance containing the discovered details and allowing access to the full device description.
-		/// </summary>
-		public DiscoveredSsdpDevice DiscoveredDevice
+        /// <summary>
+        /// A reference to a <see cref="DiscoveredSsdpDevice"/> instance containing the discovered details and allowing access to the full device description.
+        /// </summary>
+        public DiscoveredSsdpDevice DiscoveredDevice
 		{
 			get { return _DiscoveredDevice; }
 		} 
diff --git a/RSSDP/DeviceEventArgs.cs b/RSSDP/DeviceEventArgs.cs
index 55b23b68c9..3925ba2481 100644
--- a/RSSDP/DeviceEventArgs.cs
+++ b/RSSDP/DeviceEventArgs.cs
@@ -22,7 +22,7 @@ namespace Rssdp
         /// Constructs a new instance for the specified <see cref="SsdpDevice"/>.
         /// </summary>
         /// <param name="device">The <see cref="SsdpDevice"/> associated with the event this argument class is being used for.</param>
-        /// <exception cref="System.ArgumentNullException">Thrown if the <paramref name="device"/> argument is null.</exception>
+        /// <exception cref="ArgumentNullException">Thrown if the <paramref name="device"/> argument is null.</exception>
         public DeviceEventArgs(SsdpDevice device)
         {
             if (device == null) throw new ArgumentNullException(nameof(device));
diff --git a/RSSDP/DeviceUnavailableEventArgs.cs b/RSSDP/DeviceUnavailableEventArgs.cs
index ecba7c0132..d90ddfb603 100644
--- a/RSSDP/DeviceUnavailableEventArgs.cs
+++ b/RSSDP/DeviceUnavailableEventArgs.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 namespace Rssdp
 {
     /// <summary>
-    /// Event arguments for the <see cref="Rssdp.Infrastructure.SsdpDeviceLocatorBase.DeviceUnavailable"/> event.
+    /// Event arguments for the <see cref="Infrastructure.SsdpDeviceLocatorBase.DeviceUnavailable"/> event.
     /// </summary>
     public sealed class DeviceUnavailableEventArgs : EventArgs
     {
@@ -25,7 +25,7 @@ namespace Rssdp
         /// </summary>
         /// <param name="discoveredDevice">A <see cref="DiscoveredSsdpDevice"/> instance representing the device that has become unavailable.</param>
         /// <param name="expired">A boolean value indicating whether this device is unavailable because it expired, or because it explicitly sent a byebye notification.. See <see cref="Expired"/> for more detail.</param>
-        /// <exception cref="System.ArgumentNullException">Thrown if the <paramref name="discoveredDevice"/> parameter is null.</exception>
+        /// <exception cref="ArgumentNullException">Thrown if the <paramref name="discoveredDevice"/> parameter is null.</exception>
         public DeviceUnavailableEventArgs(DiscoveredSsdpDevice discoveredDevice, bool expired)
         {
             if (discoveredDevice == null) throw new ArgumentNullException(nameof(discoveredDevice));
@@ -47,7 +47,7 @@ namespace Rssdp
         }
 
         /// <summary>
-        /// A reference to a <see cref="Rssdp.DiscoveredSsdpDevice"/> instance containing the discovery details of the removed device.
+        /// A reference to a <see cref="DiscoveredSsdpDevice"/> instance containing the discovery details of the removed device.
         /// </summary>
         public DiscoveredSsdpDevice DiscoveredDevice
         {
diff --git a/RSSDP/DiscoveredSsdpDevice.cs b/RSSDP/DiscoveredSsdpDevice.cs
index b643e3f081..f42e7c6747 100644
--- a/RSSDP/DiscoveredSsdpDevice.cs
+++ b/RSSDP/DiscoveredSsdpDevice.cs
@@ -11,7 +11,7 @@ namespace Rssdp
     /// Represents a discovered device, containing basic information about the device and the location of it's full device description document. Also provides convenience methods for retrieving the device description document.
     /// </summary>
     /// <seealso cref="SsdpDevice"/>
-    /// <seealso cref="Rssdp.Infrastructure.ISsdpDeviceLocator"/>
+    /// <seealso cref="Infrastructure.ISsdpDeviceLocator"/>
     public sealed class DiscoveredSsdpDevice
     {
 
diff --git a/RSSDP/DisposableManagedObjectBase.cs b/RSSDP/DisposableManagedObjectBase.cs
index 9933194bc8..0f656fb469 100644
--- a/RSSDP/DisposableManagedObjectBase.cs
+++ b/RSSDP/DisposableManagedObjectBase.cs
@@ -20,10 +20,10 @@ namespace Rssdp.Infrastructure
         protected abstract void Dispose(bool disposing);
 
         /// <summary>
-        /// Throws and <see cref="System.ObjectDisposedException"/> if the <see cref="IsDisposed"/> property is true.
+        /// Throws and <see cref="ObjectDisposedException"/> if the <see cref="IsDisposed"/> property is true.
         /// </summary>
         /// <seealso cref="IsDisposed"/>
-        /// <exception cref="System.ObjectDisposedException">Thrown if the <see cref="IsDisposed"/> property is true.</exception>
+        /// <exception cref="ObjectDisposedException">Thrown if the <see cref="IsDisposed"/> property is true.</exception>
         /// <seealso cref="Dispose()"/>
         protected virtual void ThrowIfDisposed()
         {
diff --git a/RSSDP/HttpParserBase.cs b/RSSDP/HttpParserBase.cs
index db496fe6fa..18712470da 100644
--- a/RSSDP/HttpParserBase.cs
+++ b/RSSDP/HttpParserBase.cs
@@ -26,19 +26,19 @@ namespace Rssdp.Infrastructure
         private static byte[] EmptyByteArray = new byte[]{};
 
         /// <summary>
-        /// Parses the <paramref name="data"/> provided into either a <see cref="System.Net.Http.HttpRequestMessage"/> or <see cref="System.Net.Http.HttpResponseMessage"/> object.
+        /// Parses the <paramref name="data"/> provided into either a <see cref="HttpRequestMessage"/> or <see cref="HttpResponseMessage"/> object.
         /// </summary>
         /// <param name="data">A string containing the HTTP message to parse.</param>
-        /// <returns>Either a <see cref="System.Net.Http.HttpRequestMessage"/> or <see cref="System.Net.Http.HttpResponseMessage"/> object containing the parsed data.</returns>
+        /// <returns>Either a <see cref="HttpRequestMessage"/> or <see cref="HttpResponseMessage"/> object containing the parsed data.</returns>
         public abstract T Parse(string data);
 
         /// <summary>
-        /// Parses a string containing either an HTTP request or response into a <see cref="System.Net.Http.HttpRequestMessage"/> or <see cref="System.Net.Http.HttpResponseMessage"/> object.
+        /// Parses a string containing either an HTTP request or response into a <see cref="HttpRequestMessage"/> or <see cref="HttpResponseMessage"/> object.
         /// </summary>
-        /// <param name="message">A <see cref="System.Net.Http.HttpRequestMessage"/> or <see cref="System.Net.Http.HttpResponseMessage"/> object representing the parsed message.</param>
+        /// <param name="message">A <see cref="HttpRequestMessage"/> or <see cref="HttpResponseMessage"/> object representing the parsed message.</param>
         /// <param name="headers">A reference to the <see cref="System.Net.Http.Headers.HttpHeaders"/> collection for the <paramref name="message"/> object.</param>
         /// <param name="data">A string containing the data to be parsed.</param>
-        /// <returns>An <see cref="System.Net.Http.HttpContent"/> object containing the content of the parsed message.</returns>
+        /// <returns>An <see cref="HttpContent"/> object containing the content of the parsed message.</returns>
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2202:Do not dispose objects multiple times", Justification = "Honestly, it's fine. MemoryStream doesn't mind.")]
         protected virtual void Parse(T message, System.Net.Http.Headers.HttpHeaders headers, string data)
         {
@@ -61,7 +61,7 @@ namespace Rssdp.Infrastructure
         /// Used to parse the first line of an HTTP request or response and assign the values to the appropriate properties on the <paramref name="message"/>.
         /// </summary>
         /// <param name="data">The first line of the HTTP message to be parsed.</param>
-        /// <param name="message">Either a <see cref="System.Net.Http.HttpResponseMessage"/> or <see cref="System.Net.Http.HttpRequestMessage"/> to assign the parsed values to.</param>
+        /// <param name="message">Either a <see cref="HttpResponseMessage"/> or <see cref="HttpRequestMessage"/> to assign the parsed values to.</param>
         protected abstract void ParseStatusLine(string data, T message);
 
         /// <summary>
diff --git a/RSSDP/HttpRequestParser.cs b/RSSDP/HttpRequestParser.cs
index 1af7f0d515..d4505b8ad6 100644
--- a/RSSDP/HttpRequestParser.cs
+++ b/RSSDP/HttpRequestParser.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 namespace Rssdp.Infrastructure
 {
     /// <summary>
-    /// Parses a string into a <see cref="System.Net.Http.HttpRequestMessage"/> or throws an exception.
+    /// Parses a string into a <see cref="HttpRequestMessage"/> or throws an exception.
     /// </summary>
     public sealed class HttpRequestParser : HttpParserBase<HttpRequestMessage>
     {
@@ -26,17 +26,17 @@ namespace Rssdp.Infrastructure
         #region Public Methods
 
         /// <summary>
-        /// Parses the specified data into a <see cref="System.Net.Http.HttpRequestMessage"/> instance.
+        /// Parses the specified data into a <see cref="HttpRequestMessage"/> instance.
         /// </summary>
         /// <param name="data">A string containing the data to parse.</param>
-        /// <returns>A <see cref="System.Net.Http.HttpRequestMessage"/> instance containing the parsed data.</returns>
-        public override System.Net.Http.HttpRequestMessage Parse(string data)
+        /// <returns>A <see cref="HttpRequestMessage"/> instance containing the parsed data.</returns>
+        public override HttpRequestMessage Parse(string data)
         {
-            System.Net.Http.HttpRequestMessage retVal = null;
+            HttpRequestMessage retVal = null;
 
             try
             {
-                retVal = new System.Net.Http.HttpRequestMessage();
+                retVal = new HttpRequestMessage();
 
                 Parse(retVal, retVal.Headers, data);
 
@@ -57,7 +57,7 @@ namespace Rssdp.Infrastructure
         /// Used to parse the first line of an HTTP request or response and assign the values to the appropriate properties on the <paramref name="message"/>.
         /// </summary>
         /// <param name="data">The first line of the HTTP message to be parsed.</param>
-        /// <param name="message">Either a <see cref="System.Net.Http.HttpResponseMessage"/> or <see cref="System.Net.Http.HttpRequestMessage"/> to assign the parsed values to.</param>
+        /// <param name="message">Either a <see cref="HttpResponseMessage"/> or <see cref="HttpRequestMessage"/> to assign the parsed values to.</param>
         protected override void ParseStatusLine(string data, HttpRequestMessage message)
         {
             if (data == null) throw new ArgumentNullException(nameof(data));
diff --git a/RSSDP/HttpResponseParser.cs b/RSSDP/HttpResponseParser.cs
index d864a8bb74..a77c898ffe 100644
--- a/RSSDP/HttpResponseParser.cs
+++ b/RSSDP/HttpResponseParser.cs
@@ -9,9 +9,9 @@ using System.Threading.Tasks;
 namespace Rssdp.Infrastructure
 {
     /// <summary>
-    /// Parses a string into a <see cref="System.Net.Http.HttpResponseMessage"/> or throws an exception.
+    /// Parses a string into a <see cref="HttpResponseMessage"/> or throws an exception.
     /// </summary>
-    public sealed class HttpResponseParser : HttpParserBase<System.Net.Http.HttpResponseMessage>
+    public sealed class HttpResponseParser : HttpParserBase<HttpResponseMessage>
     {
 
         #region Fields & Constants
@@ -26,16 +26,16 @@ namespace Rssdp.Infrastructure
         #region Public Methods
 
         /// <summary>
-        /// Parses the specified data into a <see cref="System.Net.Http.HttpResponseMessage"/> instance.
+        /// Parses the specified data into a <see cref="HttpResponseMessage"/> instance.
         /// </summary>
         /// <param name="data">A string containing the data to parse.</param>
-        /// <returns>A <see cref="System.Net.Http.HttpResponseMessage"/> instance containing the parsed data.</returns>
+        /// <returns>A <see cref="HttpResponseMessage"/> instance containing the parsed data.</returns>
         public override HttpResponseMessage Parse(string data)
         {
-            System.Net.Http.HttpResponseMessage retVal = null;
+            HttpResponseMessage retVal = null;
             try
             {
-                retVal = new System.Net.Http.HttpResponseMessage();
+                retVal = new HttpResponseMessage();
 
                 Parse(retVal, retVal.Headers, data);
 
@@ -68,7 +68,7 @@ namespace Rssdp.Infrastructure
         /// Used to parse the first line of an HTTP request or response and assign the values to the appropriate properties on the <paramref name="message"/>.
         /// </summary>
         /// <param name="data">The first line of the HTTP message to be parsed.</param>
-        /// <param name="message">Either a <see cref="System.Net.Http.HttpResponseMessage"/> or <see cref="System.Net.Http.HttpRequestMessage"/> to assign the parsed values to.</param>
+        /// <param name="message">Either a <see cref="HttpResponseMessage"/> or <see cref="HttpRequestMessage"/> to assign the parsed values to.</param>
         protected override void ParseStatusLine(string data, HttpResponseMessage message)
         {
             if (data == null) throw new ArgumentNullException(nameof(data));
diff --git a/RSSDP/ISsdpDeviceLocator.cs b/RSSDP/ISsdpDeviceLocator.cs
index 2351f5d621..8f0d39e75a 100644
--- a/RSSDP/ISsdpDeviceLocator.cs
+++ b/RSSDP/ISsdpDeviceLocator.cs
@@ -128,7 +128,7 @@ namespace Rssdp.Infrastructure
         /// <remarks>
         /// <para>Does nothing if this instance is not already listening for notifications.</para>
         /// </remarks>
-        /// <exception cref="System.ObjectDisposedException">Throw if the <see cref="DisposableManagedObjectBase.IsDisposed"/> property is true.</exception>
+        /// <exception cref="ObjectDisposedException">Throw if the <see cref="DisposableManagedObjectBase.IsDisposed"/> property is true.</exception>
         /// <seealso cref="StartListeningForNotifications"/>
         /// <seealso cref="DeviceAvailable"/>
         /// <seealso cref="DeviceUnavailable"/>
diff --git a/RSSDP/ISsdpDevicePublisher.cs b/RSSDP/ISsdpDevicePublisher.cs
index da2607fc4e..7e914c109d 100644
--- a/RSSDP/ISsdpDevicePublisher.cs
+++ b/RSSDP/ISsdpDevicePublisher.cs
@@ -17,14 +17,14 @@ namespace Rssdp.Infrastructure
         /// Adds a device (and it's children) to the list of devices being published by this server, making them discoverable to SSDP clients.
         /// </summary>
         /// <param name="device">The <see cref="SsdpRootDevice"/> instance to add.</param>
-        /// <returns>An awaitable <see cref="System.Threading.Tasks.Task"/>.</returns>
+        /// <returns>An awaitable <see cref="Task"/>.</returns>
         void AddDevice(SsdpRootDevice device);
 
         /// <summary>
         /// Removes a device (and it's children) from the list of devices being published by this server, making them undiscoverable.
         /// </summary>
         /// <param name="device">The <see cref="SsdpRootDevice"/> instance to add.</param>
-        /// <returns>An awaitable <see cref="System.Threading.Tasks.Task"/>.</returns>
+        /// <returns>An awaitable <see cref="Task"/>.</returns>
         Task RemoveDevice(SsdpRootDevice device);
 
         /// <summary>
diff --git a/RSSDP/SsdpCommunicationsServer.cs b/RSSDP/SsdpCommunicationsServer.cs
index 8fb33924f7..abd0dbdad9 100644
--- a/RSSDP/SsdpCommunicationsServer.cs
+++ b/RSSDP/SsdpCommunicationsServer.cs
@@ -73,7 +73,7 @@ namespace Rssdp.Infrastructure
         /// <summary>
         /// Minimum constructor.
         /// </summary>
-        /// <exception cref="System.ArgumentNullException">The <paramref name="socketFactory"/> argument is null.</exception>
+        /// <exception cref="ArgumentNullException">The <paramref name="socketFactory"/> argument is null.</exception>
         public SsdpCommunicationsServer(ISocketFactory socketFactory, INetworkManager networkManager, ILogger logger, bool enableMultiSocketBinding)
             : this(socketFactory, 0, SsdpConstants.SsdpDefaultMulticastTimeToLive, networkManager, logger, enableMultiSocketBinding)
         {
@@ -82,8 +82,8 @@ namespace Rssdp.Infrastructure
         /// <summary>
         /// Full constructor.
         /// </summary>
-        /// <exception cref="System.ArgumentNullException">The <paramref name="socketFactory"/> argument is null.</exception>
-        /// <exception cref="System.ArgumentOutOfRangeException">The <paramref name="multicastTimeToLive"/> argument is less than or equal to zero.</exception>
+        /// <exception cref="ArgumentNullException">The <paramref name="socketFactory"/> argument is null.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">The <paramref name="multicastTimeToLive"/> argument is less than or equal to zero.</exception>
         public SsdpCommunicationsServer(ISocketFactory socketFactory, int localPort, int multicastTimeToLive, INetworkManager networkManager, ILogger logger, bool enableMultiSocketBinding)
         {
             if (socketFactory == null) throw new ArgumentNullException(nameof(socketFactory));
@@ -111,7 +111,7 @@ namespace Rssdp.Infrastructure
         /// <summary>
         /// Causes the server to begin listening for multicast messages, being SSDP search requests and notifications.
         /// </summary>
-        /// <exception cref="System.ObjectDisposedException">Thrown if the <see cref="DisposableManagedObjectBase.IsDisposed"/> property is true (because <seealso cref="DisposableManagedObjectBase.Dispose()" /> has been called previously).</exception>
+        /// <exception cref="ObjectDisposedException">Thrown if the <see cref="DisposableManagedObjectBase.IsDisposed"/> property is true (because <seealso cref="DisposableManagedObjectBase.Dispose()" /> has been called previously).</exception>
         public void BeginListeningForBroadcasts()
         {
             ThrowIfDisposed();
@@ -138,7 +138,7 @@ namespace Rssdp.Infrastructure
         /// <summary>
         /// Causes the server to stop listening for multicast messages, being SSDP search requests and notifications.
         /// </summary>
-        /// <exception cref="System.ObjectDisposedException">Thrown if the <see cref="DisposableManagedObjectBase.IsDisposed"/> property is true (because <seealso cref="DisposableManagedObjectBase.Dispose()" /> has been called previously).</exception>
+        /// <exception cref="ObjectDisposedException">Thrown if the <see cref="DisposableManagedObjectBase.IsDisposed"/> property is true (because <seealso cref="DisposableManagedObjectBase.Dispose()" /> has been called previously).</exception>
         public void StopListeningForBroadcasts()
         {
             lock (_BroadcastListenSocketSynchroniser)
@@ -269,7 +269,7 @@ namespace Rssdp.Infrastructure
         /// <summary>
         /// Stops listening for search responses on the local, unicast socket.
         /// </summary>
-        /// <exception cref="System.ObjectDisposedException">Thrown if the <see cref="DisposableManagedObjectBase.IsDisposed"/> property is true (because <seealso cref="DisposableManagedObjectBase.Dispose()" /> has been called previously).</exception>
+        /// <exception cref="ObjectDisposedException">Thrown if the <see cref="DisposableManagedObjectBase.IsDisposed"/> property is true (because <seealso cref="DisposableManagedObjectBase.Dispose()" /> has been called previously).</exception>
         public void StopListeningForResponses()
         {
             lock (_SendSocketSynchroniser)
diff --git a/RSSDP/SsdpDevice.cs b/RSSDP/SsdpDevice.cs
index 8dc1805c57..b4c4a88fdd 100644
--- a/RSSDP/SsdpDevice.cs
+++ b/RSSDP/SsdpDevice.cs
@@ -276,8 +276,8 @@ namespace Rssdp
         /// <para>If the device is already a member of the <see cref="Devices"/> collection, this method does nothing.</para>
         /// <para>Also sets the <see cref="SsdpEmbeddedDevice.RootDevice"/> property of the added device and all descendant devices to the relevant <see cref="SsdpRootDevice"/> instance.</para>
         /// </remarks>
-        /// <exception cref="System.ArgumentNullException">Thrown if the <paramref name="device"/> argument is null.</exception>
-        /// <exception cref="System.InvalidOperationException">Thrown if the <paramref name="device"/> is already associated with a different <see cref="SsdpRootDevice"/> instance than used in this tree. Can occur if you try to add the same device instance to more than one tree. Also thrown if you try to add a device to itself.</exception>
+        /// <exception cref="ArgumentNullException">Thrown if the <paramref name="device"/> argument is null.</exception>
+        /// <exception cref="InvalidOperationException">Thrown if the <paramref name="device"/> is already associated with a different <see cref="SsdpRootDevice"/> instance than used in this tree. Can occur if you try to add the same device instance to more than one tree. Also thrown if you try to add a device to itself.</exception>
         /// <seealso cref="DeviceAdded"/>
         public void AddDevice(SsdpEmbeddedDevice device)
         {
@@ -305,7 +305,7 @@ namespace Rssdp
         /// <para>If the device is not a member of the <see cref="Devices"/> collection, this method does nothing.</para>
         /// <para>Also sets the <see cref="SsdpEmbeddedDevice.RootDevice"/> property to null for the removed device and all descendant devices.</para>
         /// </remarks>
-        /// <exception cref="System.ArgumentNullException">Thrown if the <paramref name="device"/> argument is null.</exception>
+        /// <exception cref="ArgumentNullException">Thrown if the <paramref name="device"/> argument is null.</exception>
         /// <seealso cref="DeviceRemoved"/>
         public void RemoveDevice(SsdpEmbeddedDevice device)
         {
diff --git a/RSSDP/SsdpDeviceLocator.cs b/RSSDP/SsdpDeviceLocator.cs
index ca6093725a..1348cce8da 100644
--- a/RSSDP/SsdpDeviceLocator.cs
+++ b/RSSDP/SsdpDeviceLocator.cs
@@ -185,7 +185,7 @@ namespace Rssdp.Infrastructure
         /// <seealso cref="StopListeningForNotifications"/>
         /// <seealso cref="DeviceAvailable"/>
         /// <seealso cref="DeviceUnavailable"/>
-        /// <exception cref="System.ObjectDisposedException">Throw if the <see cref="DisposableManagedObjectBase.IsDisposed"/>  ty is true.</exception>
+        /// <exception cref="ObjectDisposedException">Throw if the <see cref="DisposableManagedObjectBase.IsDisposed"/>  ty is true.</exception>
         public void StartListeningForNotifications()
         {
             ThrowIfDisposed();
@@ -204,7 +204,7 @@ namespace Rssdp.Infrastructure
         /// <seealso cref="StartListeningForNotifications"/>
         /// <seealso cref="DeviceAvailable"/>
         /// <seealso cref="DeviceUnavailable"/>
-        /// <exception cref="System.ObjectDisposedException">Throw if the <see cref="DisposableManagedObjectBase.IsDisposed"/> property is true.</exception>
+        /// <exception cref="ObjectDisposedException">Throw if the <see cref="DisposableManagedObjectBase.IsDisposed"/> property is true.</exception>
         public void StopListeningForNotifications()
         {
             ThrowIfDisposed();
diff --git a/RSSDP/SsdpDevicePublisher.cs b/RSSDP/SsdpDevicePublisher.cs
index 031b908ddb..8a73e6a2d3 100644
--- a/RSSDP/SsdpDevicePublisher.cs
+++ b/RSSDP/SsdpDevicePublisher.cs
@@ -76,8 +76,8 @@ namespace Rssdp.Infrastructure
         /// <para>This method ignores duplicate device adds (if the same device instance is added multiple times, the second and subsequent add calls do nothing).</para>
         /// </remarks>
         /// <param name="device">The <see cref="SsdpDevice"/> instance to add.</param>
-        /// <exception cref="System.ArgumentNullException">Thrown if the <paramref name="device"/> argument is null.</exception>
-        /// <exception cref="System.InvalidOperationException">Thrown if the <paramref name="device"/> contains property values that are not acceptable to the UPnP 1.0 specification.</exception>
+        /// <exception cref="ArgumentNullException">Thrown if the <paramref name="device"/> argument is null.</exception>
+        /// <exception cref="InvalidOperationException">Thrown if the <paramref name="device"/> contains property values that are not acceptable to the UPnP 1.0 specification.</exception>
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals", MessageId = "t", Justification = "Capture task to local variable supresses compiler warning, but task is not really needed.")]
         public void AddDevice(SsdpRootDevice device)
         {
@@ -85,7 +85,7 @@ namespace Rssdp.Infrastructure
 
             ThrowIfDisposed();
 
-            TimeSpan minCacheTime = TimeSpan.Zero;
+            var minCacheTime = TimeSpan.Zero;
             bool wasAdded = false;
             lock (_Devices)
             {
@@ -113,13 +113,13 @@ namespace Rssdp.Infrastructure
         /// <para>This method does nothing if the device was not found in the collection.</para>
         /// </remarks>
         /// <param name="device">The <see cref="SsdpDevice"/> instance to add.</param>
-        /// <exception cref="System.ArgumentNullException">Thrown if the <paramref name="device"/> argument is null.</exception>
+        /// <exception cref="ArgumentNullException">Thrown if the <paramref name="device"/> argument is null.</exception>
         public async Task RemoveDevice(SsdpRootDevice device)
         {
             if (device == null) throw new ArgumentNullException(nameof(device));
 
             bool wasRemoved = false;
-            TimeSpan minCacheTime = TimeSpan.Zero;
+            var minCacheTime = TimeSpan.Zero;
             lock (_Devices)
             {
                 if (_Devices.Contains(device))
diff --git a/SocketHttpListener/Ext.cs b/SocketHttpListener/Ext.cs
index 6b75648284..1251d19c06 100644
--- a/SocketHttpListener/Ext.cs
+++ b/SocketHttpListener/Ext.cs
@@ -161,7 +161,7 @@ namespace SocketHttpListener
 
         internal static bool Contains<T>(this IEnumerable<T> source, Func<T, bool> condition)
         {
-            foreach (T elm in source)
+            foreach (var elm in source)
                 if (condition(elm))
                     return true;
 
diff --git a/SocketHttpListener/MessageEventArgs.cs b/SocketHttpListener/MessageEventArgs.cs
index d9bccbf3f9..8e2151cb7a 100644
--- a/SocketHttpListener/MessageEventArgs.cs
+++ b/SocketHttpListener/MessageEventArgs.cs
@@ -9,8 +9,8 @@ namespace SocketHttpListener
     /// <remarks>
     /// A <see cref="WebSocket.OnMessage"/> event occurs when the <see cref="WebSocket"/> receives
     /// a text or binary data frame.
-    /// If you want to get the received data, you access the <see cref="MessageEventArgs.Data"/> or
-    /// <see cref="MessageEventArgs.RawData"/> property.
+    /// If you want to get the received data, you access the <see cref="Data"/> or
+    /// <see cref="RawData"/> property.
     /// </remarks>
     public class MessageEventArgs : EventArgs
     {
diff --git a/SocketHttpListener/Net/ChunkStream.cs b/SocketHttpListener/Net/ChunkStream.cs
index 4bf3a6dea5..3836947d4c 100644
--- a/SocketHttpListener/Net/ChunkStream.cs
+++ b/SocketHttpListener/Net/ChunkStream.cs
@@ -108,7 +108,7 @@ namespace SocketHttpListener.Net
             var chunksForRemoving = new List<Chunk>(count);
             for (int i = 0; i < count; i++)
             {
-                Chunk chunk = _chunks[i];
+                var chunk = _chunks[i];
 
                 if (chunk.Offset == chunk.Bytes.Length)
                 {
@@ -189,7 +189,7 @@ namespace SocketHttpListener.Net
                 int count = _chunks.Count;
                 for (int i = 0; i < count; i++)
                 {
-                    Chunk ch = _chunks[i];
+                    var ch = _chunks[i];
                     if (ch == null || ch.Bytes == null)
                         continue;
                     if (ch.Bytes.Length > 0 && ch.Offset < ch.Bytes.Length)
@@ -368,7 +368,7 @@ namespace SocketHttpListener.Net
                 return State.Trailer;
             }
 
-            StringReader reader = new StringReader(_saved.ToString());
+            var reader = new StringReader(_saved.ToString());
             string line;
             while ((line = reader.ReadLine()) != null && line != "")
                 _headers.Add(line);
@@ -378,7 +378,7 @@ namespace SocketHttpListener.Net
 
         private static void ThrowProtocolViolation(string message)
         {
-            WebException we = new WebException(message, null, WebExceptionStatus.ServerProtocolViolation, null);
+            var we = new WebException(message, null, WebExceptionStatus.ServerProtocolViolation, null);
             throw we;
         }
     }
diff --git a/SocketHttpListener/Net/ChunkedInputStream.cs b/SocketHttpListener/Net/ChunkedInputStream.cs
index cdf7ac649b..8d59a79078 100644
--- a/SocketHttpListener/Net/ChunkedInputStream.cs
+++ b/SocketHttpListener/Net/ChunkedInputStream.cs
@@ -61,7 +61,7 @@ namespace SocketHttpListener.Net
                     : base(stream, buffer, offset, length)
         {
             _context = context;
-            WebHeaderCollection coll = (WebHeaderCollection)context.Request.Headers;
+            var coll = (WebHeaderCollection)context.Request.Headers;
             _decoder = new ChunkStream(coll);
         }
 
@@ -73,13 +73,13 @@ namespace SocketHttpListener.Net
 
         protected override int ReadCore(byte[] buffer, int offset, int count)
         {
-            IAsyncResult ares = BeginReadCore(buffer, offset, count, null, null);
+            var ares = BeginReadCore(buffer, offset, count, null, null);
             return EndRead(ares);
         }
 
         protected override IAsyncResult BeginReadCore(byte[] buffer, int offset, int size, AsyncCallback cback, object state)
         {
-            HttpStreamAsyncResult ares = new HttpStreamAsyncResult(this);
+            var ares = new HttpStreamAsyncResult(this);
             ares._callback = cback;
             ares._state = state;
             if (_no_more_data || size == 0 || _closed)
@@ -107,7 +107,7 @@ namespace SocketHttpListener.Net
             ares._buffer = new byte[8192];
             ares._offset = 0;
             ares._count = 8192;
-            ReadBufferState rb = new ReadBufferState(buffer, offset, size, ares);
+            var rb = new ReadBufferState(buffer, offset, size, ares);
             rb.InitialCount += nread;
             base.BeginReadCore(ares._buffer, ares._offset, ares._count, OnRead, rb);
             return ares;
@@ -115,8 +115,8 @@ namespace SocketHttpListener.Net
 
         private void OnRead(IAsyncResult base_ares)
         {
-            ReadBufferState rb = (ReadBufferState)base_ares.AsyncState;
-            HttpStreamAsyncResult ares = rb.Ares;
+            var rb = (ReadBufferState)base_ares.AsyncState;
+            var ares = rb.Ares;
             try
             {
                 int nread = base.EndRead(base_ares);
@@ -155,7 +155,7 @@ namespace SocketHttpListener.Net
             if (asyncResult == null)
                 throw new ArgumentNullException(nameof(asyncResult));
 
-            HttpStreamAsyncResult ares = asyncResult as HttpStreamAsyncResult;
+            var ares = asyncResult as HttpStreamAsyncResult;
             if (ares == null || !ReferenceEquals(this, ares._parent))
             {
                 throw new ArgumentException("Invalid async result");
diff --git a/SocketHttpListener/Net/HttpConnection.cs b/SocketHttpListener/Net/HttpConnection.cs
index f6db5f0b22..e87503118f 100644
--- a/SocketHttpListener/Net/HttpConnection.cs
+++ b/SocketHttpListener/Net/HttpConnection.cs
@@ -212,7 +212,7 @@ namespace SocketHttpListener.Net
 
         private static void OnRead(IAsyncResult ares)
         {
-            HttpConnection cnc = (HttpConnection)ares.AsyncState;
+            var cnc = (HttpConnection)ares.AsyncState;
             cnc.OnReadInternal(ares);
         }
 
@@ -269,7 +269,7 @@ namespace SocketHttpListener.Net
                     Close(true);
                     return;
                 }
-                HttpListener listener = _epl.Listener;
+                var listener = _epl.Listener;
                 if (_lastListener != listener)
                 {
                     RemoveConnection();
@@ -417,7 +417,7 @@ namespace SocketHttpListener.Net
         {
             try
             {
-                HttpListenerResponse response = _context.Response;
+                var response = _context.Response;
                 response.StatusCode = status;
                 response.ContentType = "text/html";
                 string description = HttpStatusDescription.Get(status);
@@ -509,7 +509,7 @@ namespace SocketHttpListener.Net
                     return;
                 }
 
-                Socket s = _socket;
+                var s = _socket;
                 _socket = null;
                 try
                 {
diff --git a/SocketHttpListener/Net/HttpEndPointListener.cs b/SocketHttpListener/Net/HttpEndPointListener.cs
index 0f1ce696f7..d002c13b2b 100644
--- a/SocketHttpListener/Net/HttpEndPointListener.cs
+++ b/SocketHttpListener/Net/HttpEndPointListener.cs
@@ -160,7 +160,7 @@ namespace SocketHttpListener.Net
             }
             catch (Exception ex)
             {
-                HttpEndPointListener epl = (HttpEndPointListener)acceptEventArg.UserToken;
+                var epl = (HttpEndPointListener)acceptEventArg.UserToken;
 
                 epl._logger.LogError(ex, "Error in socket.AcceptAsync");
             }
@@ -176,7 +176,7 @@ namespace SocketHttpListener.Net
 
         private static async void ProcessAccept(SocketAsyncEventArgs args)
         {
-            HttpEndPointListener epl = (HttpEndPointListener)args.UserToken;
+            var epl = (HttpEndPointListener)args.UserToken;
 
             if (epl._closed)
             {
@@ -214,7 +214,7 @@ namespace SocketHttpListener.Net
                 var localEndPointString = accepted.LocalEndPoint == null ? string.Empty : accepted.LocalEndPoint.ToString();
                 //_logger.LogInformation("HttpEndPointListener Accepting connection from {0} to {1} secure connection requested: {2}", remoteEndPointString, localEndPointString, _secure);
 
-                HttpConnection conn = new HttpConnection(epl._logger, accepted, epl, epl._secure, epl._cert, epl._cryptoProvider, epl._streamHelper, epl._textEncoding, epl._fileSystem, epl._environment);
+                var conn = new HttpConnection(epl._logger, accepted, epl, epl._secure, epl._cert, epl._cryptoProvider, epl._streamHelper, epl._textEncoding, epl._fileSystem, epl._environment);
 
                 await conn.Init().ConfigureAwait(false);
 
@@ -276,9 +276,9 @@ namespace SocketHttpListener.Net
 
         public bool BindContext(HttpListenerContext context)
         {
-            HttpListenerRequest req = context.Request;
+            var req = context.Request;
             ListenerPrefix prefix;
-            HttpListener listener = SearchListener(req.Url, out prefix);
+            var listener = SearchListener(req.Url, out prefix);
             if (listener == null)
                 return false;
 
@@ -310,8 +310,8 @@ namespace SocketHttpListener.Net
 
             if (host != null && host != "")
             {
-                Dictionary<ListenerPrefix, HttpListener> localPrefixes = _prefixes;
-                foreach (ListenerPrefix p in localPrefixes.Keys)
+                var localPrefixes = _prefixes;
+                foreach (var p in localPrefixes.Keys)
                 {
                     string ppath = p.Path;
                     if (ppath.Length < bestLength)
@@ -331,7 +331,7 @@ namespace SocketHttpListener.Net
                     return bestMatch;
             }
 
-            List<ListenerPrefix> list = _unhandledPrefixes;
+            var list = _unhandledPrefixes;
             bestMatch = MatchFromList(host, path, list, out prefix);
 
             if (path != pathSlash && bestMatch == null)
@@ -361,7 +361,7 @@ namespace SocketHttpListener.Net
             HttpListener bestMatch = null;
             int bestLength = -1;
 
-            foreach (ListenerPrefix p in list)
+            foreach (var p in list)
             {
                 string ppath = p.Path;
                 if (ppath.Length < bestLength)
@@ -383,7 +383,7 @@ namespace SocketHttpListener.Net
             if (list == null)
                 return;
 
-            foreach (ListenerPrefix p in list)
+            foreach (var p in list)
             {
                 if (p.Path == prefix.Path)
                     throw new Exception("net_listener_already");
@@ -399,7 +399,7 @@ namespace SocketHttpListener.Net
             int c = list.Count;
             for (int i = 0; i < c; i++)
             {
-                ListenerPrefix p = list[i];
+                var p = list[i];
                 if (p.Path == prefix.Path)
                 {
                     list.RemoveAt(i);
@@ -414,7 +414,7 @@ namespace SocketHttpListener.Net
             if (_prefixes.Count > 0)
                 return;
 
-            List<ListenerPrefix> list = _unhandledPrefixes;
+            var list = _unhandledPrefixes;
             if (list != null && list.Count > 0)
                 return;
 
@@ -434,7 +434,7 @@ namespace SocketHttpListener.Net
                 // Clone the list because RemoveConnection can be called from Close
                 var connections = new List<HttpConnection>(_unregisteredConnections.Keys);
 
-                foreach (HttpConnection c in connections)
+                foreach (var c in connections)
                     c.Close(true);
                 _unregisteredConnections.Clear();
             }
diff --git a/SocketHttpListener/Net/HttpEndPointManager.cs b/SocketHttpListener/Net/HttpEndPointManager.cs
index 787730ed41..98986333bc 100644
--- a/SocketHttpListener/Net/HttpEndPointManager.cs
+++ b/SocketHttpListener/Net/HttpEndPointManager.cs
@@ -17,7 +17,7 @@ namespace SocketHttpListener.Net
 
         public static void AddListener(ILogger logger, HttpListener listener)
         {
-            List<string> added = new List<string>();
+            var added = new List<string>();
             try
             {
                 lock ((s_ipEndPoints as ICollection).SyncRoot)
@@ -64,7 +64,7 @@ namespace SocketHttpListener.Net
                 }
             }
 
-            ListenerPrefix lp = new ListenerPrefix(p);
+            var lp = new ListenerPrefix(p);
             if (lp.Host != "*" && lp.Host != "+" && Uri.CheckHostName(lp.Host) == UriHostNameType.Unknown)
                 throw new HttpListenerException((int)HttpStatusCode.BadRequest, "net_listener_host");
 
@@ -75,7 +75,7 @@ namespace SocketHttpListener.Net
                 throw new HttpListenerException((int)HttpStatusCode.BadRequest, "net_invalid_path");
 
             // listens on all the interfaces if host name cannot be parsed by IPAddress.
-            HttpEndPointListener epl = GetEPListener(logger, lp.Host, lp.Port, listener, lp.Secure);
+            var epl = GetEPListener(logger, lp.Host, lp.Port, listener, lp.Secure);
             epl.AddPrefix(lp, listener);
         }
 
@@ -179,14 +179,14 @@ namespace SocketHttpListener.Net
 
         private static void RemovePrefixInternal(ILogger logger, string prefix, HttpListener listener)
         {
-            ListenerPrefix lp = new ListenerPrefix(prefix);
+            var lp = new ListenerPrefix(prefix);
             if (lp.Path.IndexOf('%') != -1)
                 return;
 
             if (lp.Path.IndexOf("//", StringComparison.Ordinal) != -1)
                 return;
 
-            HttpEndPointListener epl = GetEPListener(logger, lp.Host, lp.Port, listener, lp.Secure);
+            var epl = GetEPListener(logger, lp.Host, lp.Port, listener, lp.Secure);
             epl.RemovePrefix(lp, listener);
         }
     }
diff --git a/SocketHttpListener/Net/HttpListenerContext.Managed.cs b/SocketHttpListener/Net/HttpListenerContext.Managed.cs
index a6622c4798..4cdb6882ec 100644
--- a/SocketHttpListener/Net/HttpListenerContext.Managed.cs
+++ b/SocketHttpListener/Net/HttpListenerContext.Managed.cs
@@ -44,7 +44,7 @@ namespace SocketHttpListener.Net
         }
 
         internal IPrincipal ParseBasicAuthentication(string authData) =>
-            TryParseBasicAuth(authData, out HttpStatusCode errorCode, out string username, out string password) ?
+            TryParseBasicAuth(authData, out var errorCode, out string username, out string password) ?
                 new GenericPrincipal(new HttpListenerBasicIdentity(username, password), Array.Empty<string>()) :
                 null;
 
diff --git a/SocketHttpListener/Net/HttpListenerRequest.Managed.cs b/SocketHttpListener/Net/HttpListenerRequest.Managed.cs
index 3f9e32f089..41d0750457 100644
--- a/SocketHttpListener/Net/HttpListenerRequest.Managed.cs
+++ b/SocketHttpListener/Net/HttpListenerRequest.Managed.cs
@@ -180,7 +180,7 @@ namespace SocketHttpListener.Net
 
             if (string.Compare(Headers[HttpKnownHeaderNames.Expect], "100-continue", StringComparison.OrdinalIgnoreCase) == 0)
             {
-                HttpResponseStream output = _context.Connection.GetResponseStream();
+                var output = _context.Connection.GetResponseStream();
                 output.InternalWrite(s_100continue, 0, s_100continue.Length);
             }
         }
@@ -256,7 +256,7 @@ namespace SocketHttpListener.Net
             {
                 try
                 {
-                    IAsyncResult ares = InputStream.BeginRead(bytes, 0, length, null, null);
+                    var ares = InputStream.BeginRead(bytes, 0, length, null, null);
                     if (!ares.IsCompleted && !ares.AsyncWaitHandle.WaitOne(1000))
                         return false;
                     if (InputStream.EndRead(ares) <= 0)
diff --git a/SocketHttpListener/Net/HttpListenerRequest.cs b/SocketHttpListener/Net/HttpListenerRequest.cs
index 2e8396f6f3..1c832367ef 100644
--- a/SocketHttpListener/Net/HttpListenerRequest.cs
+++ b/SocketHttpListener/Net/HttpListenerRequest.cs
@@ -23,7 +23,7 @@ namespace SocketHttpListener.Net
 
         private static CookieCollection ParseCookies(Uri uri, string setCookieHeader)
         {
-            CookieCollection cookies = new CookieCollection();
+            var cookies = new CookieCollection();
             return cookies;
         }
 
@@ -171,7 +171,7 @@ namespace SocketHttpListener.Net
         {
             get
             {
-                QueryParamCollection queryString = new QueryParamCollection();
+                var queryString = new QueryParamCollection();
                 Helpers.FillFromString(queryString, Url.Query, true, ContentEncoding);
                 return queryString;
             }
@@ -197,7 +197,7 @@ namespace SocketHttpListener.Net
                     return null;
                 }
 
-                bool success = Uri.TryCreate(referrer, UriKind.RelativeOrAbsolute, out Uri urlReferrer);
+                bool success = Uri.TryCreate(referrer, UriKind.RelativeOrAbsolute, out var urlReferrer);
                 return success ? urlReferrer : null;
             }
         }
@@ -296,7 +296,7 @@ namespace SocketHttpListener.Net
 
                 // collect comma-separated values into list
 
-                List<string> values = new List<string>();
+                var values = new List<string>();
                 int i = 0;
 
                 while (i < l)
@@ -341,7 +341,7 @@ namespace SocketHttpListener.Net
             private static string UrlDecodeStringFromStringInternal(string s, Encoding e)
             {
                 int count = s.Length;
-                UrlDecoder helper = new UrlDecoder(count, e);
+                var helper = new UrlDecoder(count, e);
 
                 // go through the string's chars collapsing %XX and %uXXXX and
                 // appending each char as char, with exception of %XX constructs
diff --git a/SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs b/SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs
index f1a0af0bf5..310c71a0dc 100644
--- a/SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs
+++ b/SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs
@@ -54,7 +54,7 @@ namespace SocketHttpListener.Net
         public static Uri GetRequestUri(string rawUri, string cookedUriScheme, string cookedUriHost,
             string cookedUriPath, string cookedUriQuery)
         {
-            HttpListenerRequestUriBuilder builder = new HttpListenerRequestUriBuilder(rawUri,
+            var builder = new HttpListenerRequestUriBuilder(rawUri,
                 cookedUriScheme, cookedUriHost, cookedUriPath, cookedUriQuery);
 
             return builder.Build();
@@ -94,10 +94,10 @@ namespace SocketHttpListener.Net
 
             // Try to check the raw path using first the primary encoding (according to http.sys settings);
             // if it fails try the secondary encoding.
-            ParsingResult result = BuildRequestUriUsingRawPath(GetEncoding(EncodingType.Primary));
+            var result = BuildRequestUriUsingRawPath(GetEncoding(EncodingType.Primary));
             if (result == ParsingResult.EncodingError)
             {
-                Encoding secondaryEncoding = GetEncoding(EncodingType.Secondary);
+                var secondaryEncoding = GetEncoding(EncodingType.Secondary);
                 result = BuildRequestUriUsingRawPath(secondaryEncoding);
             }
             isValid = (result == ParsingResult.Success) ? true : false;
@@ -136,7 +136,7 @@ namespace SocketHttpListener.Net
             _requestUriString.Append(Uri.SchemeDelimiter);
             _requestUriString.Append(_cookedUriHost);
 
-            ParsingResult result = ParseRawPath(encoding);
+            var result = ParseRawPath(encoding);
             if (result == ParsingResult.Success)
             {
                 _requestUriString.Append(_cookedUriQuery);
@@ -327,7 +327,7 @@ namespace SocketHttpListener.Net
 
         private static string GetOctetsAsString(IEnumerable<byte> octets)
         {
-            StringBuilder octetString = new StringBuilder();
+            var octetString = new StringBuilder();
 
             bool first = true;
             foreach (byte octet in octets)
diff --git a/SocketHttpListener/Net/HttpListenerResponse.Managed.cs b/SocketHttpListener/Net/HttpListenerResponse.Managed.cs
index 198cdcf764..9f9b8384d5 100644
--- a/SocketHttpListener/Net/HttpListenerResponse.Managed.cs
+++ b/SocketHttpListener/Net/HttpListenerResponse.Managed.cs
@@ -263,8 +263,8 @@ namespace SocketHttpListener.Net
                 ComputeCookies();
             }
 
-            Encoding encoding = _textEncoding.GetDefaultEncoding();
-            StreamWriter writer = new StreamWriter(ms, encoding, 256);
+            var encoding = _textEncoding.GetDefaultEncoding();
+            var writer = new StreamWriter(ms, encoding, 256);
             writer.Write("HTTP/1.1 {0} ", _statusCode); // "1.1" matches Windows implementation, which ignores the response version
             writer.Flush();
             byte[] statusDescriptionBytes = WebHeaderEncoding.GetBytes(StatusDescription);
diff --git a/SocketHttpListener/Net/HttpRequestStream.Managed.cs b/SocketHttpListener/Net/HttpRequestStream.Managed.cs
index 73a6735311..42fc4d97c2 100644
--- a/SocketHttpListener/Net/HttpRequestStream.Managed.cs
+++ b/SocketHttpListener/Net/HttpRequestStream.Managed.cs
@@ -124,7 +124,7 @@ namespace SocketHttpListener.Net
         {
             if (size == 0 || _closed)
             {
-                HttpStreamAsyncResult ares = new HttpStreamAsyncResult(this);
+                var ares = new HttpStreamAsyncResult(this);
                 ares._callback = cback;
                 ares._state = state;
                 ares.Complete();
@@ -134,7 +134,7 @@ namespace SocketHttpListener.Net
             int nread = FillFromBuffer(buffer, offset, size);
             if (nread > 0 || nread == -1)
             {
-                HttpStreamAsyncResult ares = new HttpStreamAsyncResult(this);
+                var ares = new HttpStreamAsyncResult(this);
                 ares._buffer = buffer;
                 ares._offset = offset;
                 ares._count = size;
diff --git a/SocketHttpListener/Net/HttpResponseStream.Managed.cs b/SocketHttpListener/Net/HttpResponseStream.Managed.cs
index b4c223418a..cda4fe8bcb 100644
--- a/SocketHttpListener/Net/HttpResponseStream.Managed.cs
+++ b/SocketHttpListener/Net/HttpResponseStream.Managed.cs
@@ -70,7 +70,7 @@ namespace SocketHttpListener.Net
         private void DisposeCore()
         {
             byte[] bytes = null;
-            MemoryStream ms = GetHeaders(true);
+            var ms = GetHeaders(true);
             bool chunked = _response.SendChunked;
             if (_stream.CanWrite)
             {
@@ -110,7 +110,7 @@ namespace SocketHttpListener.Net
 
             if (_stream.CanWrite)
             {
-                MemoryStream ms = GetHeaders(closing: false, isWebSocketHandshake: true);
+                var ms = GetHeaders(closing: false, isWebSocketHandshake: true);
                 bool chunked = _response.SendChunked;
 
                 long start = ms.Position;
@@ -146,7 +146,7 @@ namespace SocketHttpListener.Net
                     return null;
                 }
 
-                MemoryStream ms = new MemoryStream();
+                var ms = new MemoryStream();
                 _response.SendHeaders(closing, ms, isWebSocketHandshake);
                 return ms;
             }
@@ -190,7 +190,7 @@ namespace SocketHttpListener.Net
                 return;
 
             byte[] bytes = null;
-            MemoryStream ms = GetHeaders(false);
+            var ms = GetHeaders(false);
             bool chunked = _response.SendChunked;
             if (ms != null)
             {
@@ -226,7 +226,7 @@ namespace SocketHttpListener.Net
         {
             if (_closed)
             {
-                HttpStreamAsyncResult ares = new HttpStreamAsyncResult(this);
+                var ares = new HttpStreamAsyncResult(this);
                 ares._callback = cback;
                 ares._state = state;
                 ares.Complete();
@@ -234,7 +234,7 @@ namespace SocketHttpListener.Net
             }
 
             byte[] bytes = null;
-            MemoryStream ms = GetHeaders(false);
+            var ms = GetHeaders(false);
             bool chunked = _response.SendChunked;
             if (ms != null)
             {
diff --git a/SocketHttpListener/Net/ListenerPrefix.cs b/SocketHttpListener/Net/ListenerPrefix.cs
index 3e78752fdb..edfcb89043 100644
--- a/SocketHttpListener/Net/ListenerPrefix.cs
+++ b/SocketHttpListener/Net/ListenerPrefix.cs
@@ -40,7 +40,7 @@ namespace SocketHttpListener.Net
         // Equals and GetHashCode are required to detect duplicates in HttpListenerPrefixCollection.
         public override bool Equals(object o)
         {
-            ListenerPrefix other = o as ListenerPrefix;
+            var other = o as ListenerPrefix;
             if (other == null)
                 return false;
 
diff --git a/SocketHttpListener/Net/WebHeaderCollection.cs b/SocketHttpListener/Net/WebHeaderCollection.cs
index 8c3395df5c..02d3cf61fb 100644
--- a/SocketHttpListener/Net/WebHeaderCollection.cs
+++ b/SocketHttpListener/Net/WebHeaderCollection.cs
@@ -234,7 +234,7 @@ namespace SocketHttpListener.Net
 
         internal string ToStringMultiValue()
         {
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             int count = base.Count;
             for (int i = 0; i < count; i++)
@@ -263,7 +263,7 @@ namespace SocketHttpListener.Net
 
         public override string ToString()
         {
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
             int count = base.Count;
             for (int i = 0; i < count; i++)
diff --git a/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs b/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs
index 79f87dfc9c..f51f72dba4 100644
--- a/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs
+++ b/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs
@@ -16,8 +16,8 @@ namespace SocketHttpListener.Net.WebSockets
             ValidateOptions(subProtocol, receiveBufferSize, MinSendBufferSize, keepAliveInterval);
 
             // get property will create a new response if one doesn't exist.
-            HttpListenerResponse response = context.Response;
-            HttpListenerRequest request = context.Request;
+            var response = context.Response;
+            var request = context.Request;
             ValidateWebSocketHeaders(context);
 
             string secWebSocketVersion = request.Headers[HttpKnownHeaderNames.SecWebSocketVersion];
@@ -50,15 +50,15 @@ namespace SocketHttpListener.Net.WebSockets
             response.StatusCode = (int)HttpStatusCode.SwitchingProtocols; // HTTP 101
             response.StatusDescription = HttpStatusDescription.Get(HttpStatusCode.SwitchingProtocols);
 
-            HttpResponseStream responseStream = response.OutputStream as HttpResponseStream;
+            var responseStream = response.OutputStream as HttpResponseStream;
 
             // Send websocket handshake headers
             await responseStream.WriteWebSocketHandshakeHeadersAsync().ConfigureAwait(false);
 
             //WebSocket webSocket = WebSocket.CreateFromStream(context.Connection.ConnectedStream, isServer: true, subProtocol, keepAliveInterval);
-            WebSocket webSocket = new WebSocket(subProtocol);
+            var webSocket = new WebSocket(subProtocol);
 
-            HttpListenerWebSocketContext webSocketContext = new HttpListenerWebSocketContext(
+            var webSocketContext = new HttpListenerWebSocketContext(
                                                                 request.Url,
                                                                 request.Headers,
                                                                 request.Cookies,
diff --git a/SocketHttpListener/Net/WebSockets/HttpWebSocket.cs b/SocketHttpListener/Net/WebSockets/HttpWebSocket.cs
index 4667275c5e..b346cc98ec 100644
--- a/SocketHttpListener/Net/WebSockets/HttpWebSocket.cs
+++ b/SocketHttpListener/Net/WebSockets/HttpWebSocket.cs
@@ -19,7 +19,7 @@ namespace SocketHttpListener.Net.WebSockets
             string retVal;
 
             // SHA1 used only for hashing purposes, not for crypto. Check here for FIPS compat.
-            using (SHA1 sha1 = SHA1.Create())
+            using (var sha1 = SHA1.Create())
             {
                 string acceptString = string.Concat(secWebSocketKey, HttpWebSocket.SecWebSocketKeyGuid);
                 byte[] toHash = Encoding.UTF8.GetBytes(acceptString);
diff --git a/SocketHttpListener/Net/WebSockets/WebSocketValidate.cs b/SocketHttpListener/Net/WebSockets/WebSocketValidate.cs
index 0469e3b6c5..3f61e55fce 100644
--- a/SocketHttpListener/Net/WebSockets/WebSocketValidate.cs
+++ b/SocketHttpListener/Net/WebSockets/WebSocketValidate.cs
@@ -20,7 +20,7 @@ namespace SocketHttpListener.Net.WebSockets
 
             if (validStates != null && validStates.Length > 0)
             {
-                foreach (WebSocketState validState in validStates)
+                foreach (var validState in validStates)
                 {
                     if (currentState == validState)
                     {
-- 
cgit v1.2.3


From e8674464373c3635243953cded42fcd2aa87d196 Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Sun, 13 Jan 2019 21:46:33 +0100
Subject: ReSharper format: conform inline 'out' parameters.

---
 DvdLib/Ifo/Dvd.cs                                  |  3 +-
 Emby.Dlna/ContentDirectory/ControlHandler.cs       | 19 ++-----
 Emby.Dlna/DlnaManager.cs                           |  7 +--
 Emby.Dlna/Eventing/EventManager.cs                 | 11 +---
 Emby.Dlna/Main/DlnaEntryPoint.cs                   |  3 +-
 Emby.Dlna/PlayTo/Device.cs                         |  4 +-
 Emby.Dlna/PlayTo/PlayToController.cs               | 43 ++++----------
 Emby.Dlna/PlayTo/PlayToManager.cs                  |  9 +--
 Emby.Drawing/ImageProcessor.cs                     |  3 +-
 Emby.Naming/Audio/AlbumParser.cs                   |  3 +-
 Emby.Naming/AudioBook/AudioBookFilePathParser.cs   |  6 +-
 Emby.Naming/TV/EpisodePathParser.cs                |  6 +-
 Emby.Naming/TV/SeasonPathParser.cs                 |  9 +--
 Emby.Naming/Video/CleanDateTimeParser.cs           |  3 +-
 Emby.Photos/PhotoProvider.cs                       |  4 +-
 .../Channels/ChannelManager.cs                     |  4 +-
 .../Data/SqliteExtensions.cs                       | 34 ++++-------
 .../Data/SqliteItemRepository.cs                   | 29 +++-------
 Emby.Server.Implementations/Devices/DeviceId.cs    |  3 +-
 .../Devices/DeviceManager.cs                       |  3 +-
 Emby.Server.Implementations/Dto/DtoService.cs      |  4 +-
 .../EntryPoints/ExternalPortForwarding.cs          | 12 ++--
 .../EntryPoints/LibraryChangedNotifier.cs          |  3 +-
 .../EntryPoints/UserDataChangeNotifier.cs          |  4 +-
 .../HttpClientManager/HttpClientManager.cs         |  4 +-
 .../HttpServer/HttpListenerHost.cs                 | 12 ++--
 .../HttpServer/HttpResultFactory.cs                | 17 ++----
 .../HttpServer/ResponseFilter.cs                   |  3 +-
 .../HttpServer/Security/AuthService.cs             |  3 +-
 .../HttpServer/Security/AuthorizationContext.cs    |  3 +-
 .../HttpServer/Security/SessionContext.cs          |  3 +-
 Emby.Server.Implementations/IO/LibraryMonitor.cs   | 11 +---
 .../Library/LibraryManager.cs                      |  7 +--
 .../Library/MediaSourceManager.cs                  |  7 +--
 .../LiveTv/EmbyTV/EmbyTV.cs                        | 30 +++-------
 .../LiveTv/EmbyTV/TimerManager.cs                  |  3 +-
 .../LiveTv/LiveTvManager.cs                        |  6 +-
 .../LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs   |  3 +-
 .../TunerHosts/HdHomerun/HdHomerunManager.cs       |  9 +--
 .../LiveTv/TunerHosts/M3UTunerHost.cs              |  3 +-
 .../LiveTv/TunerHosts/M3uParser.cs                 | 33 ++++-------
 .../Localization/LocalizationManager.cs            | 16 ++----
 .../Networking/IPNetwork/IPNetwork.cs              | 39 +++++--------
 .../Networking/NetworkManager.cs                   | 20 ++-----
 .../ScheduledTasks/TaskManager.cs                  |  3 +-
 .../Security/MBLicenseFile.cs                      |  9 +--
 .../Serialization/XmlSerializer.cs                 |  3 +-
 .../Services/ServiceController.cs                  |  3 +-
 .../Services/ServiceExec.cs                        |  3 +-
 .../Services/ServiceHandler.cs                     |  9 +--
 .../Services/ServicePath.cs                        |  6 +-
 .../Session/SessionManager.cs                      |  6 +-
 .../TextEncoding/NLangDetect/ProbVector.cs         |  4 +-
 .../TextEncoding/NLangDetect/Utils/Messages.cs     |  4 +-
 .../Updates/InstallationManager.cs                 |  4 +-
 Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs       |  9 +--
 Jellyfin.Server/SocketSharp/RequestMono.cs         |  4 +-
 MediaBrowser.Api/ApiEntryPoint.cs                  |  3 +-
 MediaBrowser.Api/IHasItemFields.cs                 |  4 +-
 MediaBrowser.Api/Images/ImageService.cs            |  3 +-
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |  9 +--
 MediaBrowser.Api/Session/SessionsService.cs        |  3 +-
 MediaBrowser.Common/Net/HttpRequestOptions.cs      |  4 +-
 .../Entities/CollectionFolder.cs                   |  3 +-
 MediaBrowser.Controller/Entities/Folder.cs         |  4 +-
 MediaBrowser.Controller/Entities/Year.cs           |  8 +--
 MediaBrowser.Controller/Library/TVUtils.cs         |  4 +-
 .../MediaEncoding/EncodingHelper.cs                |  4 +-
 .../MediaEncoding/EncodingJobInfo.cs               | 15 ++---
 .../MediaEncoding/EncodingJobOptions.cs            |  3 +-
 MediaBrowser.Controller/MediaEncoding/JobLogger.cs | 14 ++---
 .../Providers/DirectoryService.cs                  | 10 +---
 .../Parsers/BaseItemXmlParser.cs                   | 33 ++++-------
 .../Parsers/GameXmlParser.cs                       |  4 +-
 .../Probing/FFProbeHelpers.cs                      | 12 +---
 .../Probing/ProbeResultNormalizer.cs               | 41 ++++----------
 MediaBrowser.MediaEncoding/Subtitles/AssParser.cs  |  3 +-
 MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs  |  3 +-
 MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs  |  3 +-
 MediaBrowser.Model/Configuration/LibraryOptions.cs |  3 +-
 MediaBrowser.Model/Dlna/ConditionProcessor.cs      | 12 ++--
 MediaBrowser.Model/Dlna/StreamBuilder.cs           | 39 +++++--------
 MediaBrowser.Model/Dlna/StreamInfo.cs              | 18 ++----
 MediaBrowser.Model/Drawing/ImageSize.cs            |  4 +-
 .../Entities/ProviderIdsExtensions.cs              |  3 +-
 MediaBrowser.Model/Net/MimeTypes.cs                |  6 +-
 MediaBrowser.Providers/Manager/ProviderManager.cs  |  6 +-
 .../Manager/SimplePriorityQueue.cs                 |  3 +-
 .../MediaInfo/FFProbeVideoInfo.cs                  |  4 +-
 .../Movies/FanartMovieImageProvider.cs             |  3 +-
 .../Movies/GenericMovieDbInfo.cs                   |  7 +--
 MediaBrowser.Providers/Movies/MovieDbProvider.cs   |  4 +-
 MediaBrowser.Providers/Movies/MovieDbSearch.cs     |  8 +--
 MediaBrowser.Providers/Music/Extensions.cs         |  6 +-
 .../Music/FanArtAlbumProvider.cs                   |  3 +-
 .../Music/FanArtArtistProvider.cs                  |  3 +-
 .../Music/MusicBrainzAlbumProvider.cs              |  3 +-
 MediaBrowser.Providers/Omdb/OmdbItemProvider.cs    |  6 +-
 MediaBrowser.Providers/Omdb/OmdbProvider.cs        | 30 +++-------
 .../People/MovieDbPersonProvider.cs                |  4 +-
 .../TV/FanArt/FanArtSeasonProvider.cs              |  7 +--
 .../TV/FanArt/FanartSeriesProvider.cs              |  3 +-
 .../TV/MissingEpisodeProvider.cs                   | 11 +---
 .../TV/Omdb/OmdbEpisodeProvider.cs                 |  3 +-
 .../TV/TheMovieDb/MovieDbEpisodeProvider.cs        |  3 +-
 .../TV/TheMovieDb/MovieDbSeasonProvider.cs         |  3 +-
 .../TV/TheMovieDb/MovieDbSeriesProvider.cs         |  3 +-
 .../TV/TheTVDB/TvdbEpisodeImageProvider.cs         |  8 +--
 .../TV/TheTVDB/TvdbEpisodeProvider.cs              | 42 ++++----------
 .../TV/TheTVDB/TvdbPrescanTask.cs                  |  4 +-
 .../TV/TheTVDB/TvdbSeasonImageProvider.cs          | 12 +---
 .../TV/TheTVDB/TvdbSeriesImageProvider.cs          | 12 +---
 .../TV/TheTVDB/TvdbSeriesProvider.cs               | 65 +++++++---------------
 MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs | 39 ++++---------
 .../Parsers/EpisodeNfoParser.cs                    | 32 +++--------
 .../Parsers/SeasonNfoParser.cs                     |  4 +-
 .../Parsers/SeriesNfoParser.cs                     |  3 +-
 SocketHttpListener/Ext.cs                          |  3 +-
 SocketHttpListener/Net/CookieHelper.cs             |  3 +-
 SocketHttpListener/Net/HttpEndPointListener.cs     |  3 +-
 SocketHttpListener/Net/HttpEndPointManager.cs      |  3 +-
 .../Net/HttpListenerRequestUriBuilder.cs           |  6 +-
 SocketHttpListener/Net/WebHeaderCollection.cs      |  6 +-
 .../Net/WebSockets/HttpWebSocket.Managed.cs        |  3 +-
 124 files changed, 354 insertions(+), 820 deletions(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/DvdLib/Ifo/Dvd.cs b/DvdLib/Ifo/Dvd.cs
index 71ba2d5e4f..f784be83e7 100644
--- a/DvdLib/Ifo/Dvd.cs
+++ b/DvdLib/Ifo/Dvd.cs
@@ -31,10 +31,9 @@ namespace DvdLib.Ifo
                 foreach (var ifo in allIfos)
                 {
                     var num = ifo.Name.Split('_').ElementAtOrDefault(1);
-                    ushort ifoNumber;
                     var numbersRead = new List<ushort>();
 
-                    if (!string.IsNullOrEmpty(num) && ushort.TryParse(num, out ifoNumber) && !numbersRead.Contains(ifoNumber))
+                    if (!string.IsNullOrEmpty(num) && ushort.TryParse(num, out var ifoNumber) && !numbersRead.Contains(ifoNumber))
                     {
                         ReadVTS(ifoNumber, ifo.FullName);
                         numbersRead.Add(ifoNumber);
diff --git a/Emby.Dlna/ContentDirectory/ControlHandler.cs b/Emby.Dlna/ContentDirectory/ControlHandler.cs
index 5a8fd40685..ed2114e6aa 100644
--- a/Emby.Dlna/ContentDirectory/ControlHandler.cs
+++ b/Emby.Dlna/ContentDirectory/ControlHandler.cs
@@ -192,9 +192,7 @@ namespace Emby.Dlna.ContentDirectory
 
         public string GetValueOrDefault(IDictionary<string, string> sparams, string key, string defaultValue)
         {
-            string val;
-
-            if (sparams.TryGetValue(key, out val))
+            if (sparams.TryGetValue(key, out var val))
             {
                 return val;
             }
@@ -216,14 +214,12 @@ namespace Emby.Dlna.ContentDirectory
             int? requestedCount = null;
             int? start = 0;
 
-            int requestedVal;
-            if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out requestedVal) && requestedVal > 0)
+            if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out var requestedVal) && requestedVal > 0)
             {
                 requestedCount = requestedVal;
             }
 
-            int startVal;
-            if (sparams.ContainsKey("StartingIndex") && int.TryParse(sparams["StartingIndex"], out startVal) && startVal > 0)
+            if (sparams.ContainsKey("StartingIndex") && int.TryParse(sparams["StartingIndex"], out var startVal) && startVal > 0)
             {
                 start = startVal;
             }
@@ -334,14 +330,12 @@ namespace Emby.Dlna.ContentDirectory
             int? requestedCount = null;
             int? start = 0;
 
-            int requestedVal;
-            if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out requestedVal) && requestedVal > 0)
+            if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out var requestedVal) && requestedVal > 0)
             {
                 requestedCount = requestedVal;
             }
 
-            int startVal;
-            if (sparams.ContainsKey("StartingIndex") && int.TryParse(sparams["StartingIndex"], out startVal) && startVal > 0)
+            if (sparams.ContainsKey("StartingIndex") && int.TryParse(sparams["StartingIndex"], out var startVal) && startVal > 0)
             {
                 start = startVal;
             }
@@ -1293,7 +1287,6 @@ namespace Emby.Dlna.ContentDirectory
 
         private ServerItem ParseItemId(string id, User user)
         {
-            Guid itemId;
             StubType? stubType = null;
 
             // After using PlayTo, MediaMonkey sends a request to the server trying to get item info
@@ -1319,7 +1312,7 @@ namespace Emby.Dlna.ContentDirectory
                 }
             }
 
-            if (Guid.TryParse(id, out itemId))
+            if (Guid.TryParse(id, out var itemId))
             {
                 var item = _libraryManager.GetItemById(itemId);
 
diff --git a/Emby.Dlna/DlnaManager.cs b/Emby.Dlna/DlnaManager.cs
index 62b2619087..45ba44870d 100644
--- a/Emby.Dlna/DlnaManager.cs
+++ b/Emby.Dlna/DlnaManager.cs
@@ -239,9 +239,7 @@ namespace Emby.Dlna
                 return false;
             }
 
-            string value;
-
-            if (headers.TryGetValue(header.Name, out value))
+            if (headers.TryGetValue(header.Name, out var value))
             {
                 switch (header.Match)
                 {
@@ -288,8 +286,7 @@ namespace Emby.Dlna
         {
             lock (_profiles)
             {
-                Tuple<InternalProfileInfo, DeviceProfile> profileTuple;
-                if (_profiles.TryGetValue(path, out profileTuple))
+                if (_profiles.TryGetValue(path, out var profileTuple))
                 {
                     return profileTuple.Item2;
                 }
diff --git a/Emby.Dlna/Eventing/EventManager.cs b/Emby.Dlna/Eventing/EventManager.cs
index a416ebb2b7..c17f64a57a 100644
--- a/Emby.Dlna/Eventing/EventManager.cs
+++ b/Emby.Dlna/Eventing/EventManager.cs
@@ -82,9 +82,7 @@ namespace Emby.Dlna.Eventing
                 // Starts with SECOND-
                 header = header.Split('-').Last();
 
-                int val;
-
-                if (int.TryParse(header, NumberStyles.Integer, _usCulture, out val))
+                if (int.TryParse(header, NumberStyles.Integer, _usCulture, out var val))
                 {
                     return val;
                 }
@@ -97,8 +95,7 @@ namespace Emby.Dlna.Eventing
         {
             _logger.LogDebug("Cancelling event subscription {0}", subscriptionId);
 
-            EventSubscription sub;
-            _subscriptions.TryRemove(subscriptionId, out sub);
+            _subscriptions.TryRemove(subscriptionId, out var sub);
 
             return new EventSubscriptionResponse
             {
@@ -129,9 +126,7 @@ namespace Emby.Dlna.Eventing
 
         private EventSubscription GetSubscription(string id, bool throwOnMissing)
         {
-            EventSubscription e;
-
-            if (!_subscriptions.TryGetValue(id, out e) && throwOnMissing)
+            if (!_subscriptions.TryGetValue(id, out var e) && throwOnMissing)
             {
                 throw new ResourceNotFoundException("Event with Id " + id + " not found.");
             }
diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs
index e0b4f025a2..1ab6014eb0 100644
--- a/Emby.Dlna/Main/DlnaEntryPoint.cs
+++ b/Emby.Dlna/Main/DlnaEntryPoint.cs
@@ -308,8 +308,7 @@ namespace Emby.Dlna.Main
 
         private string CreateUuid(string text)
         {
-            Guid guid;
-            if (!Guid.TryParse(text, out guid))
+            if (!Guid.TryParse(text, out var guid))
             {
                 guid = text.GetMD5();
             }
diff --git a/Emby.Dlna/PlayTo/Device.cs b/Emby.Dlna/PlayTo/Device.cs
index a85720b5f9..68aa0a6a71 100644
--- a/Emby.Dlna/PlayTo/Device.cs
+++ b/Emby.Dlna/PlayTo/Device.cs
@@ -589,9 +589,7 @@ namespace Emby.Dlna.PlayTo
 
             if (transportStateValue != null)
             {
-                TRANSPORTSTATE state;
-
-                if (Enum.TryParse(transportStateValue, true, out state))
+                if (Enum.TryParse(transportStateValue, true, out TRANSPORTSTATE state))
                 {
                     return state;
                 }
diff --git a/Emby.Dlna/PlayTo/PlayToController.cs b/Emby.Dlna/PlayTo/PlayToController.cs
index 85a37d7f8f..c615b9fbc3 100644
--- a/Emby.Dlna/PlayTo/PlayToController.cs
+++ b/Emby.Dlna/PlayTo/PlayToController.cs
@@ -98,14 +98,11 @@ namespace Emby.Dlna.PlayTo
         {
             var info = e.Argument;
 
-            string nts;
-            info.Headers.TryGetValue("NTS", out nts);
+            info.Headers.TryGetValue("NTS", out var nts);
 
-            string usn;
-            if (!info.Headers.TryGetValue("USN", out usn)) usn = string.Empty;
+            if (!info.Headers.TryGetValue("USN", out var usn)) usn = string.Empty;
 
-            string nt;
-            if (!info.Headers.TryGetValue("NT", out nt)) nt = string.Empty;
+            if (!info.Headers.TryGetValue("NT", out var nt)) nt = string.Empty;
 
             if (usn.IndexOf(_device.Properties.UUID, StringComparison.OrdinalIgnoreCase) != -1 &&
                 !_disposed)
@@ -623,9 +620,7 @@ namespace Emby.Dlna.PlayTo
 
         private Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken)
         {
-            GeneralCommandType commandType;
-
-            if (Enum.TryParse(command.Name, true, out commandType))
+            if (Enum.TryParse(command.Name, true, out GeneralCommandType commandType))
             {
                 switch (commandType)
                 {
@@ -641,13 +636,9 @@ namespace Emby.Dlna.PlayTo
                         return _device.ToggleMute(cancellationToken);
                     case GeneralCommandType.SetAudioStreamIndex:
                         {
-                            string arg;
-
-                            if (command.Arguments.TryGetValue("Index", out arg))
+                            if (command.Arguments.TryGetValue("Index", out var arg))
                             {
-                                int val;
-
-                                if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out val))
+                                if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out var val))
                                 {
                                     return SetAudioStreamIndex(val);
                                 }
@@ -659,13 +650,9 @@ namespace Emby.Dlna.PlayTo
                         }
                     case GeneralCommandType.SetSubtitleStreamIndex:
                         {
-                            string arg;
-
-                            if (command.Arguments.TryGetValue("Index", out arg))
+                            if (command.Arguments.TryGetValue("Index", out var arg))
                             {
-                                int val;
-
-                                if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out val))
+                                if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out var val))
                                 {
                                     return SetSubtitleStreamIndex(val);
                                 }
@@ -677,13 +664,9 @@ namespace Emby.Dlna.PlayTo
                         }
                     case GeneralCommandType.SetVolume:
                         {
-                            string arg;
-
-                            if (command.Arguments.TryGetValue("Volume", out arg))
+                            if (command.Arguments.TryGetValue("Volume", out var arg))
                             {
-                                int volume;
-
-                                if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out volume))
+                                if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out var volume))
                                 {
                                     return _device.SetVolume(volume, cancellationToken);
                                 }
@@ -878,8 +861,7 @@ namespace Emby.Dlna.PlayTo
         {
             var value = values.Get(name);
 
-            int result;
-            if (int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out result))
+            if (int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var result))
             {
                 return result;
             }
@@ -891,8 +873,7 @@ namespace Emby.Dlna.PlayTo
         {
             var value = values.Get(name);
 
-            long result;
-            if (long.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out result))
+            if (long.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var result))
             {
                 return result;
             }
diff --git a/Emby.Dlna/PlayTo/PlayToManager.cs b/Emby.Dlna/PlayTo/PlayToManager.cs
index d8d289c590..12280d1bf7 100644
--- a/Emby.Dlna/PlayTo/PlayToManager.cs
+++ b/Emby.Dlna/PlayTo/PlayToManager.cs
@@ -78,11 +78,9 @@ namespace Emby.Dlna.PlayTo
 
             var info = e.Argument;
 
-            string usn;
-            if (!info.Headers.TryGetValue("USN", out usn)) usn = string.Empty;
+            if (!info.Headers.TryGetValue("USN", out var usn)) usn = string.Empty;
 
-            string nt;
-            if (!info.Headers.TryGetValue("NT", out nt)) nt = string.Empty;
+            if (!info.Headers.TryGetValue("NT", out var nt)) nt = string.Empty;
 
             string location = info.Location.ToString();
 
@@ -155,8 +153,7 @@ namespace Emby.Dlna.PlayTo
             _logger.LogDebug("Attempting to create PlayToController from location {0}", location);
 
             _logger.LogDebug("Logging session activity from location {0}", location);
-            string uuid;
-            if (info.Headers.TryGetValue("USN", out uuid))
+            if (info.Headers.TryGetValue("USN", out var uuid))
             {
                 uuid = GetUuid(uuid);
             }
diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index a88c720a70..ac6c7e9dba 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -846,8 +846,7 @@ namespace Emby.Drawing
         {
             lock (_locks)
             {
-                LockInfo info;
-                if (_locks.TryGetValue(key, out info))
+                if (_locks.TryGetValue(key, out var info))
                 {
                     info.Count++;
                 }
diff --git a/Emby.Naming/Audio/AlbumParser.cs b/Emby.Naming/Audio/AlbumParser.cs
index 8cf8ec5e5b..7d029a9f49 100644
--- a/Emby.Naming/Audio/AlbumParser.cs
+++ b/Emby.Naming/Audio/AlbumParser.cs
@@ -49,8 +49,7 @@ namespace Emby.Naming.Audio
 
                     tmp = tmp.Trim().Split(' ').FirstOrDefault() ?? string.Empty;
 
-                    int val;
-                    if (int.TryParse(tmp, NumberStyles.Integer, CultureInfo.InvariantCulture, out val))
+                    if (int.TryParse(tmp, NumberStyles.Integer, CultureInfo.InvariantCulture, out var val))
                     {
                         result.IsMultiPart = true;
                         break;
diff --git a/Emby.Naming/AudioBook/AudioBookFilePathParser.cs b/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
index b386593e72..5909797947 100644
--- a/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
+++ b/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
@@ -34,8 +34,7 @@ namespace Emby.Naming.AudioBook
                         var value = match.Groups["chapter"];
                         if (value.Success)
                         {
-                            int intValue;
-                            if (int.TryParse(value.Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out intValue))
+                            if (int.TryParse(value.Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intValue))
                             {
                                 result.ChapterNumber = intValue;
                             }
@@ -46,8 +45,7 @@ namespace Emby.Naming.AudioBook
                         var value = match.Groups["part"];
                         if (value.Success)
                         {
-                            int intValue;
-                            if (int.TryParse(value.Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out intValue))
+                            if (int.TryParse(value.Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intValue))
                             {
                                 result.ChapterNumber = intValue;
                             }
diff --git a/Emby.Naming/TV/EpisodePathParser.cs b/Emby.Naming/TV/EpisodePathParser.cs
index 260cb505c3..9485d697b1 100644
--- a/Emby.Naming/TV/EpisodePathParser.cs
+++ b/Emby.Naming/TV/EpisodePathParser.cs
@@ -122,8 +122,7 @@ namespace Emby.Naming.TV
                 }
                 else if (expression.IsNamed)
                 {
-                    int num;
-                    if (int.TryParse(match.Groups["seasonnumber"].Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out num))
+                    if (int.TryParse(match.Groups["seasonnumber"].Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var num))
                     {
                         result.SeasonNumber = num;
                     }
@@ -154,8 +153,7 @@ namespace Emby.Naming.TV
                 }
                 else
                 {
-                    int num;
-                    if (int.TryParse(match.Groups[1].Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out num))
+                    if (int.TryParse(match.Groups[1].Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var num))
                     {
                         result.SeasonNumber = num;
                     }
diff --git a/Emby.Naming/TV/SeasonPathParser.cs b/Emby.Naming/TV/SeasonPathParser.cs
index 002bbe19cf..f1dcc50b89 100644
--- a/Emby.Naming/TV/SeasonPathParser.cs
+++ b/Emby.Naming/TV/SeasonPathParser.cs
@@ -72,8 +72,7 @@ namespace Emby.Naming.TV
 
             if (supportNumericSeasonFolders)
             {
-                int val;
-                if (int.TryParse(filename, NumberStyles.Integer, CultureInfo.InvariantCulture, out val))
+                if (int.TryParse(filename, NumberStyles.Integer, CultureInfo.InvariantCulture, out var val))
                 {
                     return new Tuple<int?, bool>(val, true);
                 }
@@ -83,8 +82,7 @@ namespace Emby.Naming.TV
             {
                 var testFilename = filename.Substring(1);
 
-                int val;
-                if (int.TryParse(testFilename, NumberStyles.Integer, CultureInfo.InvariantCulture, out val))
+                if (int.TryParse(testFilename, NumberStyles.Integer, CultureInfo.InvariantCulture, out var val))
                 {
                     return new Tuple<int?, bool>(val, true);
                 }
@@ -121,8 +119,7 @@ namespace Emby.Naming.TV
 
             part = part.Substring(1);
 
-            int value;
-            if (int.TryParse(part, NumberStyles.Integer, CultureInfo.InvariantCulture, out value))
+            if (int.TryParse(part, NumberStyles.Integer, CultureInfo.InvariantCulture, out var value))
             {
                 return value;
             }
diff --git a/Emby.Naming/Video/CleanDateTimeParser.cs b/Emby.Naming/Video/CleanDateTimeParser.cs
index 702e7ae6fd..74807ef53f 100644
--- a/Emby.Naming/Video/CleanDateTimeParser.cs
+++ b/Emby.Naming/Video/CleanDateTimeParser.cs
@@ -71,8 +71,7 @@ namespace Emby.Naming.Video
 
             if (match.Success && match.Groups.Count == 4)
             {
-                int year;
-                if (match.Groups[1].Success && match.Groups[2].Success && int.TryParse(match.Groups[2].Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out year))
+                if (match.Groups[1].Success && match.Groups[2].Success && int.TryParse(match.Groups[2].Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var year))
                 {
                     name = match.Groups[1].Value;
                     result.Year = year;
diff --git a/Emby.Photos/PhotoProvider.cs b/Emby.Photos/PhotoProvider.cs
index 99d0ed7aba..4fcd418f0b 100644
--- a/Emby.Photos/PhotoProvider.cs
+++ b/Emby.Photos/PhotoProvider.cs
@@ -7,6 +7,7 @@ using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using Microsoft.Extensions.Logging;
@@ -144,8 +145,7 @@ namespace Emby.Photos
                             }
                             else
                             {
-                                MediaBrowser.Model.Drawing.ImageOrientation orientation;
-                                if (Enum.TryParse(image.ImageTag.Orientation.ToString(), true, out orientation))
+                                if (Enum.TryParse(image.ImageTag.Orientation.ToString(), true, out ImageOrientation orientation))
                                 {
                                     item.Orientation = orientation;
                                 }
diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/Emby.Server.Implementations/Channels/ChannelManager.cs
index e9002abfb6..3650900c36 100644
--- a/Emby.Server.Implementations/Channels/ChannelManager.cs
+++ b/Emby.Server.Implementations/Channels/ChannelManager.cs
@@ -387,9 +387,7 @@ namespace Emby.Server.Implementations.Channels
 
         private async Task<IEnumerable<MediaSourceInfo>> GetChannelItemMediaSourcesInternal(IRequiresMediaInfoCallback channel, string id, CancellationToken cancellationToken)
         {
-            Tuple<DateTime, List<MediaSourceInfo>> cachedInfo;
-
-            if (_channelItemMediaInfo.TryGetValue(id, out cachedInfo))
+            if (_channelItemMediaInfo.TryGetValue(id, out var cachedInfo))
             {
                 if ((DateTime.UtcNow - cachedInfo.Item1).TotalMinutes < 5)
                 {
diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs
index edb73d2a15..d990e71493 100644
--- a/Emby.Server.Implementations/Data/SqliteExtensions.cs
+++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs
@@ -114,9 +114,7 @@ namespace Emby.Server.Implementations.Data
         {
             var dateText = result.ToString();
 
-            DateTime dateTimeResult;
-
-            if (DateTime.TryParseExact(dateText, _datetimeFormats, DateTimeFormatInfo.InvariantInfo, DateTimeStyles.None, out dateTimeResult))
+            if (DateTime.TryParseExact(dateText, _datetimeFormats, DateTimeFormatInfo.InvariantInfo, DateTimeStyles.None, out var dateTimeResult))
             {
                 return dateTimeResult.ToUniversalTime();
             }
@@ -201,8 +199,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, double value)
         {
-            IBindParameter bindParam;
-            if (statement.BindParameters.TryGetValue(name, out bindParam))
+            if (statement.BindParameters.TryGetValue(name, out var bindParam))
             {
                 bindParam.Bind(value);
             }
@@ -214,8 +211,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, string value)
         {
-            IBindParameter bindParam;
-            if (statement.BindParameters.TryGetValue(name, out bindParam))
+            if (statement.BindParameters.TryGetValue(name, out var bindParam))
             {
                 if (value == null)
                 {
@@ -234,8 +230,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, bool value)
         {
-            IBindParameter bindParam;
-            if (statement.BindParameters.TryGetValue(name, out bindParam))
+            if (statement.BindParameters.TryGetValue(name, out var bindParam))
             {
                 bindParam.Bind(value);
             }
@@ -247,8 +242,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, float value)
         {
-            IBindParameter bindParam;
-            if (statement.BindParameters.TryGetValue(name, out bindParam))
+            if (statement.BindParameters.TryGetValue(name, out var bindParam))
             {
                 bindParam.Bind(value);
             }
@@ -260,8 +254,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, int value)
         {
-            IBindParameter bindParam;
-            if (statement.BindParameters.TryGetValue(name, out bindParam))
+            if (statement.BindParameters.TryGetValue(name, out var bindParam))
             {
                 bindParam.Bind(value);
             }
@@ -273,8 +266,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, Guid value)
         {
-            IBindParameter bindParam;
-            if (statement.BindParameters.TryGetValue(name, out bindParam))
+            if (statement.BindParameters.TryGetValue(name, out var bindParam))
             {
                 bindParam.Bind(value.ToGuidBlob());
             }
@@ -286,8 +278,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, DateTime value)
         {
-            IBindParameter bindParam;
-            if (statement.BindParameters.TryGetValue(name, out bindParam))
+            if (statement.BindParameters.TryGetValue(name, out var bindParam))
             {
                 bindParam.Bind(value.ToDateTimeParamValue());
             }
@@ -299,8 +290,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, long value)
         {
-            IBindParameter bindParam;
-            if (statement.BindParameters.TryGetValue(name, out bindParam))
+            if (statement.BindParameters.TryGetValue(name, out var bindParam))
             {
                 bindParam.Bind(value);
             }
@@ -312,8 +302,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, byte[] value)
         {
-            IBindParameter bindParam;
-            if (statement.BindParameters.TryGetValue(name, out bindParam))
+            if (statement.BindParameters.TryGetValue(name, out var bindParam))
             {
                 bindParam.Bind(value);
             }
@@ -325,8 +314,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBindNull(this IStatement statement, string name)
         {
-            IBindParameter bindParam;
-            if (statement.BindParameters.TryGetValue(name, out bindParam))
+            if (statement.BindParameters.TryGetValue(name, out var bindParam))
             {
                 bindParam.BindNull();
             }
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 7e72713714..972c5c52d0 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -1164,25 +1164,21 @@ namespace Emby.Server.Implementations.Data
 
             image.Path = RestorePath(parts[0]);
 
-            long ticks;
-            if (long.TryParse(parts[1], NumberStyles.Any, CultureInfo.InvariantCulture, out ticks))
+            if (long.TryParse(parts[1], NumberStyles.Any, CultureInfo.InvariantCulture, out var ticks))
             {
                 image.DateModified = new DateTime(ticks, DateTimeKind.Utc);
             }
 
-            ImageType type;
-            if (Enum.TryParse(parts[2], true, out type))
+            if (Enum.TryParse(parts[2], true, out ImageType type))
             {
                 image.Type = type;
             }
 
             if (parts.Length >= 5)
             {
-                int width;
-                int height;
-                if (int.TryParse(parts[3], NumberStyles.Integer, CultureInfo.InvariantCulture, out width))
+                if (int.TryParse(parts[3], NumberStyles.Integer, CultureInfo.InvariantCulture, out var width))
                 {
-                    if (int.TryParse(parts[4], NumberStyles.Integer, CultureInfo.InvariantCulture, out height))
+                    if (int.TryParse(parts[4], NumberStyles.Integer, CultureInfo.InvariantCulture, out var height))
                     {
                         image.Width = width;
                         image.Height = height;
@@ -1589,8 +1585,7 @@ namespace Emby.Server.Implementations.Data
 
             if (!reader.IsDBNull(index))
             {
-                ProgramAudio audio;
-                if (Enum.TryParse(reader.GetString(index), true, out audio))
+                if (Enum.TryParse(reader.GetString(index), true, out ProgramAudio audio))
                 {
                     item.Audio = audio;
                 }
@@ -1634,9 +1629,7 @@ namespace Emby.Server.Implementations.Data
                     item.LockedFields = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(
                         i =>
                         {
-                            MetadataFields parsedValue;
-
-                            if (Enum.TryParse(i, true, out parsedValue))
+                            if (Enum.TryParse(i, true, out MetadataFields parsedValue))
                             {
                                 return parsedValue;
                             }
@@ -1674,9 +1667,7 @@ namespace Emby.Server.Implementations.Data
                         trailer.TrailerTypes = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(
                             i =>
                             {
-                                TrailerType parsedValue;
-
-                                if (Enum.TryParse(i, true, out parsedValue))
+                                if (Enum.TryParse(i, true, out TrailerType parsedValue))
                                 {
                                     return parsedValue;
                                 }
@@ -1857,8 +1848,7 @@ namespace Emby.Server.Implementations.Data
 
             if (!reader.IsDBNull(index))
             {
-                ExtraType extraType;
-                if (Enum.TryParse(reader.GetString(index), true, out extraType))
+                if (Enum.TryParse(reader.GetString(index), true, out ExtraType extraType))
                 {
                     item.ExtraType = extraType;
                 }
@@ -5149,8 +5139,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
 
         private IEnumerable<string> MapIncludeItemTypes(string value)
         {
-            string[] result;
-            if (_types.TryGetValue(value, out result))
+            if (_types.TryGetValue(value, out var result))
             {
                 return result;
             }
diff --git a/Emby.Server.Implementations/Devices/DeviceId.cs b/Emby.Server.Implementations/Devices/DeviceId.cs
index 4f5950ac73..56e555937a 100644
--- a/Emby.Server.Implementations/Devices/DeviceId.cs
+++ b/Emby.Server.Implementations/Devices/DeviceId.cs
@@ -25,8 +25,7 @@ namespace Emby.Server.Implementations.Devices
                 {
                     var value = File.ReadAllText(CachePath, Encoding.UTF8);
 
-                    Guid guid;
-                    if (Guid.TryParse(value, out guid))
+                    if (Guid.TryParse(value, out var guid))
                     {
                         return value;
                     }
diff --git a/Emby.Server.Implementations/Devices/DeviceManager.cs b/Emby.Server.Implementations/Devices/DeviceManager.cs
index f21daab62e..f2ab28d4cf 100644
--- a/Emby.Server.Implementations/Devices/DeviceManager.cs
+++ b/Emby.Server.Implementations/Devices/DeviceManager.cs
@@ -98,8 +98,7 @@ namespace Emby.Server.Implementations.Devices
         {
             lock (_capabilitiesSyncLock)
             {
-                ClientCapabilities result;
-                if (_capabilitiesCache.TryGetValue(id, out result))
+                if (_capabilitiesCache.TryGetValue(id, out var result))
                 {
                     return result;
                 }
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 8877fc051f..6cb8207160 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -637,9 +637,7 @@ namespace Emby.Server.Implementations.Dto
                     Type = person.Type
                 };
 
-                Person entity;
-
-                if (dictionary.TryGetValue(person.Name, out entity))
+                if (dictionary.TryGetValue(person.Name, out var entity))
                 {
                     baseItemPerson.PrimaryImageTag = GetImageCacheTag(entity, ImageType.Primary);
                     baseItemPerson.Id = entity.Id.ToString("N");
diff --git a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs b/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
index 382861635b..7faad05e3c 100644
--- a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
+++ b/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
@@ -108,11 +108,9 @@ namespace Emby.Server.Implementations.EntryPoints
 
             var info = e.Argument;
 
-            string usn;
-            if (!info.Headers.TryGetValue("USN", out usn)) usn = string.Empty;
+            if (!info.Headers.TryGetValue("USN", out var usn)) usn = string.Empty;
 
-            string nt;
-            if (!info.Headers.TryGetValue("NT", out nt)) nt = string.Empty;
+            if (!info.Headers.TryGetValue("NT", out var nt)) nt = string.Empty;
 
             // Filter device type
             if (usn.IndexOf("WANIPConnection:", StringComparison.OrdinalIgnoreCase) == -1 &&
@@ -141,8 +139,7 @@ namespace Emby.Server.Implementations.EntryPoints
 
             _logger.LogDebug("Found NAT device: " + identifier);
 
-            IPAddress address;
-            if (IPAddress.TryParse(info.Location.Host, out address))
+            if (IPAddress.TryParse(info.Location.Host, out var address))
             {
                 // The Handle method doesn't need the port
                 var endpoint = new IPEndPoint(address, info.Location.Port);
@@ -153,8 +150,7 @@ namespace Emby.Server.Implementations.EntryPoints
                 {
                     var localAddressString = await _appHost.GetLocalApiUrl(CancellationToken.None).ConfigureAwait(false);
 
-                    Uri uri;
-                    if (Uri.TryCreate(localAddressString, UriKind.Absolute, out uri))
+                    if (Uri.TryCreate(localAddressString, UriKind.Absolute, out var uri))
                     {
                         localAddressString = uri.Host;
 
diff --git a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
index bcfcc339ca..7a8b09cf78 100644
--- a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
@@ -89,8 +89,7 @@ namespace Emby.Server.Implementations.EntryPoints
 
             var progress = e.Argument.Item2;
 
-            DateTime lastMessageSendTime;
-            if (_lastProgressMessageTimes.TryGetValue(item.Id, out lastMessageSendTime))
+            if (_lastProgressMessageTimes.TryGetValue(item.Id, out var lastMessageSendTime))
             {
                 if (progress > 0 && progress < 100 && (DateTime.UtcNow - lastMessageSendTime).TotalMilliseconds < 1000)
                 {
diff --git a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
index d6cf39d623..93e222ebea 100644
--- a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
@@ -62,9 +62,7 @@ namespace Emby.Server.Implementations.EntryPoints
                     UpdateTimer.Change(UpdateDuration, Timeout.Infinite);
                 }
 
-                List<BaseItem> keys;
-
-                if (!_changedItems.TryGetValue(e.UserId, out keys))
+                if (!_changedItems.TryGetValue(e.UserId, out var keys))
                 {
                     keys = new List<BaseItem>();
                     _changedItems[e.UserId] = keys;
diff --git a/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs b/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
index 255e1476f5..8b0012410a 100644
--- a/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
+++ b/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
@@ -90,11 +90,9 @@ namespace Emby.Server.Implementations.HttpClientManager
                 throw new ArgumentNullException(nameof(host));
             }
 
-            HttpClientInfo client;
-
             var key = host + enableHttpCompression;
 
-            if (!_httpClients.TryGetValue(key, out client))
+            if (!_httpClients.TryGetValue(key, out var client))
             {
                 client = new HttpClientInfo();
 
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index 784b397353..6ae56c2add 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -124,8 +124,7 @@ namespace Emby.Server.Implementations.HttpServer
 
         public Type GetServiceTypeByRequest(Type requestType)
         {
-            Type serviceType;
-            ServiceOperationsMap.TryGetValue(requestType, out serviceType);
+            ServiceOperationsMap.TryGetValue(requestType, out var serviceType);
             return serviceType;
         }
 
@@ -215,8 +214,7 @@ namespace Emby.Server.Implementations.HttpServer
 
             var exceptionType = ex.GetType();
 
-            int statusCode;
-            if (!_mapExceptionToStatusCode.TryGetValue(exceptionType, out statusCode))
+            if (!_mapExceptionToStatusCode.TryGetValue(exceptionType, out var statusCode))
             {
                 if (ex is DirectoryNotFoundException)
                 {
@@ -704,8 +702,7 @@ namespace Emby.Server.Implementations.HttpServer
                 return null;
             }
 
-            string contentType;
-            var restPath = ServiceHandler.FindMatchingRestPath(httpReq.HttpMethod, pathInfo, out contentType);
+            var restPath = ServiceHandler.FindMatchingRestPath(httpReq.HttpMethod, pathInfo, out var contentType);
 
             if (restPath != null)
             {
@@ -731,8 +728,7 @@ namespace Emby.Server.Implementations.HttpServer
         private void RedirectToSecureUrl(IHttpRequest httpReq, IResponse httpRes, string url)
         {
             int currentPort;
-            Uri uri;
-            if (Uri.TryCreate(url, UriKind.Absolute, out uri))
+            if (Uri.TryCreate(url, UriKind.Absolute, out var uri))
             {
                 currentPort = uri.Port;
                 var builder = new UriBuilder(uri);
diff --git a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
index ce9dc9ad9c..3cfa2bc75f 100644
--- a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -96,8 +96,7 @@ namespace Emby.Server.Implementations.HttpServer
                 responseHeaders = new Dictionary<string, string>();
             }
 
-            string expires;
-            if (addCachePrevention && !responseHeaders.TryGetValue("Expires", out expires))
+            if (addCachePrevention && !responseHeaders.TryGetValue("Expires", out var expires))
             {
                 responseHeaders["Expires"] = "-1";
             }
@@ -143,8 +142,7 @@ namespace Emby.Server.Implementations.HttpServer
                 responseHeaders = new Dictionary<string, string>();
             }
 
-            string expires;
-            if (addCachePrevention && !responseHeaders.TryGetValue("Expires", out expires))
+            if (addCachePrevention && !responseHeaders.TryGetValue("Expires", out var expires))
             {
                 responseHeaders["Expires"] = "-1";
             }
@@ -188,8 +186,7 @@ namespace Emby.Server.Implementations.HttpServer
                 responseHeaders = new Dictionary<string, string>();
             }
 
-            string expires;
-            if (addCachePrevention && !responseHeaders.TryGetValue("Expires", out expires))
+            if (addCachePrevention && !responseHeaders.TryGetValue("Expires", out var expires))
             {
                 responseHeaders["Expires"] = "-1";
             }
@@ -702,9 +699,7 @@ namespace Emby.Server.Implementations.HttpServer
 
             if (!string.IsNullOrEmpty(ifModifiedSinceHeader))
             {
-                DateTime ifModifiedSince;
-
-                if (DateTime.TryParse(ifModifiedSinceHeader, out ifModifiedSince))
+                if (DateTime.TryParse(ifModifiedSinceHeader, out var ifModifiedSince))
                 {
                     if (IsNotModified(ifModifiedSince.ToUniversalTime(), cacheDuration, lastDateModified))
                     {
@@ -720,11 +715,9 @@ namespace Emby.Server.Implementations.HttpServer
             // Validate If-None-Match
             if ((hasCacheKey || !string.IsNullOrEmpty(ifNoneMatchHeader)))
             {
-                Guid ifNoneMatch;
-
                 ifNoneMatchHeader = (ifNoneMatchHeader ?? string.Empty).Trim('\"');
 
-                if (Guid.TryParse(ifNoneMatchHeader, out ifNoneMatch))
+                if (Guid.TryParse(ifNoneMatchHeader, out var ifNoneMatch))
                 {
                     if (hasCacheKey && cacheKey.Equals(ifNoneMatch))
                     {
diff --git a/Emby.Server.Implementations/HttpServer/ResponseFilter.cs b/Emby.Server.Implementations/HttpServer/ResponseFilter.cs
index edd2a394b5..ed8644e33e 100644
--- a/Emby.Server.Implementations/HttpServer/ResponseFilter.cs
+++ b/Emby.Server.Implementations/HttpServer/ResponseFilter.cs
@@ -56,9 +56,8 @@ namespace Emby.Server.Implementations.HttpServer
                 }
 
                 // Content length has to be explicitly set on on HttpListenerResponse or it won't be happy
-                string contentLength;
 
-                if (hasHeaders.Headers.TryGetValue("Content-Length", out contentLength) && !string.IsNullOrEmpty(contentLength))
+                if (hasHeaders.Headers.TryGetValue("Content-Length", out var contentLength) && !string.IsNullOrEmpty(contentLength))
                 {
                     var length = long.Parse(contentLength, UsCulture);
 
diff --git a/Emby.Server.Implementations/HttpServer/Security/AuthService.cs b/Emby.Server.Implementations/HttpServer/Security/AuthService.cs
index c037292ffe..499a334fc9 100644
--- a/Emby.Server.Implementations/HttpServer/Security/AuthService.cs
+++ b/Emby.Server.Implementations/HttpServer/Security/AuthService.cs
@@ -207,8 +207,7 @@ namespace Emby.Server.Implementations.HttpServer.Security
 
         private static AuthenticationInfo GetTokenInfo(IRequest request)
         {
-            object info;
-            request.Items.TryGetValue("OriginalAuthenticationInfo", out info);
+            request.Items.TryGetValue("OriginalAuthenticationInfo", out var info);
             return info as AuthenticationInfo;
         }
 
diff --git a/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs b/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
index ae4adda7cd..cab41e65b9 100644
--- a/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
+++ b/Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
@@ -26,8 +26,7 @@ namespace Emby.Server.Implementations.HttpServer.Security
 
         public AuthorizationInfo GetAuthorizationInfo(IRequest requestContext)
         {
-            object cached;
-            if (requestContext.Items.TryGetValue("AuthorizationInfo", out cached))
+            if (requestContext.Items.TryGetValue("AuthorizationInfo", out var cached))
             {
                 return (AuthorizationInfo)cached;
             }
diff --git a/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs b/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
index 2c70572227..81e11d3122 100644
--- a/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
+++ b/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
@@ -31,8 +31,7 @@ namespace Emby.Server.Implementations.HttpServer.Security
 
         private AuthenticationInfo GetTokenInfo(IRequest request)
         {
-            object info;
-            request.Items.TryGetValue("OriginalAuthenticationInfo", out info);
+            request.Items.TryGetValue("OriginalAuthenticationInfo", out var info);
             return info as AuthenticationInfo;
         }
 
diff --git a/Emby.Server.Implementations/IO/LibraryMonitor.cs b/Emby.Server.Implementations/IO/LibraryMonitor.cs
index 2c92e65432..6a32040110 100644
--- a/Emby.Server.Implementations/IO/LibraryMonitor.cs
+++ b/Emby.Server.Implementations/IO/LibraryMonitor.cs
@@ -103,8 +103,7 @@ namespace Emby.Server.Implementations.IO
             // But if we make this delay too high, we risk missing legitimate changes, such as user adding a new file, or hand-editing metadata
             await Task.Delay(45000).ConfigureAwait(false);
 
-            string val;
-            _tempIgnoredPaths.TryRemove(path, out val);
+            _tempIgnoredPaths.TryRemove(path, out var val);
 
             if (refreshPath)
             {
@@ -365,9 +364,7 @@ namespace Emby.Server.Implementations.IO
         /// <param name="path">The path.</param>
         private void StopWatchingPath(string path)
         {
-            FileSystemWatcher watcher;
-
-            if (_fileSystemWatchers.TryGetValue(path, out watcher))
+            if (_fileSystemWatchers.TryGetValue(path, out var watcher))
             {
                 DisposeWatcher(watcher, true);
             }
@@ -424,9 +421,7 @@ namespace Emby.Server.Implementations.IO
         /// <param name="watcher">The watcher.</param>
         private void RemoveWatcherFromList(FileSystemWatcher watcher)
         {
-            FileSystemWatcher removed;
-
-            _fileSystemWatchers.TryRemove(watcher.Path, out removed);
+            _fileSystemWatchers.TryRemove(watcher.Path, out var removed);
         }
 
         /// <summary>
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 0d25cbc92c..9f999cb7f3 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -432,8 +432,7 @@ namespace Emby.Server.Implementations.Library
                 ItemRepository.DeleteItem(child.Id, CancellationToken.None);
             }
 
-            BaseItem removed;
-            _libraryItemsCache.TryRemove(item.Id, out removed);
+            _libraryItemsCache.TryRemove(item.Id, out var removed);
 
             ReportItemRemoved(item, parent);
         }
@@ -1241,9 +1240,7 @@ namespace Emby.Server.Implementations.Library
                 throw new ArgumentNullException(nameof(id));
             }
 
-            BaseItem item;
-
-            if (LibraryItemsCache.TryGetValue(id, out item))
+            if (LibraryItemsCache.TryGetValue(id, out var item))
             {
                 return item;
             }
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index fb0f33a2f6..321a82c78c 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -777,8 +777,7 @@ namespace Emby.Server.Implementations.Library
 
             try
             {
-                ILiveStream info;
-                if (_openStreams.TryGetValue(id, out info))
+                if (_openStreams.TryGetValue(id, out var info))
                 {
                     return info;
                 }
@@ -810,9 +809,7 @@ namespace Emby.Server.Implementations.Library
 
             try
             {
-                ILiveStream liveStream;
-
-                if (_openStreams.TryGetValue(id, out liveStream))
+                if (_openStreams.TryGetValue(id, out var liveStream))
                 {
                     liveStream.ConsumerCount--;
 
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 0ee53281df..f48d59040e 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -395,8 +395,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         private async Task<EpgChannelData> GetEpgChannels(IListingsProvider provider, ListingsProviderInfo info, bool enableCache, CancellationToken cancellationToken)
         {
-            EpgChannelData result;
-            if (!enableCache || !_epgChannels.TryGetValue(info.Id, out result))
+            if (!enableCache || !_epgChannels.TryGetValue(info.Id, out var result))
             {
                 var channels = await provider.GetChannels(info, cancellationToken).ConfigureAwait(false);
 
@@ -652,9 +651,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     TimerCancelled(this, new GenericEventArgs<string>(timerId));
                 }
             }
-            ActiveRecordingInfo activeRecordingInfo;
 
-            if (_activeRecordings.TryGetValue(timerId, out activeRecordingInfo))
+            if (_activeRecordings.TryGetValue(timerId, out var activeRecordingInfo))
             {
                 activeRecordingInfo.Timer = timer;
                 activeRecordingInfo.CancellationTokenSource.Cancel();
@@ -821,8 +819,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
 
             // Only update if not currently active
-            ActiveRecordingInfo activeRecordingInfo;
-            if (!_activeRecordings.TryGetValue(updatedTimer.Id, out activeRecordingInfo))
+            if (!_activeRecordings.TryGetValue(updatedTimer.Id, out var activeRecordingInfo))
             {
                 existingTimer.PrePaddingSeconds = updatedTimer.PrePaddingSeconds;
                 existingTimer.PostPaddingSeconds = updatedTimer.PostPaddingSeconds;
@@ -864,9 +861,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         public string GetActiveRecordingPath(string id)
         {
-            ActiveRecordingInfo info;
-
-            if (_activeRecordings.TryGetValue(id, out info))
+            if (_activeRecordings.TryGetValue(id, out var info))
             {
                 return info.Path;
             }
@@ -1440,8 +1435,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             TriggerRefresh(recordPath);
             _libraryMonitor.ReportFileSystemChangeComplete(recordPath, false);
 
-            ActiveRecordingInfo removed;
-            _activeRecordings.TryRemove(timer.Id, out removed);
+            _activeRecordings.TryRemove(timer.Id, out var removed);
 
             if (recordingStatus != RecordingStatus.Completed && DateTime.UtcNow < timer.EndDate && timer.RetryCount < 10)
             {
@@ -2007,8 +2001,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     writer.WriteStartDocument(true);
                     writer.WriteStartElement("tvshow");
 
-                    string id;
-                    if (timer.SeriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out id))
+                    if (timer.SeriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out var id))
                     {
                         writer.WriteElementString("id", id);
                     }
@@ -2417,8 +2410,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     {
                         // 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
-                        ActiveRecordingInfo activeRecordingInfo;
-                        if (!_activeRecordings.TryGetValue(timer.Id, out activeRecordingInfo) && !_activeRecordings.TryGetValue(existingTimer.Id, out activeRecordingInfo))
+                        if (!_activeRecordings.TryGetValue(timer.Id, out var activeRecordingInfo) && !_activeRecordings.TryGetValue(existingTimer.Id, out activeRecordingInfo))
                         {
                             UpdateExistingTimerWithNewMetadata(existingTimer, timer);
 
@@ -2521,9 +2513,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (string.IsNullOrWhiteSpace(channelId) && !parent.ChannelId.Equals(Guid.Empty))
             {
-                LiveTvChannel channel;
-
-                if (!tempChannelCache.TryGetValue(parent.ChannelId, out channel))
+                if (!tempChannelCache.TryGetValue(parent.ChannelId, out var channel))
                 {
                     channel = _libraryManager.GetItemList(new InternalItemsQuery
                     {
@@ -2582,9 +2572,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (!programInfo.ChannelId.Equals(Guid.Empty))
             {
-                LiveTvChannel channel;
-
-                if (!tempChannelCache.TryGetValue(programInfo.ChannelId, out channel))
+                if (!tempChannelCache.TryGetValue(programInfo.ChannelId, out var channel))
                 {
                     channel = _libraryManager.GetItemList(new InternalItemsQuery
                     {
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
index 9730d552d1..7f67d70a96 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
@@ -140,8 +140,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         private void StopTimer(TimerInfo item)
         {
-            ITimer timer;
-            if (_timers.TryRemove(item.Id, out timer))
+            if (_timers.TryRemove(item.Id, out var timer))
             {
                 timer.Dispose();
             }
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index 3799271919..6efbefd5d6 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -528,8 +528,7 @@ namespace Emby.Server.Implementations.LiveTv
             var isNew = false;
             var forceUpdate = false;
 
-            LiveTvProgram item;
-            if (!allExistingPrograms.TryGetValue(id, out item))
+            if (!allExistingPrograms.TryGetValue(id, out var item))
             {
                 isNew = true;
                 item = new LiveTvProgram
@@ -1940,8 +1939,7 @@ namespace Emby.Server.Implementations.LiveTv
 
                 foreach (var programDto in currentProgramDtos)
                 {
-                    BaseItemDto channelDto;
-                    if (currentChannelsDict.TryGetValue(programDto.ChannelId, out channelDto))
+                    if (currentChannelsDict.TryGetValue(programDto.ChannelId, out var channelDto))
                     {
                         channelDto.CurrentProgram = programDto;
                     }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index 36f688c43a..09d33342e9 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -118,8 +118,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             {
                 if (!string.IsNullOrEmpty(cacheKey))
                 {
-                    DiscoverResponse response;
-                    if (_modelCache.TryGetValue(cacheKey, out response))
+                    if (_modelCache.TryGetValue(cacheKey, out var response))
                     {
                         return response;
                     }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
index 67eeec21dd..8268802fb9 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
@@ -132,8 +132,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             var receiveBuffer = new byte[8192];
             var response = await socket.ReceiveAsync(receiveBuffer, 0, receiveBuffer.Length, cancellationToken).ConfigureAwait(false);
 
-            string returnVal;
-            ParseReturnMessage(response.Buffer, response.ReceivedBytes, out returnVal);
+            ParseReturnMessage(response.Buffer, response.ReceivedBytes, out var returnVal);
 
             return string.Equals(returnVal, "none", StringComparison.OrdinalIgnoreCase);
         }
@@ -167,9 +166,8 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 var lockkeyMsg = CreateSetMessage(i, "lockkey", lockKeyString, null);
                 await tcpClient.SendToAsync(lockkeyMsg, 0, lockkeyMsg.Length, ipEndPoint, cancellationToken).ConfigureAwait(false);
                 var response = await tcpClient.ReceiveAsync(receiveBuffer, 0, receiveBuffer.Length, cancellationToken).ConfigureAwait(false);
-                string returnVal;
                 // parse response to make sure it worked
-                if (!ParseReturnMessage(response.Buffer, response.ReceivedBytes, out returnVal))
+                if (!ParseReturnMessage(response.Buffer, response.ReceivedBytes, out var returnVal))
                     continue;
 
                 var commandList = commands.GetCommands();
@@ -222,8 +220,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                     await tcpClient.SendToAsync(channelMsg, 0, channelMsg.Length, new IpEndPointInfo(_remoteIp, HdHomeRunPort), cancellationToken).ConfigureAwait(false);
                     var response = await tcpClient.ReceiveAsync(receiveBuffer, 0, receiveBuffer.Length, cancellationToken).ConfigureAwait(false);
                     // parse response to make sure it worked
-                    string returnVal;
-                    if (!ParseReturnMessage(response.Buffer, response.ReceivedBytes, out returnVal))
+                    if (!ParseReturnMessage(response.Buffer, response.ReceivedBytes, out var returnVal))
                     {
                         return;
                     }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
index 0772a60252..638796e2ef 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
@@ -135,9 +135,8 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
             var protocol = _mediaSourceManager.GetPathProtocol(path);
 
-            Uri uri;
             var isRemote = true;
-            if (Uri.TryCreate(path, UriKind.Absolute, out uri))
+            if (Uri.TryCreate(path, UriKind.Absolute, out var uri))
             {
                 isRemote = !_networkManager.IsInLocalNetwork(uri.Host);
             }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
index 353b938c67..c1ee059f48 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
@@ -117,12 +117,10 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
             extInf = extInf.Trim();
 
-            string remaining;
-            var attributes = ParseExtInf(extInf, out remaining);
+            var attributes = ParseExtInf(extInf, out var remaining);
             extInf = remaining;
 
-            string value;
-            if (attributes.TryGetValue("tvg-logo", out value))
+            if (attributes.TryGetValue("tvg-logo", out var value))
             {
                 channel.ImageUrl = value;
             }
@@ -130,11 +128,9 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             channel.Name = GetChannelName(extInf, attributes);
             channel.Number = GetChannelNumber(extInf, attributes, mediaUrl);
 
-            string tvgId;
-            attributes.TryGetValue("tvg-id", out tvgId);
+            attributes.TryGetValue("tvg-id", out var tvgId);
 
-            string channelId;
-            attributes.TryGetValue("channel-id", out channelId);
+            attributes.TryGetValue("channel-id", out var channelId);
 
             channel.TunerChannelId = string.IsNullOrWhiteSpace(tvgId) ? channelId : tvgId;
 
@@ -172,8 +168,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 {
                     var numberPart = nameInExtInf.Substring(0, numberIndex).Trim(new[] { ' ', '.' });
 
-                    double number;
-                    if (double.TryParse(numberPart, NumberStyles.Any, CultureInfo.InvariantCulture, out number))
+                    if (double.TryParse(numberPart, NumberStyles.Any, CultureInfo.InvariantCulture, out var number))
                     {
                         numberString = numberPart;
                     }
@@ -187,11 +182,9 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
             if (!IsValidChannelNumber(numberString))
             {
-                string value;
-                if (attributes.TryGetValue("tvg-id", out value))
+                if (attributes.TryGetValue("tvg-id", out var value))
                 {
-                    double doubleValue;
-                    if (double.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out doubleValue))
+                    if (double.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var doubleValue))
                     {
                         numberString = value;
                     }
@@ -205,8 +198,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
             if (!IsValidChannelNumber(numberString))
             {
-                string value;
-                if (attributes.TryGetValue("channel-id", out value))
+                if (attributes.TryGetValue("channel-id", out var value))
                 {
                     numberString = value;
                 }
@@ -259,8 +251,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 return false;
             }
 
-            double value;
-            if (!double.TryParse(numberString, NumberStyles.Any, CultureInfo.InvariantCulture, out value))
+            if (!double.TryParse(numberString, NumberStyles.Any, CultureInfo.InvariantCulture, out var value))
             {
                 return false;
             }
@@ -283,8 +274,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 {
                     var numberPart = nameInExtInf.Substring(0, numberIndex).Trim(new[] { ' ', '.' });
 
-                    double number;
-                    if (double.TryParse(numberPart, NumberStyles.Any, CultureInfo.InvariantCulture, out number))
+                    if (double.TryParse(numberPart, NumberStyles.Any, CultureInfo.InvariantCulture, out var number))
                     {
                         //channel.Number = number.ToString();
                         nameInExtInf = nameInExtInf.Substring(numberIndex + 1).Trim(new[] { ' ', '-' });
@@ -292,8 +282,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
             }
 
-            string name;
-            attributes.TryGetValue("tvg-name", out name);
+            attributes.TryGetValue("tvg-name", out var name);
 
             if (string.IsNullOrWhiteSpace(name))
             {
diff --git a/Emby.Server.Implementations/Localization/LocalizationManager.cs b/Emby.Server.Implementations/Localization/LocalizationManager.cs
index 998595ecd1..b71e89c5ae 100644
--- a/Emby.Server.Implementations/Localization/LocalizationManager.cs
+++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs
@@ -298,9 +298,7 @@ namespace Emby.Server.Implementations.Localization
         /// <param name="countryCode">The country code.</param>
         private Dictionary<string, ParentalRating> GetRatings(string countryCode)
         {
-            Dictionary<string, ParentalRating> value;
-
-            _allParentalRatings.TryGetValue(countryCode, out value);
+            _allParentalRatings.TryGetValue(countryCode, out var value);
 
             return value;
         }
@@ -320,9 +318,7 @@ namespace Emby.Server.Implementations.Localization
 
                     if (parts.Length == 2)
                     {
-                        int value;
-
-                        if (int.TryParse(parts[1], NumberStyles.Integer, UsCulture, out value))
+                        if (int.TryParse(parts[1], NumberStyles.Integer, UsCulture, out var value))
                         {
                             return new ParentalRating { Name = parts[0], Value = value };
                         }
@@ -364,9 +360,7 @@ namespace Emby.Server.Implementations.Localization
 
             var ratingsDictionary = GetParentalRatingsDictionary();
 
-            ParentalRating value;
-
-            if (ratingsDictionary.TryGetValue(rating, out value))
+            if (ratingsDictionary.TryGetValue(rating, out var value))
             {
                 return value.Value;
             }
@@ -427,9 +421,7 @@ namespace Emby.Server.Implementations.Localization
 
             var dictionary = GetLocalizationDictionary(culture);
 
-            string value;
-
-            if (dictionary.TryGetValue(phrase, out value))
+            if (dictionary.TryGetValue(phrase, out var value))
             {
                 return value;
             }
diff --git a/Emby.Server.Implementations/Networking/IPNetwork/IPNetwork.cs b/Emby.Server.Implementations/Networking/IPNetwork/IPNetwork.cs
index 21feaea33d..16f39daf7c 100644
--- a/Emby.Server.Implementations/Networking/IPNetwork/IPNetwork.cs
+++ b/Emby.Server.Implementations/Networking/IPNetwork/IPNetwork.cs
@@ -524,8 +524,7 @@ namespace System.Net
             }
 
             var uintIpAddress = IPNetwork.ToBigInteger(ipaddress);
-            byte? cidr2 = null;
-            bool parsed = IPNetwork.TryToCidr(netmask, out cidr2);
+            bool parsed = IPNetwork.TryToCidr(netmask, out var cidr2);
             if (parsed == false)
             {
                 if (tryParse == false)
@@ -615,8 +614,7 @@ namespace System.Net
         /// <returns></returns>
         public static BigInteger ToBigInteger(IPAddress ipaddress)
         {
-            BigInteger? uintIpAddress = null;
-            IPNetwork.InternalToBigInteger(false, ipaddress, out uintIpAddress);
+            IPNetwork.InternalToBigInteger(false, ipaddress, out var uintIpAddress);
             return (BigInteger)uintIpAddress;
 
         }
@@ -630,8 +628,7 @@ namespace System.Net
         /// <returns></returns>
         public static bool TryToBigInteger(IPAddress ipaddress, out BigInteger? uintIpAddress)
         {
-            BigInteger? uintIpAddress2 = null;
-            IPNetwork.InternalToBigInteger(true, ipaddress, out uintIpAddress2);
+            IPNetwork.InternalToBigInteger(true, ipaddress, out var uintIpAddress2);
             bool parsed = (uintIpAddress2 != null);
             uintIpAddress = uintIpAddress2;
             return parsed;
@@ -681,9 +678,7 @@ namespace System.Net
         /// <returns></returns>
         public static BigInteger ToUint(byte cidr, AddressFamily family)
         {
-
-            BigInteger? uintNetmask = null;
-            IPNetwork.InternalToBigInteger(false, cidr, family, out uintNetmask);
+            IPNetwork.InternalToBigInteger(false, cidr, family, out var uintNetmask);
             return (BigInteger)uintNetmask;
         }
 
@@ -695,9 +690,7 @@ namespace System.Net
         /// <returns></returns>
         public static bool TryToUint(byte cidr, AddressFamily family, out BigInteger? uintNetmask)
         {
-
-            BigInteger? uintNetmask2 = null;
-            IPNetwork.InternalToBigInteger(true, cidr, family, out uintNetmask2);
+            IPNetwork.InternalToBigInteger(true, cidr, family, out var uintNetmask2);
             bool parsed = (uintNetmask2 != null);
             uintNetmask = uintNetmask2;
             return parsed;
@@ -812,8 +805,7 @@ namespace System.Net
         /// <returns></returns>
         public static byte ToCidr(IPAddress netmask)
         {
-            byte? cidr = null;
-            IPNetwork.InternalToCidr(false, netmask, out cidr);
+            IPNetwork.InternalToCidr(false, netmask, out var cidr);
             return (byte)cidr;
         }
 
@@ -827,8 +819,7 @@ namespace System.Net
         /// <returns></returns>
         public static bool TryToCidr(IPAddress netmask, out byte? cidr)
         {
-            byte? cidr2 = null;
-            IPNetwork.InternalToCidr(true, netmask, out cidr2);
+            IPNetwork.InternalToCidr(true, netmask, out var cidr2);
             bool parsed = (cidr2 != null);
             cidr = cidr2;
             return parsed;
@@ -846,8 +837,8 @@ namespace System.Net
                 cidr = null;
                 return;
             }
-            BigInteger? uintNetmask2 = null;
-            bool parsed = IPNetwork.TryToBigInteger(netmask, out uintNetmask2);
+
+            bool parsed = IPNetwork.TryToBigInteger(netmask, out var uintNetmask2);
 
             /// 20180217 lduchosal
             /// impossible to reach code.
@@ -860,8 +851,7 @@ namespace System.Net
             /// }
             var uintNetmask = (BigInteger)uintNetmask2;
 
-            byte? cidr2 = null;
-            IPNetwork.InternalToCidr(tryParse, uintNetmask, netmask.AddressFamily, out cidr2);
+            IPNetwork.InternalToCidr(tryParse, uintNetmask, netmask.AddressFamily, out var cidr2);
             cidr = cidr2;
 
             return;
@@ -1491,8 +1481,7 @@ namespace System.Net
         /// <returns></returns>
         public static IPNetwork[] Supernet(IPNetwork[] ipnetworks)
         {
-            IPNetwork[] supernet;
-            InternalSupernet(false, ipnetworks, out supernet);
+            InternalSupernet(false, ipnetworks, out var supernet);
             return supernet;
         }
 
@@ -1642,14 +1631,12 @@ namespace System.Net
                 throw new ArgumentNullException(nameof(end));
             }
 
-            IPAddress startIP;
-            if (!IPAddress.TryParse(start, out startIP))
+            if (!IPAddress.TryParse(start, out var startIP))
             {
                 throw new ArgumentException("start");
             }
 
-            IPAddress endIP;
-            if (!IPAddress.TryParse(end, out endIP))
+            if (!IPAddress.TryParse(end, out var endIP))
             {
                 throw new ArgumentException("end");
             }
diff --git a/Emby.Server.Implementations/Networking/NetworkManager.cs b/Emby.Server.Implementations/Networking/NetworkManager.cs
index 70d8376a97..b486c0ef71 100644
--- a/Emby.Server.Implementations/Networking/NetworkManager.cs
+++ b/Emby.Server.Implementations/Networking/NetworkManager.cs
@@ -203,11 +203,9 @@ namespace Emby.Server.Implementations.Networking
         private Dictionary<string, List<string>> _subnetLookup = new Dictionary<string, List<string>>(StringComparer.Ordinal);
         private List<string> GetSubnets(string endpointFirstPart)
         {
-            List<string> subnets;
-
             lock (_subnetLookup)
             {
-                if (_subnetLookup.TryGetValue(endpointFirstPart, out subnets))
+                if (_subnetLookup.TryGetValue(endpointFirstPart, out var subnets))
                 {
                     return subnets;
                 }
@@ -298,8 +296,7 @@ namespace Emby.Server.Implementations.Networking
                 throw new ArgumentNullException(nameof(endpoint));
             }
 
-            IPAddress address;
-            if (IPAddress.TryParse(endpoint, out address))
+            if (IPAddress.TryParse(endpoint, out var address))
             {
                 var addressString = address.ToString();
 
@@ -348,8 +345,7 @@ namespace Emby.Server.Implementations.Networking
             }
             else if (resolveHost)
             {
-                Uri uri;
-                if (Uri.TryCreate(endpoint, UriKind.RelativeOrAbsolute, out uri))
+                if (Uri.TryCreate(endpoint, UriKind.RelativeOrAbsolute, out var uri))
                 {
                     try
                     {
@@ -588,9 +584,7 @@ namespace Emby.Server.Implementations.Networking
         /// <exception cref="FormatException"></exception>
         private static int GetPort(string p)
         {
-            int port;
-
-            if (!int.TryParse(p, out port)
+            if (!int.TryParse(p, out var port)
              || port < IPEndPoint.MinPort
              || port > IPEndPoint.MaxPort)
             {
@@ -618,8 +612,7 @@ namespace Emby.Server.Implementations.Networking
 
         public IpAddressInfo ParseIpAddress(string ipAddress)
         {
-            IpAddressInfo info;
-            if (TryParseIpAddress(ipAddress, out info))
+            if (TryParseIpAddress(ipAddress, out var info))
             {
                 return info;
             }
@@ -629,8 +622,7 @@ namespace Emby.Server.Implementations.Networking
 
         public bool TryParseIpAddress(string ipAddress, out IpAddressInfo ipAddressInfo)
         {
-            IPAddress address;
-            if (IPAddress.TryParse(ipAddress, out address))
+            if (IPAddress.TryParse(ipAddress, out var address))
             {
                 ipAddressInfo = ToIpAddressInfo(address);
                 return true;
diff --git a/Emby.Server.Implementations/ScheduledTasks/TaskManager.cs b/Emby.Server.Implementations/ScheduledTasks/TaskManager.cs
index ac47c9625b..09c348e240 100644
--- a/Emby.Server.Implementations/ScheduledTasks/TaskManager.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/TaskManager.cs
@@ -364,8 +364,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
             {
                 var list = new List<Tuple<Type, TaskOptions>>();
 
-                Tuple<Type, TaskOptions> item;
-                while (_taskQueue.TryDequeue(out item))
+                while (_taskQueue.TryDequeue(out var item))
                 {
                     if (list.All(i => i.Item1 != item.Item1))
                     {
diff --git a/Emby.Server.Implementations/Security/MBLicenseFile.cs b/Emby.Server.Implementations/Security/MBLicenseFile.cs
index 8273ec8b22..91fbb4a2c8 100644
--- a/Emby.Server.Implementations/Security/MBLicenseFile.cs
+++ b/Emby.Server.Implementations/Security/MBLicenseFile.cs
@@ -68,9 +68,8 @@ namespace Emby.Server.Implementations.Security
         public void RemoveRegCheck(string featureId)
         {
             var key = GetKey(featureId);
-            FeatureRegInfo val;
 
-            _updateRecords.TryRemove(key, out val);
+            _updateRecords.TryRemove(key, out var val);
 
             Save();
         }
@@ -135,13 +134,11 @@ namespace Emby.Server.Implementations.Security
                         continue;
                     }
 
-                    Guid feat;
-                    if (Guid.TryParse(line, out feat))
+                    if (Guid.TryParse(line, out var feat))
                     {
                         var lineParts = contents[i + 1].Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
 
-                        long ticks;
-                        if (long.TryParse(lineParts[0], out ticks))
+                        if (long.TryParse(lineParts[0], out var ticks))
                         {
                             var info = new FeatureRegInfo
                             {
diff --git a/Emby.Server.Implementations/Serialization/XmlSerializer.cs b/Emby.Server.Implementations/Serialization/XmlSerializer.cs
index 210b5dfdd8..22d6712ec2 100644
--- a/Emby.Server.Implementations/Serialization/XmlSerializer.cs
+++ b/Emby.Server.Implementations/Serialization/XmlSerializer.cs
@@ -33,8 +33,7 @@ namespace Emby.Server.Implementations.Serialization
             var key = type.FullName;
             lock (_serializers)
             {
-                XmlSerializer serializer;
-                if (!_serializers.TryGetValue(key, out serializer))
+                if (!_serializers.TryGetValue(key, out var serializer))
                 {
                     serializer = new XmlSerializer(type);
                     _serializers[key] = serializer;
diff --git a/Emby.Server.Implementations/Services/ServiceController.cs b/Emby.Server.Implementations/Services/ServiceController.cs
index b34832f45e..9afa7f5023 100644
--- a/Emby.Server.Implementations/Services/ServiceController.cs
+++ b/Emby.Server.Implementations/Services/ServiceController.cs
@@ -89,8 +89,7 @@ namespace Emby.Server.Implementations.Services
             if (restPath.Path.IndexOfAny(InvalidRouteChars) != -1)
                 throw new ArgumentException(string.Format("Route '{0}' on '{1}' contains invalid chars. ", restPath.Path, restPath.RequestType.GetMethodName()));
 
-            List<RestPath> pathsAtFirstMatch;
-            if (!RestPathMap.TryGetValue(restPath.FirstMatchHashKey, out pathsAtFirstMatch))
+            if (!RestPathMap.TryGetValue(restPath.FirstMatchHashKey, out var pathsAtFirstMatch))
             {
                 pathsAtFirstMatch = new List<RestPath>();
                 RestPathMap[restPath.FirstMatchHashKey] = pathsAtFirstMatch;
diff --git a/Emby.Server.Implementations/Services/ServiceExec.cs b/Emby.Server.Implementations/Services/ServiceExec.cs
index 2791ee2ac4..0f2247a012 100644
--- a/Emby.Server.Implementations/Services/ServiceExec.cs
+++ b/Emby.Server.Implementations/Services/ServiceExec.cs
@@ -73,8 +73,7 @@ namespace Emby.Server.Implementations.Services
         {
             var actionName = request.Verb ?? "POST";
 
-            ServiceMethod actionContext;
-            if (ServiceExecGeneral.execMap.TryGetValue(ServiceMethod.Key(serviceType, actionName, requestName), out actionContext))
+            if (ServiceExecGeneral.execMap.TryGetValue(ServiceMethod.Key(serviceType, actionName, requestName), out var actionContext))
             {
                 if (actionContext.RequestFilters != null)
                 {
diff --git a/Emby.Server.Implementations/Services/ServiceHandler.cs b/Emby.Server.Implementations/Services/ServiceHandler.cs
index c1c42e3ec9..dcf4f41723 100644
--- a/Emby.Server.Implementations/Services/ServiceHandler.cs
+++ b/Emby.Server.Implementations/Services/ServiceHandler.cs
@@ -62,8 +62,7 @@ namespace Emby.Server.Implementations.Services
         {
             if (this.RestPath == null)
             {
-                string contentType;
-                this.RestPath = FindMatchingRestPath(httpMethod, pathInfo, out contentType);
+                this.RestPath = FindMatchingRestPath(httpMethod, pathInfo, out var contentType);
 
                 if (contentType != null)
                     ResponseContentType = contentType;
@@ -137,9 +136,8 @@ namespace Emby.Server.Implementations.Services
 
         public static object CreateRequest(IRequest httpReq, RestPath restPath, Dictionary<string, string> requestParams, object requestDto)
         {
-            string contentType;
             var pathInfo = !restPath.IsWildCardPath
-                ? GetSanitizedPathInfo(httpReq.PathInfo, out contentType)
+                ? GetSanitizedPathInfo(httpReq.PathInfo, out var contentType)
                 : httpReq.PathInfo;
 
             return restPath.CreateRequest(pathInfo, requestParams, requestDto);
@@ -239,8 +237,7 @@ namespace Emby.Server.Implementations.Services
 
         private static RestPath GetRoute(IRequest req)
         {
-            object route;
-            req.Items.TryGetValue("__route", out route);
+            req.Items.TryGetValue("__route", out var route);
             return route as RestPath;
         }
     }
diff --git a/Emby.Server.Implementations/Services/ServicePath.cs b/Emby.Server.Implementations/Services/ServicePath.cs
index 8ad31c160d..7e1993b710 100644
--- a/Emby.Server.Implementations/Services/ServicePath.cs
+++ b/Emby.Server.Implementations/Services/ServicePath.cs
@@ -306,8 +306,7 @@ namespace Emby.Server.Implementations.Services
 
         public int MatchScore(string httpMethod, string[] withPathInfoParts)
         {
-            int wildcardMatchCount;
-            var isMatch = IsMatch(httpMethod, withPathInfoParts, out wildcardMatchCount);
+            var isMatch = IsMatch(httpMethod, withPathInfoParts, out var wildcardMatchCount);
             if (!isMatch)
             {
                 return -1;
@@ -484,8 +483,7 @@ namespace Emby.Server.Implementations.Services
                     continue;
                 }
 
-                string propertyNameOnRequest;
-                if (!this.propertyNamesMap.TryGetValue(variableName.ToLower(), out propertyNameOnRequest))
+                if (!this.propertyNamesMap.TryGetValue(variableName.ToLower(), out var propertyNameOnRequest))
                 {
                     if (string.Equals("ignore", variableName, StringComparison.OrdinalIgnoreCase))
                     {
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index e398b58cc9..e605931989 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -265,8 +265,7 @@ namespace Emby.Server.Implementations.Session
             {
                 var key = GetSessionKey(session.Client, session.DeviceId);
 
-                SessionInfo removed;
-                _activeConnections.TryRemove(key, out removed);
+                _activeConnections.TryRemove(key, out var removed);
 
                 OnSessionEnded(session);
             }
@@ -281,8 +280,7 @@ namespace Emby.Server.Implementations.Session
             {
                 var key = GetSessionKey(session.Client, session.DeviceId);
 
-                SessionInfo removed;
-                _activeConnections.TryRemove(key, out removed);
+                _activeConnections.TryRemove(key, out var removed);
 
                 OnSessionEnded(session);
             }
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/ProbVector.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/ProbVector.cs
index 7ad16108a9..d7afb41133 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/ProbVector.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/ProbVector.cs
@@ -11,9 +11,7 @@ namespace NLangDetect.Core
         {
             get
             {
-                double value;
-
-                return _dict.TryGetValue(key, out value) ? value : 0.0;
+                return _dict.TryGetValue(key, out var value) ? value : 0.0;
             }
 
             set
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/Utils/Messages.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/Utils/Messages.cs
index d7dab85281..879c0a09b2 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/Utils/Messages.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/Utils/Messages.cs
@@ -18,10 +18,8 @@ namespace NLangDetect.Core.Utils
 
         public static string getString(string key)
         {
-            string value;
-
             return
-              _messages.TryGetValue(key, out value)
+              _messages.TryGetValue(key, out var value)
                 ? value
                 : string.Format("!{0}!", key);
         }
diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index 68cb7821d6..6ed6f127b5 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -317,9 +317,7 @@ namespace Emby.Server.Implementations.Updates
                 return true;
             }
 
-            Version requiredVersion;
-
-            return Version.TryParse(packageVersionInfo.requiredVersionStr, out requiredVersion) && currentServerVersion >= requiredVersion;
+            return Version.TryParse(packageVersionInfo.requiredVersionStr, out var requiredVersion) && currentServerVersion >= requiredVersion;
         }
 
         /// <summary>
diff --git a/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs b/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs
index 8234393c2c..52e58ed8da 100644
--- a/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs
+++ b/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs
@@ -140,8 +140,7 @@ namespace Emby.XmlTv.Classes
         private void SetChannelNumber(XmlTvChannel channel, string value)
         {
             value = value.Replace("-", ".");
-            double number;
-            if (double.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out number))
+            if (double.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var number))
             {
                 channel.Number = value;
             }
@@ -426,8 +425,7 @@ namespace Emby.XmlTv.Classes
                 if (textValue.Contains("/"))
                 {
                     var components = textValue.Split('/');
-                    float value;
-                    if (float.TryParse(components[0], out value))
+                    if (float.TryParse(components[0], out var value))
                     {
                         result.StarRating = value;
                     }
@@ -1053,8 +1051,7 @@ namespace Emby.XmlTv.Classes
                 }
 
                 var standardDate = string.Format("{0} {1}", dateComponent, dateOffset);
-                DateTimeOffset parsedDateTime;
-                if (DateTimeOffset.TryParseExact(standardDate, "yyyyMMddHHmmss zzz", CultureInfo.CurrentCulture, DateTimeStyles.None, out parsedDateTime))
+                if (DateTimeOffset.TryParseExact(standardDate, "yyyyMMddHHmmss zzz", CultureInfo.CurrentCulture, DateTimeStyles.None, out var parsedDateTime))
                 {
                     return parsedDateTime.ToUniversalTime();
                 }
diff --git a/Jellyfin.Server/SocketSharp/RequestMono.cs b/Jellyfin.Server/SocketSharp/RequestMono.cs
index 0e3d2ad657..45cb323d28 100644
--- a/Jellyfin.Server/SocketSharp/RequestMono.cs
+++ b/Jellyfin.Server/SocketSharp/RequestMono.cs
@@ -148,9 +148,7 @@ namespace Jellyfin.SocketSharp
 
         internal static bool IsInvalidString(string val)
         {
-            int validationFailureIndex;
-
-            return IsInvalidString(val, out validationFailureIndex);
+            return IsInvalidString(val, out var validationFailureIndex);
         }
 
         internal static bool IsInvalidString(string val, out int validationFailureIndex)
diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs
index 0c3431e97e..4e2380cfab 100644
--- a/MediaBrowser.Api/ApiEntryPoint.cs
+++ b/MediaBrowser.Api/ApiEntryPoint.cs
@@ -101,8 +101,7 @@ namespace MediaBrowser.Api
         {
             lock (_transcodingLocks)
             {
-                SemaphoreSlim result;
-                if (!_transcodingLocks.TryGetValue(outputPath, out result))
+                if (!_transcodingLocks.TryGetValue(outputPath, out var result))
                 {
                     result = new SemaphoreSlim(1, 1);
                     _transcodingLocks[outputPath] = result;
diff --git a/MediaBrowser.Api/IHasItemFields.cs b/MediaBrowser.Api/IHasItemFields.cs
index 6b7a643896..8598ea262f 100644
--- a/MediaBrowser.Api/IHasItemFields.cs
+++ b/MediaBrowser.Api/IHasItemFields.cs
@@ -37,9 +37,7 @@ namespace MediaBrowser.Api
 
             return val.Split(',').Select(v =>
             {
-                ItemFields value;
-
-                if (Enum.TryParse(v, true, out value))
+                if (Enum.TryParse(v, true, out ItemFields value))
                 {
                     return (ItemFields?)value;
                 }
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index 418ed18d67..369e9781f1 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -659,8 +659,7 @@ namespace MediaBrowser.Api.Images
         {
             if (!string.IsNullOrWhiteSpace(request.Format))
             {
-                ImageFormat format;
-                if (Enum.TryParse(request.Format, true, out format))
+                if (Enum.TryParse(request.Format, true, out ImageFormat format))
                 {
                     return new ImageFormat[] { format };
                 }
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 6d4af16e73..bb525adc73 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -531,8 +531,7 @@ namespace MediaBrowser.Api.Playback
                 {
                     if (!string.IsNullOrWhiteSpace(val) && videoRequest != null)
                     {
-                        SubtitleDeliveryMethod method;
-                        if (Enum.TryParse(val, out method))
+                        if (Enum.TryParse(val, out SubtitleDeliveryMethod method))
                         {
                             videoRequest.SubtitleMethod = method;
                         }
@@ -636,8 +635,7 @@ namespace MediaBrowser.Api.Playback
             if (value.IndexOf(':') == -1)
             {
                 // Parses npt times in the format of '417.33'
-                double seconds;
-                if (double.TryParse(value, NumberStyles.Any, UsCulture, out seconds))
+                if (double.TryParse(value, NumberStyles.Any, UsCulture, out var seconds))
                 {
                     return TimeSpan.FromSeconds(seconds).Ticks;
                 }
@@ -652,8 +650,7 @@ namespace MediaBrowser.Api.Playback
 
             foreach (var time in tokens)
             {
-                double digit;
-                if (double.TryParse(time, NumberStyles.Any, UsCulture, out digit))
+                if (double.TryParse(time, NumberStyles.Any, UsCulture, out var digit))
                 {
                     secondsSum += digit * timeFactor;
                 }
diff --git a/MediaBrowser.Api/Session/SessionsService.cs b/MediaBrowser.Api/Session/SessionsService.cs
index ded82c19ba..234ada6c0d 100644
--- a/MediaBrowser.Api/Session/SessionsService.cs
+++ b/MediaBrowser.Api/Session/SessionsService.cs
@@ -413,10 +413,9 @@ namespace MediaBrowser.Api.Session
         /// <param name="request">The request.</param>
         public Task Post(SendSystemCommand request)
         {
-            GeneralCommandType commandType;
             var name = request.Command;
 
-            if (Enum.TryParse(name, true, out commandType))
+            if (Enum.TryParse(name, true, out GeneralCommandType commandType))
             {
                 name = commandType.ToString();
             }
diff --git a/MediaBrowser.Common/Net/HttpRequestOptions.cs b/MediaBrowser.Common/Net/HttpRequestOptions.cs
index 0b21472f04..dadac5e03d 100644
--- a/MediaBrowser.Common/Net/HttpRequestOptions.cs
+++ b/MediaBrowser.Common/Net/HttpRequestOptions.cs
@@ -102,9 +102,7 @@ namespace MediaBrowser.Common.Net
 
         private string GetHeaderValue(string name)
         {
-            string value;
-
-            RequestHeaders.TryGetValue(name, out value);
+            RequestHeaders.TryGetValue(name, out var value);
 
             return value;
         }
diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index c56dc04ece..91cfcd0cec 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -103,8 +103,7 @@ namespace MediaBrowser.Controller.Entities
         {
             lock (LibraryOptions)
             {
-                LibraryOptions options;
-                if (!LibraryOptions.TryGetValue(path, out options))
+                if (!LibraryOptions.TryGetValue(path, out var options))
                 {
                     options = LoadLibraryOptions(path);
                     LibraryOptions[path] = options;
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index bbee594f6a..b40bccde62 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -331,9 +331,7 @@ namespace MediaBrowser.Controller.Entities
 
                 foreach (var child in nonCachedChildren)
                 {
-                    BaseItem currentChild;
-
-                    if (currentChildren.TryGetValue(child.Id, out currentChild))
+                    if (currentChildren.TryGetValue(child.Id, out var currentChild))
                     {
                         validChildren.Add(currentChild);
 
diff --git a/MediaBrowser.Controller/Entities/Year.cs b/MediaBrowser.Controller/Entities/Year.cs
index 643c0ddcf0..cad5ed863e 100644
--- a/MediaBrowser.Controller/Entities/Year.cs
+++ b/MediaBrowser.Controller/Entities/Year.cs
@@ -50,11 +50,9 @@ namespace MediaBrowser.Controller.Entities
 
         public IList<BaseItem> GetTaggedItems(InternalItemsQuery query)
         {
-            int year;
-
             var usCulture = new CultureInfo("en-US");
 
-            if (!int.TryParse(Name, NumberStyles.Integer, usCulture, out year))
+            if (!int.TryParse(Name, NumberStyles.Integer, usCulture, out var year))
             {
                 return new List<BaseItem>();
             }
@@ -66,9 +64,7 @@ namespace MediaBrowser.Controller.Entities
 
         public int? GetYearValue()
         {
-            int i;
-
-            if (int.TryParse(Name, NumberStyles.Integer, CultureInfo.InvariantCulture, out i))
+            if (int.TryParse(Name, NumberStyles.Integer, CultureInfo.InvariantCulture, out var i))
             {
                 return i;
             }
diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs
index 223761654d..3080143ce9 100644
--- a/MediaBrowser.Controller/Library/TVUtils.cs
+++ b/MediaBrowser.Controller/Library/TVUtils.cs
@@ -40,9 +40,7 @@ namespace MediaBrowser.Controller.Library
                                };
                 }
 
-                DayOfWeek value;
-
-                if (Enum.TryParse(day, true, out value))
+                if (Enum.TryParse(day, true, out DayOfWeek value))
                 {
                     return new DayOfWeek[]
                                {
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 3bc43143f5..edc43ef46f 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -943,9 +943,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var level = state.GetRequestedLevel(videoStream.Codec);
             if (!string.IsNullOrEmpty(level))
             {
-                double requestLevel;
-
-                if (double.TryParse(level, NumberStyles.Any, _usCulture, out requestLevel))
+                if (double.TryParse(level, NumberStyles.Any, _usCulture, out var requestLevel))
                 {
                     if (!videoStream.Level.HasValue)
                     {
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
index bb09d365e3..ea8a793068 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -193,8 +193,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             if (!string.IsNullOrEmpty(codec))
             {
                 var value = BaseRequest.GetOption(codec, "maxrefframes");
-                int result;
-                if (!string.IsNullOrEmpty(value) && int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out result))
+                if (!string.IsNullOrEmpty(value) && int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var result))
                 {
                     return result;
                 }
@@ -213,8 +212,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             if (!string.IsNullOrEmpty(codec))
             {
                 var value = BaseRequest.GetOption(codec, "videobitdepth");
-                int result;
-                if (!string.IsNullOrEmpty(value) && int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out result))
+                if (!string.IsNullOrEmpty(value) && int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var result))
                 {
                     return result;
                 }
@@ -233,8 +231,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             if (!string.IsNullOrEmpty(codec))
             {
                 var value = BaseRequest.GetOption(codec, "audiobitdepth");
-                int result;
-                if (!string.IsNullOrEmpty(value) && int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out result))
+                if (!string.IsNullOrEmpty(value) && int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var result))
                 {
                     return result;
                 }
@@ -257,8 +254,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             if (!string.IsNullOrEmpty(codec))
             {
                 var value = BaseRequest.GetOption(codec, "audiochannels");
-                int result;
-                if (!string.IsNullOrEmpty(value) && int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out result))
+                if (!string.IsNullOrEmpty(value) && int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var result))
                 {
                     return result;
                 }
@@ -419,8 +415,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 }
 
                 var level = GetRequestedLevel(ActualOutputVideoCodec);
-                double result;
-                if (!string.IsNullOrEmpty(level) && double.TryParse(level, NumberStyles.Any, CultureInfo.InvariantCulture, out result))
+                if (!string.IsNullOrEmpty(level) && double.TryParse(level, NumberStyles.Any, CultureInfo.InvariantCulture, out var result))
                 {
                     return result;
                 }
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
index 625f0b3892..ff54bb3937 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
@@ -228,8 +228,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
         public string GetOption(string name)
         {
-            string value;
-            if (StreamOptions.TryGetValue(name, out value))
+            if (StreamOptions.TryGetValue(name, out var value))
             {
                 return value;
             }
diff --git a/MediaBrowser.Controller/MediaEncoding/JobLogger.cs b/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
index a379efafa7..b812a8ddc6 100644
--- a/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
+++ b/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
@@ -74,9 +74,8 @@ namespace MediaBrowser.Controller.MediaEncoding
                     (i + 1 < parts.Length))
                 {
                     var rate = parts[i + 1];
-                    float val;
 
-                    if (float.TryParse(rate, NumberStyles.Any, _usCulture, out val))
+                    if (float.TryParse(rate, NumberStyles.Any, _usCulture, out var val))
                     {
                         framerate = val;
                     }
@@ -85,9 +84,8 @@ namespace MediaBrowser.Controller.MediaEncoding
                     part.StartsWith("time=", StringComparison.OrdinalIgnoreCase))
                 {
                     var time = part.Split(new[] { '=' }, 2).Last();
-                    TimeSpan val;
 
-                    if (TimeSpan.TryParse(time, _usCulture, out val))
+                    if (TimeSpan.TryParse(time, _usCulture, out var val))
                     {
                         var currentMs = startMs + val.TotalMilliseconds;
 
@@ -110,9 +108,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                     if (scale.HasValue)
                     {
-                        long val;
-
-                        if (long.TryParse(size, NumberStyles.Any, _usCulture, out val))
+                        if (long.TryParse(size, NumberStyles.Any, _usCulture, out var val))
                         {
                             bytesTranscoded = val * scale.Value;
                         }
@@ -131,9 +127,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                     if (scale.HasValue)
                     {
-                        float val;
-
-                        if (float.TryParse(rate, NumberStyles.Any, _usCulture, out val))
+                        if (float.TryParse(rate, NumberStyles.Any, _usCulture, out var val))
                         {
                             bitRate = (int)Math.Ceiling(val * scale.Value);
                         }
diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs
index 622bba637d..ab3196aba8 100644
--- a/MediaBrowser.Controller/Providers/DirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/DirectoryService.cs
@@ -25,9 +25,7 @@ namespace MediaBrowser.Controller.Providers
 
         public FileSystemMetadata[] GetFileSystemEntries(string path)
         {
-            FileSystemMetadata[] entries;
-
-            if (!_cache.TryGetValue(path, out entries))
+            if (!_cache.TryGetValue(path, out var entries))
             {
                 //_logger.LogDebug("Getting files for " + path);
 
@@ -56,8 +54,7 @@ namespace MediaBrowser.Controller.Providers
 
         public FileSystemMetadata GetFile(string path)
         {
-            FileSystemMetadata file;
-            if (!_fileCache.TryGetValue(path, out file))
+            if (!_fileCache.TryGetValue(path, out var file))
             {
                 file = _fileSystem.GetFileInfo(path);
 
@@ -83,8 +80,7 @@ namespace MediaBrowser.Controller.Providers
 
         public List<string> GetFilePaths(string path, bool clearCache)
         {
-            List<string> result;
-            if (clearCache || !_filePathCache.TryGetValue(path, out result))
+            if (clearCache || !_filePathCache.TryGetValue(path, out var result))
             {
                 result = _fileSystem.GetFilePaths(path).ToList();
 
diff --git a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
index 0ee283325b..821b11a5de 100644
--- a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
@@ -151,8 +151,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(val))
                         {
-                            DateTime added;
-                            if (DateTime.TryParse(val, out added))
+                            if (DateTime.TryParse(val, out var added))
                             {
                                 item.DateCreated = added.ToUniversalTime();
                             }
@@ -185,8 +184,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
 
                         if (!string.IsNullOrEmpty(text))
                         {
-                            float value;
-                            if (float.TryParse(text, NumberStyles.Any, _usCulture, out value))
+                            if (float.TryParse(text, NumberStyles.Any, _usCulture, out var value))
                             {
                                 item.CriticRating = value;
                             }
@@ -261,9 +259,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
                         {
                             item.LockedFields = val.Split('|').Select(i =>
                             {
-                                MetadataFields field;
-
-                                if (Enum.TryParse(i, true, out field))
+                                if (Enum.TryParse(i, true, out MetadataFields field))
                                 {
                                     return (MetadataFields?)field;
                                 }
@@ -337,8 +333,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(text))
                         {
-                            int runtime;
-                            if (int.TryParse(text.Split(' ')[0], NumberStyles.Integer, _usCulture, out runtime))
+                            if (int.TryParse(text.Split(' ')[0], NumberStyles.Integer, _usCulture, out var runtime))
                             {
                                 item.RunTimeTicks = TimeSpan.FromMinutes(runtime).Ticks;
                             }
@@ -494,8 +489,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(val))
                         {
-                            int productionYear;
-                            if (int.TryParse(val, out productionYear) && productionYear > 1850)
+                            if (int.TryParse(val, out var productionYear) && productionYear > 1850)
                             {
                                 item.ProductionYear = productionYear;
                             }
@@ -512,9 +506,8 @@ namespace MediaBrowser.LocalMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(rating))
                         {
-                            float val;
                             // All external meta is saving this as '.' for decimal I believe...but just to be sure
-                            if (float.TryParse(rating.Replace(',', '.'), NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out val))
+                            if (float.TryParse(rating.Replace(',', '.'), NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var val))
                             {
                                 item.CommunityRating = val;
                             }
@@ -530,9 +523,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(firstAired))
                         {
-                            DateTime airDate;
-
-                            if (DateTime.TryParseExact(firstAired, "yyyy-MM-dd", CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal, out airDate) && airDate.Year > 1850)
+                            if (DateTime.TryParseExact(firstAired, "yyyy-MM-dd", CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal, out var airDate) && airDate.Year > 1850)
                             {
                                 item.PremiereDate = airDate.ToUniversalTime();
                                 item.ProductionYear = airDate.Year;
@@ -549,9 +540,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(firstAired))
                         {
-                            DateTime airDate;
-
-                            if (DateTime.TryParseExact(firstAired, "yyyy-MM-dd", CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal, out airDate) && airDate.Year > 1850)
+                            if (DateTime.TryParseExact(firstAired, "yyyy-MM-dd", CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal, out var airDate) && airDate.Year > 1850)
                             {
                                 item.EndDate = airDate.ToUniversalTime();
                             }
@@ -687,8 +676,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
                 default:
                     {
                         string readerName = reader.Name;
-                        string providerIdValue;
-                        if (_validProviderIds.TryGetValue(readerName, out providerIdValue))
+                        if (_validProviderIds.TryGetValue(readerName, out var providerIdValue))
                         {
                             var id = reader.ReadElementContentAsString();
                             if (!string.IsNullOrWhiteSpace(id))
@@ -1127,8 +1115,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
 
                                 if (!string.IsNullOrWhiteSpace(val))
                                 {
-                                    int intVal;
-                                    if (int.TryParse(val, NumberStyles.Integer, _usCulture, out intVal))
+                                    if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var intVal))
                                     {
                                         sortOrder = intVal;
                                     }
diff --git a/MediaBrowser.LocalMetadata/Parsers/GameXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/GameXmlParser.cs
index cc908b97b5..df7c51f279 100644
--- a/MediaBrowser.LocalMetadata/Parsers/GameXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/GameXmlParser.cs
@@ -63,9 +63,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
                         var val = reader.ReadElementContentAsString();
                         if (!string.IsNullOrWhiteSpace(val))
                         {
-                            int num;
-
-                            if (int.TryParse(val, NumberStyles.Integer, _usCulture, out num))
+                            if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var num))
                             {
                                 item.PlayersSupported = num;
                             }
diff --git a/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs b/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
index f4d0899b60..e4eabaf384 100644
--- a/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
+++ b/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
@@ -52,9 +52,7 @@ namespace MediaBrowser.MediaEncoding.Probing
                 return null;
             }
 
-            string val;
-
-            tags.TryGetValue(key, out val);
+            tags.TryGetValue(key, out var val);
             return val;
         }
 
@@ -70,9 +68,7 @@ namespace MediaBrowser.MediaEncoding.Probing
 
             if (!string.IsNullOrEmpty(val))
             {
-                int i;
-
-                if (int.TryParse(val, out i))
+                if (int.TryParse(val, out var i))
                 {
                     return i;
                 }
@@ -93,9 +89,7 @@ namespace MediaBrowser.MediaEncoding.Probing
 
             if (!string.IsNullOrEmpty(val))
             {
-                DateTime i;
-
-                if (DateTime.TryParse(val, out i))
+                if (DateTime.TryParse(val, out var i))
                 {
                     return i.ToUniversalTime();
                 }
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index 7b89647071..b72ad572a3 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -52,8 +52,7 @@ namespace MediaBrowser.MediaEncoding.Probing
 
                 if (!string.IsNullOrEmpty(data.format.bit_rate))
                 {
-                    int value;
-                    if (int.TryParse(data.format.bit_rate, NumberStyles.Any, _usCulture, out value))
+                    if (int.TryParse(data.format.bit_rate, NumberStyles.Any, _usCulture, out var value))
                     {
                         info.Bitrate = value;
                     }
@@ -579,8 +578,7 @@ namespace MediaBrowser.MediaEncoding.Probing
 
                 if (!string.IsNullOrEmpty(streamInfo.sample_rate))
                 {
-                    int value;
-                    if (int.TryParse(streamInfo.sample_rate, NumberStyles.Any, _usCulture, out value))
+                    if (int.TryParse(streamInfo.sample_rate, NumberStyles.Any, _usCulture, out var value))
                     {
                         stream.SampleRate = value;
                     }
@@ -669,8 +667,7 @@ namespace MediaBrowser.MediaEncoding.Probing
 
             if (!string.IsNullOrEmpty(streamInfo.bit_rate))
             {
-                int value;
-                if (int.TryParse(streamInfo.bit_rate, NumberStyles.Any, _usCulture, out value))
+                if (int.TryParse(streamInfo.bit_rate, NumberStyles.Any, _usCulture, out var value))
                 {
                     bitrate = value;
                 }
@@ -679,8 +676,7 @@ namespace MediaBrowser.MediaEncoding.Probing
             if (bitrate == 0 && formatInfo != null && !string.IsNullOrEmpty(formatInfo.bit_rate) && stream.Type == MediaStreamType.Video)
             {
                 // If the stream info doesn't have a bitrate get the value from the media format info
-                int value;
-                if (int.TryParse(formatInfo.bit_rate, NumberStyles.Any, _usCulture, out value))
+                if (int.TryParse(formatInfo.bit_rate, NumberStyles.Any, _usCulture, out var value))
                 {
                     bitrate = value;
                 }
@@ -732,9 +728,7 @@ namespace MediaBrowser.MediaEncoding.Probing
                 return null;
             }
 
-            string val;
-
-            tags.TryGetValue(key, out val);
+            tags.TryGetValue(key, out var val);
             return val;
         }
 
@@ -752,13 +746,10 @@ namespace MediaBrowser.MediaEncoding.Probing
         {
             var original = info.display_aspect_ratio;
 
-            int height;
-            int width;
-
             var parts = (original ?? string.Empty).Split(':');
             if (!(parts.Length == 2 &&
-                int.TryParse(parts[0], NumberStyles.Any, _usCulture, out width) &&
-                int.TryParse(parts[1], NumberStyles.Any, _usCulture, out height) &&
+                int.TryParse(parts[0], NumberStyles.Any, _usCulture, out var width) &&
+                int.TryParse(parts[1], NumberStyles.Any, _usCulture, out var height) &&
                 width > 0 &&
                 height > 0))
             {
@@ -1187,9 +1178,7 @@ namespace MediaBrowser.MediaEncoding.Probing
             {
                 disc = disc.Split('/')[0];
 
-                int num;
-
-                if (int.TryParse(disc, out num))
+                if (int.TryParse(disc, out var num))
                 {
                     return num;
                 }
@@ -1204,8 +1193,7 @@ namespace MediaBrowser.MediaEncoding.Probing
 
             if (chapter.tags != null)
             {
-                string name;
-                if (chapter.tags.TryGetValue("title", out name))
+                if (chapter.tags.TryGetValue("title", out var name))
                 {
                     info.Name = name;
                 }
@@ -1213,9 +1201,8 @@ namespace MediaBrowser.MediaEncoding.Probing
 
             // Limit accuracy to milliseconds to match xml saving
             var secondsString = chapter.start_time;
-            double seconds;
 
-            if (double.TryParse(secondsString, NumberStyles.Any, CultureInfo.InvariantCulture, out seconds))
+            if (double.TryParse(secondsString, NumberStyles.Any, CultureInfo.InvariantCulture, out var seconds))
             {
                 var ms = Math.Round(TimeSpan.FromSeconds(seconds).TotalMilliseconds);
                 info.StartPositionTicks = TimeSpan.FromMilliseconds(ms).Ticks;
@@ -1269,9 +1256,7 @@ namespace MediaBrowser.MediaEncoding.Probing
             var year = FFProbeHelpers.GetDictionaryValue(data.format.tags, "WM/OriginalReleaseTime");
             if (!string.IsNullOrWhiteSpace(year))
             {
-                int val;
-
-                if (int.TryParse(year, NumberStyles.Integer, _usCulture, out val))
+                if (int.TryParse(year, NumberStyles.Integer, _usCulture, out var val))
                 {
                     video.ProductionYear = val;
                 }
@@ -1280,11 +1265,9 @@ namespace MediaBrowser.MediaEncoding.Probing
             var premiereDateString = FFProbeHelpers.GetDictionaryValue(data.format.tags, "WM/MediaOriginalBroadcastDateTime");
             if (!string.IsNullOrWhiteSpace(premiereDateString))
             {
-                DateTime val;
-
                 // Credit to MCEBuddy: https://mcebuddy2x.codeplex.com/
                 // DateTime is reported along with timezone info (typically Z i.e. UTC hence assume None)
-                if (DateTime.TryParse(year, null, DateTimeStyles.None, out val))
+                if (DateTime.TryParse(year, null, DateTimeStyles.None, out var val))
                 {
                     video.PremiereDate = val.ToUniversalTime();
                 }
diff --git a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
index 7f312eaecb..605504418b 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
@@ -61,8 +61,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
         long GetTicks(string time)
         {
-            TimeSpan span;
-            return TimeSpan.TryParseExact(time, @"h\:mm\:ss\.ff", _usCulture, out span)
+            return TimeSpan.TryParseExact(time, @"h\:mm\:ss\.ff", _usCulture, out var span)
                 ? span.Ticks : 0;
         }
 
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
index 02ce71ec38..0606dbdb29 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
@@ -83,8 +83,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
         long GetTicks(string time)
         {
-            TimeSpan span;
-            return TimeSpan.TryParseExact(time, @"hh\:mm\:ss\.fff", _usCulture, out span)
+            return TimeSpan.TryParseExact(time, @"hh\:mm\:ss\.fff", _usCulture, out var span)
                 ? span.Ticks
                 : (TimeSpan.TryParseExact(time, @"hh\:mm\:ss\,fff", _usCulture, out span)
                 ? span.Ticks : 0);
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
index 8281de7643..2c18a02ef8 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
@@ -288,8 +288,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
         private static bool IsInteger(string s)
         {
-            int i;
-            if (int.TryParse(s, out i))
+            if (int.TryParse(s, out var i))
                 return true;
             return false;
         }
diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs
index b3d035be21..808c0ed654 100644
--- a/MediaBrowser.Model/Configuration/LibraryOptions.cs
+++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs
@@ -108,8 +108,7 @@ namespace MediaBrowser.Model.Configuration
                 }
             }
 
-            ImageOption[] options;
-            if (DefaultImageOptions.TryGetValue(Type, out options))
+            if (DefaultImageOptions.TryGetValue(Type, out var options))
             {
                 foreach (var i in options)
                 {
diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
index ae7d17275b..dc0c5f1397 100644
--- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs
+++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -129,8 +129,7 @@ namespace MediaBrowser.Model.Dlna
                 return !condition.IsRequired;
             }
 
-            int expected;
-            if (int.TryParse(condition.Value, NumberStyles.Any, CultureInfo.InvariantCulture, out expected))
+            if (int.TryParse(condition.Value, NumberStyles.Any, CultureInfo.InvariantCulture, out var expected))
             {
                 switch (condition.Condition)
                 {
@@ -184,8 +183,7 @@ namespace MediaBrowser.Model.Dlna
                 return !condition.IsRequired;
             }
 
-            bool expected;
-            if (bool.TryParse(condition.Value, out expected))
+            if (bool.TryParse(condition.Value, out var expected))
             {
                 switch (condition.Condition)
                 {
@@ -209,8 +207,7 @@ namespace MediaBrowser.Model.Dlna
                 return !condition.IsRequired;
             }
 
-            float expected;
-            if (float.TryParse(condition.Value, NumberStyles.Any, CultureInfo.InvariantCulture, out expected))
+            if (float.TryParse(condition.Value, NumberStyles.Any, CultureInfo.InvariantCulture, out var expected))
             {
                 switch (condition.Condition)
                 {
@@ -238,8 +235,7 @@ namespace MediaBrowser.Model.Dlna
                 return !condition.IsRequired;
             }
 
-            double expected;
-            if (double.TryParse(condition.Value, NumberStyles.Any, CultureInfo.InvariantCulture, out expected))
+            if (double.TryParse(condition.Value, NumberStyles.Any, CultureInfo.InvariantCulture, out var expected))
             {
                 switch (condition.Condition)
                 {
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 2335f0553e..4f4054db4b 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -688,8 +688,7 @@ namespace MediaBrowser.Model.Dlna
 
             if (!string.IsNullOrEmpty(transcodingProfile.MaxAudioChannels))
             {
-                int transcodingMaxAudioChannels;
-                if (int.TryParse(transcodingProfile.MaxAudioChannels, NumberStyles.Any, CultureInfo.InvariantCulture, out transcodingMaxAudioChannels))
+                if (int.TryParse(transcodingProfile.MaxAudioChannels, NumberStyles.Any, CultureInfo.InvariantCulture, out var transcodingMaxAudioChannels))
                 {
                     playlistItem.TranscodingMaxAudioChannels = transcodingMaxAudioChannels;
                 }
@@ -1491,8 +1490,7 @@ namespace MediaBrowser.Model.Dlna
                                 continue;
                             }
 
-                            int num;
-                            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out num))
+                            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var num))
                             {
                                 if (condition.Condition == ProfileConditionType.Equals)
                                 {
@@ -1526,8 +1524,7 @@ namespace MediaBrowser.Model.Dlna
                                 }
                             }
 
-                            int num;
-                            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out num))
+                            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var num))
                             {
                                 if (condition.Condition == ProfileConditionType.Equals)
                                 {
@@ -1551,8 +1548,7 @@ namespace MediaBrowser.Model.Dlna
                                 continue;
                             }
 
-                            bool isAvc;
-                            if (bool.TryParse(value, out isAvc))
+                            if (bool.TryParse(value, out var isAvc))
                             {
                                 if (isAvc && condition.Condition == ProfileConditionType.Equals)
                                 {
@@ -1572,8 +1568,7 @@ namespace MediaBrowser.Model.Dlna
                                 continue;
                             }
 
-                            bool isAnamorphic;
-                            if (bool.TryParse(value, out isAnamorphic))
+                            if (bool.TryParse(value, out var isAnamorphic))
                             {
                                 if (isAnamorphic && condition.Condition == ProfileConditionType.Equals)
                                 {
@@ -1603,8 +1598,7 @@ namespace MediaBrowser.Model.Dlna
                                 }
                             }
 
-                            bool isInterlaced;
-                            if (bool.TryParse(value, out isInterlaced))
+                            if (bool.TryParse(value, out var isInterlaced))
                             {
                                 if (!isInterlaced && condition.Condition == ProfileConditionType.Equals)
                                 {
@@ -1645,8 +1639,7 @@ namespace MediaBrowser.Model.Dlna
                                 }
                             }
 
-                            int num;
-                            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out num))
+                            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var num))
                             {
                                 if (condition.Condition == ProfileConditionType.Equals)
                                 {
@@ -1680,8 +1673,7 @@ namespace MediaBrowser.Model.Dlna
                                 }
                             }
 
-                            int num;
-                            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out num))
+                            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var num))
                             {
                                 if (condition.Condition == ProfileConditionType.Equals)
                                 {
@@ -1727,8 +1719,7 @@ namespace MediaBrowser.Model.Dlna
                                 continue;
                             }
 
-                            int num;
-                            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out num))
+                            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var num))
                             {
                                 if (condition.Condition == ProfileConditionType.Equals)
                                 {
@@ -1752,8 +1743,7 @@ namespace MediaBrowser.Model.Dlna
                                 continue;
                             }
 
-                            int num;
-                            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out num))
+                            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var num))
                             {
                                 if (condition.Condition == ProfileConditionType.Equals)
                                 {
@@ -1777,8 +1767,7 @@ namespace MediaBrowser.Model.Dlna
                                 continue;
                             }
 
-                            float num;
-                            if (float.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out num))
+                            if (float.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var num))
                             {
                                 if (condition.Condition == ProfileConditionType.Equals)
                                 {
@@ -1802,8 +1791,7 @@ namespace MediaBrowser.Model.Dlna
                                 continue;
                             }
 
-                            int num;
-                            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out num))
+                            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var num))
                             {
                                 if (condition.Condition == ProfileConditionType.Equals)
                                 {
@@ -1827,8 +1815,7 @@ namespace MediaBrowser.Model.Dlna
                                 continue;
                             }
 
-                            int num;
-                            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out num))
+                            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var num))
                             {
                                 if (condition.Condition == ProfileConditionType.Equals)
                                 {
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 84bd1f4299..99c545cc02 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -56,8 +56,7 @@ namespace MediaBrowser.Model.Dlna
 
         public string GetOption(string name)
         {
-            string value;
-            if (StreamOptions.TryGetValue(name, out value))
+            if (StreamOptions.TryGetValue(name, out var value))
             {
                 return value;
             }
@@ -622,8 +621,7 @@ namespace MediaBrowser.Model.Dlna
                 return null;
             }
 
-            int result;
-            if (int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out result))
+            if (int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var result))
             {
                 return result;
             }
@@ -639,8 +637,7 @@ namespace MediaBrowser.Model.Dlna
                 return null;
             }
 
-            int result;
-            if (int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out result))
+            if (int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var result))
             {
                 return result;
             }
@@ -656,8 +653,7 @@ namespace MediaBrowser.Model.Dlna
                 return null;
             }
 
-            double result;
-            if (double.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out result))
+            if (double.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var result))
             {
                 return result;
             }
@@ -673,8 +669,7 @@ namespace MediaBrowser.Model.Dlna
                 return null;
             }
 
-            int result;
-            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out result))
+            if (int.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var result))
             {
                 return result;
             }
@@ -781,8 +776,7 @@ namespace MediaBrowser.Model.Dlna
                 return defaultValue;
             }
 
-            int result;
-            if (int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out result))
+            if (int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var result))
             {
                 return Math.Min(result, defaultValue ?? result);
             }
diff --git a/MediaBrowser.Model/Drawing/ImageSize.cs b/MediaBrowser.Model/Drawing/ImageSize.cs
index b27df346cb..87764bbf42 100644
--- a/MediaBrowser.Model/Drawing/ImageSize.cs
+++ b/MediaBrowser.Model/Drawing/ImageSize.cs
@@ -69,9 +69,7 @@ namespace MediaBrowser.Model.Drawing
 
                 if (parts.Length == 2)
                 {
-                    double val;
-
-                    if (double.TryParse(parts[0], NumberStyles.Any, CultureInfo.InvariantCulture, out val))
+                    if (double.TryParse(parts[0], NumberStyles.Any, CultureInfo.InvariantCulture, out var val))
                     {
                         _width = val;
                     }
diff --git a/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs b/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
index 3957f9dbeb..437572d57f 100644
--- a/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
+++ b/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
@@ -48,8 +48,7 @@ namespace MediaBrowser.Model.Entities
                 return null;
             }
 
-            string id;
-            instance.ProviderIds.TryGetValue(name, out id);
+            instance.ProviderIds.TryGetValue(name, out var id);
             return id;
         }
 
diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index 77cba0f716..3891417c7d 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -132,8 +132,7 @@ namespace MediaBrowser.Model.Net
 
             var ext = Path.GetExtension(path) ?? string.Empty;
 
-            string result;
-            if (MimeTypeLookup.TryGetValue(ext, out result))
+            if (MimeTypeLookup.TryGetValue(ext, out var result))
             {
                 return result;
             }
@@ -339,8 +338,7 @@ namespace MediaBrowser.Model.Net
             // handle text/html; charset=UTF-8
             mimeType = mimeType.Split(';')[0];
 
-            string result;
-            if (ExtensionLookup.TryGetValue(mimeType, out result))
+            if (ExtensionLookup.TryGetValue(mimeType, out var result))
             {
                 return result;
             }
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index ec6ecaad37..915c260bf2 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -968,8 +968,7 @@ namespace MediaBrowser.Providers.Manager
         {
             lock (_activeRefreshes)
             {
-                double value;
-                if (_activeRefreshes.TryGetValue(id, out value))
+                if (_activeRefreshes.TryGetValue(id, out var value))
                 {
                     return value;
                 }
@@ -1029,7 +1028,6 @@ namespace MediaBrowser.Providers.Manager
 
         private async Task StartProcessingRefreshQueue()
         {
-            Tuple<Guid, MetadataRefreshOptions> refreshItem;
             var libraryManager = _libraryManagerFactory();
 
             if (_disposed)
@@ -1039,7 +1037,7 @@ namespace MediaBrowser.Providers.Manager
 
             var cancellationToken = _disposeCancellationTokenSource.Token;
 
-            while (_refreshQueue.TryDequeue(out refreshItem))
+            while (_refreshQueue.TryDequeue(out var refreshItem))
             {
                 if (_disposed)
                 {
diff --git a/MediaBrowser.Providers/Manager/SimplePriorityQueue.cs b/MediaBrowser.Providers/Manager/SimplePriorityQueue.cs
index 71e979e2c9..b67edf50a9 100644
--- a/MediaBrowser.Providers/Manager/SimplePriorityQueue.cs
+++ b/MediaBrowser.Providers/Manager/SimplePriorityQueue.cs
@@ -133,8 +133,7 @@ namespace Priority_Queue
                     return false;
                 }
 
-                SimpleNode node;
-                if (_queue.TryDequeue(out node))
+                if (_queue.TryDequeue(out var node))
                 {
                     item = node.Data;
                     return true;
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
index 45d3b11b60..80c93f1571 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
@@ -251,12 +251,10 @@ namespace MediaBrowser.Providers.MediaInfo
 
             foreach (var chapter in chapters)
             {
-                TimeSpan time;
-
                 // Check if the name is empty and/or if the name is a time
                 // Some ripping programs do that.
                 if (string.IsNullOrWhiteSpace(chapter.Name) ||
-                    TimeSpan.TryParse(chapter.Name, out time))
+                    TimeSpan.TryParse(chapter.Name, out var time))
                 {
                     chapter.Name = string.Format(_localization.GetLocalizedString("ChapterNameValue"), index.ToString(CultureInfo.InvariantCulture));
                 }
diff --git a/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs b/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs
index 79e61f6a71..63d99db9b6 100644
--- a/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs
+++ b/MediaBrowser.Providers/Movies/FanartMovieImageProvider.cs
@@ -168,7 +168,6 @@ namespace MediaBrowser.Providers.Movies
                 if (!string.IsNullOrEmpty(url))
                 {
                     var likesString = i.likes;
-                    int likes;
 
                     var info = new RemoteImageInfo
                     {
@@ -181,7 +180,7 @@ namespace MediaBrowser.Providers.Movies
                         Language = i.lang
                     };
 
-                    if (!string.IsNullOrEmpty(likesString) && int.TryParse(likesString, NumberStyles.Integer, _usCulture, out likes))
+                    if (!string.IsNullOrEmpty(likesString) && int.TryParse(likesString, NumberStyles.Integer, _usCulture, out var likes))
                     {
                         info.CommunityRating = likes;
                     }
diff --git a/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs b/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs
index ff294966b9..10d3e5e9d1 100644
--- a/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs
+++ b/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs
@@ -161,10 +161,9 @@ namespace MediaBrowser.Providers.Movies
                 }
             }
 
-            float rating;
             string voteAvg = movieData.vote_average.ToString(CultureInfo.InvariantCulture);
 
-            if (float.TryParse(voteAvg, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out rating))
+            if (float.TryParse(voteAvg, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var rating))
             {
                 movie.CommunityRating = rating;
             }
@@ -195,10 +194,8 @@ namespace MediaBrowser.Providers.Movies
 
             if (!string.IsNullOrWhiteSpace(movieData.release_date))
             {
-                DateTime r;
-
                 // These dates are always in this exact format
-                if (DateTime.TryParse(movieData.release_date, _usCulture, DateTimeStyles.None, out r))
+                if (DateTime.TryParse(movieData.release_date, _usCulture, DateTimeStyles.None, out var r))
                 {
                     movie.PremiereDate = r.ToUniversalTime();
                     movie.ProductionYear = movie.PremiereDate.Value.Year;
diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
index 88d9a346b3..a1ad57ea59 100644
--- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
@@ -86,10 +86,8 @@ namespace MediaBrowser.Providers.Movies
 
                 if (!string.IsNullOrWhiteSpace(obj.release_date))
                 {
-                    DateTime r;
-
                     // These dates are always in this exact format
-                    if (DateTime.TryParse(obj.release_date, _usCulture, DateTimeStyles.None, out r))
+                    if (DateTime.TryParse(obj.release_date, _usCulture, DateTimeStyles.None, out var r))
                     {
                         remoteResult.PremiereDate = r.ToUniversalTime();
                         remoteResult.ProductionYear = remoteResult.PremiereDate.Value.Year;
diff --git a/MediaBrowser.Providers/Movies/MovieDbSearch.cs b/MediaBrowser.Providers/Movies/MovieDbSearch.cs
index 95f1935a33..47d3d21bd6 100644
--- a/MediaBrowser.Providers/Movies/MovieDbSearch.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbSearch.cs
@@ -180,10 +180,8 @@ namespace MediaBrowser.Providers.Movies
 
                             if (!string.IsNullOrWhiteSpace(i.release_date))
                             {
-                                DateTime r;
-
                                 // These dates are always in this exact format
-                                if (DateTime.TryParseExact(i.release_date, "yyyy-MM-dd", EnUs, DateTimeStyles.None, out r))
+                                if (DateTime.TryParseExact(i.release_date, "yyyy-MM-dd", EnUs, DateTimeStyles.None, out var r))
                                 {
                                     remoteResult.PremiereDate = r.ToUniversalTime();
                                     remoteResult.ProductionYear = remoteResult.PremiereDate.Value.Year;
@@ -235,10 +233,8 @@ namespace MediaBrowser.Providers.Movies
 
                             if (!string.IsNullOrWhiteSpace(i.first_air_date))
                             {
-                                DateTime r;
-
                                 // These dates are always in this exact format
-                                if (DateTime.TryParseExact(i.first_air_date, "yyyy-MM-dd", EnUs, DateTimeStyles.None, out r))
+                                if (DateTime.TryParseExact(i.first_air_date, "yyyy-MM-dd", EnUs, DateTimeStyles.None, out var r))
                                 {
                                     remoteResult.PremiereDate = r.ToUniversalTime();
                                     remoteResult.ProductionYear = remoteResult.PremiereDate.Value.Year;
diff --git a/MediaBrowser.Providers/Music/Extensions.cs b/MediaBrowser.Providers/Music/Extensions.cs
index 4753e8ea4f..68020b9de3 100644
--- a/MediaBrowser.Providers/Music/Extensions.cs
+++ b/MediaBrowser.Providers/Music/Extensions.cs
@@ -47,8 +47,7 @@ namespace MediaBrowser.Providers.Music
 
         public static string GetMusicBrainzArtistId(this AlbumInfo info)
         {
-            string id;
-            info.ProviderIds.TryGetValue(MetadataProviders.MusicBrainzAlbumArtist.ToString(), out id);
+            info.ProviderIds.TryGetValue(MetadataProviders.MusicBrainzAlbumArtist.ToString(), out var id);
 
             if (string.IsNullOrEmpty(id))
             {
@@ -66,8 +65,7 @@ namespace MediaBrowser.Providers.Music
 
         public static string GetMusicBrainzArtistId(this ArtistInfo info)
         {
-            string id;
-            info.ProviderIds.TryGetValue(MetadataProviders.MusicBrainzArtist.ToString(), out id);
+            info.ProviderIds.TryGetValue(MetadataProviders.MusicBrainzArtist.ToString(), out var id);
 
             if (string.IsNullOrEmpty(id))
             {
diff --git a/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs b/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs
index 09c11899b2..3a87c27780 100644
--- a/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs
@@ -163,7 +163,6 @@ namespace MediaBrowser.Providers.Music
                 if (!string.IsNullOrEmpty(url))
                 {
                     var likesString = i.likes;
-                    int likes;
 
                     var info = new RemoteImageInfo
                     {
@@ -176,7 +175,7 @@ namespace MediaBrowser.Providers.Music
                         Language = i.lang
                     };
 
-                    if (!string.IsNullOrEmpty(likesString) && int.TryParse(likesString, NumberStyles.Integer, _usCulture, out likes))
+                    if (!string.IsNullOrEmpty(likesString) && int.TryParse(likesString, NumberStyles.Integer, _usCulture, out var likes))
                     {
                         info.CommunityRating = likes;
                     }
diff --git a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs
index 9d63484a84..a7456bdc0e 100644
--- a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs
+++ b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs
@@ -161,7 +161,6 @@ namespace MediaBrowser.Providers.Music
                 if (!string.IsNullOrEmpty(url))
                 {
                     var likesString = i.likes;
-                    int likes;
 
                     var info = new RemoteImageInfo
                     {
@@ -174,7 +173,7 @@ namespace MediaBrowser.Providers.Music
                         Language = i.lang
                     };
 
-                    if (!string.IsNullOrEmpty(likesString) && int.TryParse(likesString, NumberStyles.Integer, _usCulture, out likes))
+                    if (!string.IsNullOrEmpty(likesString) && int.TryParse(likesString, NumberStyles.Integer, _usCulture, out var likes))
                     {
                         info.CommunityRating = likes;
                     }
diff --git a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
index 3c54b2d2fc..3ad9684497 100644
--- a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
@@ -413,8 +413,7 @@ namespace MediaBrowser.Providers.Music
                             case "date":
                                 {
                                     var val = reader.ReadElementContentAsString();
-                                    DateTime date;
-                                    if (DateTime.TryParse(val, out date))
+                                    if (DateTime.TryParse(val, out var date))
                                     {
                                         result.Year = date.Year;
                                     }
diff --git a/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs b/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
index 5dab978c06..646d0a5be8 100644
--- a/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
+++ b/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
@@ -161,16 +161,14 @@ namespace MediaBrowser.Providers.Omdb
 
                         item.SetProviderId(MetadataProviders.Imdb, result.imdbID);
 
-                        int parsedYear;
                         if (result.Year.Length > 0
-                            && int.TryParse(result.Year.Substring(0, Math.Min(result.Year.Length, 4)), NumberStyles.Integer, CultureInfo.InvariantCulture, out parsedYear))
+                            && int.TryParse(result.Year.Substring(0, Math.Min(result.Year.Length, 4)), NumberStyles.Integer, CultureInfo.InvariantCulture, out var parsedYear))
                         {
                             item.ProductionYear = parsedYear;
                         }
 
-                        DateTime released;
                         if (!string.IsNullOrEmpty(result.Released)
-                            && DateTime.TryParse(result.Released, CultureInfo.InvariantCulture, DateTimeStyles.AllowWhiteSpaces, out released))
+                            && DateTime.TryParse(result.Released, CultureInfo.InvariantCulture, DateTimeStyles.AllowWhiteSpaces, out var released))
                         {
                             item.PremiereDate = released;
                         }
diff --git a/MediaBrowser.Providers/Omdb/OmdbProvider.cs b/MediaBrowser.Providers/Omdb/OmdbProvider.cs
index 618e5eb2d0..44e4202bfb 100644
--- a/MediaBrowser.Providers/Omdb/OmdbProvider.cs
+++ b/MediaBrowser.Providers/Omdb/OmdbProvider.cs
@@ -58,10 +58,8 @@ namespace MediaBrowser.Providers.Omdb
                 }
             }
 
-            int year;
-
             if (!string.IsNullOrEmpty(result.Year) && result.Year.Length >= 4
-                && int.TryParse(result.Year.Substring(0, 4), NumberStyles.Number, _usCulture, out year)
+                && int.TryParse(result.Year.Substring(0, 4), NumberStyles.Number, _usCulture, out var year)
                 && year >= 0)
             {
                 item.ProductionYear = year;
@@ -74,19 +72,15 @@ namespace MediaBrowser.Providers.Omdb
                 item.CriticRating = tomatoScore;
             }
 
-            int voteCount;
-
             if (!string.IsNullOrEmpty(result.imdbVotes)
-                && int.TryParse(result.imdbVotes, NumberStyles.Number, _usCulture, out voteCount)
+                && int.TryParse(result.imdbVotes, NumberStyles.Number, _usCulture, out var voteCount)
                 && voteCount >= 0)
             {
                 //item.VoteCount = voteCount;
             }
 
-            float imdbRating;
-
             if (!string.IsNullOrEmpty(result.imdbRating)
-                && float.TryParse(result.imdbRating, NumberStyles.Any, _usCulture, out imdbRating)
+                && float.TryParse(result.imdbRating, NumberStyles.Any, _usCulture, out var imdbRating)
                 && imdbRating >= 0)
             {
                 item.CommunityRating = imdbRating;
@@ -165,10 +159,8 @@ namespace MediaBrowser.Providers.Omdb
                 }
             }
 
-            int year;
-
             if (!string.IsNullOrEmpty(result.Year) && result.Year.Length >= 4
-                && int.TryParse(result.Year.Substring(0, 4), NumberStyles.Number, _usCulture, out year)
+                && int.TryParse(result.Year.Substring(0, 4), NumberStyles.Number, _usCulture, out var year)
                 && year >= 0)
             {
                 item.ProductionYear = year;
@@ -181,19 +173,15 @@ namespace MediaBrowser.Providers.Omdb
                 item.CriticRating = tomatoScore;
             }
 
-            int voteCount;
-
             if (!string.IsNullOrEmpty(result.imdbVotes)
-                && int.TryParse(result.imdbVotes, NumberStyles.Number, _usCulture, out voteCount)
+                && int.TryParse(result.imdbVotes, NumberStyles.Number, _usCulture, out var voteCount)
                 && voteCount >= 0)
             {
                 //item.VoteCount = voteCount;
             }
 
-            float imdbRating;
-
             if (!string.IsNullOrEmpty(result.imdbRating)
-                && float.TryParse(result.imdbRating, NumberStyles.Any, _usCulture, out imdbRating)
+                && float.TryParse(result.imdbRating, NumberStyles.Any, _usCulture, out var imdbRating)
                 && imdbRating >= 0)
             {
                 item.CommunityRating = imdbRating;
@@ -254,8 +242,7 @@ namespace MediaBrowser.Providers.Omdb
 
         internal static bool IsValidSeries(Dictionary<string, string> seriesProviderIds)
         {
-            string id;
-            if (seriesProviderIds.TryGetValue(MetadataProviders.Imdb.ToString(), out id) && !string.IsNullOrEmpty(id))
+            if (seriesProviderIds.TryGetValue(MetadataProviders.Imdb.ToString(), out var id) && !string.IsNullOrEmpty(id))
             {
                 // This check should ideally never be necessary but we're seeing some cases of this and haven't tracked them down yet.
                 if (!string.IsNullOrWhiteSpace(id))
@@ -515,8 +502,7 @@ namespace MediaBrowser.Providers.Omdb
                     if (rating != null && rating.Value != null)
                     {
                         var value = rating.Value.TrimEnd('%');
-                        float score;
-                        if (float.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out score))
+                        if (float.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var score))
                         {
                             return score;
                         }
diff --git a/MediaBrowser.Providers/People/MovieDbPersonProvider.cs b/MediaBrowser.Providers/People/MovieDbPersonProvider.cs
index 9d9d8fef3b..dc6ce842e5 100644
--- a/MediaBrowser.Providers/People/MovieDbPersonProvider.cs
+++ b/MediaBrowser.Providers/People/MovieDbPersonProvider.cs
@@ -167,9 +167,7 @@ namespace MediaBrowser.Providers.People
                 }
                 item.Overview = info.biography;
 
-                DateTime date;
-
-                if (DateTime.TryParseExact(info.birthday, "yyyy-MM-dd", new CultureInfo("en-US"), DateTimeStyles.None, out date))
+                if (DateTime.TryParseExact(info.birthday, "yyyy-MM-dd", new CultureInfo("en-US"), DateTimeStyles.None, out var date))
                 {
                     item.PremiereDate = date.ToUniversalTime();
                 }
diff --git a/MediaBrowser.Providers/TV/FanArt/FanArtSeasonProvider.cs b/MediaBrowser.Providers/TV/FanArt/FanArtSeasonProvider.cs
index 9d537f3dfd..4937294460 100644
--- a/MediaBrowser.Providers/TV/FanArt/FanArtSeasonProvider.cs
+++ b/MediaBrowser.Providers/TV/FanArt/FanArtSeasonProvider.cs
@@ -161,15 +161,12 @@ namespace MediaBrowser.Providers.TV
                 var url = i.url;
                 var season = i.season;
 
-                int imageSeasonNumber;
-
                 if (!string.IsNullOrEmpty(url) &&
                     !string.IsNullOrEmpty(season) &&
-                    int.TryParse(season, NumberStyles.Integer, _usCulture, out imageSeasonNumber) &&
+                    int.TryParse(season, NumberStyles.Integer, _usCulture, out var imageSeasonNumber) &&
                     seasonNumber == imageSeasonNumber)
                 {
                     var likesString = i.likes;
-                    int likes;
 
                     var info = new RemoteImageInfo
                     {
@@ -182,7 +179,7 @@ namespace MediaBrowser.Providers.TV
                         Language = i.lang
                     };
 
-                    if (!string.IsNullOrEmpty(likesString) && int.TryParse(likesString, NumberStyles.Integer, _usCulture, out likes))
+                    if (!string.IsNullOrEmpty(likesString) && int.TryParse(likesString, NumberStyles.Integer, _usCulture, out var likes))
                     {
                         info.CommunityRating = likes;
                     }
diff --git a/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs b/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs
index abdd0c7bf2..7f3bc323e3 100644
--- a/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs
@@ -179,7 +179,6 @@ namespace MediaBrowser.Providers.TV
                 if (!string.IsNullOrEmpty(url) && isSeasonValid)
                 {
                     var likesString = i.likes;
-                    int likes;
 
                     var info = new RemoteImageInfo
                     {
@@ -192,7 +191,7 @@ namespace MediaBrowser.Providers.TV
                         Language = i.lang
                     };
 
-                    if (!string.IsNullOrEmpty(likesString) && int.TryParse(likesString, NumberStyles.Integer, _usCulture, out likes))
+                    if (!string.IsNullOrEmpty(likesString) && int.TryParse(likesString, NumberStyles.Integer, _usCulture, out var likes))
                     {
                         info.CommunityRating = likes;
                     }
diff --git a/MediaBrowser.Providers/TV/MissingEpisodeProvider.cs b/MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
index 945d9777d4..8da6d45230 100644
--- a/MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
@@ -76,13 +76,9 @@ namespace MediaBrowser.Providers.TV
 
                     if (parts.Length == 3)
                     {
-                        int seasonNumber;
-
-                        if (int.TryParse(parts[1], NumberStyles.Integer, _usCulture, out seasonNumber))
+                        if (int.TryParse(parts[1], NumberStyles.Integer, _usCulture, out var seasonNumber))
                         {
-                            int episodeNumber;
-
-                            if (int.TryParse(parts[2], NumberStyles.Integer, _usCulture, out episodeNumber))
+                            if (int.TryParse(parts[2], NumberStyles.Integer, _usCulture, out var episodeNumber))
                             {
                                 return new ValueTuple<int, int>(seasonNumber, episodeNumber);
                             }
@@ -506,8 +502,7 @@ namespace MediaBrowser.Providers.TV
 
                                             if (!string.IsNullOrWhiteSpace(val))
                                             {
-                                                DateTime date;
-                                                if (DateTime.TryParse(val, out date))
+                                                if (DateTime.TryParse(val, out var date))
                                                 {
                                                     airDate = date.ToUniversalTime();
                                                 }
diff --git a/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs b/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs
index e37e867e5c..38bb83694d 100644
--- a/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs
@@ -56,8 +56,7 @@ namespace MediaBrowser.Providers.TV
                 return result;
             }
 
-            string seriesImdbId;
-            if (info.SeriesProviderIds.TryGetValue(MetadataProviders.Imdb.ToString(), out seriesImdbId) && !string.IsNullOrEmpty(seriesImdbId))
+            if (info.SeriesProviderIds.TryGetValue(MetadataProviders.Imdb.ToString(), out var seriesImdbId) && !string.IsNullOrEmpty(seriesImdbId))
             {
                 if (info.IndexNumber.HasValue && info.ParentIndexNumber.HasValue)
                 {
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
index 49f73286d1..08e541ecf4 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
@@ -71,8 +71,7 @@ namespace MediaBrowser.Providers.TV
                 return result;
             }
 
-            string seriesTmdbId;
-            info.SeriesProviderIds.TryGetValue(MetadataProviders.Tmdb.ToString(), out seriesTmdbId);
+            info.SeriesProviderIds.TryGetValue(MetadataProviders.Tmdb.ToString(), out var seriesTmdbId);
 
             if (string.IsNullOrEmpty(seriesTmdbId))
             {
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs
index a29fd46dfa..3a40aed7b5 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs
@@ -44,8 +44,7 @@ namespace MediaBrowser.Providers.TV
         {
             var result = new MetadataResult<Season>();
 
-            string seriesTmdbId;
-            info.SeriesProviderIds.TryGetValue(MetadataProviders.Tmdb.ToString(), out seriesTmdbId);
+            info.SeriesProviderIds.TryGetValue(MetadataProviders.Tmdb.ToString(), out var seriesTmdbId);
 
             var seasonNumber = info.IndexNumber;
 
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
index 0844862db9..2cadaec86a 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
@@ -219,9 +219,8 @@ namespace MediaBrowser.Providers.TV
             //series.VoteCount = seriesInfo.vote_count;
 
             string voteAvg = seriesInfo.vote_average.ToString(CultureInfo.InvariantCulture);
-            float rating;
 
-            if (float.TryParse(voteAvg, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out rating))
+            if (float.TryParse(voteAvg, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var rating))
             {
                 series.CommunityRating = rating;
             }
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeImageProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeImageProvider.cs
index c594cb923f..39d2fa77aa 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeImageProvider.cs
@@ -94,10 +94,8 @@ namespace MediaBrowser.Providers.TV
 
                                     if (!string.IsNullOrWhiteSpace(val))
                                     {
-                                        int rval;
-
                                         // int.TryParse is local aware, so it can be probamatic, force us culture
-                                        if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
+                                        if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var rval))
                                         {
                                             width = rval;
                                         }
@@ -111,10 +109,8 @@ namespace MediaBrowser.Providers.TV
 
                                     if (!string.IsNullOrWhiteSpace(val))
                                     {
-                                        int rval;
-
                                         // int.TryParse is local aware, so it can be probamatic, force us culture
-                                        if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
+                                        if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var rval))
                                         {
                                             height = rval;
                                         }
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
index dc0a785ecb..c4edb43ffe 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
@@ -401,8 +401,7 @@ namespace MediaBrowser.Providers.TV
 
                                         if (!string.IsNullOrWhiteSpace(val))
                                         {
-                                            DateTime date;
-                                            if (DateTime.TryParse(val, out date))
+                                            if (DateTime.TryParse(val, out var date))
                                             {
                                                 date = date.ToUniversalTime();
 
@@ -482,10 +481,8 @@ namespace MediaBrowser.Providers.TV
 
                                     if (!string.IsNullOrWhiteSpace(val))
                                     {
-                                        int rval;
-
                                         // int.TryParse is local aware, so it can be probamatic, force us culture
-                                        if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
+                                        if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var rval))
                                         {
                                             episodeNumber = rval;
                                         }
@@ -500,10 +497,8 @@ namespace MediaBrowser.Providers.TV
 
                                     if (!string.IsNullOrWhiteSpace(val))
                                     {
-                                        int rval;
-
                                         // int.TryParse is local aware, so it can be probamatic, force us culture
-                                        if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
+                                        if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var rval))
                                         {
                                             seasonNumber = rval;
                                         }
@@ -518,9 +513,7 @@ namespace MediaBrowser.Providers.TV
 
                                     if (!string.IsNullOrWhiteSpace(val))
                                     {
-                                        float num;
-
-                                        if (float.TryParse(val, NumberStyles.Any, _usCulture, out num))
+                                        if (float.TryParse(val, NumberStyles.Any, _usCulture, out var num))
                                         {
                                             combinedEpisodeNumber = Convert.ToInt32(num);
                                         }
@@ -535,9 +528,7 @@ namespace MediaBrowser.Providers.TV
 
                                     if (!string.IsNullOrWhiteSpace(val))
                                     {
-                                        float num;
-
-                                        if (float.TryParse(val, NumberStyles.Any, _usCulture, out num))
+                                        if (float.TryParse(val, NumberStyles.Any, _usCulture, out var num))
                                         {
                                             combinedSeasonNumber = Convert.ToInt32(num);
                                         }
@@ -552,10 +543,8 @@ namespace MediaBrowser.Providers.TV
 
                                     if (!string.IsNullOrWhiteSpace(val))
                                     {
-                                        int rval;
-
                                         // int.TryParse is local aware, so it can be probamatic, force us culture
-                                        if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
+                                        if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var rval))
                                         {
                                             item.AirsBeforeEpisodeNumber = rval;
                                         }
@@ -570,10 +559,8 @@ namespace MediaBrowser.Providers.TV
 
                                     if (!string.IsNullOrWhiteSpace(val))
                                     {
-                                        int rval;
-
                                         // int.TryParse is local aware, so it can be probamatic, force us culture
-                                        if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
+                                        if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var rval))
                                         {
                                             item.AirsAfterSeasonNumber = rval;
                                         }
@@ -588,10 +575,8 @@ namespace MediaBrowser.Providers.TV
 
                                     if (!string.IsNullOrWhiteSpace(val))
                                     {
-                                        int rval;
-
                                         // int.TryParse is local aware, so it can be probamatic, force us culture
-                                        if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
+                                        if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var rval))
                                         {
                                             item.AirsBeforeSeasonNumber = rval;
                                         }
@@ -631,10 +616,8 @@ namespace MediaBrowser.Providers.TV
 
                                     if (!string.IsNullOrWhiteSpace(val))
                                     {
-                                        float rval;
-
                                         // float.TryParse is local aware, so it can be probamatic, force us culture
-                                        if (float.TryParse(val, NumberStyles.AllowDecimalPoint, _usCulture, out rval))
+                                        if (float.TryParse(val, NumberStyles.AllowDecimalPoint, _usCulture, out var rval))
                                         {
                                             item.CommunityRating = rval;
                                         }
@@ -647,10 +630,8 @@ namespace MediaBrowser.Providers.TV
 
                                     if (!string.IsNullOrWhiteSpace(val))
                                     {
-                                        int rval;
-
                                         // int.TryParse is local aware, so it can be probamatic, force us culture
-                                        if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
+                                        if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var rval))
                                         {
                                             //item.VoteCount = rval;
                                         }
@@ -665,8 +646,7 @@ namespace MediaBrowser.Providers.TV
 
                                     if (!string.IsNullOrWhiteSpace(val))
                                     {
-                                        DateTime date;
-                                        if (DateTime.TryParse(val, out date))
+                                        if (DateTime.TryParse(val, out var date))
                                         {
                                             date = date.ToUniversalTime();
 
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbPrescanTask.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbPrescanTask.cs
index 33fefc29c8..c4a132d452 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbPrescanTask.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbPrescanTask.cs
@@ -161,9 +161,7 @@ namespace MediaBrowser.Providers.TV
 
                 newUpdateTime = seriesToUpdate.Item2;
 
-                long lastUpdateValue;
-
-                long.TryParse(lastUpdateTime, NumberStyles.Any, UsCulture, out lastUpdateValue);
+                long.TryParse(lastUpdateTime, NumberStyles.Any, UsCulture, out var lastUpdateValue);
 
                 var nullableUpdateValue = lastUpdateValue == 0 ? (long?)null : lastUpdateValue;
 
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs
index 4cdfb4b11b..af36d1ebf1 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs
@@ -201,9 +201,7 @@ namespace MediaBrowser.Providers.TV
                             {
                                 var val = reader.ReadElementContentAsString() ?? string.Empty;
 
-                                double rval;
-
-                                if (double.TryParse(val, NumberStyles.Any, UsCulture, out rval))
+                                if (double.TryParse(val, NumberStyles.Any, UsCulture, out var rval))
                                 {
                                     rating = rval;
                                 }
@@ -215,9 +213,7 @@ namespace MediaBrowser.Providers.TV
                             {
                                 var val = reader.ReadElementContentAsString() ?? string.Empty;
 
-                                int rval;
-
-                                if (int.TryParse(val, NumberStyles.Integer, UsCulture, out rval))
+                                if (int.TryParse(val, NumberStyles.Integer, UsCulture, out var rval))
                                 {
                                     voteCount = rval;
                                 }
@@ -252,9 +248,7 @@ namespace MediaBrowser.Providers.TV
 
                                 if (resolutionParts.Length == 2)
                                 {
-                                    int rval;
-
-                                    if (int.TryParse(resolutionParts[0], NumberStyles.Integer, UsCulture, out rval))
+                                    if (int.TryParse(resolutionParts[0], NumberStyles.Integer, UsCulture, out var rval))
                                     {
                                         width = rval;
                                     }
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
index 3ee1bf7dcf..82fa14f49b 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
@@ -197,9 +197,7 @@ namespace MediaBrowser.Providers.TV
                             {
                                 var val = reader.ReadElementContentAsString() ?? string.Empty;
 
-                                double rval;
-
-                                if (double.TryParse(val, NumberStyles.Any, _usCulture, out rval))
+                                if (double.TryParse(val, NumberStyles.Any, _usCulture, out var rval))
                                 {
                                     rating = rval;
                                 }
@@ -211,9 +209,7 @@ namespace MediaBrowser.Providers.TV
                             {
                                 var val = reader.ReadElementContentAsString() ?? string.Empty;
 
-                                int rval;
-
-                                if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
+                                if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var rval))
                                 {
                                     voteCount = rval;
                                 }
@@ -255,9 +251,7 @@ namespace MediaBrowser.Providers.TV
 
                                 if (resolutionParts.Length == 2)
                                 {
-                                    int rval;
-
-                                    if (int.TryParse(resolutionParts[0], NumberStyles.Integer, _usCulture, out rval))
+                                    if (int.TryParse(resolutionParts[0], NumberStyles.Integer, _usCulture, out var rval))
                                     {
                                         width = rval;
                                     }
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
index 958312633e..f55c52b5ba 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
@@ -137,8 +137,7 @@ namespace MediaBrowser.Providers.TV
         {
             var series = result.Item;
 
-            string id;
-            if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out id) && !string.IsNullOrEmpty(id))
+            if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out var id) && !string.IsNullOrEmpty(id))
             {
                 series.SetProviderId(MetadataProviders.Tvdb, id);
             }
@@ -389,8 +388,7 @@ namespace MediaBrowser.Providers.TV
 
         internal static bool IsValidSeries(Dictionary<string, string> seriesProviderIds)
         {
-            string id;
-            if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out id))
+            if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out var id))
             {
                 // This check should ideally never be necessary but we're seeing some cases of this and haven't tracked them down yet.
                 if (!string.IsNullOrWhiteSpace(id))
@@ -426,8 +424,7 @@ namespace MediaBrowser.Providers.TV
 
             try
             {
-                string seriesId;
-                if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out seriesId) && !string.IsNullOrWhiteSpace(seriesId))
+                if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out var seriesId) && !string.IsNullOrWhiteSpace(seriesId))
                 {
                     var seriesDataPath = GetSeriesDataPath(_config.ApplicationPaths, seriesProviderIds);
 
@@ -721,8 +718,7 @@ namespace MediaBrowser.Providers.TV
 
                                 if (!string.IsNullOrWhiteSpace(val))
                                 {
-                                    DateTime date;
-                                    if (DateTime.TryParse(val, out date))
+                                    if (DateTime.TryParse(val, out var date))
                                     {
                                         searchResult.ProductionYear = date.Year;
                                     }
@@ -926,8 +922,7 @@ namespace MediaBrowser.Providers.TV
 
                                 if (!string.IsNullOrWhiteSpace(val))
                                 {
-                                    DateTime date;
-                                    if (DateTime.TryParse(val, out date))
+                                    if (DateTime.TryParse(val, out var date))
                                     {
                                         airDate = date.ToUniversalTime();
                                     }
@@ -942,10 +937,8 @@ namespace MediaBrowser.Providers.TV
 
                                 if (!string.IsNullOrWhiteSpace(val))
                                 {
-                                    int rval;
-
                                     // int.TryParse is local aware, so it can be probamatic, force us culture
-                                    if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
+                                    if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var rval))
                                     {
                                         seasonNumber = rval;
                                     }
@@ -1086,10 +1079,8 @@ namespace MediaBrowser.Providers.TV
 
                                 if (!string.IsNullOrWhiteSpace(val))
                                 {
-                                    int rval;
-
                                     // int.TryParse is local aware, so it can be probamatic, force us culture
-                                    if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
+                                    if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var rval))
                                     {
                                         personInfo.SortOrder = rval;
                                     }
@@ -1195,10 +1186,8 @@ namespace MediaBrowser.Providers.TV
 
                                 if (!string.IsNullOrWhiteSpace(val))
                                 {
-                                    float rval;
-
                                     // float.TryParse is local aware, so it can be probamatic, force us culture
-                                    if (float.TryParse(val, NumberStyles.AllowDecimalPoint, _usCulture, out rval))
+                                    if (float.TryParse(val, NumberStyles.AllowDecimalPoint, _usCulture, out var rval))
                                     {
                                         item.CommunityRating = rval;
                                     }
@@ -1211,10 +1200,8 @@ namespace MediaBrowser.Providers.TV
 
                                 if (!string.IsNullOrWhiteSpace(val))
                                 {
-                                    int rval;
-
                                     // int.TryParse is local aware, so it can be probamatic, force us culture
-                                    if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
+                                    if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var rval))
                                     {
                                         //item.VoteCount = rval;
                                     }
@@ -1253,9 +1240,7 @@ namespace MediaBrowser.Providers.TV
 
                                 if (!string.IsNullOrWhiteSpace(val))
                                 {
-                                    SeriesStatus seriesStatus;
-
-                                    if (Enum.TryParse(val, true, out seriesStatus))
+                                    if (Enum.TryParse(val, true, out SeriesStatus seriesStatus))
                                         item.Status = seriesStatus;
                                 }
 
@@ -1268,8 +1253,7 @@ namespace MediaBrowser.Providers.TV
 
                                 if (!string.IsNullOrWhiteSpace(val))
                                 {
-                                    DateTime date;
-                                    if (DateTime.TryParse(val, out date))
+                                    if (DateTime.TryParse(val, out var date))
                                     {
                                         date = date.ToUniversalTime();
 
@@ -1287,10 +1271,8 @@ namespace MediaBrowser.Providers.TV
 
                                 if (!string.IsNullOrWhiteSpace(val))
                                 {
-                                    int rval;
-
                                     // int.TryParse is local aware, so it can be probamatic, force us culture
-                                    if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
+                                    if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var rval))
                                     {
                                         item.RunTimeTicks = TimeSpan.FromMinutes(rval).Ticks;
                                     }
@@ -1455,8 +1437,7 @@ namespace MediaBrowser.Providers.TV
                                         var val = reader.ReadElementContentAsString();
                                         if (!string.IsNullOrWhiteSpace(val))
                                         {
-                                            int num;
-                                            if (int.TryParse(val, NumberStyles.Integer, _usCulture, out num))
+                                            if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var num))
                                             {
                                                 episodeNumber = num;
                                             }
@@ -1470,9 +1451,7 @@ namespace MediaBrowser.Providers.TV
 
                                         if (!string.IsNullOrWhiteSpace(val))
                                         {
-                                            float num;
-
-                                            if (float.TryParse(val, NumberStyles.Any, _usCulture, out num))
+                                            if (float.TryParse(val, NumberStyles.Any, _usCulture, out var num))
                                             {
                                                 dvdEpisodeNumber = num;
                                             }
@@ -1487,9 +1466,7 @@ namespace MediaBrowser.Providers.TV
 
                                         if (!string.IsNullOrWhiteSpace(val))
                                         {
-                                            float num;
-
-                                            if (float.TryParse(val, NumberStyles.Any, _usCulture, out num))
+                                            if (float.TryParse(val, NumberStyles.Any, _usCulture, out var num))
                                             {
                                                 dvdSeasonNumber = Convert.ToInt32(num);
                                             }
@@ -1503,8 +1480,7 @@ namespace MediaBrowser.Providers.TV
                                         var val = reader.ReadElementContentAsString();
                                         if (!string.IsNullOrWhiteSpace(val))
                                         {
-                                            int num;
-                                            if (int.TryParse(val, NumberStyles.Integer, _usCulture, out num))
+                                            if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var num))
                                             {
                                                 absoluteNumber = num;
                                             }
@@ -1517,8 +1493,7 @@ namespace MediaBrowser.Providers.TV
                                         var val = reader.ReadElementContentAsString();
                                         if (!string.IsNullOrWhiteSpace(val))
                                         {
-                                            int num;
-                                            if (int.TryParse(val, NumberStyles.Integer, _usCulture, out num))
+                                            if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var num))
                                             {
                                                 seasonNumber = num;
                                             }
@@ -1542,8 +1517,7 @@ namespace MediaBrowser.Providers.TV
             var hasEpisodeChanged = true;
             if (!string.IsNullOrWhiteSpace(lastUpdateString) && lastTvDbUpdateTime.HasValue)
             {
-                long num;
-                if (long.TryParse(lastUpdateString, NumberStyles.Any, _usCulture, out num))
+                if (long.TryParse(lastUpdateString, NumberStyles.Any, _usCulture, out var num))
                 {
                     hasEpisodeChanged = num >= lastTvDbUpdateTime.Value;
                 }
@@ -1618,8 +1592,7 @@ namespace MediaBrowser.Providers.TV
         /// <returns>System.String.</returns>
         internal static string GetSeriesDataPath(IApplicationPaths appPaths, Dictionary<string, string> seriesProviderIds)
         {
-            string seriesId;
-            if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out seriesId) && !string.IsNullOrEmpty(seriesId))
+            if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out var seriesId) && !string.IsNullOrEmpty(seriesId))
             {
                 var seriesDataPath = Path.Combine(GetSeriesDataPath(appPaths), seriesId);
 
diff --git a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
index 3744df9b4c..47cad3e1b1 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
@@ -239,8 +239,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
             if (index != -1)
             {
                 var tmdbId = xml.Substring(index + srch.Length).TrimEnd('/').Split('-')[0];
-                int value;
-                if (!string.IsNullOrWhiteSpace(tmdbId) && int.TryParse(tmdbId, NumberStyles.Integer, CultureInfo.InvariantCulture, out value))
+                if (!string.IsNullOrWhiteSpace(tmdbId) && int.TryParse(tmdbId, NumberStyles.Integer, CultureInfo.InvariantCulture, out var value))
                 {
                     item.SetProviderId(MetadataProviders.Tmdb, value.ToString(_usCulture));
                 }
@@ -255,8 +254,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                 if (index != -1)
                 {
                     var tvdbId = xml.Substring(index + srch.Length).TrimEnd('/');
-                    int value;
-                    if (!string.IsNullOrWhiteSpace(tvdbId) && int.TryParse(tvdbId, NumberStyles.Integer, CultureInfo.InvariantCulture, out value))
+                    if (!string.IsNullOrWhiteSpace(tvdbId) && int.TryParse(tvdbId, NumberStyles.Integer, CultureInfo.InvariantCulture, out var value))
                     {
                         item.SetProviderId(MetadataProviders.Tvdb, value.ToString(_usCulture));
                     }
@@ -277,8 +275,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(val))
                         {
-                            DateTime added;
-                            if (DateTime.TryParseExact(val, BaseNfoSaver.DateAddedFormat, CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal, out added))
+                            if (DateTime.TryParseExact(val, BaseNfoSaver.DateAddedFormat, CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal, out var added))
                             {
                                 item.DateCreated = added.ToUniversalTime();
                             }
@@ -316,8 +313,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrEmpty(text))
                         {
-                            float value;
-                            if (float.TryParse(text, NumberStyles.Any, _usCulture, out value))
+                            if (float.TryParse(text, NumberStyles.Any, _usCulture, out var value))
                             {
                                 item.CriticRating = value;
                             }
@@ -377,9 +373,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         {
                             item.LockedFields = val.Split('|').Select(i =>
                             {
-                                MetadataFields field;
-
-                                if (Enum.TryParse(i, true, out field))
+                                if (Enum.TryParse(i, true, out MetadataFields field))
                                 {
                                     return (MetadataFields?)field;
                                 }
@@ -445,8 +439,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(text))
                         {
-                            int runtime;
-                            if (int.TryParse(text.Split(' ')[0], NumberStyles.Integer, _usCulture, out runtime))
+                            if (int.TryParse(text.Split(' ')[0], NumberStyles.Integer, _usCulture, out var runtime))
                             {
                                 item.RunTimeTicks = TimeSpan.FromMinutes(runtime).Ticks;
                             }
@@ -599,8 +592,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(val))
                         {
-                            int productionYear;
-                            if (int.TryParse(val, out productionYear) && productionYear > 1850)
+                            if (int.TryParse(val, out var productionYear) && productionYear > 1850)
                             {
                                 item.ProductionYear = productionYear;
                             }
@@ -616,9 +608,8 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(rating))
                         {
-                            float val;
                             // All external meta is saving this as '.' for decimal I believe...but just to be sure
-                            if (float.TryParse(rating.Replace(',', '.'), NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out val))
+                            if (float.TryParse(rating.Replace(',', '.'), NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var val))
                             {
                                 item.CommunityRating = val;
                             }
@@ -637,9 +628,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(val))
                         {
-                            DateTime date;
-
-                            if (DateTime.TryParseExact(val, formatString, CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal, out date) && date.Year > 1850)
+                            if (DateTime.TryParseExact(val, formatString, CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal, out var date) && date.Year > 1850)
                             {
                                 item.PremiereDate = date.ToUniversalTime();
                                 item.ProductionYear = date.Year;
@@ -657,9 +646,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(val))
                         {
-                            DateTime date;
-
-                            if (DateTime.TryParseExact(val, formatString, CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal, out date) && date.Year > 1850)
+                            if (DateTime.TryParseExact(val, formatString, CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal, out var date) && date.Year > 1850)
                             {
                                 item.EndDate = date.ToUniversalTime();
                             }
@@ -715,8 +702,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                 default:
                     string readerName = reader.Name;
-                    string providerIdValue;
-                    if (_validProviderIds.TryGetValue(readerName, out providerIdValue))
+                    if (_validProviderIds.TryGetValue(readerName, out var providerIdValue))
                     {
                         var id = reader.ReadElementContentAsString();
                         if (!string.IsNullOrWhiteSpace(id))
@@ -906,8 +892,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                                 if (!string.IsNullOrWhiteSpace(val))
                                 {
-                                    int intVal;
-                                    if (int.TryParse(val, NumberStyles.Integer, _usCulture, out intVal))
+                                    if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var intVal))
                                     {
                                         sortOrder = intVal;
                                     }
diff --git a/MediaBrowser.XbmcMetadata/Parsers/EpisodeNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/EpisodeNfoParser.cs
index 5ba695cc35..c76f8345aa 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/EpisodeNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/EpisodeNfoParser.cs
@@ -97,9 +97,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(number))
                         {
-                            int num;
-
-                            if (int.TryParse(number, out num))
+                            if (int.TryParse(number, out var num))
                             {
                                 item.ParentIndexNumber = num;
                             }
@@ -113,9 +111,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(number))
                         {
-                            int num;
-
-                            if (int.TryParse(number, out num))
+                            if (int.TryParse(number, out var num))
                             {
                                 item.IndexNumber = num;
                             }
@@ -129,9 +125,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(number))
                         {
-                            int num;
-
-                            if (int.TryParse(number, out num))
+                            if (int.TryParse(number, out var num))
                             {
                                 item.IndexNumberEnd = num;
                             }
@@ -145,10 +139,8 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(val))
                         {
-                            int rval;
-
                             // int.TryParse is local aware, so it can be probamatic, force us culture
-                            if (int.TryParse(val, NumberStyles.Integer, UsCulture, out rval))
+                            if (int.TryParse(val, NumberStyles.Integer, UsCulture, out var rval))
                             {
                                 item.AirsBeforeEpisodeNumber = rval;
                             }
@@ -163,10 +155,8 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(val))
                         {
-                            int rval;
-
                             // int.TryParse is local aware, so it can be probamatic, force us culture
-                            if (int.TryParse(val, NumberStyles.Integer, UsCulture, out rval))
+                            if (int.TryParse(val, NumberStyles.Integer, UsCulture, out var rval))
                             {
                                 item.AirsAfterSeasonNumber = rval;
                             }
@@ -181,10 +171,8 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(val))
                         {
-                            int rval;
-
                             // int.TryParse is local aware, so it can be probamatic, force us culture
-                            if (int.TryParse(val, NumberStyles.Integer, UsCulture, out rval))
+                            if (int.TryParse(val, NumberStyles.Integer, UsCulture, out var rval))
                             {
                                 item.AirsBeforeSeasonNumber = rval;
                             }
@@ -199,10 +187,8 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(val))
                         {
-                            int rval;
-
                             // int.TryParse is local aware, so it can be probamatic, force us culture
-                            if (int.TryParse(val, NumberStyles.Integer, UsCulture, out rval))
+                            if (int.TryParse(val, NumberStyles.Integer, UsCulture, out var rval))
                             {
                                 item.AirsBeforeSeasonNumber = rval;
                             }
@@ -217,10 +203,8 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(val))
                         {
-                            int rval;
-
                             // int.TryParse is local aware, so it can be probamatic, force us culture
-                            if (int.TryParse(val, NumberStyles.Integer, UsCulture, out rval))
+                            if (int.TryParse(val, NumberStyles.Integer, UsCulture, out var rval))
                             {
                                 item.AirsBeforeEpisodeNumber = rval;
                             }
diff --git a/MediaBrowser.XbmcMetadata/Parsers/SeasonNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/SeasonNfoParser.cs
index 57aea88a31..17f36d82d7 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/SeasonNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/SeasonNfoParser.cs
@@ -28,9 +28,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(number))
                         {
-                            int num;
-
-                            if (int.TryParse(number, NumberStyles.Integer, CultureInfo.InvariantCulture, out num))
+                            if (int.TryParse(number, NumberStyles.Integer, CultureInfo.InvariantCulture, out var num))
                             {
                                 item.IndexNumber = num;
                             }
diff --git a/MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs
index 571fc50358..700656b652 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs
@@ -75,8 +75,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
 
                         if (!string.IsNullOrWhiteSpace(status))
                         {
-                            SeriesStatus seriesStatus;
-                            if (Enum.TryParse(status, true, out seriesStatus))
+                            if (Enum.TryParse(status, true, out SeriesStatus seriesStatus))
                             {
                                 item.Status = seriesStatus;
                             }
diff --git a/SocketHttpListener/Ext.cs b/SocketHttpListener/Ext.cs
index 1251d19c06..b9894ca8fd 100644
--- a/SocketHttpListener/Ext.cs
+++ b/SocketHttpListener/Ext.cs
@@ -932,9 +932,8 @@ namespace SocketHttpListener
         /// </param>
         public static Uri ToUri(this string uriString)
         {
-            Uri res;
             return Uri.TryCreate(
-                     uriString, uriString.MaybeUri() ? UriKind.Absolute : UriKind.Relative, out res)
+                     uriString, uriString.MaybeUri() ? UriKind.Absolute : UriKind.Relative, out var res)
                    ? res
                    : null;
         }
diff --git a/SocketHttpListener/Net/CookieHelper.cs b/SocketHttpListener/Net/CookieHelper.cs
index c59756c770..3ad76ff238 100644
--- a/SocketHttpListener/Net/CookieHelper.cs
+++ b/SocketHttpListener/Net/CookieHelper.cs
@@ -43,13 +43,12 @@ namespace SocketHttpListener.Net
                     if (i < pairs.Length - 1)
                         buffer.AppendFormat(", {0}", pairs[++i].Trim());
 
-                    DateTime expires;
                     if (!DateTime.TryParseExact(
                       buffer.ToString(),
                       new[] { "ddd, dd'-'MMM'-'yyyy HH':'mm':'ss 'GMT'", "r" },
                       new CultureInfo("en-US"),
                       DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal,
-                      out expires))
+                      out var expires))
                         expires = DateTime.Now;
 
                     if (cookie != null && cookie.Expires == DateTime.MinValue)
diff --git a/SocketHttpListener/Net/HttpEndPointListener.cs b/SocketHttpListener/Net/HttpEndPointListener.cs
index d002c13b2b..c78d186c57 100644
--- a/SocketHttpListener/Net/HttpEndPointListener.cs
+++ b/SocketHttpListener/Net/HttpEndPointListener.cs
@@ -277,8 +277,7 @@ namespace SocketHttpListener.Net
         public bool BindContext(HttpListenerContext context)
         {
             var req = context.Request;
-            ListenerPrefix prefix;
-            var listener = SearchListener(req.Url, out prefix);
+            var listener = SearchListener(req.Url, out var prefix);
             if (listener == null)
                 return false;
 
diff --git a/SocketHttpListener/Net/HttpEndPointManager.cs b/SocketHttpListener/Net/HttpEndPointManager.cs
index 98986333bc..07b6331f27 100644
--- a/SocketHttpListener/Net/HttpEndPointManager.cs
+++ b/SocketHttpListener/Net/HttpEndPointManager.cs
@@ -57,8 +57,7 @@ namespace SocketHttpListener.Net
                 int root = p.IndexOf('/', colon, p.Length - colon);
                 string portString = p.Substring(colon + 1, root - colon - 1);
 
-                int port;
-                if (!int.TryParse(portString, out port) || port <= 0 || port >= 65536)
+                if (!int.TryParse(portString, out var port) || port <= 0 || port >= 65536)
                 {
                     throw new HttpListenerException((int)HttpStatusCode.BadRequest, "net_invalid_port");
                 }
diff --git a/SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs b/SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs
index 310c71a0dc..52e70b68b3 100644
--- a/SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs
+++ b/SocketHttpListener/Net/HttpListenerRequestUriBuilder.cs
@@ -232,8 +232,7 @@ namespace SocketHttpListener.Net
         {
             // http.sys only supports %uXXXX (4 hex-digits), even though unicode code points could have up to
             // 6 hex digits. Therefore we parse always 4 characters after %u and convert them to an int.
-            int codePointValue;
-            if (!int.TryParse(codePoint, NumberStyles.HexNumber, null, out codePointValue))
+            if (!int.TryParse(codePoint, NumberStyles.HexNumber, null, out var codePointValue))
             {
                 //if (NetEventSource.IsEnabled)
                 //    NetEventSource.Error(this, SR.Format(SR.net_log_listener_cant_convert_percent_value, codePoint));
@@ -264,8 +263,7 @@ namespace SocketHttpListener.Net
 
         private bool AddPercentEncodedOctetToRawOctetsList(Encoding encoding, string escapedCharacter)
         {
-            byte encodedValue;
-            if (!byte.TryParse(escapedCharacter, NumberStyles.HexNumber, null, out encodedValue))
+            if (!byte.TryParse(escapedCharacter, NumberStyles.HexNumber, null, out var encodedValue))
             {
                 //if (NetEventSource.IsEnabled) NetEventSource.Error(this, SR.Format(SR.net_log_listener_cant_convert_percent_value, escapedCharacter));
                 return false;
diff --git a/SocketHttpListener/Net/WebHeaderCollection.cs b/SocketHttpListener/Net/WebHeaderCollection.cs
index 02d3cf61fb..c56d2ef383 100644
--- a/SocketHttpListener/Net/WebHeaderCollection.cs
+++ b/SocketHttpListener/Net/WebHeaderCollection.cs
@@ -208,8 +208,7 @@ namespace SocketHttpListener.Net
             if (!IsHeaderName(headerName))
                 throw new ArgumentException("Invalid character in header");
 
-            HeaderInfo info;
-            if (!headers.TryGetValue(headerName, out info))
+            if (!headers.TryGetValue(headerName, out var info))
                 return false;
 
             var flag = response ? HeaderInfo.Response : HeaderInfo.Request;
@@ -313,8 +312,7 @@ namespace SocketHttpListener.Net
             if (headerName == null)
                 return false;
 
-            HeaderInfo info;
-            return headers.TryGetValue(headerName, out info) && (info & HeaderInfo.MultiValue) != 0;
+            return headers.TryGetValue(headerName, out var info) && (info & HeaderInfo.MultiValue) != 0;
         }
 
         internal static bool IsHeaderValue(string value)
diff --git a/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs b/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs
index f51f72dba4..5f77ff565b 100644
--- a/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs
+++ b/SocketHttpListener/Net/WebSockets/HttpWebSocket.Managed.cs
@@ -26,12 +26,11 @@ namespace SocketHttpListener.Net.WebSockets
             string origin = request.Headers[HttpKnownHeaderNames.Origin];
 
             string[] secWebSocketProtocols = null;
-            string outgoingSecWebSocketProtocolString;
             bool shouldSendSecWebSocketProtocolHeader =
                 ProcessWebSocketProtocolHeader(
                     request.Headers[HttpKnownHeaderNames.SecWebSocketProtocol],
                     subProtocol,
-                    out outgoingSecWebSocketProtocolString);
+                    out var outgoingSecWebSocketProtocolString);
 
             if (shouldSendSecWebSocketProtocolHeader)
             {
-- 
cgit v1.2.3


From 38f96af079887cce7c38fcde8340fd7c6d1150ad Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Thu, 17 Jan 2019 20:24:39 +0100
Subject: Reformat JustAMan review pt2 changes

Refs #575
---
 MediaBrowser.Api/ApiEntryPoint.cs                  |  2 +-
 MediaBrowser.Api/IHasDtoOptions.cs                 |  1 -
 MediaBrowser.Api/Library/LibraryService.cs         |  2 +-
 .../Configuration/IApplicationPaths.cs             |  1 -
 MediaBrowser.Controller/Channels/IHasCacheKey.cs   |  1 -
 MediaBrowser.Controller/Connect/UserLinkResult.cs  |  1 -
 .../Drawing/ImageCollageOptions.cs                 |  1 -
 .../Entities/Audio/IHasAlbumArtist.cs              |  1 -
 .../Entities/BasePluginFolder.cs                   |  1 -
 MediaBrowser.Controller/Entities/Folder.cs         |  2 +-
 .../Entities/IHasDisplayOrder.cs                   |  1 -
 .../Entities/IHasScreenshots.cs                    |  1 -
 MediaBrowser.Controller/Entities/IHasSeries.cs     |  1 -
 .../Entities/ISupportsBoxSetGrouping.cs            |  1 -
 .../Entities/ISupportsPlaceHolders.cs              |  1 -
 MediaBrowser.Controller/Entities/SourceType.cs     |  1 -
 MediaBrowser.Controller/Entities/Year.cs           |  4 +-
 MediaBrowser.Controller/Library/DeleteOptions.cs   |  1 -
 MediaBrowser.Controller/LiveTv/TimerInfo.cs        |  8 ++++
 .../MediaEncoding/ImageEncodingOptions.cs          |  1 -
 .../Providers/DirectoryService.cs                  |  6 +--
 .../Providers/IForcedProvider.cs                   |  1 -
 .../Providers/MetadataProviderPriority.cs          |  1 -
 .../Providers/VideoContentType.cs                  |  1 -
 .../Resolvers/IResolverIgnoreRule.cs               |  1 -
 .../Resolvers/ResolverPriority.cs                  |  1 -
 .../Security/IEncryptionManager.cs                 |  1 -
 .../Sync/IRemoteSyncProvider.cs                    |  1 -
 MediaBrowser.LocalMetadata/BaseXmlProvider.cs      |  1 +
 .../Images/CollectionFolderImageProvider.cs        |  1 +
 .../Images/InternalMetadataFolderImageProvider.cs  |  2 +-
 .../Images/LocalImageProvider.cs                   |  2 +-
 .../Parsers/BaseItemXmlParser.cs                   |  2 +-
 .../Encoder/EncoderValidator.cs                    |  2 +-
 .../Probing/ProbeResultNormalizer.cs               |  2 +-
 .../ApiClient/ServerDiscoveryInfo.cs               |  1 -
 MediaBrowser.Model/Branding/BrandingOptions.cs     |  1 -
 MediaBrowser.Model/Channels/ChannelInfo.cs         |  1 -
 MediaBrowser.Model/Configuration/AccessSchedule.cs |  1 -
 .../Configuration/DynamicDayOfWeek.cs              |  1 -
 .../Configuration/EncodingOptions.cs               |  1 -
 MediaBrowser.Model/Configuration/FanartOptions.cs  |  1 -
 MediaBrowser.Model/Configuration/LibraryOptions.cs |  2 +-
 .../Configuration/MetadataConfiguration.cs         |  1 -
 .../Configuration/XbmcMetadataOptions.cs           |  1 -
 MediaBrowser.Model/Connect/ConnectUser.cs          |  1 -
 MediaBrowser.Model/Connect/ConnectUserQuery.cs     |  1 -
 MediaBrowser.Model/Connect/UserLinkType.cs         |  1 -
 MediaBrowser.Model/Devices/DeviceQuery.cs          |  1 -
 MediaBrowser.Model/Devices/LocalFileInfo.cs        |  1 -
 MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs   |  6 +--
 MediaBrowser.Model/Dlna/DeviceProfile.cs           |  4 +-
 MediaBrowser.Model/Dlna/DeviceProfileInfo.cs       |  1 -
 MediaBrowser.Model/Dlna/MediaFormatProfile.cs      |  1 -
 MediaBrowser.Model/Dlna/PlaybackErrorCode.cs       |  1 -
 MediaBrowser.Model/Dlna/StreamBuilder.cs           | 46 +++++++++++-----------
 MediaBrowser.Model/Dlna/StreamInfo.cs              |  4 +-
 MediaBrowser.Model/Drawing/ImageFormat.cs          |  1 -
 MediaBrowser.Model/Drawing/ImageOrientation.cs     |  1 -
 MediaBrowser.Model/Dto/IHasServerId.cs             |  1 -
 MediaBrowser.Model/Dto/IItemDto.cs                 |  1 -
 MediaBrowser.Model/Dto/ItemIndex.cs                |  1 -
 MediaBrowser.Model/Dto/NameValuePair.cs            |  1 -
 MediaBrowser.Model/Entities/EmptyRequestResult.cs  |  1 -
 MediaBrowser.Model/Entities/ExtraType.cs           |  1 -
 MediaBrowser.Model/Entities/ImageType.cs           |  1 -
 MediaBrowser.Model/Entities/LocationType.cs        |  1 -
 MediaBrowser.Model/Entities/MediaType.cs           |  1 -
 MediaBrowser.Model/Entities/MediaUrl.cs            |  1 -
 MediaBrowser.Model/Entities/MetadataFields.cs      |  1 -
 MediaBrowser.Model/Entities/MetadataProviders.cs   |  1 -
 MediaBrowser.Model/Entities/ParentalRating.cs      |  1 -
 MediaBrowser.Model/Entities/PersonType.cs          |  1 -
 .../Entities/ProviderIdsExtensions.cs              |  2 +-
 MediaBrowser.Model/Entities/SeriesStatus.cs        |  1 -
 MediaBrowser.Model/Entities/UserDataSaveReason.cs  |  1 -
 MediaBrowser.Model/Entities/Video3DFormat.cs       |  1 -
 MediaBrowser.Model/Entities/VideoType.cs           |  1 -
 MediaBrowser.Model/Globalization/CountryInfo.cs    |  1 -
 MediaBrowser.Model/IO/FileSystemEntryInfo.cs       |  1 -
 MediaBrowser.Model/IO/IShortcutHandler.cs          |  1 -
 MediaBrowser.Model/IO/StreamDefaults.cs            |  1 -
 MediaBrowser.Model/Library/PlayAccess.cs           |  1 -
 MediaBrowser.Model/LiveTv/ChannelType.cs           |  1 -
 MediaBrowser.Model/LiveTv/RecordingStatus.cs       |  1 -
 MediaBrowser.Model/MediaInfo/Container.cs          |  1 -
 MediaBrowser.Model/MediaInfo/IBlurayExaminer.cs    |  1 -
 MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs |  1 -
 MediaBrowser.Model/Net/ISocketFactory.cs           |  1 -
 MediaBrowser.Model/Net/MimeTypes.cs                |  4 +-
 MediaBrowser.Model/Net/NetworkShare.cs             |  1 -
 MediaBrowser.Model/Net/NetworkShareType.cs         |  1 -
 MediaBrowser.Model/Net/SocketReceiveResult.cs      |  1 -
 MediaBrowser.Model/Net/WebSocketMessage.cs         |  1 -
 .../Notifications/NotificationLevel.cs             |  1 -
 .../Notifications/NotificationOptions.cs           | 10 ++---
 .../Playlists/PlaylistCreationResult.cs            |  1 -
 .../Plugins/BasePluginConfiguration.cs             |  1 -
 MediaBrowser.Model/Providers/ExternalIdInfo.cs     |  1 -
 MediaBrowser.Model/Querying/EpisodeQuery.cs        |  1 -
 MediaBrowser.Model/Querying/ItemCountsQuery.cs     |  1 -
 MediaBrowser.Model/Querying/ItemFilter.cs          |  1 -
 MediaBrowser.Model/Querying/ItemSortBy.cs          |  1 -
 .../Querying/MovieRecommendationQuery.cs           |  1 -
 MediaBrowser.Model/Querying/QueryResult.cs         |  1 -
 MediaBrowser.Model/Querying/SessionQuery.cs        |  1 -
 MediaBrowser.Model/Querying/UserQuery.cs           |  1 -
 MediaBrowser.Model/Search/SearchHintResult.cs      |  1 -
 MediaBrowser.Model/Services/IHasRequestFilter.cs   |  1 -
 MediaBrowser.Model/Services/IService.cs            |  1 -
 MediaBrowser.Model/Session/BrowseRequest.cs        |  1 -
 MediaBrowser.Model/Session/MessageCommand.cs       |  1 -
 MediaBrowser.Model/Session/PlaybackStartInfo.cs    |  1 -
 MediaBrowser.Model/Session/PlaystateCommand.cs     |  1 -
 MediaBrowser.Model/Sync/SyncCategory.cs            |  1 -
 MediaBrowser.Model/Sync/SyncJobStatus.cs           |  1 -
 MediaBrowser.Model/Sync/SyncTarget.cs              |  1 -
 MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs   |  1 -
 MediaBrowser.Model/Tasks/SystemEvent.cs            |  1 -
 MediaBrowser.Model/Tasks/TaskCompletionStatus.cs   |  1 -
 MediaBrowser.Model/Tasks/TaskOptions.cs            |  1 -
 MediaBrowser.Model/Tasks/TaskState.cs              |  1 -
 MediaBrowser.Model/Updates/CheckForUpdateResult.cs |  1 -
 MediaBrowser.Model/Users/ForgotPasswordAction.cs   |  1 -
 MediaBrowser.Model/Users/PinRedeemResult.cs        |  1 -
 MediaBrowser.Model/Users/UserActionType.cs         |  1 -
 .../Folders/FolderMetadataService.cs               |  1 +
 MediaBrowser.Providers/Manager/ProviderManager.cs  |  4 +-
 .../Manager/SimplePriorityQueue.cs                 |  6 +--
 .../MediaInfo/FFProbeProvider.cs                   |  2 +-
 .../MediaInfo/VideoImageProvider.cs                |  2 +-
 MediaBrowser.Providers/Movies/MovieDbProvider.cs   |  4 +-
 .../Music/AudioDbAlbumImageProvider.cs             |  2 +-
 .../Music/AudioDbAlbumProvider.cs                  |  2 +-
 .../Music/AudioDbArtistImageProvider.cs            |  2 +-
 .../Music/AudioDbArtistProvider.cs                 |  2 +-
 MediaBrowser.Providers/Music/Extensions.cs         |  2 +-
 .../Music/FanArtAlbumProvider.cs                   |  2 +-
 MediaBrowser.Providers/Omdb/OmdbImageProvider.cs   |  3 +-
 MediaBrowser.Providers/Omdb/OmdbItemProvider.cs    |  2 +-
 MediaBrowser.Providers/Omdb/OmdbProvider.cs        |  2 +-
 .../Playlists/PlaylistItemsProvider.cs             |  2 +-
 .../TV/Omdb/OmdbEpisodeProvider.cs                 |  4 +-
 .../TV/TheMovieDb/MovieDbEpisodeImageProvider.cs   |  2 +-
 .../TV/TheMovieDb/MovieDbEpisodeProvider.cs        |  4 +-
 .../TV/TheMovieDb/MovieDbSeasonProvider.cs         |  2 +-
 .../TV/TheMovieDb/MovieDbSeriesImageProvider.cs    |  2 +-
 .../TV/TheMovieDb/MovieDbSeriesProvider.cs         |  2 +-
 .../TV/TheTVDB/TvdbSeriesProvider.cs               | 10 ++---
 .../Videos/VideoMetadataService.cs                 |  1 +
 150 files changed, 97 insertions(+), 189 deletions(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs
index 4e2380cfab..8ae0ad9428 100644
--- a/MediaBrowser.Api/ApiEntryPoint.cs
+++ b/MediaBrowser.Api/ApiEntryPoint.cs
@@ -101,7 +101,7 @@ namespace MediaBrowser.Api
         {
             lock (_transcodingLocks)
             {
-                if (!_transcodingLocks.TryGetValue(outputPath, out var result))
+                if (!_transcodingLocks.TryGetValue(outputPath, out SemaphoreSlim result))
                 {
                     result = new SemaphoreSlim(1, 1);
                     _transcodingLocks[outputPath] = result;
diff --git a/MediaBrowser.Api/IHasDtoOptions.cs b/MediaBrowser.Api/IHasDtoOptions.cs
index c51043c5f3..03d3b3692f 100644
--- a/MediaBrowser.Api/IHasDtoOptions.cs
+++ b/MediaBrowser.Api/IHasDtoOptions.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Api
 {
     public interface IHasDtoOptions : IHasItemFields
diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index 1248f7316f..12d807a7e2 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -902,7 +902,7 @@ namespace MediaBrowser.Api.Library
 
             var dtoOptions = GetDtoOptions(_authContext, request);
 
-            var parent = item.GetParent();
+            BaseItem parent = item.GetParent();
 
             while (parent != null)
             {
diff --git a/MediaBrowser.Common/Configuration/IApplicationPaths.cs b/MediaBrowser.Common/Configuration/IApplicationPaths.cs
index 8030636222..27092c0e1a 100644
--- a/MediaBrowser.Common/Configuration/IApplicationPaths.cs
+++ b/MediaBrowser.Common/Configuration/IApplicationPaths.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Common.Configuration
 {
     /// <summary>
diff --git a/MediaBrowser.Controller/Channels/IHasCacheKey.cs b/MediaBrowser.Controller/Channels/IHasCacheKey.cs
index 1814a890bf..d86ad0dba3 100644
--- a/MediaBrowser.Controller/Channels/IHasCacheKey.cs
+++ b/MediaBrowser.Controller/Channels/IHasCacheKey.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.Channels
 {
     public interface IHasCacheKey
diff --git a/MediaBrowser.Controller/Connect/UserLinkResult.cs b/MediaBrowser.Controller/Connect/UserLinkResult.cs
index 0388a6430d..327ceb9524 100644
--- a/MediaBrowser.Controller/Connect/UserLinkResult.cs
+++ b/MediaBrowser.Controller/Connect/UserLinkResult.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.Connect
 {
     public class UserLinkResult
diff --git a/MediaBrowser.Controller/Drawing/ImageCollageOptions.cs b/MediaBrowser.Controller/Drawing/ImageCollageOptions.cs
index c296128108..3f762fad07 100644
--- a/MediaBrowser.Controller/Drawing/ImageCollageOptions.cs
+++ b/MediaBrowser.Controller/Drawing/ImageCollageOptions.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.Drawing
 {
     public class ImageCollageOptions
diff --git a/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs b/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
index c28eebffa2..a269b34863 100644
--- a/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.Entities.Audio
 {
     public interface IHasAlbumArtist
diff --git a/MediaBrowser.Controller/Entities/BasePluginFolder.cs b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
index c15ba1a1e5..8cdb9695cc 100644
--- a/MediaBrowser.Controller/Entities/BasePluginFolder.cs
+++ b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
@@ -1,4 +1,3 @@
-
 using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.Controller.Entities
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index b40bccde62..2103e0045b 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -331,7 +331,7 @@ namespace MediaBrowser.Controller.Entities
 
                 foreach (var child in nonCachedChildren)
                 {
-                    if (currentChildren.TryGetValue(child.Id, out var currentChild))
+                    if (currentChildren.TryGetValue(child.Id, out BaseItem currentChild))
                     {
                         validChildren.Add(currentChild);
 
diff --git a/MediaBrowser.Controller/Entities/IHasDisplayOrder.cs b/MediaBrowser.Controller/Entities/IHasDisplayOrder.cs
index 0da9369142..abee75a28d 100644
--- a/MediaBrowser.Controller/Entities/IHasDisplayOrder.cs
+++ b/MediaBrowser.Controller/Entities/IHasDisplayOrder.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Controller/Entities/IHasScreenshots.cs b/MediaBrowser.Controller/Entities/IHasScreenshots.cs
index d25f47af4c..0975242f5b 100644
--- a/MediaBrowser.Controller/Entities/IHasScreenshots.cs
+++ b/MediaBrowser.Controller/Entities/IHasScreenshots.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Controller/Entities/IHasSeries.cs b/MediaBrowser.Controller/Entities/IHasSeries.cs
index a0cc00a72e..7da53f730a 100644
--- a/MediaBrowser.Controller/Entities/IHasSeries.cs
+++ b/MediaBrowser.Controller/Entities/IHasSeries.cs
@@ -1,4 +1,3 @@
-
 using System;
 
 namespace MediaBrowser.Controller.Entities
diff --git a/MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs b/MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs
index 8545901983..7d13bf3259 100644
--- a/MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs
+++ b/MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Controller/Entities/ISupportsPlaceHolders.cs b/MediaBrowser.Controller/Entities/ISupportsPlaceHolders.cs
index 083cb4ebe7..3e96771c30 100644
--- a/MediaBrowser.Controller/Entities/ISupportsPlaceHolders.cs
+++ b/MediaBrowser.Controller/Entities/ISupportsPlaceHolders.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.Entities
 {
     public interface ISupportsPlaceHolders
diff --git a/MediaBrowser.Controller/Entities/SourceType.cs b/MediaBrowser.Controller/Entities/SourceType.cs
index 5fc7401dc1..927483b939 100644
--- a/MediaBrowser.Controller/Entities/SourceType.cs
+++ b/MediaBrowser.Controller/Entities/SourceType.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.Entities
 {
     public enum SourceType
diff --git a/MediaBrowser.Controller/Entities/Year.cs b/MediaBrowser.Controller/Entities/Year.cs
index cad5ed863e..13e82fada3 100644
--- a/MediaBrowser.Controller/Entities/Year.cs
+++ b/MediaBrowser.Controller/Entities/Year.cs
@@ -64,9 +64,9 @@ namespace MediaBrowser.Controller.Entities
 
         public int? GetYearValue()
         {
-            if (int.TryParse(Name, NumberStyles.Integer, CultureInfo.InvariantCulture, out var i))
+            if (int.TryParse(Name, NumberStyles.Integer, CultureInfo.InvariantCulture, out var year))
             {
-                return i;
+                return year;
             }
 
             return null;
diff --git a/MediaBrowser.Controller/Library/DeleteOptions.cs b/MediaBrowser.Controller/Library/DeleteOptions.cs
index 50bb874740..751b904816 100644
--- a/MediaBrowser.Controller/Library/DeleteOptions.cs
+++ b/MediaBrowser.Controller/Library/DeleteOptions.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.Library
 {
     public class DeleteOptions
diff --git a/MediaBrowser.Controller/LiveTv/TimerInfo.cs b/MediaBrowser.Controller/LiveTv/TimerInfo.cs
index d89ec4fbf0..2fea6a8cb5 100644
--- a/MediaBrowser.Controller/LiveTv/TimerInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/TimerInfo.cs
@@ -114,12 +114,15 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value>The episode number.</value>
         public int? EpisodeNumber { get; set; }
+
         public bool IsMovie { get; set; }
+
         public bool IsKids => Tags.Contains("Kids", StringComparer.OrdinalIgnoreCase);
 
         public bool IsSports => Tags.Contains("Sports", StringComparer.OrdinalIgnoreCase);
 
         public bool IsNews => Tags.Contains("News", StringComparer.OrdinalIgnoreCase);
+
         public bool IsSeries { get; set; }
 
         /// <summary>
@@ -133,10 +136,15 @@ namespace MediaBrowser.Controller.LiveTv
         public bool IsPremiere => Tags.Contains("Premiere", StringComparer.OrdinalIgnoreCase);
 
         public int? ProductionYear { get; set; }
+
         public string EpisodeTitle { get; set; }
+
         public DateTime? OriginalAirDate { get; set; }
+
         public bool IsProgramSeries { get; set; }
+
         public bool IsRepeat { get; set; }
+
         public string HomePageUrl { get; set; }
         public float? CommunityRating { get; set; }
         public string OfficialRating { get; set; }
diff --git a/MediaBrowser.Controller/MediaEncoding/ImageEncodingOptions.cs b/MediaBrowser.Controller/MediaEncoding/ImageEncodingOptions.cs
index 2d6acc1a0d..361dd79dcc 100644
--- a/MediaBrowser.Controller/MediaEncoding/ImageEncodingOptions.cs
+++ b/MediaBrowser.Controller/MediaEncoding/ImageEncodingOptions.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.MediaEncoding
 {
     public class ImageEncodingOptions
diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs
index ab3196aba8..133e7c115a 100644
--- a/MediaBrowser.Controller/Providers/DirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/DirectoryService.cs
@@ -25,7 +25,7 @@ namespace MediaBrowser.Controller.Providers
 
         public FileSystemMetadata[] GetFileSystemEntries(string path)
         {
-            if (!_cache.TryGetValue(path, out var entries))
+            if (!_cache.TryGetValue(path, out FileSystemMetadata[] entries))
             {
                 //_logger.LogDebug("Getting files for " + path);
 
@@ -54,7 +54,7 @@ namespace MediaBrowser.Controller.Providers
 
         public FileSystemMetadata GetFile(string path)
         {
-            if (!_fileCache.TryGetValue(path, out var file))
+            if (!_fileCache.TryGetValue(path, out FileSystemMetadata file))
             {
                 file = _fileSystem.GetFileInfo(path);
 
@@ -80,7 +80,7 @@ namespace MediaBrowser.Controller.Providers
 
         public List<string> GetFilePaths(string path, bool clearCache)
         {
-            if (clearCache || !_filePathCache.TryGetValue(path, out var result))
+            if (clearCache || !_filePathCache.TryGetValue(path, out List<string> result))
             {
                 result = _fileSystem.GetFilePaths(path).ToList();
 
diff --git a/MediaBrowser.Controller/Providers/IForcedProvider.cs b/MediaBrowser.Controller/Providers/IForcedProvider.cs
index c7af376ebb..35fa29d94d 100644
--- a/MediaBrowser.Controller/Providers/IForcedProvider.cs
+++ b/MediaBrowser.Controller/Providers/IForcedProvider.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.Providers
 {
     /// <summary>
diff --git a/MediaBrowser.Controller/Providers/MetadataProviderPriority.cs b/MediaBrowser.Controller/Providers/MetadataProviderPriority.cs
index 81eb990423..0076bb9721 100644
--- a/MediaBrowser.Controller/Providers/MetadataProviderPriority.cs
+++ b/MediaBrowser.Controller/Providers/MetadataProviderPriority.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.Providers
 {
     /// <summary>
diff --git a/MediaBrowser.Controller/Providers/VideoContentType.cs b/MediaBrowser.Controller/Providers/VideoContentType.cs
index 3d6d15c342..c3b8964a37 100644
--- a/MediaBrowser.Controller/Providers/VideoContentType.cs
+++ b/MediaBrowser.Controller/Providers/VideoContentType.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.Providers
 {
     /// <summary>
diff --git a/MediaBrowser.Controller/Resolvers/IResolverIgnoreRule.cs b/MediaBrowser.Controller/Resolvers/IResolverIgnoreRule.cs
index e6d91e5bed..b40cc157a8 100644
--- a/MediaBrowser.Controller/Resolvers/IResolverIgnoreRule.cs
+++ b/MediaBrowser.Controller/Resolvers/IResolverIgnoreRule.cs
@@ -1,4 +1,3 @@
-
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.IO;
 
diff --git a/MediaBrowser.Controller/Resolvers/ResolverPriority.cs b/MediaBrowser.Controller/Resolvers/ResolverPriority.cs
index b405a1f9ed..e393100952 100644
--- a/MediaBrowser.Controller/Resolvers/ResolverPriority.cs
+++ b/MediaBrowser.Controller/Resolvers/ResolverPriority.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.Resolvers
 {
     /// <summary>
diff --git a/MediaBrowser.Controller/Security/IEncryptionManager.cs b/MediaBrowser.Controller/Security/IEncryptionManager.cs
index b4fd74773f..68680fdf3f 100644
--- a/MediaBrowser.Controller/Security/IEncryptionManager.cs
+++ b/MediaBrowser.Controller/Security/IEncryptionManager.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.Security
 {
     public interface IEncryptionManager
diff --git a/MediaBrowser.Controller/Sync/IRemoteSyncProvider.cs b/MediaBrowser.Controller/Sync/IRemoteSyncProvider.cs
index b1a492497c..c0b62b7530 100644
--- a/MediaBrowser.Controller/Sync/IRemoteSyncProvider.cs
+++ b/MediaBrowser.Controller/Sync/IRemoteSyncProvider.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Controller.Sync
 {
     /// <summary>
diff --git a/MediaBrowser.LocalMetadata/BaseXmlProvider.cs b/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
index e67b3ebacd..a6553563fa 100644
--- a/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
@@ -69,6 +69,7 @@ namespace MediaBrowser.LocalMetadata
 
         public string Name => XmlProviderUtils.Name;
 
+        //After Nfo
         public virtual int Order => 1;
     }
 
diff --git a/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs b/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
index f5e028ab81..206e761bb4 100644
--- a/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
@@ -21,6 +21,7 @@ namespace MediaBrowser.LocalMetadata.Images
             return item is CollectionFolder && item.SupportsLocalMetadata;
         }
 
+        // Run after LocalImageProvider
         public int Order => 1;
 
         public List<LocalImageInfo> GetImages(BaseItem item, IDirectoryService directoryService)
diff --git a/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs b/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
index 2a2f36fbd6..c0706ceeb0 100644
--- a/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
@@ -46,7 +46,7 @@ namespace MediaBrowser.LocalMetadata.Images
 
             return true;
         }
-
+        // Make sure this is last so that all other locations are scanned first
         public int Order => 1000;
 
         public List<LocalImageInfo> GetImages(BaseItem item, IDirectoryService directoryService)
diff --git a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
index e4efa2c351..0a4928ed7f 100644
--- a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
@@ -96,7 +96,7 @@ namespace MediaBrowser.LocalMetadata.Images
 
         public List<LocalImageInfo> GetImages(BaseItem item, IEnumerable<string> paths, bool arePathsInMediaFolders, IDirectoryService directoryService)
         {
-            var files = paths.SelectMany(i => _fileSystem.GetFiles(i, BaseItem.SupportedImageExtensions, true, false));
+            IEnumerable<FileSystemMetadata> files = paths.SelectMany(i => _fileSystem.GetFiles(i, BaseItem.SupportedImageExtensions, true, false));
 
             files = files
                 .OrderBy(i => Array.IndexOf(BaseItem.SupportedImageExtensions, i.Extension ?? string.Empty));
diff --git a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
index 821b11a5de..e40a55e567 100644
--- a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
@@ -676,7 +676,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
                 default:
                     {
                         string readerName = reader.Name;
-                        if (_validProviderIds.TryGetValue(readerName, out var providerIdValue))
+                        if (_validProviderIds.TryGetValue(readerName, out string providerIdValue))
                         {
                             var id = reader.ReadElementContentAsString();
                             if (!string.IsNullOrWhiteSpace(id))
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
index c0578aad1c..262772959a 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
@@ -152,7 +152,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         private string GetProcessOutput(string path, string arguments)
         {
-            var process = _processFactory.Create(new ProcessOptions
+            IProcess process = _processFactory.Create(new ProcessOptions
             {
                 CreateNoWindow = true,
                 UseShellExecute = false,
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index b72ad572a3..5099ccb2aa 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -1193,7 +1193,7 @@ namespace MediaBrowser.MediaEncoding.Probing
 
             if (chapter.tags != null)
             {
-                if (chapter.tags.TryGetValue("title", out var name))
+                if (chapter.tags.TryGetValue("title", out string name))
                 {
                     info.Name = name;
                 }
diff --git a/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs b/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs
index 8e0fd26245..d1f3577f73 100644
--- a/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs
+++ b/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.ApiClient
 {
     public class ServerDiscoveryInfo
diff --git a/MediaBrowser.Model/Branding/BrandingOptions.cs b/MediaBrowser.Model/Branding/BrandingOptions.cs
index 3f05b97b8d..f83558df59 100644
--- a/MediaBrowser.Model/Branding/BrandingOptions.cs
+++ b/MediaBrowser.Model/Branding/BrandingOptions.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Branding
 {
     public class BrandingOptions
diff --git a/MediaBrowser.Model/Channels/ChannelInfo.cs b/MediaBrowser.Model/Channels/ChannelInfo.cs
index 39cd92e01e..9b2d31bf35 100644
--- a/MediaBrowser.Model/Channels/ChannelInfo.cs
+++ b/MediaBrowser.Model/Channels/ChannelInfo.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Channels
 {
     public class ChannelInfo
diff --git a/MediaBrowser.Model/Configuration/AccessSchedule.cs b/MediaBrowser.Model/Configuration/AccessSchedule.cs
index 73a17f18c1..d34e273836 100644
--- a/MediaBrowser.Model/Configuration/AccessSchedule.cs
+++ b/MediaBrowser.Model/Configuration/AccessSchedule.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Configuration
 {
     public class AccessSchedule
diff --git a/MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs b/MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs
index 298141af7c..73dda5a77a 100644
--- a/MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs
+++ b/MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Configuration
 {
     public enum DynamicDayOfWeek
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index dddf8b89ce..8584bd3ddb 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Configuration
 {
     public class EncodingOptions
diff --git a/MediaBrowser.Model/Configuration/FanartOptions.cs b/MediaBrowser.Model/Configuration/FanartOptions.cs
index 0c991e0899..9c8be39be7 100644
--- a/MediaBrowser.Model/Configuration/FanartOptions.cs
+++ b/MediaBrowser.Model/Configuration/FanartOptions.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Configuration
 {
     public class FanartOptions
diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs
index 808c0ed654..ba33bee87c 100644
--- a/MediaBrowser.Model/Configuration/LibraryOptions.cs
+++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs
@@ -108,7 +108,7 @@ namespace MediaBrowser.Model.Configuration
                 }
             }
 
-            if (DefaultImageOptions.TryGetValue(Type, out var options))
+            if (DefaultImageOptions.TryGetValue(Type, out ImageOption[] options))
             {
                 foreach (var i in options)
                 {
diff --git a/MediaBrowser.Model/Configuration/MetadataConfiguration.cs b/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
index 91549ee66f..87e02d0549 100644
--- a/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Configuration
 {
     public class MetadataConfiguration
diff --git a/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs b/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
index 40c97c7f9a..19e6be166f 100644
--- a/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
+++ b/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Configuration
 {
     public class XbmcMetadataOptions
diff --git a/MediaBrowser.Model/Connect/ConnectUser.cs b/MediaBrowser.Model/Connect/ConnectUser.cs
index 919bb50c69..4c536c6b0e 100644
--- a/MediaBrowser.Model/Connect/ConnectUser.cs
+++ b/MediaBrowser.Model/Connect/ConnectUser.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Connect
 {
     public class ConnectUser
diff --git a/MediaBrowser.Model/Connect/ConnectUserQuery.cs b/MediaBrowser.Model/Connect/ConnectUserQuery.cs
index 607f6bab95..4f04934d69 100644
--- a/MediaBrowser.Model/Connect/ConnectUserQuery.cs
+++ b/MediaBrowser.Model/Connect/ConnectUserQuery.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Connect
 {
     public class ConnectUserQuery
diff --git a/MediaBrowser.Model/Connect/UserLinkType.cs b/MediaBrowser.Model/Connect/UserLinkType.cs
index d86772c960..19b4b67e6e 100644
--- a/MediaBrowser.Model/Connect/UserLinkType.cs
+++ b/MediaBrowser.Model/Connect/UserLinkType.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Connect
 {
     public enum UserLinkType
diff --git a/MediaBrowser.Model/Devices/DeviceQuery.cs b/MediaBrowser.Model/Devices/DeviceQuery.cs
index 84d1f2a9e8..48d7ec142c 100644
--- a/MediaBrowser.Model/Devices/DeviceQuery.cs
+++ b/MediaBrowser.Model/Devices/DeviceQuery.cs
@@ -1,4 +1,3 @@
-
 using System;
 
 namespace MediaBrowser.Model.Devices
diff --git a/MediaBrowser.Model/Devices/LocalFileInfo.cs b/MediaBrowser.Model/Devices/LocalFileInfo.cs
index 4d67e3c694..cc5c9250b5 100644
--- a/MediaBrowser.Model/Devices/LocalFileInfo.cs
+++ b/MediaBrowser.Model/Devices/LocalFileInfo.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Devices
 {
     public class LocalFileInfo
diff --git a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
index b71531bf1b..901d81c5ff 100644
--- a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
+++ b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
@@ -31,7 +31,7 @@ namespace MediaBrowser.Model.Dlna
             string dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}",
              DlnaMaps.FlagsToString(flagValue));
 
-            var mediaProfile = _profile.GetImageMediaProfile(container,
+            ResponseProfile mediaProfile = _profile.GetImageMediaProfile(container,
                 width,
                 height);
 
@@ -83,7 +83,7 @@ namespace MediaBrowser.Model.Dlna
             string dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}",
              DlnaMaps.FlagsToString(flagValue));
 
-            var mediaProfile = _profile.GetAudioMediaProfile(container,
+            ResponseProfile mediaProfile = _profile.GetAudioMediaProfile(container,
                 audioCodec,
                 audioChannels,
                 audioBitrate,
@@ -148,7 +148,7 @@ namespace MediaBrowser.Model.Dlna
             string dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}",
              DlnaMaps.FlagsToString(flagValue));
 
-            var mediaProfile = _profile.GetVideoMediaProfile(container,
+            ResponseProfile mediaProfile = _profile.GetVideoMediaProfile(container,
                 audioCodec,
                 videoCodec,
                 width,
diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs
index 8124cf5289..6894f45edc 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs
@@ -191,7 +191,7 @@ namespace MediaBrowser.Model.Dlna
                 var conditionProcessor = new ConditionProcessor();
 
                 var anyOff = false;
-                foreach (var c in i.Conditions)
+                foreach (ProfileCondition c in i.Conditions)
                 {
                     if (!conditionProcessor.IsAudioConditionSatisfied(GetModelProfileCondition(c), audioChannels, audioBitrate, audioSampleRate, audioBitDepth))
                     {
@@ -304,7 +304,7 @@ namespace MediaBrowser.Model.Dlna
                 var conditionProcessor = new ConditionProcessor();
 
                 var anyOff = false;
-                foreach (var c in i.Conditions)
+                foreach (ProfileCondition c in i.Conditions)
                 {
                     if (!conditionProcessor.IsVideoConditionSatisfied(GetModelProfileCondition(c), width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                     {
diff --git a/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs b/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
index 9b3515fc3d..c78f0d9b2b 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Dlna
 {
     public class DeviceProfileInfo
diff --git a/MediaBrowser.Model/Dlna/MediaFormatProfile.cs b/MediaBrowser.Model/Dlna/MediaFormatProfile.cs
index 376849c435..7c56fc5f45 100644
--- a/MediaBrowser.Model/Dlna/MediaFormatProfile.cs
+++ b/MediaBrowser.Model/Dlna/MediaFormatProfile.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Dlna
 {
     public enum MediaFormatProfile
diff --git a/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs b/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs
index 9412cd1b68..5080bc2863 100644
--- a/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs
+++ b/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Dlna
 {
     public enum PlaybackErrorCode
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 4f4054db4b..ec05e2eb72 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -32,7 +32,7 @@ namespace MediaBrowser.Model.Dlna
             ValidateAudioInput(options);
 
             var mediaSources = new List<MediaSourceInfo>();
-            foreach (var i in options.MediaSources)
+            foreach (MediaSourceInfo i in options.MediaSources)
             {
                 if (string.IsNullOrEmpty(options.MediaSourceId) ||
                     StringHelper.EqualsIgnoreCase(i.Id, options.MediaSourceId))
@@ -42,16 +42,16 @@ namespace MediaBrowser.Model.Dlna
             }
 
             var streams = new List<StreamInfo>();
-            foreach (var i in mediaSources)
+            foreach (MediaSourceInfo i in mediaSources)
             {
-                var streamInfo = BuildAudioItem(i, options);
+                StreamInfo streamInfo = BuildAudioItem(i, options);
                 if (streamInfo != null)
                 {
                     streams.Add(streamInfo);
                 }
             }
 
-            foreach (var stream in streams)
+            foreach (StreamInfo stream in streams)
             {
                 stream.DeviceId = options.DeviceId;
                 stream.DeviceProfileId = options.Profile.Id;
@@ -65,7 +65,7 @@ namespace MediaBrowser.Model.Dlna
             ValidateInput(options);
 
             var mediaSources = new List<MediaSourceInfo>();
-            foreach (var i in options.MediaSources)
+            foreach (MediaSourceInfo i in options.MediaSources)
             {
                 if (string.IsNullOrEmpty(options.MediaSourceId) ||
                     StringHelper.EqualsIgnoreCase(i.Id, options.MediaSourceId))
@@ -75,7 +75,7 @@ namespace MediaBrowser.Model.Dlna
             }
 
             var streams = new List<StreamInfo>();
-            foreach (var i in mediaSources)
+            foreach (MediaSourceInfo i in mediaSources)
             {
                 var streamInfo = BuildVideoItem(i, options);
                 if (streamInfo != null)
@@ -84,7 +84,7 @@ namespace MediaBrowser.Model.Dlna
                 }
             }
 
-            foreach (var stream in streams)
+            foreach (StreamInfo stream in streams)
             {
                 stream.DeviceId = options.DeviceId;
                 stream.DeviceProfileId = options.Profile.Id;
@@ -97,7 +97,7 @@ namespace MediaBrowser.Model.Dlna
         {
             var sorted = SortMediaSources(streams, maxBitrate);
 
-            foreach (var stream in sorted)
+            foreach (StreamInfo stream in sorted)
             {
                 return stream;
             }
@@ -333,7 +333,7 @@ namespace MediaBrowser.Model.Dlna
                     if (i.Type == CodecType.Audio && i.ContainsAnyCodec(audioCodec, item.Container))
                     {
                         bool applyConditions = true;
-                        foreach (var applyCondition in i.ApplyConditions)
+                        foreach (ProfileCondition applyCondition in i.ApplyConditions)
                         {
                             if (!conditionProcessor.IsAudioConditionSatisfied(applyCondition, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth))
                             {
@@ -345,7 +345,7 @@ namespace MediaBrowser.Model.Dlna
 
                         if (applyConditions)
                         {
-                            foreach (var c in i.Conditions)
+                            foreach (ProfileCondition c in i.Conditions)
                             {
                                 conditions.Add(c);
                             }
@@ -354,7 +354,7 @@ namespace MediaBrowser.Model.Dlna
                 }
 
                 bool all = true;
-                foreach (var c in conditions)
+                foreach (ProfileCondition c in conditions)
                 {
                     if (!conditionProcessor.IsAudioConditionSatisfied(c, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth))
                     {
@@ -431,7 +431,7 @@ namespace MediaBrowser.Model.Dlna
 
                     if (applyConditions)
                     {
-                        foreach (var c in i.Conditions)
+                        foreach (ProfileCondition c in i.Conditions)
                         {
                             audioTranscodingConditions.Add(c);
                         }
@@ -811,7 +811,7 @@ namespace MediaBrowser.Model.Dlna
                     if (i.Type == CodecType.Video && i.ContainsAnyCodec(transcodingProfile.VideoCodec, transcodingProfile.Container))
                     {
                         bool applyConditions = true;
-                        foreach (var applyCondition in i.ApplyConditions)
+                        foreach (ProfileCondition applyCondition in i.ApplyConditions)
                         {
                             int? width = videoStream == null ? null : videoStream.Width;
                             int? height = videoStream == null ? null : videoStream.Height;
@@ -867,7 +867,7 @@ namespace MediaBrowser.Model.Dlna
                     if (i.Type == CodecType.VideoAudio && i.ContainsAnyCodec(transcodingProfile.AudioCodec, transcodingProfile.Container))
                     {
                         bool applyConditions = true;
-                        foreach (var applyCondition in i.ApplyConditions)
+                        foreach (ProfileCondition applyCondition in i.ApplyConditions)
                         {
                             bool? isSecondaryAudio = audioStream == null ? null : item.IsSecondaryAudio(audioStream);
                             int? inputAudioBitrate = audioStream == null ? null : audioStream.BitRate;
@@ -997,7 +997,7 @@ namespace MediaBrowser.Model.Dlna
             bool isEligibleForDirectPlay,
             bool isEligibleForDirectStream)
         {
-            var profile = options.Profile;
+            DeviceProfile profile = options.Profile;
 
             if (options.ForceDirectPlay)
             {
@@ -1071,7 +1071,7 @@ namespace MediaBrowser.Model.Dlna
             int? numVideoStreams = mediaSource.GetStreamCount(MediaStreamType.Video);
 
             // Check container conditions
-            foreach (var i in conditions)
+            foreach (ProfileCondition i in conditions)
             {
                 if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                 {
@@ -1094,7 +1094,7 @@ namespace MediaBrowser.Model.Dlna
                 if (i.Type == CodecType.Video && i.ContainsAnyCodec(videoCodec, container))
                 {
                     bool applyConditions = true;
-                    foreach (var applyCondition in i.ApplyConditions)
+                    foreach (ProfileCondition applyCondition in i.ApplyConditions)
                     {
                         if (!conditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                         {
@@ -1106,7 +1106,7 @@ namespace MediaBrowser.Model.Dlna
 
                     if (applyConditions)
                     {
-                        foreach (var c in i.Conditions)
+                        foreach (ProfileCondition c in i.Conditions)
                         {
                             conditions.Add(c);
                         }
@@ -1114,7 +1114,7 @@ namespace MediaBrowser.Model.Dlna
                 }
             }
 
-            foreach (var i in conditions)
+            foreach (ProfileCondition i in conditions)
             {
                 if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                 {
@@ -1141,7 +1141,7 @@ namespace MediaBrowser.Model.Dlna
                     if (i.Type == CodecType.VideoAudio && i.ContainsAnyCodec(audioCodec, container))
                     {
                         bool applyConditions = true;
-                        foreach (var applyCondition in i.ApplyConditions)
+                        foreach (ProfileCondition applyCondition in i.ApplyConditions)
                         {
                             if (!conditionProcessor.IsVideoAudioConditionSatisfied(applyCondition, audioChannels, audioBitrate, audioSampleRate, audioBitDepth, audioProfile, isSecondaryAudio))
                             {
@@ -1153,7 +1153,7 @@ namespace MediaBrowser.Model.Dlna
 
                         if (applyConditions)
                         {
-                            foreach (var c in i.Conditions)
+                            foreach (ProfileCondition c in i.Conditions)
                             {
                                 conditions.Add(c);
                             }
@@ -1161,7 +1161,7 @@ namespace MediaBrowser.Model.Dlna
                     }
                 }
 
-                foreach (var i in conditions)
+                foreach (ProfileCondition i in conditions)
                 {
                     if (!conditionProcessor.IsVideoAudioConditionSatisfied(i, audioChannels, audioBitrate, audioSampleRate, audioBitDepth, audioProfile, isSecondaryAudio))
                     {
@@ -1466,7 +1466,7 @@ namespace MediaBrowser.Model.Dlna
 
         private void ApplyTranscodingConditions(StreamInfo item, IEnumerable<ProfileCondition> conditions, string qualifier, bool enableQualifiedConditions, bool enableNonQualifiedConditions)
         {
-            foreach (var condition in conditions)
+            foreach (ProfileCondition condition in conditions)
             {
                 string value = condition.Value;
 
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 99c545cc02..522c109803 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -145,7 +145,7 @@ namespace MediaBrowser.Model.Dlna
             }
 
             var list = new List<string>();
-            foreach (var pair in BuildParams(this, accessToken))
+            foreach (NameValuePair pair in BuildParams(this, accessToken))
             {
                 if (string.IsNullOrEmpty(pair.Value))
                 {
@@ -349,7 +349,7 @@ namespace MediaBrowser.Model.Dlna
             var newList = new List<SubtitleStreamInfo>();
 
             // First add the selected track
-            foreach (var stream in list)
+            foreach (SubtitleStreamInfo stream in list)
             {
                 if (stream.DeliveryMethod == SubtitleDeliveryMethod.External)
                 {
diff --git a/MediaBrowser.Model/Drawing/ImageFormat.cs b/MediaBrowser.Model/Drawing/ImageFormat.cs
index 31619a472a..3639c1594f 100644
--- a/MediaBrowser.Model/Drawing/ImageFormat.cs
+++ b/MediaBrowser.Model/Drawing/ImageFormat.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Drawing
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Drawing/ImageOrientation.cs b/MediaBrowser.Model/Drawing/ImageOrientation.cs
index 0df72411cf..0fce8c3dc4 100644
--- a/MediaBrowser.Model/Drawing/ImageOrientation.cs
+++ b/MediaBrowser.Model/Drawing/ImageOrientation.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Drawing
 {
     public enum ImageOrientation
diff --git a/MediaBrowser.Model/Dto/IHasServerId.cs b/MediaBrowser.Model/Dto/IHasServerId.cs
index 19991c622b..2cce5df62e 100644
--- a/MediaBrowser.Model/Dto/IHasServerId.cs
+++ b/MediaBrowser.Model/Dto/IHasServerId.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Dto
 {
     public interface IHasServerId
diff --git a/MediaBrowser.Model/Dto/IItemDto.cs b/MediaBrowser.Model/Dto/IItemDto.cs
index 60c579cdd0..0130adb6f1 100644
--- a/MediaBrowser.Model/Dto/IItemDto.cs
+++ b/MediaBrowser.Model/Dto/IItemDto.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Dto
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Dto/ItemIndex.cs b/MediaBrowser.Model/Dto/ItemIndex.cs
index de29f97d48..21e14c73e5 100644
--- a/MediaBrowser.Model/Dto/ItemIndex.cs
+++ b/MediaBrowser.Model/Dto/ItemIndex.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Dto
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Dto/NameValuePair.cs b/MediaBrowser.Model/Dto/NameValuePair.cs
index f0971c0764..624763211a 100644
--- a/MediaBrowser.Model/Dto/NameValuePair.cs
+++ b/MediaBrowser.Model/Dto/NameValuePair.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Dto
 {
     public class NameValuePair
diff --git a/MediaBrowser.Model/Entities/EmptyRequestResult.cs b/MediaBrowser.Model/Entities/EmptyRequestResult.cs
index 2b2b9bee94..5d29218e3c 100644
--- a/MediaBrowser.Model/Entities/EmptyRequestResult.cs
+++ b/MediaBrowser.Model/Entities/EmptyRequestResult.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Entities
 {
     public class EmptyRequestResult
diff --git a/MediaBrowser.Model/Entities/ExtraType.cs b/MediaBrowser.Model/Entities/ExtraType.cs
index b632e77540..97350b9554 100644
--- a/MediaBrowser.Model/Entities/ExtraType.cs
+++ b/MediaBrowser.Model/Entities/ExtraType.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Entities
 {
     public enum ExtraType
diff --git a/MediaBrowser.Model/Entities/ImageType.cs b/MediaBrowser.Model/Entities/ImageType.cs
index c2427f96da..ce3560e78f 100644
--- a/MediaBrowser.Model/Entities/ImageType.cs
+++ b/MediaBrowser.Model/Entities/ImageType.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/LocationType.cs b/MediaBrowser.Model/Entities/LocationType.cs
index 828e238b2c..52c08b28b5 100644
--- a/MediaBrowser.Model/Entities/LocationType.cs
+++ b/MediaBrowser.Model/Entities/LocationType.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/MediaType.cs b/MediaBrowser.Model/Entities/MediaType.cs
index 65236c792c..af233e61ec 100644
--- a/MediaBrowser.Model/Entities/MediaType.cs
+++ b/MediaBrowser.Model/Entities/MediaType.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/MediaUrl.cs b/MediaBrowser.Model/Entities/MediaUrl.cs
index cffb5b8579..428c895b6e 100644
--- a/MediaBrowser.Model/Entities/MediaUrl.cs
+++ b/MediaBrowser.Model/Entities/MediaUrl.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Entities
 {
     public class MediaUrl
diff --git a/MediaBrowser.Model/Entities/MetadataFields.cs b/MediaBrowser.Model/Entities/MetadataFields.cs
index e76f51249b..a7947a933b 100644
--- a/MediaBrowser.Model/Entities/MetadataFields.cs
+++ b/MediaBrowser.Model/Entities/MetadataFields.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/MetadataProviders.cs b/MediaBrowser.Model/Entities/MetadataProviders.cs
index 2d639a63e8..3999616036 100644
--- a/MediaBrowser.Model/Entities/MetadataProviders.cs
+++ b/MediaBrowser.Model/Entities/MetadataProviders.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/ParentalRating.cs b/MediaBrowser.Model/Entities/ParentalRating.cs
index 5dbbf7cb97..a22e119fa0 100644
--- a/MediaBrowser.Model/Entities/ParentalRating.cs
+++ b/MediaBrowser.Model/Entities/ParentalRating.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/PersonType.cs b/MediaBrowser.Model/Entities/PersonType.cs
index 20d585ab0d..72e3538fcb 100644
--- a/MediaBrowser.Model/Entities/PersonType.cs
+++ b/MediaBrowser.Model/Entities/PersonType.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs b/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
index 437572d57f..a151bb3bb1 100644
--- a/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
+++ b/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
@@ -48,7 +48,7 @@ namespace MediaBrowser.Model.Entities
                 return null;
             }
 
-            instance.ProviderIds.TryGetValue(name, out var id);
+            instance.ProviderIds.TryGetValue(name, out string id);
             return id;
         }
 
diff --git a/MediaBrowser.Model/Entities/SeriesStatus.cs b/MediaBrowser.Model/Entities/SeriesStatus.cs
index 558a1cd027..cab6a83e8b 100644
--- a/MediaBrowser.Model/Entities/SeriesStatus.cs
+++ b/MediaBrowser.Model/Entities/SeriesStatus.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/UserDataSaveReason.cs b/MediaBrowser.Model/Entities/UserDataSaveReason.cs
index b1590e62f6..bd7471682f 100644
--- a/MediaBrowser.Model/Entities/UserDataSaveReason.cs
+++ b/MediaBrowser.Model/Entities/UserDataSaveReason.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Entities/Video3DFormat.cs b/MediaBrowser.Model/Entities/Video3DFormat.cs
index c9e6590d2a..89923ae525 100644
--- a/MediaBrowser.Model/Entities/Video3DFormat.cs
+++ b/MediaBrowser.Model/Entities/Video3DFormat.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Entities
 {
     public enum Video3DFormat
diff --git a/MediaBrowser.Model/Entities/VideoType.cs b/MediaBrowser.Model/Entities/VideoType.cs
index d8f4cf6d04..95d69fb7bb 100644
--- a/MediaBrowser.Model/Entities/VideoType.cs
+++ b/MediaBrowser.Model/Entities/VideoType.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Globalization/CountryInfo.cs b/MediaBrowser.Model/Globalization/CountryInfo.cs
index 3ae26a158e..3ae59494f6 100644
--- a/MediaBrowser.Model/Globalization/CountryInfo.cs
+++ b/MediaBrowser.Model/Globalization/CountryInfo.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Globalization
 {
     /// <summary>
diff --git a/MediaBrowser.Model/IO/FileSystemEntryInfo.cs b/MediaBrowser.Model/IO/FileSystemEntryInfo.cs
index 40877680fd..a197f0fbe0 100644
--- a/MediaBrowser.Model/IO/FileSystemEntryInfo.cs
+++ b/MediaBrowser.Model/IO/FileSystemEntryInfo.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.IO
 {
     /// <summary>
diff --git a/MediaBrowser.Model/IO/IShortcutHandler.cs b/MediaBrowser.Model/IO/IShortcutHandler.cs
index 4c72a8e771..2cc18274b6 100644
--- a/MediaBrowser.Model/IO/IShortcutHandler.cs
+++ b/MediaBrowser.Model/IO/IShortcutHandler.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.IO
 {
     public interface IShortcutHandler
diff --git a/MediaBrowser.Model/IO/StreamDefaults.cs b/MediaBrowser.Model/IO/StreamDefaults.cs
index 2ca12a74dc..bef20e74fe 100644
--- a/MediaBrowser.Model/IO/StreamDefaults.cs
+++ b/MediaBrowser.Model/IO/StreamDefaults.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.IO
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Library/PlayAccess.cs b/MediaBrowser.Model/Library/PlayAccess.cs
index 1962d48bad..2fd754f5ef 100644
--- a/MediaBrowser.Model/Library/PlayAccess.cs
+++ b/MediaBrowser.Model/Library/PlayAccess.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Library
 {
     public enum PlayAccess
diff --git a/MediaBrowser.Model/LiveTv/ChannelType.cs b/MediaBrowser.Model/LiveTv/ChannelType.cs
index 56221ab49d..8808aa6d2c 100644
--- a/MediaBrowser.Model/LiveTv/ChannelType.cs
+++ b/MediaBrowser.Model/LiveTv/ChannelType.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.LiveTv
 {
     /// <summary>
diff --git a/MediaBrowser.Model/LiveTv/RecordingStatus.cs b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
index bb93fedbc4..d3270c4d37 100644
--- a/MediaBrowser.Model/LiveTv/RecordingStatus.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.LiveTv
 {
     public enum RecordingStatus
diff --git a/MediaBrowser.Model/MediaInfo/Container.cs b/MediaBrowser.Model/MediaInfo/Container.cs
index 10b22d16b3..f8d56702df 100644
--- a/MediaBrowser.Model/MediaInfo/Container.cs
+++ b/MediaBrowser.Model/MediaInfo/Container.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.MediaInfo
 {
     public class Container
diff --git a/MediaBrowser.Model/MediaInfo/IBlurayExaminer.cs b/MediaBrowser.Model/MediaInfo/IBlurayExaminer.cs
index 600f18e7e2..27137ab261 100644
--- a/MediaBrowser.Model/MediaInfo/IBlurayExaminer.cs
+++ b/MediaBrowser.Model/MediaInfo/IBlurayExaminer.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.MediaInfo
 {
     /// <summary>
diff --git a/MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs b/MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs
index 37734fe458..4eb000e58d 100644
--- a/MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs
+++ b/MediaBrowser.Model/MediaInfo/SubtitleTrackEvent.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.MediaInfo
 {
     public class SubtitleTrackEvent
diff --git a/MediaBrowser.Model/Net/ISocketFactory.cs b/MediaBrowser.Model/Net/ISocketFactory.cs
index a878f84b06..69fe134bc7 100644
--- a/MediaBrowser.Model/Net/ISocketFactory.cs
+++ b/MediaBrowser.Model/Net/ISocketFactory.cs
@@ -1,4 +1,3 @@
-
 using System.IO;
 
 namespace MediaBrowser.Model.Net
diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index 3891417c7d..fe13413e2e 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -132,7 +132,7 @@ namespace MediaBrowser.Model.Net
 
             var ext = Path.GetExtension(path) ?? string.Empty;
 
-            if (MimeTypeLookup.TryGetValue(ext, out var result))
+            if (MimeTypeLookup.TryGetValue(ext, out string result))
             {
                 return result;
             }
@@ -338,7 +338,7 @@ namespace MediaBrowser.Model.Net
             // handle text/html; charset=UTF-8
             mimeType = mimeType.Split(';')[0];
 
-            if (ExtensionLookup.TryGetValue(mimeType, out var result))
+            if (ExtensionLookup.TryGetValue(mimeType, out string result))
             {
                 return result;
             }
diff --git a/MediaBrowser.Model/Net/NetworkShare.cs b/MediaBrowser.Model/Net/NetworkShare.cs
index 5aab59d1c0..1f61414fc0 100644
--- a/MediaBrowser.Model/Net/NetworkShare.cs
+++ b/MediaBrowser.Model/Net/NetworkShare.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Net
 {
     public class NetworkShare
diff --git a/MediaBrowser.Model/Net/NetworkShareType.cs b/MediaBrowser.Model/Net/NetworkShareType.cs
index 3270d5b74f..bf2d092a6d 100644
--- a/MediaBrowser.Model/Net/NetworkShareType.cs
+++ b/MediaBrowser.Model/Net/NetworkShareType.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Net
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Net/SocketReceiveResult.cs b/MediaBrowser.Model/Net/SocketReceiveResult.cs
index cffc2ad27e..8c394f7c7d 100644
--- a/MediaBrowser.Model/Net/SocketReceiveResult.cs
+++ b/MediaBrowser.Model/Net/SocketReceiveResult.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Net
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Net/WebSocketMessage.cs b/MediaBrowser.Model/Net/WebSocketMessage.cs
index a6e0ca6322..c763216f12 100644
--- a/MediaBrowser.Model/Net/WebSocketMessage.cs
+++ b/MediaBrowser.Model/Net/WebSocketMessage.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Net
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Notifications/NotificationLevel.cs b/MediaBrowser.Model/Notifications/NotificationLevel.cs
index 4427b9677c..6a838b1254 100644
--- a/MediaBrowser.Model/Notifications/NotificationLevel.cs
+++ b/MediaBrowser.Model/Notifications/NotificationLevel.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Notifications
 {
     public enum NotificationLevel
diff --git a/MediaBrowser.Model/Notifications/NotificationOptions.cs b/MediaBrowser.Model/Notifications/NotificationOptions.cs
index cf85554233..f48b5ee7fc 100644
--- a/MediaBrowser.Model/Notifications/NotificationOptions.cs
+++ b/MediaBrowser.Model/Notifications/NotificationOptions.cs
@@ -77,7 +77,7 @@ namespace MediaBrowser.Model.Notifications
 
         public NotificationOption GetOptions(string type)
         {
-            foreach (var i in Options)
+            foreach (NotificationOption i in Options)
             {
                 if (StringHelper.EqualsIgnoreCase(type, i.Type)) return i;
             }
@@ -86,14 +86,14 @@ namespace MediaBrowser.Model.Notifications
 
         public bool IsEnabled(string type)
         {
-            var opt = GetOptions(type);
+            NotificationOption opt = GetOptions(type);
 
             return opt != null && opt.Enabled;
         }
 
         public bool IsServiceEnabled(string service, string notificationType)
         {
-            var opt = GetOptions(notificationType);
+            NotificationOption opt = GetOptions(notificationType);
 
             return opt == null ||
                    !ListHelper.ContainsIgnoreCase(opt.DisabledServices, service);
@@ -101,7 +101,7 @@ namespace MediaBrowser.Model.Notifications
 
         public bool IsEnabledToMonitorUser(string type, Guid userId)
         {
-            var opt = GetOptions(type);
+            NotificationOption opt = GetOptions(type);
 
             return opt != null && opt.Enabled &&
                    !ListHelper.ContainsIgnoreCase(opt.DisabledMonitorUsers, userId.ToString(""));
@@ -109,7 +109,7 @@ namespace MediaBrowser.Model.Notifications
 
         public bool IsEnabledToSendToUser(string type, string userId, UserPolicy userPolicy)
         {
-            var opt = GetOptions(type);
+            NotificationOption opt = GetOptions(type);
 
             if (opt != null && opt.Enabled)
             {
diff --git a/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs b/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs
index bb7c7b140a..301ae66a7d 100644
--- a/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs
+++ b/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Playlists
 {
     public class PlaylistCreationResult
diff --git a/MediaBrowser.Model/Plugins/BasePluginConfiguration.cs b/MediaBrowser.Model/Plugins/BasePluginConfiguration.cs
index 3dc5c6773b..39db22133e 100644
--- a/MediaBrowser.Model/Plugins/BasePluginConfiguration.cs
+++ b/MediaBrowser.Model/Plugins/BasePluginConfiguration.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Plugins
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Providers/ExternalIdInfo.cs b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
index 3ccc3cc934..bff84c5533 100644
--- a/MediaBrowser.Model/Providers/ExternalIdInfo.cs
+++ b/MediaBrowser.Model/Providers/ExternalIdInfo.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Providers
 {
     public class ExternalIdInfo
diff --git a/MediaBrowser.Model/Querying/EpisodeQuery.cs b/MediaBrowser.Model/Querying/EpisodeQuery.cs
index e2231d3565..0c8ea7ed4c 100644
--- a/MediaBrowser.Model/Querying/EpisodeQuery.cs
+++ b/MediaBrowser.Model/Querying/EpisodeQuery.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Querying
 {
     public class EpisodeQuery
diff --git a/MediaBrowser.Model/Querying/ItemCountsQuery.cs b/MediaBrowser.Model/Querying/ItemCountsQuery.cs
index c12ada345e..02b809fa88 100644
--- a/MediaBrowser.Model/Querying/ItemCountsQuery.cs
+++ b/MediaBrowser.Model/Querying/ItemCountsQuery.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Querying
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Querying/ItemFilter.cs b/MediaBrowser.Model/Querying/ItemFilter.cs
index ee7e49fb07..b8dcfbdad3 100644
--- a/MediaBrowser.Model/Querying/ItemFilter.cs
+++ b/MediaBrowser.Model/Querying/ItemFilter.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Querying
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Querying/ItemSortBy.cs b/MediaBrowser.Model/Querying/ItemSortBy.cs
index 541990eb99..1b20f43ac8 100644
--- a/MediaBrowser.Model/Querying/ItemSortBy.cs
+++ b/MediaBrowser.Model/Querying/ItemSortBy.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Querying
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Querying/MovieRecommendationQuery.cs b/MediaBrowser.Model/Querying/MovieRecommendationQuery.cs
index ec63abb64a..52c1383558 100644
--- a/MediaBrowser.Model/Querying/MovieRecommendationQuery.cs
+++ b/MediaBrowser.Model/Querying/MovieRecommendationQuery.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Querying
 {
     public class MovieRecommendationQuery
diff --git a/MediaBrowser.Model/Querying/QueryResult.cs b/MediaBrowser.Model/Querying/QueryResult.cs
index 992c7e6235..e81f2b8682 100644
--- a/MediaBrowser.Model/Querying/QueryResult.cs
+++ b/MediaBrowser.Model/Querying/QueryResult.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Querying
 {
     public class QueryResult<T>
diff --git a/MediaBrowser.Model/Querying/SessionQuery.cs b/MediaBrowser.Model/Querying/SessionQuery.cs
index d02768ed71..1fac9d639b 100644
--- a/MediaBrowser.Model/Querying/SessionQuery.cs
+++ b/MediaBrowser.Model/Querying/SessionQuery.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Querying
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Querying/UserQuery.cs b/MediaBrowser.Model/Querying/UserQuery.cs
index c668f9d8c5..55cef664e7 100644
--- a/MediaBrowser.Model/Querying/UserQuery.cs
+++ b/MediaBrowser.Model/Querying/UserQuery.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Querying
 {
     public class UserQuery
diff --git a/MediaBrowser.Model/Search/SearchHintResult.cs b/MediaBrowser.Model/Search/SearchHintResult.cs
index 3d82bfcebf..069e7e025b 100644
--- a/MediaBrowser.Model/Search/SearchHintResult.cs
+++ b/MediaBrowser.Model/Search/SearchHintResult.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Search
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Services/IHasRequestFilter.cs b/MediaBrowser.Model/Services/IHasRequestFilter.cs
index 97c11e435b..d4e6aa8e00 100644
--- a/MediaBrowser.Model/Services/IHasRequestFilter.cs
+++ b/MediaBrowser.Model/Services/IHasRequestFilter.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Services
 {
     public interface IHasRequestFilter
diff --git a/MediaBrowser.Model/Services/IService.cs b/MediaBrowser.Model/Services/IService.cs
index cc64e60bc8..8f2e63e988 100644
--- a/MediaBrowser.Model/Services/IService.cs
+++ b/MediaBrowser.Model/Services/IService.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Services
 {
     // marker interface
diff --git a/MediaBrowser.Model/Session/BrowseRequest.cs b/MediaBrowser.Model/Session/BrowseRequest.cs
index d0ad28ea60..65d58501bd 100644
--- a/MediaBrowser.Model/Session/BrowseRequest.cs
+++ b/MediaBrowser.Model/Session/BrowseRequest.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Session
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Session/MessageCommand.cs b/MediaBrowser.Model/Session/MessageCommand.cs
index d392f7d2ee..1e558ef077 100644
--- a/MediaBrowser.Model/Session/MessageCommand.cs
+++ b/MediaBrowser.Model/Session/MessageCommand.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Session
 {
     public class MessageCommand
diff --git a/MediaBrowser.Model/Session/PlaybackStartInfo.cs b/MediaBrowser.Model/Session/PlaybackStartInfo.cs
index 19e1823f4c..e531f41b2a 100644
--- a/MediaBrowser.Model/Session/PlaybackStartInfo.cs
+++ b/MediaBrowser.Model/Session/PlaybackStartInfo.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Session
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Session/PlaystateCommand.cs b/MediaBrowser.Model/Session/PlaystateCommand.cs
index 018ad61382..6eb3e53c21 100644
--- a/MediaBrowser.Model/Session/PlaystateCommand.cs
+++ b/MediaBrowser.Model/Session/PlaystateCommand.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Session
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Sync/SyncCategory.cs b/MediaBrowser.Model/Sync/SyncCategory.cs
index a01b365979..637c5ba74e 100644
--- a/MediaBrowser.Model/Sync/SyncCategory.cs
+++ b/MediaBrowser.Model/Sync/SyncCategory.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Sync
 {
     public enum SyncCategory
diff --git a/MediaBrowser.Model/Sync/SyncJobStatus.cs b/MediaBrowser.Model/Sync/SyncJobStatus.cs
index e8b7c8d1b8..4ea3d3fa5f 100644
--- a/MediaBrowser.Model/Sync/SyncJobStatus.cs
+++ b/MediaBrowser.Model/Sync/SyncJobStatus.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Sync
 {
     public enum SyncJobStatus
diff --git a/MediaBrowser.Model/Sync/SyncTarget.cs b/MediaBrowser.Model/Sync/SyncTarget.cs
index c2b36cddfa..a94bf9a259 100644
--- a/MediaBrowser.Model/Sync/SyncTarget.cs
+++ b/MediaBrowser.Model/Sync/SyncTarget.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Sync
 {
     public class SyncTarget
diff --git a/MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs b/MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs
index 197c47f801..e461e4a4b7 100644
--- a/MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs
+++ b/MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Tasks
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Tasks/SystemEvent.cs b/MediaBrowser.Model/Tasks/SystemEvent.cs
index 1e6cfe13b3..5a3d8a8eb5 100644
--- a/MediaBrowser.Model/Tasks/SystemEvent.cs
+++ b/MediaBrowser.Model/Tasks/SystemEvent.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Tasks
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Tasks/TaskCompletionStatus.cs b/MediaBrowser.Model/Tasks/TaskCompletionStatus.cs
index 9acdf61d8d..4d7ff523d1 100644
--- a/MediaBrowser.Model/Tasks/TaskCompletionStatus.cs
+++ b/MediaBrowser.Model/Tasks/TaskCompletionStatus.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Tasks
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Tasks/TaskOptions.cs b/MediaBrowser.Model/Tasks/TaskOptions.cs
index b068034295..a9f03303a0 100644
--- a/MediaBrowser.Model/Tasks/TaskOptions.cs
+++ b/MediaBrowser.Model/Tasks/TaskOptions.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Tasks
 {
     public class TaskOptions
diff --git a/MediaBrowser.Model/Tasks/TaskState.cs b/MediaBrowser.Model/Tasks/TaskState.cs
index 60c4b06d1c..91bc7f682c 100644
--- a/MediaBrowser.Model/Tasks/TaskState.cs
+++ b/MediaBrowser.Model/Tasks/TaskState.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Tasks
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Updates/CheckForUpdateResult.cs b/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
index ed6ed22a06..4c66c6d49c 100644
--- a/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
+++ b/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Updates
 {
     /// <summary>
diff --git a/MediaBrowser.Model/Users/ForgotPasswordAction.cs b/MediaBrowser.Model/Users/ForgotPasswordAction.cs
index b5240cb34b..2124126c19 100644
--- a/MediaBrowser.Model/Users/ForgotPasswordAction.cs
+++ b/MediaBrowser.Model/Users/ForgotPasswordAction.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Users
 {
     public enum ForgotPasswordAction
diff --git a/MediaBrowser.Model/Users/PinRedeemResult.cs b/MediaBrowser.Model/Users/PinRedeemResult.cs
index 0edf2f422c..35663ba57f 100644
--- a/MediaBrowser.Model/Users/PinRedeemResult.cs
+++ b/MediaBrowser.Model/Users/PinRedeemResult.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Users
 {
     public class PinRedeemResult
diff --git a/MediaBrowser.Model/Users/UserActionType.cs b/MediaBrowser.Model/Users/UserActionType.cs
index 110b8904e4..5d843a7388 100644
--- a/MediaBrowser.Model/Users/UserActionType.cs
+++ b/MediaBrowser.Model/Users/UserActionType.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Users
 {
     public enum UserActionType
diff --git a/MediaBrowser.Providers/Folders/FolderMetadataService.cs b/MediaBrowser.Providers/Folders/FolderMetadataService.cs
index c839befff8..bb16344223 100644
--- a/MediaBrowser.Providers/Folders/FolderMetadataService.cs
+++ b/MediaBrowser.Providers/Folders/FolderMetadataService.cs
@@ -11,6 +11,7 @@ namespace MediaBrowser.Providers.Folders
 {
     public class FolderMetadataService : MetadataService<Folder, ItemLookupInfo>
     {
+        // Make sure the type-specific services get picked first
         public override int Order => 10;
 
         protected override void MergeData(MetadataResult<Folder> source, MetadataResult<Folder> target, MetadataFields[] lockedFields, bool replaceData, bool mergeMetadataSettings)
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 915c260bf2..65364ad679 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -968,7 +968,7 @@ namespace MediaBrowser.Providers.Manager
         {
             lock (_activeRefreshes)
             {
-                if (_activeRefreshes.TryGetValue(id, out var value))
+                if (_activeRefreshes.TryGetValue(id, out double value))
                 {
                     return value;
                 }
@@ -1037,7 +1037,7 @@ namespace MediaBrowser.Providers.Manager
 
             var cancellationToken = _disposeCancellationTokenSource.Token;
 
-            while (_refreshQueue.TryDequeue(out var refreshItem))
+            while (_refreshQueue.TryDequeue(out Tuple<Guid, MetadataRefreshOptions> refreshItem))
             {
                 if (_disposed)
                 {
diff --git a/MediaBrowser.Providers/Manager/SimplePriorityQueue.cs b/MediaBrowser.Providers/Manager/SimplePriorityQueue.cs
index b67edf50a9..d064312cfa 100644
--- a/MediaBrowser.Providers/Manager/SimplePriorityQueue.cs
+++ b/MediaBrowser.Providers/Manager/SimplePriorityQueue.cs
@@ -80,7 +80,7 @@ namespace Priority_Queue
                         throw new InvalidOperationException("Cannot call .First on an empty queue");
                     }
 
-                    var first = _queue.First;
+                    SimpleNode first = _queue.First;
                     return (first != null ? first.Data : default(TItem));
                 }
             }
@@ -133,7 +133,7 @@ namespace Priority_Queue
                     return false;
                 }
 
-                if (_queue.TryDequeue(out var node))
+                if (_queue.TryDequeue(out SimpleNode node))
                 {
                     item = node.Data;
                     return true;
@@ -198,7 +198,7 @@ namespace Priority_Queue
             {
                 try
                 {
-                    var updateMe = GetExistingNode(item);
+                    SimpleNode updateMe = GetExistingNode(item);
                     _queue.UpdatePriority(updateMe, priority);
                 }
                 catch (InvalidOperationException ex)
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
index 70bf862fb7..5e9824ed1f 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
@@ -223,7 +223,7 @@ namespace MediaBrowser.Providers.MediaInfo
 
             return prober.Probe(item, options, cancellationToken);
         }
-
+        // Run last
         public int Order => 100;
     }
 }
diff --git a/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs b/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
index 6aaad41f75..d80084acf5 100644
--- a/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
@@ -142,7 +142,7 @@ namespace MediaBrowser.Providers.MediaInfo
 
             return false;
         }
-
+        // Make sure this comes after internet image providers
         public int Order => 100;
     }
 }
diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
index a1ad57ea59..aaed69459e 100644
--- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
@@ -138,7 +138,7 @@ namespace MediaBrowser.Providers.Movies
                 return _tmdbSettings;
             }
 
-            using (var response = await GetMovieDbResponse(new HttpRequestOptions
+            using (HttpResponseInfo response = await GetMovieDbResponse(new HttpRequestOptions
             {
                 Url = string.Format(TmdbConfigUrl, ApiKey),
                 CancellationToken = cancellationToken,
@@ -146,7 +146,7 @@ namespace MediaBrowser.Providers.Movies
 
             }).ConfigureAwait(false))
             {
-                using (var json = response.Content)
+                using (Stream json = response.Content)
                 {
                     _tmdbSettings = await _jsonSerializer.DeserializeFromStreamAsync<TmdbSettingsResult>(json).ConfigureAwait(false);
 
diff --git a/MediaBrowser.Providers/Music/AudioDbAlbumImageProvider.cs b/MediaBrowser.Providers/Music/AudioDbAlbumImageProvider.cs
index 7ff6e8fa81..c2a8431cdd 100644
--- a/MediaBrowser.Providers/Music/AudioDbAlbumImageProvider.cs
+++ b/MediaBrowser.Providers/Music/AudioDbAlbumImageProvider.cs
@@ -92,7 +92,7 @@ namespace MediaBrowser.Providers.Music
         }
 
         public string Name => "TheAudioDB";
-
+        // After embedded and fanart
         public int Order => 2;
 
         public bool Supports(BaseItem item)
diff --git a/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs b/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs
index f19537b0ba..3c4855806c 100644
--- a/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs
@@ -192,7 +192,7 @@ namespace MediaBrowser.Providers.Music
 
             return Path.Combine(dataPath, "album.json");
         }
-
+        // After music brainz
         public int Order => 1;
 
         public class Album
diff --git a/MediaBrowser.Providers/Music/AudioDbArtistImageProvider.cs b/MediaBrowser.Providers/Music/AudioDbArtistImageProvider.cs
index 8ca3f97c8b..c59e9551c4 100644
--- a/MediaBrowser.Providers/Music/AudioDbArtistImageProvider.cs
+++ b/MediaBrowser.Providers/Music/AudioDbArtistImageProvider.cs
@@ -139,7 +139,7 @@ namespace MediaBrowser.Providers.Music
         {
             return item is MusicArtist;
         }
-
+        // After fanart
         public int Order => 1;
     }
 }
diff --git a/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs b/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs
index 87b6a30e7f..03eefc2eb3 100644
--- a/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs
+++ b/MediaBrowser.Providers/Music/AudioDbArtistProvider.cs
@@ -242,7 +242,7 @@ namespace MediaBrowser.Providers.Music
         {
             public List<Artist> artists { get; set; }
         }
-
+        // After musicbrainz
         public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Providers/Music/Extensions.cs b/MediaBrowser.Providers/Music/Extensions.cs
index 68020b9de3..ea1efe266b 100644
--- a/MediaBrowser.Providers/Music/Extensions.cs
+++ b/MediaBrowser.Providers/Music/Extensions.cs
@@ -47,7 +47,7 @@ namespace MediaBrowser.Providers.Music
 
         public static string GetMusicBrainzArtistId(this AlbumInfo info)
         {
-            info.ProviderIds.TryGetValue(MetadataProviders.MusicBrainzAlbumArtist.ToString(), out var id);
+            info.ProviderIds.TryGetValue(MetadataProviders.MusicBrainzAlbumArtist.ToString(), out string id);
 
             if (string.IsNullOrEmpty(id))
             {
diff --git a/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs b/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs
index 3a87c27780..ebb740ffe4 100644
--- a/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs
@@ -186,7 +186,7 @@ namespace MediaBrowser.Providers.Music
                 return null;
             }).Where(i => i != null));
         }
-
+        // After embedded provider
         public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs b/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs
index 4e6d223a71..1e0bcacf21 100644
--- a/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs
+++ b/MediaBrowser.Providers/Omdb/OmdbImageProvider.cs
@@ -92,7 +92,8 @@ namespace MediaBrowser.Providers.Omdb
         {
             return item is Movie || item is Trailer || item is Episode;
         }
-
+        // After other internet providers, because they're better
+        // But before fallback providers like screengrab
         public int Order => 90;
     }
 }
diff --git a/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs b/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
index 646d0a5be8..44b9dcca1c 100644
--- a/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
+++ b/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
@@ -42,7 +42,7 @@ namespace MediaBrowser.Providers.Omdb
             _configurationManager = configurationManager;
             _appHost = appHost;
         }
-
+        // After primary option
         public int Order => 2;
 
         public Task<IEnumerable<RemoteSearchResult>> GetSearchResults(SeriesInfo searchInfo, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Providers/Omdb/OmdbProvider.cs b/MediaBrowser.Providers/Omdb/OmdbProvider.cs
index 44e4202bfb..c529077457 100644
--- a/MediaBrowser.Providers/Omdb/OmdbProvider.cs
+++ b/MediaBrowser.Providers/Omdb/OmdbProvider.cs
@@ -242,7 +242,7 @@ namespace MediaBrowser.Providers.Omdb
 
         internal static bool IsValidSeries(Dictionary<string, string> seriesProviderIds)
         {
-            if (seriesProviderIds.TryGetValue(MetadataProviders.Imdb.ToString(), out var id) && !string.IsNullOrEmpty(id))
+            if (seriesProviderIds.TryGetValue(MetadataProviders.Imdb.ToString(), out string id) && !string.IsNullOrEmpty(id))
             {
                 // This check should ideally never be necessary but we're seeing some cases of this and haven't tracked them down yet.
                 if (!string.IsNullOrWhiteSpace(id))
diff --git a/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs b/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
index 89c4acf041..7a57adb335 100644
--- a/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
+++ b/MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
@@ -157,7 +157,7 @@ namespace MediaBrowser.Providers.Playlists
 
             return false;
         }
-
+        // Run last
         public int Order => 100;
     }
 }
diff --git a/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs b/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs
index 38bb83694d..6f7d9f791f 100644
--- a/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/Omdb/OmdbEpisodeProvider.cs
@@ -56,7 +56,7 @@ namespace MediaBrowser.Providers.TV
                 return result;
             }
 
-            if (info.SeriesProviderIds.TryGetValue(MetadataProviders.Imdb.ToString(), out var seriesImdbId) && !string.IsNullOrEmpty(seriesImdbId))
+            if (info.SeriesProviderIds.TryGetValue(MetadataProviders.Imdb.ToString(), out string seriesImdbId) && !string.IsNullOrEmpty(seriesImdbId))
             {
                 if (info.IndexNumber.HasValue && info.ParentIndexNumber.HasValue)
                 {
@@ -67,7 +67,7 @@ namespace MediaBrowser.Providers.TV
 
             return result;
         }
-
+        // After TheTvDb
         public int Order => 1;
 
         public string Name => "The Open Movie Database";
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs
index 775b30d8d3..2482aa8d45 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs
@@ -123,7 +123,7 @@ namespace MediaBrowser.Providers.TV
         {
             return item is Controller.Entities.TV.Episode;
         }
-
+        // After TheTvDb
         public int Order => 1;
     }
 }
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
index 08e541ecf4..347c91742a 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
@@ -71,7 +71,7 @@ namespace MediaBrowser.Providers.TV
                 return result;
             }
 
-            info.SeriesProviderIds.TryGetValue(MetadataProviders.Tmdb.ToString(), out var seriesTmdbId);
+            info.SeriesProviderIds.TryGetValue(MetadataProviders.Tmdb.ToString(), out string seriesTmdbId);
 
             if (string.IsNullOrEmpty(seriesTmdbId))
             {
@@ -208,7 +208,7 @@ namespace MediaBrowser.Providers.TV
         {
             return GetResponse(url, cancellationToken);
         }
-
+        // After TheTvDb
         public int Order => 1;
 
         public string Name => "TheMovieDb";
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs
index 3a40aed7b5..8d13cc726c 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs
@@ -44,7 +44,7 @@ namespace MediaBrowser.Providers.TV
         {
             var result = new MetadataResult<Season>();
 
-            info.SeriesProviderIds.TryGetValue(MetadataProviders.Tmdb.ToString(), out var seriesTmdbId);
+            info.SeriesProviderIds.TryGetValue(MetadataProviders.Tmdb.ToString(), out string seriesTmdbId);
 
             var seasonNumber = info.IndexNumber;
 
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesImageProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesImageProvider.cs
index dc525d0fa7..fdc8cd7f12 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesImageProvider.cs
@@ -170,7 +170,7 @@ namespace MediaBrowser.Providers.TV
 
             return null;
         }
-
+        // After tvdb and fanart
         public int Order => 2;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
index 2cadaec86a..3a8209984a 100644
--- a/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
@@ -676,7 +676,7 @@ namespace MediaBrowser.Providers.TV
             public ContentRatings content_ratings { get; set; }
             public string ResultLanguage { get; set; }
         }
-
+        // After TheTVDB
         public int Order => 1;
 
         public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
index f55c52b5ba..b6df64396c 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesProvider.cs
@@ -137,7 +137,7 @@ namespace MediaBrowser.Providers.TV
         {
             var series = result.Item;
 
-            if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out var id) && !string.IsNullOrEmpty(id))
+            if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out string id) && !string.IsNullOrEmpty(id))
             {
                 series.SetProviderId(MetadataProviders.Tvdb, id);
             }
@@ -388,7 +388,7 @@ namespace MediaBrowser.Providers.TV
 
         internal static bool IsValidSeries(Dictionary<string, string> seriesProviderIds)
         {
-            if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out var id))
+            if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out string id))
             {
                 // This check should ideally never be necessary but we're seeing some cases of this and haven't tracked them down yet.
                 if (!string.IsNullOrWhiteSpace(id))
@@ -424,7 +424,7 @@ namespace MediaBrowser.Providers.TV
 
             try
             {
-                if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out var seriesId) && !string.IsNullOrWhiteSpace(seriesId))
+                if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out string seriesId) && !string.IsNullOrWhiteSpace(seriesId))
                 {
                     var seriesDataPath = GetSeriesDataPath(_config.ApplicationPaths, seriesProviderIds);
 
@@ -1109,7 +1109,7 @@ namespace MediaBrowser.Providers.TV
 
         private void FetchDataFromSeriesNode(MetadataResult<Series> result, XmlReader reader, CancellationToken cancellationToken)
         {
-            var item = result.Item;
+            Series item = result.Item;
 
             reader.MoveToContent();
             reader.Read();
@@ -1592,7 +1592,7 @@ namespace MediaBrowser.Providers.TV
         /// <returns>System.String.</returns>
         internal static string GetSeriesDataPath(IApplicationPaths appPaths, Dictionary<string, string> seriesProviderIds)
         {
-            if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out var seriesId) && !string.IsNullOrEmpty(seriesId))
+            if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out string seriesId) && !string.IsNullOrEmpty(seriesId))
             {
                 var seriesDataPath = Path.Combine(GetSeriesDataPath(appPaths), seriesId);
 
diff --git a/MediaBrowser.Providers/Videos/VideoMetadataService.cs b/MediaBrowser.Providers/Videos/VideoMetadataService.cs
index adaf39c40d..f5f5b8971f 100644
--- a/MediaBrowser.Providers/Videos/VideoMetadataService.cs
+++ b/MediaBrowser.Providers/Videos/VideoMetadataService.cs
@@ -11,6 +11,7 @@ namespace MediaBrowser.Providers.Videos
 {
     public class VideoMetadataService : MetadataService<Video, ItemLookupInfo>
     {
+        // Make sure the type-specific services get picked first
         public override int Order => 10;
 
         protected override void MergeData(MetadataResult<Video> source, MetadataResult<Video> target, MetadataFields[] lockedFields, bool replaceData, bool mergeMetadataSettings)
-- 
cgit v1.2.3


From c5430f86b0b5863482e7c4f7e55a79c7d88c133b Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Sat, 19 Jan 2019 15:01:16 +0100
Subject: Fixed csproj and xml identation.

---
 BDInfo/BDInfo.csproj                               |  20 +-
 DvdLib/DvdLib.csproj                               |  20 +-
 Emby.Dlna/Emby.Dlna.csproj                         | 106 ++++----
 Emby.Dlna/Profiles/Xml/Default.xml                 | 116 ++++-----
 Emby.Dlna/Profiles/Xml/Denon AVR.xml               | 130 +++++-----
 Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml          | 128 +++++-----
 Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml        | 186 +++++++-------
 Emby.Dlna/Profiles/Xml/LG Smart TV.xml             | 178 +++++++-------
 Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml         | 102 ++++----
 Emby.Dlna/Profiles/Xml/Marantz.xml                 | 118 ++++-----
 Emby.Dlna/Profiles/Xml/MediaMonkey.xml             | 118 ++++-----
 Emby.Dlna/Profiles/Xml/Panasonic Viera.xml         | 168 ++++++-------
 Emby.Dlna/Profiles/Xml/Popcorn Hour.xml            | 178 +++++++-------
 Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml        | 250 +++++++++----------
 Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml          | 114 ++++-----
 .../Profiles/Xml/Sony Blu-ray Player 2013.xml      | 168 ++++++-------
 .../Profiles/Xml/Sony Blu-ray Player 2014.xml      | 168 ++++++-------
 .../Profiles/Xml/Sony Blu-ray Player 2015.xml      | 164 ++++++-------
 .../Profiles/Xml/Sony Blu-ray Player 2016.xml      | 164 ++++++-------
 Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml     | 224 ++++++++---------
 Emby.Dlna/Profiles/Xml/Sony Bravia (2010).xml      | 260 ++++++++++----------
 Emby.Dlna/Profiles/Xml/Sony Bravia (2011).xml      | 272 ++++++++++-----------
 Emby.Dlna/Profiles/Xml/Sony Bravia (2012).xml      | 224 ++++++++---------
 Emby.Dlna/Profiles/Xml/Sony Bravia (2013).xml      | 222 ++++++++---------
 Emby.Dlna/Profiles/Xml/Sony Bravia (2014).xml      | 222 ++++++++---------
 Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml      | 204 ++++++++--------
 Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml      | 210 ++++++++--------
 Emby.Dlna/Profiles/Xml/WDTV Live.xml               | 182 +++++++-------
 Emby.Dlna/Profiles/Xml/Xbox One.xml                | 246 +++++++++----------
 Emby.Dlna/Profiles/Xml/foobar2000.xml              | 128 +++++-----
 Emby.Drawing.Skia/Emby.Drawing.Skia.csproj         |  32 +--
 Emby.Drawing/Emby.Drawing.csproj                   |  22 +-
 Emby.IsoMounting/IsoMounter/IsoMounter.csproj      |  22 +-
 Emby.Naming/Emby.Naming.csproj                     |  20 +-
 Emby.Notifications/Emby.Notifications.csproj       |  24 +-
 Emby.Photos/Emby.Photos.csproj                     |  24 +-
 .../Emby.Server.Implementations.csproj             |  84 +++----
 .../Emby.XmlTv.Console/Emby.XmlTv.Console.csproj   |  38 +--
 Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj  | 226 ++++++++---------
 Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj            |  14 +-
 Jellyfin.Server/Jellyfin.Server.csproj             |  50 ++--
 MediaBrowser.Api/MediaBrowser.Api.csproj           |  22 +-
 MediaBrowser.Common/MediaBrowser.Common.csproj     |  32 +--
 .../MediaBrowser.Controller.csproj                 |  34 +--
 .../MediaBrowser.LocalMetadata.csproj              |  22 +-
 .../MediaBrowser.MediaEncoding.csproj              |  28 +--
 MediaBrowser.Model/MediaBrowser.Model.csproj       |  32 +--
 .../MediaBrowser.Providers.csproj                  |  30 +--
 MediaBrowser.Tests/MediaBrowser.Tests.csproj       | 258 +++++++++----------
 .../MediaBrowser.WebDashboard.csproj               |  32 +--
 .../MediaBrowser.XbmcMetadata.csproj               |  22 +-
 MediaBrowser.sln.GhostDoc.xml                      |  66 ++---
 OpenSubtitlesHandler/OpenSubtitlesHandler.csproj   |  16 +-
 SocketHttpListener/SocketHttpListener.csproj       |  24 +-
 .../pkg-src/jellyfin-firewalld.xml                 |  14 +-
 deployment/unraid/docker-templates/jellyfin.xml    |   4 +-
 56 files changed, 3091 insertions(+), 3091 deletions(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/BDInfo/BDInfo.csproj b/BDInfo/BDInfo.csproj
index 662583b3fd..774e5709d6 100644
--- a/BDInfo/BDInfo.csproj
+++ b/BDInfo/BDInfo.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
 </Project>
diff --git a/DvdLib/DvdLib.csproj b/DvdLib/DvdLib.csproj
index 662583b3fd..774e5709d6 100644
--- a/DvdLib/DvdLib.csproj
+++ b/DvdLib/DvdLib.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
 </Project>
diff --git a/Emby.Dlna/Emby.Dlna.csproj b/Emby.Dlna/Emby.Dlna.csproj
index 7ddd7c1dc4..f155bce6d3 100644
--- a/Emby.Dlna/Emby.Dlna.csproj
+++ b/Emby.Dlna/Emby.Dlna.csproj
@@ -1,61 +1,61 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-        <ProjectReference Include="..\RSSDP\RSSDP.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+    <ProjectReference Include="..\RSSDP\RSSDP.csproj" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <EmbeddedResource Include="Images\logo120.jpg" />
-        <EmbeddedResource Include="Images\logo120.png" />
-        <EmbeddedResource Include="Images\logo240.jpg" />
-        <EmbeddedResource Include="Images\logo240.png" />
-        <EmbeddedResource Include="Images\logo48.jpg" />
-        <EmbeddedResource Include="Images\logo48.png" />
-        <EmbeddedResource Include="Images\people48.jpg" />
-        <EmbeddedResource Include="Images\people48.png" />
-        <EmbeddedResource Include="Images\people480.jpg" />
-        <EmbeddedResource Include="Images\people480.png" />
-    </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\logo120.jpg" />
+    <EmbeddedResource Include="Images\logo120.png" />
+    <EmbeddedResource Include="Images\logo240.jpg" />
+    <EmbeddedResource Include="Images\logo240.png" />
+    <EmbeddedResource Include="Images\logo48.jpg" />
+    <EmbeddedResource Include="Images\logo48.png" />
+    <EmbeddedResource Include="Images\people48.jpg" />
+    <EmbeddedResource Include="Images\people48.png" />
+    <EmbeddedResource Include="Images\people480.jpg" />
+    <EmbeddedResource Include="Images\people480.png" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <EmbeddedResource Include="Profiles\Xml\Default.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Denon AVR.xml" />
-        <EmbeddedResource Include="Profiles\Xml\DirecTV HD-DVR.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Dish Hopper-Joey.xml" />
-        <EmbeddedResource Include="Profiles\Xml\foobar2000.xml" />
-        <EmbeddedResource Include="Profiles\Xml\LG Smart TV.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Linksys DMA2100.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Marantz.xml" />
-        <EmbeddedResource Include="Profiles\Xml\MediaMonkey.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Panasonic Viera.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Popcorn Hour.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Samsung Smart TV.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player 2013.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player 2014.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player 2015.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player 2016.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282010%29.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282011%29.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282012%29.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282013%29.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282014%29.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Sony PlayStation 3.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Sony PlayStation 4.xml" />
-        <EmbeddedResource Include="Profiles\Xml\WDTV Live.xml" />
-        <EmbeddedResource Include="Profiles\Xml\Xbox One.xml" />
-    </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Profiles\Xml\Default.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Denon AVR.xml" />
+    <EmbeddedResource Include="Profiles\Xml\DirecTV HD-DVR.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Dish Hopper-Joey.xml" />
+    <EmbeddedResource Include="Profiles\Xml\foobar2000.xml" />
+    <EmbeddedResource Include="Profiles\Xml\LG Smart TV.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Linksys DMA2100.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Marantz.xml" />
+    <EmbeddedResource Include="Profiles\Xml\MediaMonkey.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Panasonic Viera.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Popcorn Hour.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Samsung Smart TV.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player 2013.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player 2014.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player 2015.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player 2016.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Sony Blu-ray Player.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282010%29.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282011%29.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282012%29.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282013%29.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Sony Bravia %282014%29.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Sony PlayStation 3.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Sony PlayStation 4.xml" />
+    <EmbeddedResource Include="Profiles\Xml\WDTV Live.xml" />
+    <EmbeddedResource Include="Profiles\Xml\Xbox One.xml" />
+  </ItemGroup>
 
 </Project>
diff --git a/Emby.Dlna/Profiles/Xml/Default.xml b/Emby.Dlna/Profiles/Xml/Default.xml
index 95e057fa94..daac4135a2 100644
--- a/Emby.Dlna/Profiles/Xml/Default.xml
+++ b/Emby.Dlna/Profiles/Xml/Default.xml
@@ -1,61 +1,61 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Generic Device</Name>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes />
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="" type="Video" />
-        <DirectPlayProfile container="" type="Audio" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles />
-    <CodecProfiles />
-    <ResponseProfiles>
-        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="External" />
-        <SubtitleProfile format="sub" method="External" />
-        <SubtitleProfile format="srt" method="Embed" />
-        <SubtitleProfile format="ass" method="Embed" />
-        <SubtitleProfile format="ssa" method="Embed" />
-        <SubtitleProfile format="smi" method="Embed" />
-        <SubtitleProfile format="dvdsub" method="Embed" />
-        <SubtitleProfile format="pgs" method="Embed" />
-        <SubtitleProfile format="pgssub" method="Embed" />
-        <SubtitleProfile format="sub" method="Embed" />
-        <SubtitleProfile format="subrip" method="Embed" />
-        <SubtitleProfile format="vtt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Generic Device</Name>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes />
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="" type="Video" />
+    <DirectPlayProfile container="" type="Audio" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles />
+  <CodecProfiles />
+  <ResponseProfiles>
+    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="External" />
+    <SubtitleProfile format="sub" method="External" />
+    <SubtitleProfile format="srt" method="Embed" />
+    <SubtitleProfile format="ass" method="Embed" />
+    <SubtitleProfile format="ssa" method="Embed" />
+    <SubtitleProfile format="smi" method="Embed" />
+    <SubtitleProfile format="dvdsub" method="Embed" />
+    <SubtitleProfile format="pgs" method="Embed" />
+    <SubtitleProfile format="pgssub" method="Embed" />
+    <SubtitleProfile format="sub" method="Embed" />
+    <SubtitleProfile format="subrip" method="Embed" />
+    <SubtitleProfile format="vtt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Denon AVR.xml b/Emby.Dlna/Profiles/Xml/Denon AVR.xml
index a0de799d02..c76cd9a898 100644
--- a/Emby.Dlna/Profiles/Xml/Denon AVR.xml	
+++ b/Emby.Dlna/Profiles/Xml/Denon AVR.xml	
@@ -1,68 +1,68 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Denon AVR</Name>
-    <Identification>
-        <FriendlyName>Denon:\[AVR:.*</FriendlyName>
-        <Manufacturer>Denon</Manufacturer>
-        <Headers />
-    </Identification>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes />
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="mp3,flac,m4a,wma" type="Audio" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles />
-    <CodecProfiles>
-        <CodecProfile type="Audio" container="flac">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioSampleRate" value="96000" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles />
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="External" />
-        <SubtitleProfile format="sub" method="External" />
-        <SubtitleProfile format="srt" method="Embed" />
-        <SubtitleProfile format="ass" method="Embed" />
-        <SubtitleProfile format="ssa" method="Embed" />
-        <SubtitleProfile format="smi" method="Embed" />
-        <SubtitleProfile format="dvdsub" method="Embed" />
-        <SubtitleProfile format="pgs" method="Embed" />
-        <SubtitleProfile format="pgssub" method="Embed" />
-        <SubtitleProfile format="sub" method="Embed" />
-        <SubtitleProfile format="subrip" method="Embed" />
-        <SubtitleProfile format="vtt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Denon AVR</Name>
+  <Identification>
+    <FriendlyName>Denon:\[AVR:.*</FriendlyName>
+    <Manufacturer>Denon</Manufacturer>
+    <Headers />
+  </Identification>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes />
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="mp3,flac,m4a,wma" type="Audio" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles />
+  <CodecProfiles>
+    <CodecProfile type="Audio" container="flac">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioSampleRate" value="96000" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles />
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="External" />
+    <SubtitleProfile format="sub" method="External" />
+    <SubtitleProfile format="srt" method="Embed" />
+    <SubtitleProfile format="ass" method="Embed" />
+    <SubtitleProfile format="ssa" method="Embed" />
+    <SubtitleProfile format="smi" method="Embed" />
+    <SubtitleProfile format="dvdsub" method="Embed" />
+    <SubtitleProfile format="pgs" method="Embed" />
+    <SubtitleProfile format="pgssub" method="Embed" />
+    <SubtitleProfile format="sub" method="Embed" />
+    <SubtitleProfile format="subrip" method="Embed" />
+    <SubtitleProfile format="vtt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml b/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml
index f7927014ad..f2ce68ab5d 100644
--- a/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml	
+++ b/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml	
@@ -1,67 +1,67 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>DirecTV HD-DVR</Name>
-    <Identification>
-        <FriendlyName>^DIRECTV.*$</FriendlyName>
-        <Headers>
-            <HttpHeaderInfo name="User-Agent" value="DIRECTV" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>true</RequiresPlainVideoItems>
-    <RequiresPlainFolders>true</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes />
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="mpeg" audioCodec="mp2" videoCodec="mpeg2video" type="Video" />
-        <DirectPlayProfile container="jpeg,jpg" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mpeg" type="Video" videoCodec="mpeg2video" audioCodec="mp2" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles />
-    <CodecProfiles>
-        <CodecProfile type="Video" codec="mpeg2video">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="8192000" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="Audio" codec="mp2">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles />
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>DirecTV HD-DVR</Name>
+  <Identification>
+    <FriendlyName>^DIRECTV.*$</FriendlyName>
+    <Headers>
+      <HttpHeaderInfo name="User-Agent" value="DIRECTV" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>true</RequiresPlainVideoItems>
+  <RequiresPlainFolders>true</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes />
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="mpeg" audioCodec="mp2" videoCodec="mpeg2video" type="Video" />
+    <DirectPlayProfile container="jpeg,jpg" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mpeg" type="Video" videoCodec="mpeg2video" audioCodec="mp2" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles />
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="mpeg2video">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="8192000" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="Audio" codec="mp2">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles />
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml b/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml
index 11b00f0374..5ff4975604 100644
--- a/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml	
+++ b/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml	
@@ -1,96 +1,96 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Dish Hopper-Joey</Name>
-    <Identification>
-        <Manufacturer>Echostar Technologies LLC</Manufacturer>
-        <ManufacturerUrl>http://www.echostar.com</ManufacturerUrl>
-        <Headers>
-            <HttpHeaderInfo name="User-Agent" value="Zip_" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/mp2t:*,http-get:*:video/MP1S:*,http-get:*:video/mpeg2:*,http-get:*:video/mp4:*,http-get:*:video/x-matroska:*,http-get:*:audio/mpeg:*,http-get:*:audio/mpeg3:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/mp4a-latm:*,http-get:*:image/jpeg:*</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes />
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="mp4,mkv,mpeg,ts" audioCodec="mp3,ac3,aac,he-aac,pcm" videoCodec="h264,mpeg2video" type="Video" />
-        <DirectPlayProfile container="mp3,alac,flac" type="Audio" />
-        <DirectPlayProfile container="jpeg" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="mp4" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles />
-    <CodecProfiles>
-        <CodecProfile type="Video" codec="h264">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="Video">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="ac3,he-aac">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="aac">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio">
-            <Conditions>
-                <ProfileCondition condition="Equals" property="IsSecondaryAudio" value="false" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles>
-        <ResponseProfile container="mkv,ts,mpegts" type="Video" mimeType="video/mp4">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Dish Hopper-Joey</Name>
+  <Identification>
+    <Manufacturer>Echostar Technologies LLC</Manufacturer>
+    <ManufacturerUrl>http://www.echostar.com</ManufacturerUrl>
+    <Headers>
+      <HttpHeaderInfo name="User-Agent" value="Zip_" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/mp2t:*,http-get:*:video/MP1S:*,http-get:*:video/mpeg2:*,http-get:*:video/mp4:*,http-get:*:video/x-matroska:*,http-get:*:audio/mpeg:*,http-get:*:audio/mpeg3:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/mp4a-latm:*,http-get:*:image/jpeg:*</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes />
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="mp4,mkv,mpeg,ts" audioCodec="mp3,ac3,aac,he-aac,pcm" videoCodec="h264,mpeg2video" type="Video" />
+    <DirectPlayProfile container="mp3,alac,flac" type="Audio" />
+    <DirectPlayProfile container="jpeg" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="mp4" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles />
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="h264">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="Video">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="ac3,he-aac">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="aac">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio">
+      <Conditions>
+        <ProfileCondition condition="Equals" property="IsSecondaryAudio" value="false" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles>
+    <ResponseProfile container="mkv,ts,mpegts" type="Video" mimeType="video/mp4">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/LG Smart TV.xml b/Emby.Dlna/Profiles/Xml/LG Smart TV.xml
index 22a9e90c66..a0f0e0ee8a 100644
--- a/Emby.Dlna/Profiles/Xml/LG Smart TV.xml	
+++ b/Emby.Dlna/Profiles/Xml/LG Smart TV.xml	
@@ -1,92 +1,92 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>LG Smart TV</Name>
-    <Identification>
-        <FriendlyName>LG.*</FriendlyName>
-        <Headers>
-            <HttpHeaderInfo name="User-Agent" value="LG" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes />
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="ts,mpegts,avi,mkv,m2ts" audioCodec="aac,ac3,eac3,mp3,dca,dts" videoCodec="h264" type="Video" />
-        <DirectPlayProfile container="mp4,m4v" audioCodec="aac,ac3,eac3,mp3,dca,dts" videoCodec="h264,mpeg4" type="Video" />
-        <DirectPlayProfile container="mp3" type="Audio" />
-        <DirectPlayProfile container="jpeg" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Photo">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video" codec="mpeg4">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="Video" codec="h264">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="ac3,eac3,aac,mp3">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles>
-        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" type="Video" mimeType="video/mpeg">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-        <SubtitleProfile format="srt" method="External" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>LG Smart TV</Name>
+  <Identification>
+    <FriendlyName>LG.*</FriendlyName>
+    <Headers>
+      <HttpHeaderInfo name="User-Agent" value="LG" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes />
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="ts,mpegts,avi,mkv,m2ts" audioCodec="aac,ac3,eac3,mp3,dca,dts" videoCodec="h264" type="Video" />
+    <DirectPlayProfile container="mp4,m4v" audioCodec="aac,ac3,eac3,mp3,dca,dts" videoCodec="h264,mpeg4" type="Video" />
+    <DirectPlayProfile container="mp3" type="Audio" />
+    <DirectPlayProfile container="jpeg" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Photo">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="mpeg4">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="Video" codec="h264">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="ac3,eac3,aac,mp3">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles>
+    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" type="Video" mimeType="video/mpeg">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+    <SubtitleProfile format="srt" method="External" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml b/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml
index 94c89a2c22..55910c77f2 100644
--- a/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml	
+++ b/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml	
@@ -1,54 +1,54 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Linksys DMA2100</Name>
-    <Identification>
-        <ModelName>DMA2100us</ModelName>
-        <Headers />
-    </Identification>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes />
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="mp3,flac,m4a,wma" type="Audio" />
-        <DirectPlayProfile container="avi,mp4,mkv,ts,mpegts,m4v" type="Video" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles />
-    <CodecProfiles />
-    <ResponseProfiles>
-        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Linksys DMA2100</Name>
+  <Identification>
+    <ModelName>DMA2100us</ModelName>
+    <Headers />
+  </Identification>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes />
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="mp3,flac,m4a,wma" type="Audio" />
+    <DirectPlayProfile container="avi,mp4,mkv,ts,mpegts,m4v" type="Video" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles />
+  <CodecProfiles />
+  <ResponseProfiles>
+    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Marantz.xml b/Emby.Dlna/Profiles/Xml/Marantz.xml
index 1a47865770..a6345ab3f3 100644
--- a/Emby.Dlna/Profiles/Xml/Marantz.xml
+++ b/Emby.Dlna/Profiles/Xml/Marantz.xml
@@ -1,62 +1,62 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Marantz</Name>
-    <Identification>
-        <Manufacturer>Marantz</Manufacturer>
-        <Headers>
-            <HttpHeaderInfo name="User-Agent" value="Marantz" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes />
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="aac,mp3,wav,wma,flac" type="Audio" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles />
-    <CodecProfiles />
-    <ResponseProfiles />
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="External" />
-        <SubtitleProfile format="sub" method="External" />
-        <SubtitleProfile format="srt" method="Embed" />
-        <SubtitleProfile format="ass" method="Embed" />
-        <SubtitleProfile format="ssa" method="Embed" />
-        <SubtitleProfile format="smi" method="Embed" />
-        <SubtitleProfile format="dvdsub" method="Embed" />
-        <SubtitleProfile format="pgs" method="Embed" />
-        <SubtitleProfile format="pgssub" method="Embed" />
-        <SubtitleProfile format="sub" method="Embed" />
-        <SubtitleProfile format="subrip" method="Embed" />
-        <SubtitleProfile format="vtt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Marantz</Name>
+  <Identification>
+    <Manufacturer>Marantz</Manufacturer>
+    <Headers>
+      <HttpHeaderInfo name="User-Agent" value="Marantz" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes />
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="aac,mp3,wav,wma,flac" type="Audio" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles />
+  <CodecProfiles />
+  <ResponseProfiles />
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="External" />
+    <SubtitleProfile format="sub" method="External" />
+    <SubtitleProfile format="srt" method="Embed" />
+    <SubtitleProfile format="ass" method="Embed" />
+    <SubtitleProfile format="ssa" method="Embed" />
+    <SubtitleProfile format="smi" method="Embed" />
+    <SubtitleProfile format="dvdsub" method="Embed" />
+    <SubtitleProfile format="pgs" method="Embed" />
+    <SubtitleProfile format="pgssub" method="Embed" />
+    <SubtitleProfile format="sub" method="Embed" />
+    <SubtitleProfile format="subrip" method="Embed" />
+    <SubtitleProfile format="vtt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/MediaMonkey.xml b/Emby.Dlna/Profiles/Xml/MediaMonkey.xml
index ab5db70789..2c2c3a1de4 100644
--- a/Emby.Dlna/Profiles/Xml/MediaMonkey.xml
+++ b/Emby.Dlna/Profiles/Xml/MediaMonkey.xml
@@ -1,62 +1,62 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>MediaMonkey</Name>
-    <Identification>
-        <FriendlyName>MediaMonkey</FriendlyName>
-        <Headers>
-            <HttpHeaderInfo name="User-Agent" value="MediaMonkey" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes />
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus,flac,m4a" type="Audio" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles />
-    <CodecProfiles />
-    <ResponseProfiles />
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="External" />
-        <SubtitleProfile format="sub" method="External" />
-        <SubtitleProfile format="srt" method="Embed" />
-        <SubtitleProfile format="ass" method="Embed" />
-        <SubtitleProfile format="ssa" method="Embed" />
-        <SubtitleProfile format="smi" method="Embed" />
-        <SubtitleProfile format="dvdsub" method="Embed" />
-        <SubtitleProfile format="pgs" method="Embed" />
-        <SubtitleProfile format="pgssub" method="Embed" />
-        <SubtitleProfile format="sub" method="Embed" />
-        <SubtitleProfile format="subrip" method="Embed" />
-        <SubtitleProfile format="vtt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>MediaMonkey</Name>
+  <Identification>
+    <FriendlyName>MediaMonkey</FriendlyName>
+    <Headers>
+      <HttpHeaderInfo name="User-Agent" value="MediaMonkey" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes />
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus,flac,m4a" type="Audio" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles />
+  <CodecProfiles />
+  <ResponseProfiles />
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="External" />
+    <SubtitleProfile format="sub" method="External" />
+    <SubtitleProfile format="srt" method="Embed" />
+    <SubtitleProfile format="ass" method="Embed" />
+    <SubtitleProfile format="ssa" method="Embed" />
+    <SubtitleProfile format="smi" method="Embed" />
+    <SubtitleProfile format="dvdsub" method="Embed" />
+    <SubtitleProfile format="pgs" method="Embed" />
+    <SubtitleProfile format="pgssub" method="Embed" />
+    <SubtitleProfile format="sub" method="Embed" />
+    <SubtitleProfile format="subrip" method="Embed" />
+    <SubtitleProfile format="vtt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml b/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml
index 6a5abfb0e2..934f0550d3 100644
--- a/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml	
+++ b/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml	
@@ -1,87 +1,87 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Panasonic Viera</Name>
-    <Identification>
-        <FriendlyName>VIERA</FriendlyName>
-        <Manufacturer>Panasonic</Manufacturer>
-        <Headers>
-            <HttpHeaderInfo name="User-Agent" value="Panasonic MIL DLNA" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes>
-        <XmlAttribute name="xmlns:pv" value="http://www.pv.com/pvns/" />
-    </XmlRootAttributes>
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,pcm_dvd" videoCodec="mpeg2video,mpeg4" type="Video" />
-        <DirectPlayProfile container="mkv" audioCodec="aac,ac3,dca,mp3,mp2,pcm,dts" videoCodec="h264,mpeg2video" type="Video" />
-        <DirectPlayProfile container="ts,mpegts" audioCodec="aac,mp3,mp2" videoCodec="h264,mpeg2video" type="Video" />
-        <DirectPlayProfile container="mp4,m4v" audioCodec="aac,ac3,mp3,pcm" videoCodec="h264" type="Video" />
-        <DirectPlayProfile container="mov" audioCodec="aac,pcm" videoCodec="h264" type="Video" />
-        <DirectPlayProfile container="avi" audioCodec="pcm" videoCodec="mpeg4" type="Video" />
-        <DirectPlayProfile container="flv" audioCodec="aac" videoCodec="h264" type="Video" />
-        <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
-        <DirectPlayProfile container="mp4" audioCodec="aac" type="Audio" />
-        <DirectPlayProfile container="jpeg" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Photo">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles>
-        <ResponseProfile container="ts,mpegts" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-        <SubtitleProfile format="srt" method="External" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Panasonic Viera</Name>
+  <Identification>
+    <FriendlyName>VIERA</FriendlyName>
+    <Manufacturer>Panasonic</Manufacturer>
+    <Headers>
+      <HttpHeaderInfo name="User-Agent" value="Panasonic MIL DLNA" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes>
+    <XmlAttribute name="xmlns:pv" value="http://www.pv.com/pvns/" />
+  </XmlRootAttributes>
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,pcm_dvd" videoCodec="mpeg2video,mpeg4" type="Video" />
+    <DirectPlayProfile container="mkv" audioCodec="aac,ac3,dca,mp3,mp2,pcm,dts" videoCodec="h264,mpeg2video" type="Video" />
+    <DirectPlayProfile container="ts,mpegts" audioCodec="aac,mp3,mp2" videoCodec="h264,mpeg2video" type="Video" />
+    <DirectPlayProfile container="mp4,m4v" audioCodec="aac,ac3,mp3,pcm" videoCodec="h264" type="Video" />
+    <DirectPlayProfile container="mov" audioCodec="aac,pcm" videoCodec="h264" type="Video" />
+    <DirectPlayProfile container="avi" audioCodec="pcm" videoCodec="mpeg4" type="Video" />
+    <DirectPlayProfile container="flv" audioCodec="aac" videoCodec="h264" type="Video" />
+    <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
+    <DirectPlayProfile container="mp4" audioCodec="aac" type="Audio" />
+    <DirectPlayProfile container="jpeg" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Photo">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles>
+    <ResponseProfile container="ts,mpegts" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+    <SubtitleProfile format="srt" method="External" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml b/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml
index da65c9e01b..eab220fae9 100644
--- a/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml	
+++ b/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml	
@@ -1,92 +1,92 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Popcorn Hour</Name>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes />
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="mp4,mov,m4v" audioCodec="aac" videoCodec="h264,mpeg4" type="Video" />
-        <DirectPlayProfile container="ts,mpegts" audioCodec="aac,ac3,eac3,mp3,mp2,pcm" videoCodec="h264" type="Video" />
-        <DirectPlayProfile container="asf,wmv" audioCodec="wmav2,wmapro" videoCodec="wmv3,vc1" type="Video" />
-        <DirectPlayProfile container="avi" audioCodec="mp3,ac3,eac3,mp2,pcm" videoCodec="mpeg4,msmpeg4" type="Video" />
-        <DirectPlayProfile container="mkv" audioCodec="aac,mp3,ac3,eac3,mp2,pcm" videoCodec="h264" type="Video" />
-        <DirectPlayProfile container="aac,mp3,flac,ogg,wma,wav" type="Audio" />
-        <DirectPlayProfile container="jpeg,gif,bmp,png" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="mp4" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles />
-    <CodecProfiles>
-        <CodecProfile type="Video" codec="h264">
-            <Conditions>
-                <ProfileCondition condition="EqualsAny" property="VideoProfile" value="baseline|constrained baseline" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="Video">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="aac">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="Audio" codec="aac">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="Audio" codec="mp3">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="AudioBitrate" value="320000" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles>
-        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Popcorn Hour</Name>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes />
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="mp4,mov,m4v" audioCodec="aac" videoCodec="h264,mpeg4" type="Video" />
+    <DirectPlayProfile container="ts,mpegts" audioCodec="aac,ac3,eac3,mp3,mp2,pcm" videoCodec="h264" type="Video" />
+    <DirectPlayProfile container="asf,wmv" audioCodec="wmav2,wmapro" videoCodec="wmv3,vc1" type="Video" />
+    <DirectPlayProfile container="avi" audioCodec="mp3,ac3,eac3,mp2,pcm" videoCodec="mpeg4,msmpeg4" type="Video" />
+    <DirectPlayProfile container="mkv" audioCodec="aac,mp3,ac3,eac3,mp2,pcm" videoCodec="h264" type="Video" />
+    <DirectPlayProfile container="aac,mp3,flac,ogg,wma,wav" type="Audio" />
+    <DirectPlayProfile container="jpeg,gif,bmp,png" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="mp4" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles />
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="h264">
+      <Conditions>
+        <ProfileCondition condition="EqualsAny" property="VideoProfile" value="baseline|constrained baseline" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="Video">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="aac">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="Audio" codec="aac">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="Audio" codec="mp3">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="AudioBitrate" value="320000" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles>
+    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml b/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml
index 6d9661201b..3e6f56e5bb 100644
--- a/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml	
+++ b/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml	
@@ -1,128 +1,128 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Samsung Smart TV</Name>
-    <Identification>
-        <ModelUrl>samsung.com</ModelUrl>
-        <Headers>
-            <HttpHeaderInfo name="User-Agent" value="SEC_" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes>
-        <XmlAttribute name="xmlns:sec" value="http://www.sec.co.kr/" />
-    </XmlRootAttributes>
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="asf" audioCodec="mp3,ac3,wmav2,wmapro,wmavoice" videoCodec="h264,mpeg4,mjpeg" type="Video" />
-        <DirectPlayProfile container="avi" audioCodec="mp3,ac3,dca,dts" videoCodec="h264,mpeg4,mjpeg" type="Video" />
-        <DirectPlayProfile container="mkv" audioCodec="mp3,ac3,dca,aac,dts" videoCodec="h264,mpeg4,mjpeg4" type="Video" />
-        <DirectPlayProfile container="mp4,m4v" audioCodec="mp3,aac" videoCodec="h264,mpeg4" type="Video" />
-        <DirectPlayProfile container="3gp" audioCodec="aac,he-aac" videoCodec="h264,mpeg4" type="Video" />
-        <DirectPlayProfile container="mpg,mpeg" audioCodec="ac3,mp2,mp3,aac" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
-        <DirectPlayProfile container="vro,vob" audioCodec="ac3,mp2,mp3" videoCodec="mpeg1video,mpeg2video" type="Video" />
-        <DirectPlayProfile container="ts" audioCodec="ac3,aac,mp3,eac3" videoCodec="mpeg2video,h264,vc1" type="Video" />
-        <DirectPlayProfile container="asf" audioCodec="wmav2,wmavoice" videoCodec="wmv2,wmv3" type="Video" />
-        <DirectPlayProfile container="mp3,flac" type="Audio" />
-        <DirectPlayProfile container="jpeg" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Photo">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video" codec="mpeg2video">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="30720000" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="Video" codec="mpeg4">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="8192000" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="Video" codec="h264">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="37500000" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="Video" codec="wmv2,wmv3,vc1">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="25600000" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="wmav2,dca,aac,mp3,dts">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles>
-        <ResponseProfile container="avi" type="Video" mimeType="video/x-msvideo">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="mkv" type="Video" mimeType="video/x-mkv">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="flac" type="Audio" mimeType="audio/x-flac">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-        <SubtitleProfile format="srt" method="External" didlMode="CaptionInfoEx" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Samsung Smart TV</Name>
+  <Identification>
+    <ModelUrl>samsung.com</ModelUrl>
+    <Headers>
+      <HttpHeaderInfo name="User-Agent" value="SEC_" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes>
+    <XmlAttribute name="xmlns:sec" value="http://www.sec.co.kr/" />
+  </XmlRootAttributes>
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="asf" audioCodec="mp3,ac3,wmav2,wmapro,wmavoice" videoCodec="h264,mpeg4,mjpeg" type="Video" />
+    <DirectPlayProfile container="avi" audioCodec="mp3,ac3,dca,dts" videoCodec="h264,mpeg4,mjpeg" type="Video" />
+    <DirectPlayProfile container="mkv" audioCodec="mp3,ac3,dca,aac,dts" videoCodec="h264,mpeg4,mjpeg4" type="Video" />
+    <DirectPlayProfile container="mp4,m4v" audioCodec="mp3,aac" videoCodec="h264,mpeg4" type="Video" />
+    <DirectPlayProfile container="3gp" audioCodec="aac,he-aac" videoCodec="h264,mpeg4" type="Video" />
+    <DirectPlayProfile container="mpg,mpeg" audioCodec="ac3,mp2,mp3,aac" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
+    <DirectPlayProfile container="vro,vob" audioCodec="ac3,mp2,mp3" videoCodec="mpeg1video,mpeg2video" type="Video" />
+    <DirectPlayProfile container="ts" audioCodec="ac3,aac,mp3,eac3" videoCodec="mpeg2video,h264,vc1" type="Video" />
+    <DirectPlayProfile container="asf" audioCodec="wmav2,wmavoice" videoCodec="wmv2,wmv3" type="Video" />
+    <DirectPlayProfile container="mp3,flac" type="Audio" />
+    <DirectPlayProfile container="jpeg" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Photo">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="mpeg2video">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="30720000" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="Video" codec="mpeg4">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="8192000" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="Video" codec="h264">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="37500000" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="Video" codec="wmv2,wmv3,vc1">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="25600000" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="wmav2,dca,aac,mp3,dts">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles>
+    <ResponseProfile container="avi" type="Video" mimeType="video/x-msvideo">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="mkv" type="Video" mimeType="video/x-mkv">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="flac" type="Audio" mimeType="audio/x-flac">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+    <SubtitleProfile format="srt" method="External" didlMode="CaptionInfoEx" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml b/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml
index e38987e89a..74240b8435 100644
--- a/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml	
@@ -1,60 +1,60 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Sharp Smart TV</Name>
-    <Identification>
-        <Manufacturer>Sharp</Manufacturer>
-        <Headers>
-            <HttpHeaderInfo name="User-Agent" value="Sharp" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>true</RequiresPlainVideoItems>
-    <RequiresPlainFolders>true</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes />
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="m4v,mkv,avi,mov,mp4" audioCodec="aac,mp3,ac3,dts,dca" videoCodec="h264,mpeg4" type="Video" />
-        <DirectPlayProfile container="asf,wmv" type="Video" />
-        <DirectPlayProfile container="mpg,mpeg" audioCodec="mp3,aac" videoCodec="mpeg2video" type="Video" />
-        <DirectPlayProfile container="flv" audioCodec="mp3,aac" videoCodec="h264" type="Video" />
-        <DirectPlayProfile container="mp3,wav" type="Audio" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3,dts,dca" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles />
-    <CodecProfiles />
-    <ResponseProfiles>
-        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-        <SubtitleProfile format="srt" method="External" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Sharp Smart TV</Name>
+  <Identification>
+    <Manufacturer>Sharp</Manufacturer>
+    <Headers>
+      <HttpHeaderInfo name="User-Agent" value="Sharp" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>true</RequiresPlainVideoItems>
+  <RequiresPlainFolders>true</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes />
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="m4v,mkv,avi,mov,mp4" audioCodec="aac,mp3,ac3,dts,dca" videoCodec="h264,mpeg4" type="Video" />
+    <DirectPlayProfile container="asf,wmv" type="Video" />
+    <DirectPlayProfile container="mpg,mpeg" audioCodec="mp3,aac" videoCodec="mpeg2video" type="Video" />
+    <DirectPlayProfile container="flv" audioCodec="mp3,aac" videoCodec="h264" type="Video" />
+    <DirectPlayProfile container="mp3,wav" type="Audio" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3,dts,dca" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles />
+  <CodecProfiles />
+  <ResponseProfiles>
+    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+    <SubtitleProfile format="srt" method="External" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml
index d4649d9e83..2c5614883c 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml	
@@ -1,87 +1,87 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Sony Blu-ray Player 2013</Name>
-    <Identification>
-        <ModelNumber>BDP-2013</ModelNumber>
-        <Headers>
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S1100" match="Substring" />
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3100" match="Substring" />
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S5100" match="Substring" />
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S6100" match="Substring" />
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S7100" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Microsoft Corporation</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Windows Media Player Sharing</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>3.0</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes>
-        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-    </XmlRootAttributes>
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
-        <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
-        <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
-        <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
-        <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm,dts" videoCodec="mpeg4,h264" type="Video" />
-        <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
-        <DirectPlayProfile container="wmv,asf" type="Video" />
-        <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
-        <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Photo">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video" codec="h264">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="ac3">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles />
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Sony Blu-ray Player 2013</Name>
+  <Identification>
+    <ModelNumber>BDP-2013</ModelNumber>
+    <Headers>
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S1100" match="Substring" />
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3100" match="Substring" />
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S5100" match="Substring" />
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S6100" match="Substring" />
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S7100" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Microsoft Corporation</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Windows Media Player Sharing</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>3.0</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes>
+    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+  </XmlRootAttributes>
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
+    <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
+    <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
+    <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
+    <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm,dts" videoCodec="mpeg4,h264" type="Video" />
+    <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
+    <DirectPlayProfile container="wmv,asf" type="Video" />
+    <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
+    <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Photo">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="h264">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="ac3">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles />
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2014.xml b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2014.xml
index 2cd4754668..44f9821b3d 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2014.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2014.xml	
@@ -1,87 +1,87 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Sony Blu-ray Player 2014</Name>
-    <Identification>
-        <ModelNumber>BDP-2014</ModelNumber>
-        <Headers>
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S1200" match="Substring" />
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3200" match="Substring" />
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S5200" match="Substring" />
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S6200" match="Substring" />
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S7200" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Microsoft Corporation</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Windows Media Player Sharing</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>3.0</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes>
-        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-    </XmlRootAttributes>
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
-        <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
-        <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
-        <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
-        <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm,dts" videoCodec="mpeg4,h264" type="Video" />
-        <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
-        <DirectPlayProfile container="wmv,asf" type="Video" />
-        <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
-        <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Photo">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video" codec="h264">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="ac3">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles />
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Sony Blu-ray Player 2014</Name>
+  <Identification>
+    <ModelNumber>BDP-2014</ModelNumber>
+    <Headers>
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S1200" match="Substring" />
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3200" match="Substring" />
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S5200" match="Substring" />
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S6200" match="Substring" />
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S7200" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Microsoft Corporation</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Windows Media Player Sharing</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>3.0</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes>
+    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+  </XmlRootAttributes>
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
+    <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
+    <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
+    <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
+    <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm,dts" videoCodec="mpeg4,h264" type="Video" />
+    <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
+    <DirectPlayProfile container="wmv,asf" type="Video" />
+    <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
+    <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Photo">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="h264">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="ac3">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles />
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2015.xml b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2015.xml
index 73b9998912..a7d17c1a07 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2015.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2015.xml	
@@ -1,85 +1,85 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Sony Blu-ray Player 2015</Name>
-    <Identification>
-        <ModelNumber>BDP-2015</ModelNumber>
-        <Headers>
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S1500" match="Substring" />
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3500" match="Substring" />
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S6500" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Microsoft Corporation</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Windows Media Player Sharing</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>3.0</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes>
-        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-    </XmlRootAttributes>
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
-        <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
-        <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
-        <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
-        <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm,dts" videoCodec="mpeg4,h264" type="Video" />
-        <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
-        <DirectPlayProfile container="wmv,asf" type="Video" />
-        <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
-        <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Photo">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video" codec="h264">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="ac3">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles />
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Sony Blu-ray Player 2015</Name>
+  <Identification>
+    <ModelNumber>BDP-2015</ModelNumber>
+    <Headers>
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S1500" match="Substring" />
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3500" match="Substring" />
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S6500" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Microsoft Corporation</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Windows Media Player Sharing</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>3.0</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes>
+    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+  </XmlRootAttributes>
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
+    <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
+    <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
+    <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
+    <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm,dts" videoCodec="mpeg4,h264" type="Video" />
+    <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
+    <DirectPlayProfile container="wmv,asf" type="Video" />
+    <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
+    <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Photo">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="h264">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="ac3">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles />
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2016.xml b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2016.xml
index 86c7216296..b42b1e84fd 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2016.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2016.xml	
@@ -1,85 +1,85 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Sony Blu-ray Player 2016</Name>
-    <Identification>
-        <ModelNumber>BDP-2016</ModelNumber>
-        <Headers>
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S1700" match="Substring" />
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3700" match="Substring" />
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S6700" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Microsoft Corporation</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Windows Media Player Sharing</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>3.0</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes>
-        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-    </XmlRootAttributes>
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
-        <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
-        <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
-        <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
-        <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm,dts" videoCodec="mpeg4,h264" type="Video" />
-        <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
-        <DirectPlayProfile container="wmv,asf" type="Video" />
-        <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
-        <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Photo">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video" codec="h264">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="ac3">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles />
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Sony Blu-ray Player 2016</Name>
+  <Identification>
+    <ModelNumber>BDP-2016</ModelNumber>
+    <Headers>
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S1700" match="Substring" />
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3700" match="Substring" />
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S6700" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Microsoft Corporation</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Windows Media Player Sharing</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>3.0</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes>
+    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+  </XmlRootAttributes>
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
+    <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
+    <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
+    <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
+    <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm,dts" videoCodec="mpeg4,h264" type="Video" />
+    <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
+    <DirectPlayProfile container="wmv,asf" type="Video" />
+    <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
+    <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Photo">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="h264">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="ac3">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles />
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml
index 3afc5bdb8d..46857caf09 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml	
@@ -1,115 +1,115 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Sony Blu-ray Player</Name>
-    <Identification>
-        <FriendlyName>Blu-ray Disc Player</FriendlyName>
-        <Manufacturer>Sony</Manufacturer>
-        <Headers>
-            <HttpHeaderInfo name="X-AV-Client-Info" value="(Blu-ray Disc Player|Home Theater System|Home Theatre System|Media Player)" match="Regex" />
-            <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="(Blu-ray Disc Player|Home Theater System|Home Theatre System|Media Player)" match="Regex" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Microsoft Corporation</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Windows Media Player Sharing</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>3.0</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes>
-        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-    </XmlRootAttributes>
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
-        <DirectPlayProfile container="mpeg" audioCodec="ac3,mp3,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
-        <DirectPlayProfile container="avi,mp4,m4v" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
-        <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
-        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
-        <DirectPlayProfile container="jpeg" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="mpeg2video" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Photo">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video" codec="h264">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="ac3">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="aac">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles>
-        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264,mpeg4,vc1" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="avi" type="Video" mimeType="video/mpeg">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="mkv" type="Video" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" type="Video" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="mp4" type="Video" mimeType="video/mpeg">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="m4v" type="Video" mimeType="video/mpeg">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="mpeg" type="Video" mimeType="video/mpeg">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="mp3" type="Audio" mimeType="audio/mpeg">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Sony Blu-ray Player</Name>
+  <Identification>
+    <FriendlyName>Blu-ray Disc Player</FriendlyName>
+    <Manufacturer>Sony</Manufacturer>
+    <Headers>
+      <HttpHeaderInfo name="X-AV-Client-Info" value="(Blu-ray Disc Player|Home Theater System|Home Theatre System|Media Player)" match="Regex" />
+      <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="(Blu-ray Disc Player|Home Theater System|Home Theatre System|Media Player)" match="Regex" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Microsoft Corporation</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Windows Media Player Sharing</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>3.0</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes>
+    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+  </XmlRootAttributes>
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
+    <DirectPlayProfile container="mpeg" audioCodec="ac3,mp3,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
+    <DirectPlayProfile container="avi,mp4,m4v" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
+    <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
+    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
+    <DirectPlayProfile container="jpeg" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="mpeg2video" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Photo">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="h264">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="ac3">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="aac">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles>
+    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264,mpeg4,vc1" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="avi" type="Video" mimeType="video/mpeg">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="mkv" type="Video" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" type="Video" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="mp4" type="Video" mimeType="video/mpeg">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="m4v" type="Video" mimeType="video/mpeg">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="mpeg" type="Video" mimeType="video/mpeg">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="mp3" type="Audio" mimeType="audio/mpeg">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Bravia (2010).xml b/Emby.Dlna/Profiles/Xml/Sony Bravia (2010).xml
index 1e9362ca31..f20e9fcb6f 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Bravia (2010).xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Bravia (2010).xml	
@@ -1,133 +1,133 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Sony Bravia (2010)</Name>
-    <Identification>
-        <FriendlyName>KDL-\d{2}[EHLNPB]X\d[01]\d.*</FriendlyName>
-        <Manufacturer>Sony</Manufacturer>
-        <Headers>
-            <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}[EHLNPB]X\d[01]\d.*" match="Regex" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Microsoft Corporation</Manufacturer>
-    <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
-    <ModelName>Windows Media Player Sharing</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>3.0</ModelNumber>
-    <ModelUrl>http://www.microsoft.com/</ModelUrl>
-    <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_TN</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <SonyAggregationFlags>10</SonyAggregationFlags>
-    <ProtocolInfo>http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes>
-        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-    </XmlRootAttributes>
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" />
-        <DirectPlayProfile container="ts,mpegts" audioCodec="mp3,mp2" videoCodec="mpeg1video,mpeg2video" type="Video" />
-        <DirectPlayProfile container="mpeg" audioCodec="mp3,mp2" videoCodec="mpeg2video,mpeg1video" type="Video" />
-        <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Photo">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video" codec="h264">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="Video" codec="mpeg2video">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="Video">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="ac3">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="aac">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-                <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="mp3,mp2">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles>
-        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions>
-                <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
-                <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
-            </Conditions>
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
-            <Conditions>
-                <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
-            </Conditions>
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Sony Bravia (2010)</Name>
+  <Identification>
+    <FriendlyName>KDL-\d{2}[EHLNPB]X\d[01]\d.*</FriendlyName>
+    <Manufacturer>Sony</Manufacturer>
+    <Headers>
+      <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}[EHLNPB]X\d[01]\d.*" match="Regex" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Microsoft Corporation</Manufacturer>
+  <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
+  <ModelName>Windows Media Player Sharing</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>3.0</ModelNumber>
+  <ModelUrl>http://www.microsoft.com/</ModelUrl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_TN</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <SonyAggregationFlags>10</SonyAggregationFlags>
+  <ProtocolInfo>http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes>
+    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+  </XmlRootAttributes>
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" />
+    <DirectPlayProfile container="ts,mpegts" audioCodec="mp3,mp2" videoCodec="mpeg1video,mpeg2video" type="Video" />
+    <DirectPlayProfile container="mpeg" audioCodec="mp3,mp2" videoCodec="mpeg2video,mpeg1video" type="Video" />
+    <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Photo">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="h264">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="Video" codec="mpeg2video">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="Video">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="ac3">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="aac">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+        <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="mp3,mp2">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles>
+    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions>
+        <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
+        <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
+      </Conditions>
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
+      <Conditions>
+        <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
+      </Conditions>
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Bravia (2011).xml b/Emby.Dlna/Profiles/Xml/Sony Bravia (2011).xml
index b9e8206894..49819ccfdb 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Bravia (2011).xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Bravia (2011).xml	
@@ -1,139 +1,139 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Sony Bravia (2011)</Name>
-    <Identification>
-        <FriendlyName>KDL-\d{2}([A-Z]X\d2\d|CX400).*</FriendlyName>
-        <Manufacturer>Sony</Manufacturer>
-        <Headers>
-            <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}([A-Z]X\d2\d|CX400).*" match="Regex" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Microsoft Corporation</Manufacturer>
-    <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
-    <ModelName>Windows Media Player Sharing</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>3.0</ModelNumber>
-    <ModelUrl>http://www.microsoft.com/</ModelUrl>
-    <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_TN</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <SonyAggregationFlags>10</SonyAggregationFlags>
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes>
-        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-    </XmlRootAttributes>
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" />
-        <DirectPlayProfile container="ts,mpegts" audioCodec="mp3" videoCodec="mpeg2video" type="Video" />
-        <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,mp3" videoCodec="h264,mpeg4" type="Video" />
-        <DirectPlayProfile container="mpeg" audioCodec="mp3" videoCodec="mpeg2video,mpeg1video" type="Video" />
-        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" videoCodec="wmv2,wmv3,vc1" type="Video" />
-        <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
-        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Photo">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video" codec="h264">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="Video" codec="mpeg2video">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="Video">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="ac3">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="aac">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-                <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="mp3,mp2">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles>
-        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions>
-                <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
-                <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
-            </Conditions>
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
-            <Conditions>
-                <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
-            </Conditions>
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Sony Bravia (2011)</Name>
+  <Identification>
+    <FriendlyName>KDL-\d{2}([A-Z]X\d2\d|CX400).*</FriendlyName>
+    <Manufacturer>Sony</Manufacturer>
+    <Headers>
+      <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}([A-Z]X\d2\d|CX400).*" match="Regex" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Microsoft Corporation</Manufacturer>
+  <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
+  <ModelName>Windows Media Player Sharing</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>3.0</ModelNumber>
+  <ModelUrl>http://www.microsoft.com/</ModelUrl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_TN</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <SonyAggregationFlags>10</SonyAggregationFlags>
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes>
+    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+  </XmlRootAttributes>
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" />
+    <DirectPlayProfile container="ts,mpegts" audioCodec="mp3" videoCodec="mpeg2video" type="Video" />
+    <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,mp3" videoCodec="h264,mpeg4" type="Video" />
+    <DirectPlayProfile container="mpeg" audioCodec="mp3" videoCodec="mpeg2video,mpeg1video" type="Video" />
+    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" videoCodec="wmv2,wmv3,vc1" type="Video" />
+    <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
+    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Photo">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="h264">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="Video" codec="mpeg2video">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="Video">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="ac3">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="aac">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+        <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="mp3,mp2">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles>
+    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions>
+        <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
+        <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
+      </Conditions>
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
+      <Conditions>
+        <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
+      </Conditions>
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Bravia (2012).xml b/Emby.Dlna/Profiles/Xml/Sony Bravia (2012).xml
index 45319e1622..aaad7b342c 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Bravia (2012).xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Bravia (2012).xml	
@@ -1,115 +1,115 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Sony Bravia (2012)</Name>
-    <Identification>
-        <FriendlyName>KDL-\d{2}[A-Z]X\d5(\d|G).*</FriendlyName>
-        <Manufacturer>Sony</Manufacturer>
-        <Headers>
-            <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}[A-Z]X\d5(\d|G).*" match="Regex" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Microsoft Corporation</Manufacturer>
-    <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
-    <ModelName>Windows Media Player Sharing</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>3.0</ModelNumber>
-    <ModelUrl>http://www.microsoft.com/</ModelUrl>
-    <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_TN</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <SonyAggregationFlags>10</SonyAggregationFlags>
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes>
-        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-    </XmlRootAttributes>
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" />
-        <DirectPlayProfile container="ts,mpegts" audioCodec="mp3,mp2" videoCodec="mpeg2video" type="Video" />
-        <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,mp3,mp2" videoCodec="h264,mpeg4" type="Video" />
-        <DirectPlayProfile container="avi" audioCodec="ac3,mp3" videoCodec="mpeg4" type="Video" />
-        <DirectPlayProfile container="mpeg" audioCodec="mp3,mp2" videoCodec="mpeg2video,mpeg1video" type="Video" />
-        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" videoCodec="wmv2,wmv3,vc1" type="Video" />
-        <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
-        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
-        <DirectPlayProfile container="jpeg" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Photo">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="ac3">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="mp3,mp2">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles>
-        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions>
-                <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
-                <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
-            </Conditions>
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
-            <Conditions>
-                <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
-            </Conditions>
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Sony Bravia (2012)</Name>
+  <Identification>
+    <FriendlyName>KDL-\d{2}[A-Z]X\d5(\d|G).*</FriendlyName>
+    <Manufacturer>Sony</Manufacturer>
+    <Headers>
+      <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}[A-Z]X\d5(\d|G).*" match="Regex" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Microsoft Corporation</Manufacturer>
+  <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
+  <ModelName>Windows Media Player Sharing</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>3.0</ModelNumber>
+  <ModelUrl>http://www.microsoft.com/</ModelUrl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_TN</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <SonyAggregationFlags>10</SonyAggregationFlags>
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes>
+    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+  </XmlRootAttributes>
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" />
+    <DirectPlayProfile container="ts,mpegts" audioCodec="mp3,mp2" videoCodec="mpeg2video" type="Video" />
+    <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,mp3,mp2" videoCodec="h264,mpeg4" type="Video" />
+    <DirectPlayProfile container="avi" audioCodec="ac3,mp3" videoCodec="mpeg4" type="Video" />
+    <DirectPlayProfile container="mpeg" audioCodec="mp3,mp2" videoCodec="mpeg2video,mpeg1video" type="Video" />
+    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" videoCodec="wmv2,wmv3,vc1" type="Video" />
+    <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
+    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
+    <DirectPlayProfile container="jpeg" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Photo">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="ac3">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="mp3,mp2">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles>
+    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions>
+        <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
+        <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
+      </Conditions>
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
+      <Conditions>
+        <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
+      </Conditions>
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Bravia (2013).xml b/Emby.Dlna/Profiles/Xml/Sony Bravia (2013).xml
index ca32b3492d..8e2e8dbaa4 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Bravia (2013).xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Bravia (2013).xml	
@@ -1,114 +1,114 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Sony Bravia (2013)</Name>
-    <Identification>
-        <FriendlyName>KDL-\d{2}[WR][5689]\d{2}A.*</FriendlyName>
-        <Manufacturer>Sony</Manufacturer>
-        <Headers>
-            <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}[WR][5689]\d{2}A.*" match="Regex" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Microsoft Corporation</Manufacturer>
-    <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
-    <ModelName>Windows Media Player Sharing</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>3.0</ModelNumber>
-    <ModelUrl>http://www.microsoft.com/</ModelUrl>
-    <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_TN</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <SonyAggregationFlags>10</SonyAggregationFlags>
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes>
-        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-    </XmlRootAttributes>
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,eac3,aac,mp3" videoCodec="h264" type="Video" />
-        <DirectPlayProfile container="ts,mpegts" audioCodec="mp3,mp2" videoCodec="mpeg2video" type="Video" />
-        <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,eac3,aac,mp3,mp2" videoCodec="h264,mpeg4" type="Video" />
-        <DirectPlayProfile container="mov" audioCodec="ac3,eac3,aac,mp3,mp2" videoCodec="h264,mpeg4,mjpeg" type="Video" />
-        <DirectPlayProfile container="mkv" audioCodec="ac3,eac3,aac,mp3,mp2,pcm,vorbis" videoCodec="h264,mpeg4,vp8" type="Video" />
-        <DirectPlayProfile container="avi" audioCodec="ac3,eac3,mp3" videoCodec="mpeg4" type="Video" />
-        <DirectPlayProfile container="avi" audioCodec="pcm" videoCodec="mjpeg" type="Video" />
-        <DirectPlayProfile container="mpeg" audioCodec="mp3,mp2" videoCodec="mpeg2video,mpeg1video" type="Video" />
-        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" videoCodec="wmv2,wmv3,vc1" type="Video" />
-        <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
-        <DirectPlayProfile container="mp4" audioCodec="aac" type="Audio" />
-        <DirectPlayProfile container="wav" audioCodec="pcm" type="Audio" />
-        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
-        <DirectPlayProfile container="jpeg" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Photo">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="mp3,mp2">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles>
-        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions>
-                <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
-                <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
-            </Conditions>
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
-            <Conditions>
-                <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
-            </Conditions>
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Sony Bravia (2013)</Name>
+  <Identification>
+    <FriendlyName>KDL-\d{2}[WR][5689]\d{2}A.*</FriendlyName>
+    <Manufacturer>Sony</Manufacturer>
+    <Headers>
+      <HttpHeaderInfo name="X-AV-Client-Info" value=".*KDL-\d{2}[WR][5689]\d{2}A.*" match="Regex" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Microsoft Corporation</Manufacturer>
+  <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
+  <ModelName>Windows Media Player Sharing</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>3.0</ModelNumber>
+  <ModelUrl>http://www.microsoft.com/</ModelUrl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_TN</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <SonyAggregationFlags>10</SonyAggregationFlags>
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes>
+    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+  </XmlRootAttributes>
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,eac3,aac,mp3" videoCodec="h264" type="Video" />
+    <DirectPlayProfile container="ts,mpegts" audioCodec="mp3,mp2" videoCodec="mpeg2video" type="Video" />
+    <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,eac3,aac,mp3,mp2" videoCodec="h264,mpeg4" type="Video" />
+    <DirectPlayProfile container="mov" audioCodec="ac3,eac3,aac,mp3,mp2" videoCodec="h264,mpeg4,mjpeg" type="Video" />
+    <DirectPlayProfile container="mkv" audioCodec="ac3,eac3,aac,mp3,mp2,pcm,vorbis" videoCodec="h264,mpeg4,vp8" type="Video" />
+    <DirectPlayProfile container="avi" audioCodec="ac3,eac3,mp3" videoCodec="mpeg4" type="Video" />
+    <DirectPlayProfile container="avi" audioCodec="pcm" videoCodec="mjpeg" type="Video" />
+    <DirectPlayProfile container="mpeg" audioCodec="mp3,mp2" videoCodec="mpeg2video,mpeg1video" type="Video" />
+    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" videoCodec="wmv2,wmv3,vc1" type="Video" />
+    <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
+    <DirectPlayProfile container="mp4" audioCodec="aac" type="Audio" />
+    <DirectPlayProfile container="wav" audioCodec="pcm" type="Audio" />
+    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
+    <DirectPlayProfile container="jpeg" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Photo">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="mp3,mp2">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles>
+    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions>
+        <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
+        <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
+      </Conditions>
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
+      <Conditions>
+        <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
+      </Conditions>
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Bravia (2014).xml b/Emby.Dlna/Profiles/Xml/Sony Bravia (2014).xml
index 27e54a2452..17a6135e1f 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Bravia (2014).xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Bravia (2014).xml	
@@ -1,114 +1,114 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Sony Bravia (2014)</Name>
-    <Identification>
-        <FriendlyName>(KDL-\d{2}W[5-9]\d{2}B|KDL-\d{2}R480|XBR-\d{2}X[89]\d{2}B|KD-\d{2}[SX][89]\d{3}B).*</FriendlyName>
-        <Manufacturer>Sony</Manufacturer>
-        <Headers>
-            <HttpHeaderInfo name="X-AV-Client-Info" value=".*(KDL-\d{2}W[5-9]\d{2}B|KDL-\d{2}R480|XBR-\d{2}X[89]\d{2}B|KD-\d{2}[SX][89]\d{3}B).*" match="Regex" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Microsoft Corporation</Manufacturer>
-    <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
-    <ModelName>Windows Media Player Sharing</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>3.0</ModelNumber>
-    <ModelUrl>http://www.microsoft.com/</ModelUrl>
-    <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_TN</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <SonyAggregationFlags>10</SonyAggregationFlags>
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes>
-        <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
-    </XmlRootAttributes>
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,eac3,aac,mp3" videoCodec="h264" type="Video" />
-        <DirectPlayProfile container="ts,mpegts" audioCodec="mp3,mp2" videoCodec="mpeg2video" type="Video" />
-        <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,eac3,aac,mp3,mp2" videoCodec="h264,mpeg4" type="Video" />
-        <DirectPlayProfile container="mov" audioCodec="ac3,eac3,aac,mp3,mp2" videoCodec="h264,mpeg4,mjpeg" type="Video" />
-        <DirectPlayProfile container="mkv" audioCodec="ac3,eac3,aac,mp3,mp2,pcm,vorbis" videoCodec="h264,mpeg4,vp8" type="Video" />
-        <DirectPlayProfile container="avi" audioCodec="ac3,eac3,mp3" videoCodec="mpeg4" type="Video" />
-        <DirectPlayProfile container="avi" audioCodec="pcm" videoCodec="mjpeg" type="Video" />
-        <DirectPlayProfile container="mpeg" audioCodec="mp3,mp2" videoCodec="mpeg2video,mpeg1video" type="Video" />
-        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" videoCodec="wmv2,wmv3,vc1" type="Video" />
-        <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
-        <DirectPlayProfile container="mp4" audioCodec="aac" type="Audio" />
-        <DirectPlayProfile container="wav" audioCodec="pcm" type="Audio" />
-        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
-        <DirectPlayProfile container="jpeg" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Photo">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="mp3,mp2">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles>
-        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions>
-                <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
-                <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
-            </Conditions>
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
-            <Conditions>
-                <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
-            </Conditions>
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Sony Bravia (2014)</Name>
+  <Identification>
+    <FriendlyName>(KDL-\d{2}W[5-9]\d{2}B|KDL-\d{2}R480|XBR-\d{2}X[89]\d{2}B|KD-\d{2}[SX][89]\d{3}B).*</FriendlyName>
+    <Manufacturer>Sony</Manufacturer>
+    <Headers>
+      <HttpHeaderInfo name="X-AV-Client-Info" value=".*(KDL-\d{2}W[5-9]\d{2}B|KDL-\d{2}R480|XBR-\d{2}X[89]\d{2}B|KD-\d{2}[SX][89]\d{3}B).*" match="Regex" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Microsoft Corporation</Manufacturer>
+  <ManufacturerUrl>http://www.microsoft.com/</ManufacturerUrl>
+  <ModelName>Windows Media Player Sharing</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>3.0</ModelNumber>
+  <ModelUrl>http://www.microsoft.com/</ModelUrl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_TN</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <SonyAggregationFlags>10</SonyAggregationFlags>
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes>
+    <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
+  </XmlRootAttributes>
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,eac3,aac,mp3" videoCodec="h264" type="Video" />
+    <DirectPlayProfile container="ts,mpegts" audioCodec="mp3,mp2" videoCodec="mpeg2video" type="Video" />
+    <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,eac3,aac,mp3,mp2" videoCodec="h264,mpeg4" type="Video" />
+    <DirectPlayProfile container="mov" audioCodec="ac3,eac3,aac,mp3,mp2" videoCodec="h264,mpeg4,mjpeg" type="Video" />
+    <DirectPlayProfile container="mkv" audioCodec="ac3,eac3,aac,mp3,mp2,pcm,vorbis" videoCodec="h264,mpeg4,vp8" type="Video" />
+    <DirectPlayProfile container="avi" audioCodec="ac3,eac3,mp3" videoCodec="mpeg4" type="Video" />
+    <DirectPlayProfile container="avi" audioCodec="pcm" videoCodec="mjpeg" type="Video" />
+    <DirectPlayProfile container="mpeg" audioCodec="mp3,mp2" videoCodec="mpeg2video,mpeg1video" type="Video" />
+    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" videoCodec="wmv2,wmv3,vc1" type="Video" />
+    <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
+    <DirectPlayProfile container="mp4" audioCodec="aac" type="Audio" />
+    <DirectPlayProfile container="wav" audioCodec="pcm" type="Audio" />
+    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
+    <DirectPlayProfile container="jpeg" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Photo">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="mp3,mp2">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles>
+    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions>
+        <ProfileCondition condition="Equals" property="PacketLength" value="192" isRequired="true" />
+        <ProfileCondition condition="Equals" property="VideoTimestamp" value="Valid" isRequired="true" />
+      </Conditions>
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
+      <Conditions>
+        <ProfileCondition condition="Equals" property="PacketLength" value="188" isRequired="true" />
+      </Conditions>
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="ts,mpegts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml b/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml
index 2039f123e6..df385135cd 100644
--- a/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml	
@@ -1,105 +1,105 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Sony PlayStation 3</Name>
-    <Identification>
-        <FriendlyName>PLAYSTATION 3</FriendlyName>
-        <Headers>
-            <HttpHeaderInfo name="User-Agent" value="PLAYSTATION 3" match="Substring" />
-            <HttpHeaderInfo name="X-AV-Client-Info" value="PLAYSTATION 3" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_TN</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <SonyAggregationFlags>10</SonyAggregationFlags>
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes />
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="avi" audioCodec="mp2,mp3" videoCodec="mpeg4" type="Video" />
-        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,mp2,mp3,aac" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
-        <DirectPlayProfile container="mpeg" audioCodec="mp2" videoCodec="mpeg1video,mpeg2video" type="Video" />
-        <DirectPlayProfile container="mp4" audioCodec="aac,ac3" videoCodec="h264,mpeg4" type="Video" />
-        <DirectPlayProfile container="aac,mp3,wav" type="Audio" />
-        <DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Photo">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video" codec="h264">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="ac3">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="AudioBitrate" value="640000" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="wmapro">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="aac">
-            <Conditions>
-                <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles>
-        <ResponseProfile container="mp4,mov" audioCodec="aac" type="Video" mimeType="video/mp4">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="avi" type="Video" orgPn="AVI" mimeType="video/divx">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="wav" type="Audio" mimeType="audio/wav">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Sony PlayStation 3</Name>
+  <Identification>
+    <FriendlyName>PLAYSTATION 3</FriendlyName>
+    <Headers>
+      <HttpHeaderInfo name="User-Agent" value="PLAYSTATION 3" match="Substring" />
+      <HttpHeaderInfo name="X-AV-Client-Info" value="PLAYSTATION 3" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_TN</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <SonyAggregationFlags>10</SonyAggregationFlags>
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes />
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="avi" audioCodec="mp2,mp3" videoCodec="mpeg4" type="Video" />
+    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,mp2,mp3,aac" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
+    <DirectPlayProfile container="mpeg" audioCodec="mp2" videoCodec="mpeg1video,mpeg2video" type="Video" />
+    <DirectPlayProfile container="mp4" audioCodec="aac,ac3" videoCodec="h264,mpeg4" type="Video" />
+    <DirectPlayProfile container="aac,mp3,wav" type="Audio" />
+    <DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Photo">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="h264">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="ac3">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="AudioBitrate" value="640000" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="wmapro">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="aac">
+      <Conditions>
+        <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles>
+    <ResponseProfile container="mp4,mov" audioCodec="aac" type="Video" mimeType="video/mp4">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="avi" type="Video" orgPn="AVI" mimeType="video/divx">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="wav" type="Audio" mimeType="audio/wav">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml b/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml
index d4d804dfe1..20f50f6b63 100644
--- a/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml	
@@ -1,108 +1,108 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Sony PlayStation 4</Name>
-    <Identification>
-        <FriendlyName>PLAYSTATION 4</FriendlyName>
-        <Headers>
-            <HttpHeaderInfo name="User-Agent" value="PLAYSTATION 4" match="Substring" />
-            <HttpHeaderInfo name="X-AV-Client-Info" value="PLAYSTATION 4" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_TN</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <SonyAggregationFlags>10</SonyAggregationFlags>
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes />
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="avi" audioCodec="mp2,mp3" videoCodec="mpeg4" type="Video" />
-        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,mp2,mp3,aac" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
-        <DirectPlayProfile container="mpeg" audioCodec="mp2" videoCodec="mpeg1video,mpeg2video" type="Video" />
-        <DirectPlayProfile container="mp4,mkv,m4v" audioCodec="aac,ac3" videoCodec="h264,mpeg4" type="Video" />
-        <DirectPlayProfile container="aac,mp3,wav" type="Audio" />
-        <DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Bytes" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Photo">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video" codec="h264">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="ac3">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="AudioBitrate" value="640000" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="wmapro">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="aac">
-            <Conditions>
-                <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles>
-        <ResponseProfile container="mp4,mov" audioCodec="aac" type="Video" mimeType="video/mp4">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="avi" type="Video" orgPn="AVI" mimeType="video/divx">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="wav" type="Audio" mimeType="audio/wav">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Sony PlayStation 4</Name>
+  <Identification>
+    <FriendlyName>PLAYSTATION 4</FriendlyName>
+    <Headers>
+      <HttpHeaderInfo name="User-Agent" value="PLAYSTATION 4" match="Substring" />
+      <HttpHeaderInfo name="X-AV-Client-Info" value="PLAYSTATION 4" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_TN</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <SonyAggregationFlags>10</SonyAggregationFlags>
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes />
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="avi" audioCodec="mp2,mp3" videoCodec="mpeg4" type="Video" />
+    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,mp2,mp3,aac" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
+    <DirectPlayProfile container="mpeg" audioCodec="mp2" videoCodec="mpeg1video,mpeg2video" type="Video" />
+    <DirectPlayProfile container="mp4,mkv,m4v" audioCodec="aac,ac3" videoCodec="h264,mpeg4" type="Video" />
+    <DirectPlayProfile container="aac,mp3,wav" type="Audio" />
+    <DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Bytes" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Photo">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="h264">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="ac3">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="AudioBitrate" value="640000" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="wmapro">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="aac">
+      <Conditions>
+        <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles>
+    <ResponseProfile container="mp4,mov" audioCodec="aac" type="Video" mimeType="video/mp4">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="avi" type="Video" orgPn="AVI" mimeType="video/divx">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="wav" type="Audio" mimeType="audio/wav">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/WDTV Live.xml b/Emby.Dlna/Profiles/Xml/WDTV Live.xml
index 147d133f41..05380e33a6 100644
--- a/Emby.Dlna/Profiles/Xml/WDTV Live.xml	
+++ b/Emby.Dlna/Profiles/Xml/WDTV Live.xml	
@@ -1,94 +1,94 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>WDTV Live</Name>
-    <Identification>
-        <ModelName>WD TV</ModelName>
-        <Headers>
-            <HttpHeaderInfo name="User-Agent" value="alphanetworks" match="Substring" />
-            <HttpHeaderInfo name="User-Agent" value="ALPHA Networks" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>5</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>true</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes />
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="avi" audioCodec="ac3,eac3,dca,mp2,mp3,pcm,dts" videoCodec="mpeg1video,mpeg2video,mpeg4,h264,vc1" type="Video" />
-        <DirectPlayProfile container="mpeg" audioCodec="ac3,eac3,dca,mp2,mp3,pcm,dts" videoCodec="mpeg1video,mpeg2video" type="Video" />
-        <DirectPlayProfile container="mkv" audioCodec="ac3,eac3,dca,aac,mp2,mp3,pcm,dts" videoCodec="mpeg1video,mpeg2video,mpeg4,h264,vc1" type="Video" />
-        <DirectPlayProfile container="ts,m2ts,mpegts" audioCodec="ac3,eac3,dca,mp2,mp3,aac,dts" videoCodec="mpeg1video,mpeg2video,h264,vc1" type="Video" />
-        <DirectPlayProfile container="mp4,mov,m4v" audioCodec="ac3,eac3,aac,mp2,mp3,dca,dts" videoCodec="h264,mpeg4" type="Video" />
-        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro" videoCodec="vc1" type="Video" />
-        <DirectPlayProfile container="asf" audioCodec="mp2,ac3" videoCodec="mpeg2video" type="Video" />
-        <DirectPlayProfile container="mp3" audioCodec="mp2,mp3" type="Audio" />
-        <DirectPlayProfile container="mp4" audioCodec="mp4" type="Audio" />
-        <DirectPlayProfile container="flac" type="Audio" />
-        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
-        <DirectPlayProfile container="ogg" audioCodec="vorbis" type="Audio" />
-        <DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Photo">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video" codec="h264">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="aac">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles>
-        <ResponseProfile container="ts,mpegts" type="Video" orgPn="MPEG_TS_SD_NA">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="External" />
-        <SubtitleProfile format="srt" method="Embed" />
-        <SubtitleProfile format="sub" method="Embed" />
-        <SubtitleProfile format="subrip" method="Embed" />
-        <SubtitleProfile format="idx" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>WDTV Live</Name>
+  <Identification>
+    <ModelName>WD TV</ModelName>
+    <Headers>
+      <HttpHeaderInfo name="User-Agent" value="alphanetworks" match="Substring" />
+      <HttpHeaderInfo name="User-Agent" value="ALPHA Networks" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>5</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>true</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes />
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="avi" audioCodec="ac3,eac3,dca,mp2,mp3,pcm,dts" videoCodec="mpeg1video,mpeg2video,mpeg4,h264,vc1" type="Video" />
+    <DirectPlayProfile container="mpeg" audioCodec="ac3,eac3,dca,mp2,mp3,pcm,dts" videoCodec="mpeg1video,mpeg2video" type="Video" />
+    <DirectPlayProfile container="mkv" audioCodec="ac3,eac3,dca,aac,mp2,mp3,pcm,dts" videoCodec="mpeg1video,mpeg2video,mpeg4,h264,vc1" type="Video" />
+    <DirectPlayProfile container="ts,m2ts,mpegts" audioCodec="ac3,eac3,dca,mp2,mp3,aac,dts" videoCodec="mpeg1video,mpeg2video,h264,vc1" type="Video" />
+    <DirectPlayProfile container="mp4,mov,m4v" audioCodec="ac3,eac3,aac,mp2,mp3,dca,dts" videoCodec="h264,mpeg4" type="Video" />
+    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro" videoCodec="vc1" type="Video" />
+    <DirectPlayProfile container="asf" audioCodec="mp2,ac3" videoCodec="mpeg2video" type="Video" />
+    <DirectPlayProfile container="mp3" audioCodec="mp2,mp3" type="Audio" />
+    <DirectPlayProfile container="mp4" audioCodec="mp4" type="Audio" />
+    <DirectPlayProfile container="flac" type="Audio" />
+    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
+    <DirectPlayProfile container="ogg" audioCodec="vorbis" type="Audio" />
+    <DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Photo">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="h264">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="aac">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles>
+    <ResponseProfile container="ts,mpegts" type="Video" orgPn="MPEG_TS_SD_NA">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="External" />
+    <SubtitleProfile format="srt" method="Embed" />
+    <SubtitleProfile format="sub" method="Embed" />
+    <SubtitleProfile format="subrip" method="Embed" />
+    <SubtitleProfile format="idx" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Xbox One.xml b/Emby.Dlna/Profiles/Xml/Xbox One.xml
index 41ccd49b91..5f5cf1af31 100644
--- a/Emby.Dlna/Profiles/Xml/Xbox One.xml	
+++ b/Emby.Dlna/Profiles/Xml/Xbox One.xml	
@@ -1,126 +1,126 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>Xbox One</Name>
-    <Identification>
-        <ModelName>Xbox One</ModelName>
-        <Headers>
-            <HttpHeaderInfo name="FriendlyName.DLNA.ORG" value="XboxOne" match="Substring" />
-            <HttpHeaderInfo name="User-Agent" value="NSPlayer/12" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>40</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes />
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264,mpeg2video,hevc" type="Video" />
-        <DirectPlayProfile container="avi" audioCodec="ac3,mp3" videoCodec="mpeg4" type="Video" />
-        <DirectPlayProfile container="avi" audioCodec="aac" videoCodec="h264" type="Video" />
-        <DirectPlayProfile container="mp4,mov,mkv,m4v" audioCodec="aac,ac3" videoCodec="h264,mpeg4,mpeg2video,hevc" type="Video" />
-        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro" videoCodec="wmv2,wmv3,vc1" type="Video" />
-        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
-        <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
-        <DirectPlayProfile container="jpeg" type="Photo" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" videoCodec="jpeg" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles>
-        <ContainerProfile type="Video" container="mp4,mov">
-            <Conditions>
-                <ProfileCondition condition="Equals" property="Has64BitOffsets" value="false" isRequired="false" />
-            </Conditions>
-        </ContainerProfile>
-    </ContainerProfiles>
-    <CodecProfiles>
-        <CodecProfile type="Video" codec="mpeg4">
-            <Conditions>
-                <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="5120000" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="Video" codec="h264">
-            <Conditions>
-                <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" />
-                <ProfileCondition condition="EqualsAny" property="VideoProfile" value="high|main|baseline|constrained baseline" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="Video" codec="wmv2,wmv3,vc1">
-            <Conditions>
-                <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-                <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="Video">
-            <Conditions>
-                <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
-                <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="ac3,wmav2,wmapro">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-        <CodecProfile type="VideoAudio" codec="aac">
-            <Conditions>
-                <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
-                <ProfileCondition condition="Equals" property="AudioProfile" value="lc" isRequired="false" />
-            </Conditions>
-            <ApplyConditions />
-        </CodecProfile>
-    </CodecProfiles>
-    <ResponseProfiles>
-        <ResponseProfile container="avi" type="Video" mimeType="video/avi">
-            <Conditions />
-        </ResponseProfile>
-        <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-            <Conditions />
-        </ResponseProfile>
-    </ResponseProfiles>
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>Xbox One</Name>
+  <Identification>
+    <ModelName>Xbox One</ModelName>
+    <Headers>
+      <HttpHeaderInfo name="FriendlyName.DLNA.ORG" value="XboxOne" match="Substring" />
+      <HttpHeaderInfo name="User-Agent" value="NSPlayer/12" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>40</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes />
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3" videoCodec="h264,mpeg2video,hevc" type="Video" />
+    <DirectPlayProfile container="avi" audioCodec="ac3,mp3" videoCodec="mpeg4" type="Video" />
+    <DirectPlayProfile container="avi" audioCodec="aac" videoCodec="h264" type="Video" />
+    <DirectPlayProfile container="mp4,mov,mkv,m4v" audioCodec="aac,ac3" videoCodec="h264,mpeg4,mpeg2video,hevc" type="Video" />
+    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro" videoCodec="wmv2,wmv3,vc1" type="Video" />
+    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
+    <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
+    <DirectPlayProfile container="jpeg" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" videoCodec="jpeg" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles>
+    <ContainerProfile type="Video" container="mp4,mov">
+      <Conditions>
+        <ProfileCondition condition="Equals" property="Has64BitOffsets" value="false" isRequired="false" />
+      </Conditions>
+    </ContainerProfile>
+  </ContainerProfiles>
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="mpeg4">
+      <Conditions>
+        <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="5120000" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="Video" codec="h264">
+      <Conditions>
+        <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" />
+        <ProfileCondition condition="EqualsAny" property="VideoProfile" value="high|main|baseline|constrained baseline" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="Video" codec="wmv2,wmv3,vc1">
+      <Conditions>
+        <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="Video">
+      <Conditions>
+        <ProfileCondition condition="NotEquals" property="IsAnamorphic" value="true" isRequired="false" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitDepth" value="8" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="ac3,wmav2,wmapro">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+    <CodecProfile type="VideoAudio" codec="aac">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" />
+        <ProfileCondition condition="Equals" property="AudioProfile" value="lc" isRequired="false" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles>
+    <ResponseProfile container="avi" type="Video" mimeType="video/avi">
+      <Conditions />
+    </ResponseProfile>
+    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
+      <Conditions />
+    </ResponseProfile>
+  </ResponseProfiles>
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Dlna/Profiles/Xml/foobar2000.xml b/Emby.Dlna/Profiles/Xml/foobar2000.xml
index 57c065e231..f3eedb35c6 100644
--- a/Emby.Dlna/Profiles/Xml/foobar2000.xml
+++ b/Emby.Dlna/Profiles/Xml/foobar2000.xml
@@ -1,67 +1,67 @@
 <?xml version="1.0"?>
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <Name>foobar2000</Name>
-    <Identification>
-        <FriendlyName>foobar</FriendlyName>
-        <Headers>
-            <HttpHeaderInfo name="User-Agent" value="foobar" match="Substring" />
-        </Headers>
-    </Identification>
-    <Manufacturer>Jellyfin</Manufacturer>
-    <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-    <ModelName>Jellyfin Server</ModelName>
-    <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-    <ModelNumber>01</ModelNumber>
-    <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-    <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-    <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-    <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-    <SupportedMediaTypes>Audio</SupportedMediaTypes>
-    <AlbumArtPn>JPEG_SM</AlbumArtPn>
-    <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-    <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-    <MaxIconWidth>48</MaxIconWidth>
-    <MaxIconHeight>48</MaxIconHeight>
-    <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-    <MaxStaticBitrate>140000000</MaxStaticBitrate>
-    <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-    <MaxStaticMusicBitrate xsi:nil="true" />
-    <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
-    <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
-    <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-    <RequiresPlainFolders>false</RequiresPlainFolders>
-    <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-    <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-    <XmlRootAttributes />
-    <DirectPlayProfiles>
-        <DirectPlayProfile container="mp3" audioCodec="mp2,mp3" type="Audio" />
-        <DirectPlayProfile container="mp4" audioCodec="mp4" type="Audio" />
-        <DirectPlayProfile container="aac,wav" type="Audio" />
-        <DirectPlayProfile container="flac" audioCodec="flac" type="Audio" />
-        <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
-        <DirectPlayProfile container="ogg" audioCodec="vorbis" type="Audio" />
-    </DirectPlayProfiles>
-    <TranscodingProfiles>
-        <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-        <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    </TranscodingProfiles>
-    <ContainerProfiles />
-    <CodecProfiles />
-    <ResponseProfiles />
-    <SubtitleProfiles>
-        <SubtitleProfile format="srt" method="External" />
-        <SubtitleProfile format="sub" method="External" />
-        <SubtitleProfile format="srt" method="Embed" />
-        <SubtitleProfile format="ass" method="Embed" />
-        <SubtitleProfile format="ssa" method="Embed" />
-        <SubtitleProfile format="smi" method="Embed" />
-        <SubtitleProfile format="dvdsub" method="Embed" />
-        <SubtitleProfile format="pgs" method="Embed" />
-        <SubtitleProfile format="pgssub" method="Embed" />
-        <SubtitleProfile format="sub" method="Embed" />
-        <SubtitleProfile format="subrip" method="Embed" />
-        <SubtitleProfile format="vtt" method="Embed" />
-    </SubtitleProfiles>
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>foobar2000</Name>
+  <Identification>
+    <FriendlyName>foobar</FriendlyName>
+    <Headers>
+      <HttpHeaderInfo name="User-Agent" value="foobar" match="Substring" />
+    </Headers>
+  </Identification>
+  <Manufacturer>Jellyfin</Manufacturer>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
+  <ModelName>Jellyfin Server</ModelName>
+  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
+  <ModelNumber>01</ModelNumber>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
+  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
+  <SupportedMediaTypes>Audio</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>140000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
+  <MaxStaticMusicBitrate xsi:nil="true" />
+  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*image/jpeg:*,http-get:*image/png:*,http-get:*image/gif:*,http-get:*image/tiff:*</ProtocolInfo>
+  <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
+  <RequiresPlainFolders>false</RequiresPlainFolders>
+  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <XmlRootAttributes />
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="mp3" audioCodec="mp2,mp3" type="Audio" />
+    <DirectPlayProfile container="mp4" audioCodec="mp4" type="Audio" />
+    <DirectPlayProfile container="aac,wav" type="Audio" />
+    <DirectPlayProfile container="flac" audioCodec="flac" type="Audio" />
+    <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
+    <DirectPlayProfile container="ogg" audioCodec="vorbis" type="Audio" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+  </TranscodingProfiles>
+  <ContainerProfiles />
+  <CodecProfiles />
+  <ResponseProfiles />
+  <SubtitleProfiles>
+    <SubtitleProfile format="srt" method="External" />
+    <SubtitleProfile format="sub" method="External" />
+    <SubtitleProfile format="srt" method="Embed" />
+    <SubtitleProfile format="ass" method="Embed" />
+    <SubtitleProfile format="ssa" method="Embed" />
+    <SubtitleProfile format="smi" method="Embed" />
+    <SubtitleProfile format="dvdsub" method="Embed" />
+    <SubtitleProfile format="pgs" method="Embed" />
+    <SubtitleProfile format="pgssub" method="Embed" />
+    <SubtitleProfile format="sub" method="Embed" />
+    <SubtitleProfile format="subrip" method="Embed" />
+    <SubtitleProfile format="vtt" method="Embed" />
+  </SubtitleProfiles>
 </Profile>
diff --git a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
index a0892e8bb0..1eb5377411 100644
--- a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
+++ b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="SkiaSharp" Version="1.68.0" />
-        <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.0" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="SkiaSharp" Version="1.68.0" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.0" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
 </Project>
diff --git a/Emby.Drawing/Emby.Drawing.csproj b/Emby.Drawing/Emby.Drawing.csproj
index 36e66d5441..ba29c656bf 100644
--- a/Emby.Drawing/Emby.Drawing.csproj
+++ b/Emby.Drawing/Emby.Drawing.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
 </Project>
diff --git a/Emby.IsoMounting/IsoMounter/IsoMounter.csproj b/Emby.IsoMounting/IsoMounter/IsoMounter.csproj
index f9ec57ddf3..2a81f5aa0f 100644
--- a/Emby.IsoMounting/IsoMounter/IsoMounter.csproj
+++ b/Emby.IsoMounting/IsoMounter/IsoMounter.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <ItemGroup>
-        <Compile Include="..\..\SharedVersion.cs" Link="SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\SharedVersion.cs" Link="SharedVersion.cs" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-        <ProjectReference Include="..\..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    <ProjectReference Include="..\..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
 </Project>
diff --git a/Emby.Naming/Emby.Naming.csproj b/Emby.Naming/Emby.Naming.csproj
index 49619d5560..88e3af522d 100644
--- a/Emby.Naming/Emby.Naming.csproj
+++ b/Emby.Naming/Emby.Naming.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+  </ItemGroup>
 
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
diff --git a/Emby.Notifications/Emby.Notifications.csproj b/Emby.Notifications/Emby.Notifications.csproj
index 95d99c6923..14caa4a550 100644
--- a/Emby.Notifications/Emby.Notifications.csproj
+++ b/Emby.Notifications/Emby.Notifications.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" Link="SharedVersion.cs" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/Emby.Photos/Emby.Photos.csproj b/Emby.Photos/Emby.Photos.csproj
index af7fa39321..e6b445202f 100644
--- a/Emby.Photos/Emby.Photos.csproj
+++ b/Emby.Photos/Emby.Photos.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-        <ProjectReference Include="..\ThirdParty\taglib-sharp\src\taglib-sharp.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    <ProjectReference Include="..\ThirdParty\taglib-sharp\src\taglib-sharp.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
 </Project>
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 54950658cb..5a0e1da4d7 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -1,50 +1,50 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <ItemGroup>
-        <ProjectReference Include="..\Emby.Naming\Emby.Naming.csproj" />
-        <ProjectReference Include="..\Emby.Notifications\Emby.Notifications.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Providers\MediaBrowser.Providers.csproj" />
-        <ProjectReference Include="..\MediaBrowser.WebDashboard\MediaBrowser.WebDashboard.csproj" />
-        <ProjectReference Include="..\MediaBrowser.XbmcMetadata\MediaBrowser.XbmcMetadata.csproj" />
-        <ProjectReference Include="..\SocketHttpListener\SocketHttpListener.csproj" />
-        <ProjectReference Include="..\Emby.Dlna\Emby.Dlna.csproj" />
-        <ProjectReference Include="..\Mono.Nat\Mono.Nat.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Api\MediaBrowser.Api.csproj" />
-        <ProjectReference Include="..\MediaBrowser.LocalMetadata\MediaBrowser.LocalMetadata.csproj" />
-        <ProjectReference Include="..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj" />
-        <ProjectReference Include="..\Emby.Photos\Emby.Photos.csproj" />
-        <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" />
-        <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv\Emby.XmlTv.csproj" />
-        <ProjectReference Include="..\MediaBrowser.MediaEncoding\MediaBrowser.MediaEncoding.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Emby.Naming\Emby.Naming.csproj" />
+    <ProjectReference Include="..\Emby.Notifications\Emby.Notifications.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Providers\MediaBrowser.Providers.csproj" />
+    <ProjectReference Include="..\MediaBrowser.WebDashboard\MediaBrowser.WebDashboard.csproj" />
+    <ProjectReference Include="..\MediaBrowser.XbmcMetadata\MediaBrowser.XbmcMetadata.csproj" />
+    <ProjectReference Include="..\SocketHttpListener\SocketHttpListener.csproj" />
+    <ProjectReference Include="..\Emby.Dlna\Emby.Dlna.csproj" />
+    <ProjectReference Include="..\Mono.Nat\Mono.Nat.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Api\MediaBrowser.Api.csproj" />
+    <ProjectReference Include="..\MediaBrowser.LocalMetadata\MediaBrowser.LocalMetadata.csproj" />
+    <ProjectReference Include="..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj" />
+    <ProjectReference Include="..\Emby.Photos\Emby.Photos.csproj" />
+    <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" />
+    <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv\Emby.XmlTv.csproj" />
+    <ProjectReference Include="..\MediaBrowser.MediaEncoding\MediaBrowser.MediaEncoding.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="ServiceStack.Text.Core" Version="5.4.0" />
-        <PackageReference Include="sharpcompress" Version="0.22.0" />
-        <PackageReference Include="SimpleInjector" Version="4.4.2" />
-        <PackageReference Include="SQLitePCL.pretty.core" Version="1.1.8" />
-        <PackageReference Include="SQLitePCLRaw.core" Version="1.1.11" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ServiceStack.Text.Core" Version="5.4.0" />
+    <PackageReference Include="sharpcompress" Version="0.22.0" />
+    <PackageReference Include="SimpleInjector" Version="4.4.2" />
+    <PackageReference Include="SQLitePCL.pretty.core" Version="1.1.8" />
+    <PackageReference Include="SQLitePCLRaw.core" Version="1.1.11" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <EmbeddedResource Include="Localization\iso6392.txt" />
-        <EmbeddedResource Include="Localization\countries.json" />
-        <EmbeddedResource Include="Localization\Core\*.json" />
-        <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\*" />
-        <EmbeddedResource Include="TextEncoding\NLangDetect\Utils\messages.properties" />
-        <EmbeddedResource Include="Localization\Ratings\*.txt" />
-    </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\iso6392.txt" />
+    <EmbeddedResource Include="Localization\countries.json" />
+    <EmbeddedResource Include="Localization\Core\*.json" />
+    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\*" />
+    <EmbeddedResource Include="TextEncoding\NLangDetect\Utils\messages.properties" />
+    <EmbeddedResource Include="Localization\Ratings\*.txt" />
+  </ItemGroup>
 
 </Project>
diff --git a/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj b/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj
index 5d213c1772..c10b28e824 100644
--- a/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj
+++ b/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj
@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <ItemGroup>
-        <Reference Include="System" />
-        <Reference Include="System.Core" />
-        <Reference Include="System.Xml.Linq" />
-        <Reference Include="Microsoft.CSharp" />
-        <Reference Include="System.Data" />
-        <Reference Include="System.Net.Http" />
-        <Reference Include="System.Xml" />
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv.csproj">
-            <Project>{0d023565-5942-4d79-9098-a1b4b6665a40}</Project>
-            <Name>Emby.XmlTv</Name>
-        </ProjectReference>
-    </ItemGroup>
-    <PropertyGroup>
-        <TargetFramework>netcoreapp2.1</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv.csproj">
+      <Project>{0d023565-5942-4d79-9098-a1b4b6665a40}</Project>
+      <Name>Emby.XmlTv</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
 </Project>
diff --git a/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj b/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj
index 74ad859ff1..d7c4ad0b72 100644
--- a/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj
+++ b/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj
@@ -1,124 +1,124 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build"
-    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{C8298223-2468-466C-9B06-FBF61926CECB}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Emby.XmlTv.Test</RootNamespace>
+    <AssemblyName>Emby.XmlTv.Test</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
+          <Private>False</Private>
+        </Reference>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+  <ItemGroup>
+    <Compile Include="XmlTvReaderDateTimeTests.cs" />
+    <Compile Include="XmlTvReaderLanguageTests.cs" />
+    <Compile Include="XmlTvReaderTests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Xml Files\epg.xml" />
+    <Content Include="Xml Files\ES_MultiLanguageData.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Xml Files\honeybee.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Xml Files\MultilanguageData.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Xml Files\UK_Data.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv.csproj">
+      <Project>{0D023565-5942-4D79-9098-A1B4B6665A40}</Project>
+      <Name>Emby.XmlTv</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <ProjectGuid>{C8298223-2468-466C-9B06-FBF61926CECB}</ProjectGuid>
-        <OutputType>Library</OutputType>
-        <AppDesignerFolder>Properties</AppDesignerFolder>
-        <RootNamespace>Emby.XmlTv.Test</RootNamespace>
-        <AssemblyName>Emby.XmlTv.Test</AssemblyName>
-        <FileAlignment>512</FileAlignment>
-        <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-        <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-        <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-        <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-        <IsCodedUITest>False</IsCodedUITest>
-        <TestProjectType>UnitTest</TestProjectType>
-        <TargetFrameworkProfile />
-        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-        <RestorePackages>true</RestorePackages>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <DebugSymbols>true</DebugSymbols>
-        <DebugType>full</DebugType>
-        <Optimize>false</Optimize>
-        <OutputPath>bin\Debug\</OutputPath>
-        <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-        <DebugType>pdbonly</DebugType>
-        <Optimize>true</Optimize>
-        <OutputPath>bin\Release\</OutputPath>
-        <DefineConstants>TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
-    <ItemGroup>
-        <Reference Include="System" />
-        <Reference Include="System.Xml" />
-    </ItemGroup>
-    <Choose>
-        <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
-            <ItemGroup>
-                <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-            </ItemGroup>
-        </When>
-        <Otherwise>
-            <ItemGroup>
-                <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
-                    <Private>False</Private>
-                </Reference>
-            </ItemGroup>
-        </Otherwise>
-    </Choose>
-    <ItemGroup>
-        <Compile Include="XmlTvReaderDateTimeTests.cs" />
-        <Compile Include="XmlTvReaderLanguageTests.cs" />
-        <Compile Include="XmlTvReaderTests.cs" />
-        <Compile Include="Properties\AssemblyInfo.cs" />
-    </ItemGroup>
-    <ItemGroup>
-        <Content Include="Xml Files\epg.xml" />
-        <Content Include="Xml Files\ES_MultiLanguageData.xml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-        <Content Include="Xml Files\honeybee.xml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-        <Content Include="Xml Files\MultilanguageData.xml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-        <Content Include="Xml Files\UK_Data.xml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <SubType>Designer</SubType>
-        </Content>
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv.csproj">
-            <Project>{0D023565-5942-4D79-9098-A1B4B6665A40}</Project>
-            <Name>Emby.XmlTv</Name>
-        </ProjectReference>
-    </ItemGroup>
-    <Choose>
-        <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-            <ItemGroup>
-                <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-                    <Private>False</Private>
-                </Reference>
-                <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-                    <Private>False</Private>
-                </Reference>
-                <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-                    <Private>False</Private>
-                </Reference>
-                <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-                    <Private>False</Private>
-                </Reference>
-            </ItemGroup>
-        </When>
-    </Choose>
-    <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-    <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-    <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-        <PropertyGroup>
-            <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-        </PropertyGroup>
-        <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-    </Target>
-    <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 </Project>
diff --git a/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj b/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj
index d9f43a991e..baa522ee3e 100644
--- a/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj
+++ b/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <Compile Include="..\..\SharedVersion.cs" Link="SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\SharedVersion.cs" Link="SharedVersion.cs" />
+  </ItemGroup>
 
 </Project>
diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj
index 02d8ab7319..f17e06e69e 100644
--- a/Jellyfin.Server/Jellyfin.Server.csproj
+++ b/Jellyfin.Server/Jellyfin.Server.csproj
@@ -1,24 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <AssemblyName>jellyfin</AssemblyName>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp2.1</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <!-- We need C# 7.1 for async main-->
-        <LangVersion>latest</LangVersion>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <EmbeddedResource Include="Resources/Configuration/*" />
-    </ItemGroup>
+  <PropertyGroup>
+    <AssemblyName>jellyfin</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- We need C# 7.1 for async main-->
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources/Configuration/*" />
+  </ItemGroup>
 
   <!-- Code analysers-->
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -41,11 +41,11 @@
     <PackageReference Include="SQLitePCLRaw.provider.sqlite3.netstandard11" Version="1.1.12" />
   </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" />
-        <ProjectReference Include="..\Emby.Drawing.Skia\Emby.Drawing.Skia.csproj" />
-        <ProjectReference Include="..\Emby.IsoMounting\IsoMounter\IsoMounter.csproj" />
-        <ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" />
+    <ProjectReference Include="..\Emby.Drawing.Skia\Emby.Drawing.Skia.csproj" />
+    <ProjectReference Include="..\Emby.IsoMounting\IsoMounter\IsoMounter.csproj" />
+    <ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index 36e66d5441..ba29c656bf 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
 </Project>
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index 4e4eaf32ed..2220d46610 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <Authors>Jellyfin Contributors</Authors>
-        <PackageId>Jellyfin.Common</PackageId>
-        <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl>
-        <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
-    </PropertyGroup>
+  <PropertyGroup>
+    <Authors>Jellyfin Contributors</Authors>
+    <PackageId>Jellyfin.Common</PackageId>
+    <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
 </Project>
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index ce31eb8066..01893f1b55 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -1,24 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <Authors>Jellyfin Contributors</Authors>
-        <PackageId>Jellyfin.Controller</PackageId>
-        <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl>
-        <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
-    </PropertyGroup>
+  <PropertyGroup>
+    <Authors>Jellyfin Contributors</Authors>
+    <PackageId>Jellyfin.Controller</PackageId>
+    <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
 </Project>
diff --git a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
index 96c4749ace..867b82eded 100644
--- a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
+++ b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
 </Project>
diff --git a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
index a6f247813a..c5ed65734a 100644
--- a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
+++ b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\BDInfo\BDInfo.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-        <ProjectReference Include="..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\BDInfo\BDInfo.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    <ProjectReference Include="..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 2ffe473b2f..f17fd7159d 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <Authors>Jellyfin Contributors</Authors>
-        <PackageId>Jellyfin.Model</PackageId>
-        <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl>
-        <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
-    </PropertyGroup>
+  <PropertyGroup>
+    <Authors>Jellyfin Contributors</Authors>
+    <PackageId>Jellyfin.Model</PackageId>
+    <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
+  </PropertyGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
 </Project>
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index e7c090631b..e6ef889c3e 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-        <ProjectReference Include="..\DvdLib\DvdLib.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    <ProjectReference Include="..\DvdLib\DvdLib.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="PlaylistsNET" Version="1.0.2" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="PlaylistsNET" Version="1.0.2" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
 </Project>
diff --git a/MediaBrowser.Tests/MediaBrowser.Tests.csproj b/MediaBrowser.Tests/MediaBrowser.Tests.csproj
index 5c5f0d82c9..6415d42110 100644
--- a/MediaBrowser.Tests/MediaBrowser.Tests.csproj
+++ b/MediaBrowser.Tests/MediaBrowser.Tests.csproj
@@ -1,135 +1,135 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build"
-    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <ProjectGuid>{E22BFD35-0FCD-4A85-978A-C22DCD73A081}</ProjectGuid>
-        <OutputType>Library</OutputType>
-        <AppDesignerFolder>Properties</AppDesignerFolder>
-        <RootNamespace>MediaBrowser.Tests</RootNamespace>
-        <AssemblyName>MediaBrowser.Tests</AssemblyName>
-        <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-        <FileAlignment>512</FileAlignment>
-        <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-        <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-        <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-        <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-        <IsCodedUITest>False</IsCodedUITest>
-        <TestProjectType>UnitTest</TestProjectType>
-        <TargetFrameworkProfile />
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <DebugSymbols>true</DebugSymbols>
-        <DebugType>full</DebugType>
-        <Optimize>false</Optimize>
-        <OutputPath>bin\Debug\</OutputPath>
-        <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-        <DocumentationFile>bin\Debug\MediaBrowser.Tests.XML</DocumentationFile>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-        <DebugType>none</DebugType>
-        <Optimize>true</Optimize>
-        <OutputPath>bin\Release\</OutputPath>
-        <DefineConstants>TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
-    <ItemGroup>
-        <Reference Include="Emby.Server.MediaEncoding">
-            <HintPath>..\ThirdParty\emby\Emby.Server.MediaEncoding.dll</HintPath>
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{E22BFD35-0FCD-4A85-978A-C22DCD73A081}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MediaBrowser.Tests</RootNamespace>
+    <AssemblyName>MediaBrowser.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Debug\MediaBrowser.Tests.XML</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Emby.Server.MediaEncoding">
+      <HintPath>..\ThirdParty\emby\Emby.Server.MediaEncoding.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.XML" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+  <ItemGroup>
+    <Compile Include="ConsistencyTests\StringUsageReporter.cs" />
+    <Compile Include="ConsistencyTests\TextIndexing\IndexBuilder.cs" />
+    <Compile Include="ConsistencyTests\TextIndexing\WordIndex.cs" />
+    <Compile Include="ConsistencyTests\TextIndexing\WordOccurrence.cs" />
+    <Compile Include="ConsistencyTests\TextIndexing\WordOccurrences.cs" />
+    <Compile Include="M3uParserTest.cs" />
+    <Compile Include="MediaEncoding\Subtitles\AssParserTests.cs" />
+    <Compile Include="MediaEncoding\Subtitles\SrtParserTests.cs" />
+    <Compile Include="MediaEncoding\Subtitles\VttWriterTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj">
+      <Project>{e383961b-9356-4d5d-8233-9a1079d03055}</Project>
+      <Name>Emby.Server.Implementations</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
+      <Project>{9142eefa-7570-41e1-bfcc-468bb571af2f}</Project>
+      <Name>MediaBrowser.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj">
+      <Project>{17e1f4e6-8abd-4fe5-9ecf-43d4b6087ba2}</Project>
+      <Name>MediaBrowser.Controller</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
+      <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
+      <Name>MediaBrowser.Model</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.Providers\MediaBrowser.Providers.csproj">
+      <Project>{442B5058-DCAF-4263-BB6A-F21E31120A1B}</Project>
+      <Name>MediaBrowser.Providers</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.XbmcMetadata\MediaBrowser.XbmcMetadata.csproj">
+      <Project>{23499896-b135-4527-8574-c26e926ea99e}</Project>
+      <Name>MediaBrowser.XbmcMetadata</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="MediaEncoding\Subtitles\TestSubtitles\data.ass" />
+    <None Include="MediaEncoding\Subtitles\TestSubtitles\data2.ass" />
+    <None Include="MediaEncoding\Subtitles\TestSubtitles\expected.vtt" />
+    <None Include="MediaEncoding\Subtitles\TestSubtitles\unit.srt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ContentWithTargetPath Include="ConsistencyTests\Resources\StringCheck.xslt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <TargetPath>StringCheck.xslt</TargetPath>
+    </ContentWithTargetPath>
+    <None Include="ConsistencyTests\Resources\SampleTransformed.htm" />
+    <None Include="ConsistencyTests\Resources\StringCheckSample.xml" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
         </Reference>
-        <Reference Include="System" />
-        <Reference Include="System.XML" />
-    </ItemGroup>
-    <Choose>
-        <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
-            <ItemGroup>
-                <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-            </ItemGroup>
-        </When>
-        <Otherwise>
-            <ItemGroup>
-                <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
-            </ItemGroup>
-        </Otherwise>
-    </Choose>
-    <ItemGroup>
-        <Compile Include="ConsistencyTests\StringUsageReporter.cs" />
-        <Compile Include="ConsistencyTests\TextIndexing\IndexBuilder.cs" />
-        <Compile Include="ConsistencyTests\TextIndexing\WordIndex.cs" />
-        <Compile Include="ConsistencyTests\TextIndexing\WordOccurrence.cs" />
-        <Compile Include="ConsistencyTests\TextIndexing\WordOccurrences.cs" />
-        <Compile Include="M3uParserTest.cs" />
-        <Compile Include="MediaEncoding\Subtitles\AssParserTests.cs" />
-        <Compile Include="MediaEncoding\Subtitles\SrtParserTests.cs" />
-        <Compile Include="MediaEncoding\Subtitles\VttWriterTest.cs" />
-        <Compile Include="Properties\AssemblyInfo.cs" />
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj">
-            <Project>{e383961b-9356-4d5d-8233-9a1079d03055}</Project>
-            <Name>Emby.Server.Implementations</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
-            <Project>{9142eefa-7570-41e1-bfcc-468bb571af2f}</Project>
-            <Name>MediaBrowser.Common</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj">
-            <Project>{17e1f4e6-8abd-4fe5-9ecf-43d4b6087ba2}</Project>
-            <Name>MediaBrowser.Controller</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
-            <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
-            <Name>MediaBrowser.Model</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\MediaBrowser.Providers\MediaBrowser.Providers.csproj">
-            <Project>{442B5058-DCAF-4263-BB6A-F21E31120A1B}</Project>
-            <Name>MediaBrowser.Providers</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\MediaBrowser.XbmcMetadata\MediaBrowser.XbmcMetadata.csproj">
-            <Project>{23499896-b135-4527-8574-c26e926ea99e}</Project>
-            <Name>MediaBrowser.XbmcMetadata</Name>
-        </ProjectReference>
-    </ItemGroup>
-    <ItemGroup>
-        <None Include="app.config" />
-        <None Include="MediaEncoding\Subtitles\TestSubtitles\data.ass" />
-        <None Include="MediaEncoding\Subtitles\TestSubtitles\data2.ass" />
-        <None Include="MediaEncoding\Subtitles\TestSubtitles\expected.vtt" />
-        <None Include="MediaEncoding\Subtitles\TestSubtitles\unit.srt" />
-    </ItemGroup>
-    <ItemGroup>
-        <ContentWithTargetPath Include="ConsistencyTests\Resources\StringCheck.xslt">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-            <TargetPath>StringCheck.xslt</TargetPath>
-        </ContentWithTargetPath>
-        <None Include="ConsistencyTests\Resources\SampleTransformed.htm" />
-        <None Include="ConsistencyTests\Resources\StringCheckSample.xml" />
-    </ItemGroup>
-    <Choose>
-        <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-            <ItemGroup>
-                <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-                    <Private>False</Private>
-                </Reference>
-                <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-                    <Private>False</Private>
-                </Reference>
-                <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-                    <Private>False</Private>
-                </Reference>
-                <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-                    <Private>False</Private>
-                </Reference>
-            </ItemGroup>
-        </When>
-    </Choose>
-    <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-    <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 8b8136e1ea..c099e77d65 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <None Include="jellyfin-web\src\**\*.*">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
+  <ItemGroup>
+    <None Include="jellyfin-web\src\**\*.*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
 </Project>
diff --git a/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj b/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj
index 36e66d5441..ba29c656bf 100644
--- a/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj
+++ b/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
 </Project>
diff --git a/MediaBrowser.sln.GhostDoc.xml b/MediaBrowser.sln.GhostDoc.xml
index 256c41e6c5..eafee0bf55 100644
--- a/MediaBrowser.sln.GhostDoc.xml
+++ b/MediaBrowser.sln.GhostDoc.xml
@@ -1,35 +1,35 @@
 <GhostDoc>
-    <SpellChecker>
-        <IncludeExtensions>
-        </IncludeExtensions>
-        <IgnoreExtensions>
-        </IgnoreExtensions>
-        <IgnoreFiles>
-        </IgnoreFiles>
-    </SpellChecker>
-    <HelpConfigurations selected="HelpFile">
-        <HelpConfiguration name="HelpFile">
-            <OutputPath>D:\Development\MediaBrowser\Help</OutputPath>
-            <ImageFolderPath />
-            <HtmlFormats>
-                <HtmlHelp>true</HtmlHelp>
-                <MSHelpViewer>false</MSHelpViewer>
-                <MSHelp2>false</MSHelp2>
-                <Website>false</Website>
-            </HtmlFormats>
-            <IncludeScopes>
-                <Public>true</Public>
-                <Internal>false</Internal>
-                <Protected>false</Protected>
-                <Private>false</Private>
-                <Inherited>true</Inherited>
-                <EnableTags>false</EnableTags>
-                <TagList />
-            </IncludeScopes>
-            <ResolveCrefLinks>true</ResolveCrefLinks>
-            <HeaderText />
-            <FooterText />
-            <SelectedProjects />
-        </HelpConfiguration>
-    </HelpConfigurations>
+  <SpellChecker>
+    <IncludeExtensions>
+    </IncludeExtensions>
+    <IgnoreExtensions>
+    </IgnoreExtensions>
+    <IgnoreFiles>
+    </IgnoreFiles>
+  </SpellChecker>
+  <HelpConfigurations selected="HelpFile">
+    <HelpConfiguration name="HelpFile">
+      <OutputPath>D:\Development\MediaBrowser\Help</OutputPath>
+      <ImageFolderPath />
+      <HtmlFormats>
+        <HtmlHelp>true</HtmlHelp>
+        <MSHelpViewer>false</MSHelpViewer>
+        <MSHelp2>false</MSHelp2>
+        <Website>false</Website>
+      </HtmlFormats>
+      <IncludeScopes>
+        <Public>true</Public>
+        <Internal>false</Internal>
+        <Protected>false</Protected>
+        <Private>false</Private>
+        <Inherited>true</Inherited>
+        <EnableTags>false</EnableTags>
+        <TagList />
+      </IncludeScopes>
+      <ResolveCrefLinks>true</ResolveCrefLinks>
+      <HeaderText />
+      <FooterText />
+      <SelectedProjects />
+    </HelpConfiguration>
+  </HelpConfigurations>
 </GhostDoc>
diff --git a/OpenSubtitlesHandler/OpenSubtitlesHandler.csproj b/OpenSubtitlesHandler/OpenSubtitlesHandler.csproj
index 7ce28f2284..eabd3e070c 100644
--- a/OpenSubtitlesHandler/OpenSubtitlesHandler.csproj
+++ b/OpenSubtitlesHandler/OpenSubtitlesHandler.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
 </Project>
diff --git a/SocketHttpListener/SocketHttpListener.csproj b/SocketHttpListener/SocketHttpListener.csproj
index 2e08c15a77..e700540a91 100644
--- a/SocketHttpListener/SocketHttpListener.csproj
+++ b/SocketHttpListener/SocketHttpListener.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <ItemGroup>
-        <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-        <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <Compile Include="..\SharedVersion.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 
 </Project>
diff --git a/deployment/fedora-package-x64/pkg-src/jellyfin-firewalld.xml b/deployment/fedora-package-x64/pkg-src/jellyfin-firewalld.xml
index 062db370da..538c5d65f8 100644
--- a/deployment/fedora-package-x64/pkg-src/jellyfin-firewalld.xml
+++ b/deployment/fedora-package-x64/pkg-src/jellyfin-firewalld.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <service>
-    <short>Jellyfin</short>
-    <description>The Free Software Media System.</description>
-    <port protocol="tcp" port="8096"/>
-    <port protocol="tcp" port="8920"/>
-    <port protocol="udp" port="1900"/>
-    <port protocol="udp" port="7359"/>
-</service>
\ No newline at end of file
+  <short>Jellyfin</short>
+  <description>The Free Software Media System.</description>
+  <port protocol="tcp" port="8096"/>
+  <port protocol="tcp" port="8920"/>
+  <port protocol="udp" port="1900"/>
+  <port protocol="udp" port="7359"/>
+</service>
diff --git a/deployment/unraid/docker-templates/jellyfin.xml b/deployment/unraid/docker-templates/jellyfin.xml
index be11884248..1d97a9f00f 100644
--- a/deployment/unraid/docker-templates/jellyfin.xml
+++ b/deployment/unraid/docker-templates/jellyfin.xml
@@ -23,7 +23,7 @@
   <Project>https://jellyfin.media/</Project>
   <BindTime>true</BindTime>
   <Privileged>false</Privileged>
-    <Networking>
+  <Networking>
     <Mode>host</Mode>
     <Publish>
       <Port>
@@ -32,7 +32,7 @@
         <Protocol>tcp</Protocol>
       </Port>
     </Publish>
-    </Networking>
+  </Networking>
   <Data>
     <Volume>
       <HostDir>/mnt/cache/appdata/config</HostDir>
-- 
cgit v1.2.3