From 39ef1106d7ed9cef1ec6fcb0703ce7550080ee45 Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Sun, 13 Jan 2019 20:22:00 +0100
Subject: Visual Studio Reformat: Emby.Server.Implementations Part Liv-P

---
 .../Localization/LocalizationManager.cs                    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/Emby.Server.Implementations/Localization/LocalizationManager.cs b/Emby.Server.Implementations/Localization/LocalizationManager.cs
index a2c47cd79..998595ecd 100644
--- a/Emby.Server.Implementations/Localization/LocalizationManager.cs
+++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs
@@ -1,17 +1,17 @@
-using MediaBrowser.Model.Extensions;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Reflection;
+using MediaBrowser.Model.Serialization;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.Localization
 {
@@ -138,7 +138,7 @@ namespace Emby.Server.Implementations.Localization
                 new ParentalRating("FSK-18", 9)
             });
 
-            LoadRatings("ru", new [] {
+            LoadRatings("ru", new[] {
 
                 new ParentalRating("RU-0+", 1),
                 new ParentalRating("RU-6+", 3),
-- 
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 'Emby.Server.Implementations/Localization')

diff --git a/BDInfo/BDInfo.csproj b/BDInfo/BDInfo.csproj
index b64f5e7a7..5246e09cb 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 68326d560..65490065d 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 b64f5e7a7..5246e09cb 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 f48816453..b2ac9c2df 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 9b862fec3..95e057fa9 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 599726c51..a0de799d0 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 e640e86bf..f7927014a 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 615774adf..11b00f037 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 21dccf531..22a9e90c6 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 ac081bba3..94c89a2c2 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 2bbdecde8..1a4786577 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 955c30e85..ab5db7078 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 0da0e0926..6a5abfb0e 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 775d40b74..da65c9e01 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 1362d8c38..6d9661201 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 dac2fdea4..e38987e89 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 0cb0c52c2..d4649d9e8 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 602c54f61..2cd475466 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 701aba85f..73b999891 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 5f9012678..86c721629 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 765d5d5fe..3afc5bdb8 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 d84531758..1e9362ca3 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 8e376fbf9..b9e820689 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 92a04dc7a..45319e162 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 953ac0a43..ca32b3492 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 34afe7e6e..27e54a245 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 d1afc162c..2039f123e 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 090abe417..d4d804dfe 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 db4ce4722..147d133f4 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 40e05f7fc..41ccd49b9 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 19dc10e83..57c065e23 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 7d6643d54..b01bb8b08 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 5ffaaed27..3e19ddfe5 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 9274f9763..f9ec57ddf 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 360ffaabe..7b40f905b 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 5b5ae445e..58bb07ebd 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 3ecab9176..7a560f256 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 da3a4da07..dab328485 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 857f66c64..ec2c3f237 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 b768e03c6..ba6c98555 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 9a6a8e0c4..a818b78de 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 51fb132a4..e066051a8 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 c7c2a796e..30581c389 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 c5873450c..98cb07663 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 81903db8f..ba687a089 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 b16afea5b..20d397a1a 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 b90e8b593..69c8bf03c 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 ae74d6f7e..aaaf09788 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 4fa29a398..2ba9c8c7a 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 ad6a32a0e..38a282382 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 08a5f185d..1d7bc5fe8 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 737fde076..22cd4cf6d 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 c374ec3ed..085e22cf7 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 4d53418b9..537fe35d5 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 67abf1d18..6fff9d0ab 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 e0add87bf..3232a4ff7 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 ad3164588..3a0119faf 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 ed980ac7a..58b7bb61a 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 970a5d460..45b8617f1 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 ec7785619..04fc52d6e 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 bd362c493..653565db6 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 ae74d6f7e..aaaf09788 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 779b508c4..ed63aa29c 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 67529ccd9..7b8c8765e 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 82ee1becd..5aefa740b 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 84c29174b..9ae25d3ac 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 0d3acc9c1..59c25f0e3 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 97216f276..338141294 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 ddf690a55..ed0c68952 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 cd2076c64..8fe279836 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 f5f52f658..517d648bb 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 b04d61c65..9e86e2125 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 fcf260e28..6d877ec17 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 dc6332b03..cad5700fd 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 62f00fb87..e5edaf62c 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 5a110648c..fb8d7a27f 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 a694a0be6..9684fa052 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 b9a085e01..5364ae1f2 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 32a1e6438..887d91ba6 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 2bb205b0d..f586a3fa9 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 283f07767..e42be5cd4 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 2e1da30d8..a8fc2d143 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 b31e12d96..4441c5650 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 93b609c3d..785a8ba22 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 f69cc2bcc..8c005092e 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 46e4067ba..bba99b764 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 3fdaed9cc..4089b282f 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 20440921f..6c8005b3f 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 eebd828c7..34c897fe3 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 2639aa274..581e9f835 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 a7e7cfc20..05a17f594 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 6ce4cff2c..cf6fe76de 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 7ffb30b93..64fa8f090 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 41dd9dd97..a43c92318 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 98c578e83..ea7ca84fa 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 5ffaaed27..3e19ddfe5 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 af5536b36..51e7568af 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 5898d8f98..fa76d2555 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 b5eb9c2ee..b5a2610e1 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 d93394957..28de11e40 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 4aacc4a49..48b62fd81 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 a318cf38a..c7717915d 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 62bcad000..666ae94fb 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 c5367ba75..db7c102e0 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 5ffaaed27..3e19ddfe5 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 73f7a08ba..256c41e6c 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 5d7ae0d49..3e5bc0290 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 ba8bcbc23..2f7adbbd0 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 42b4fdab3..01943cc30 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 8c84444a9..fe90f2462 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 ca9056a6a..680776103 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 5d98484cd..f32b2089e 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 000000000..7882b3821
--- /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 e566d9a23163c297bdddddcbffb438c2b951d840 Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Sun, 13 Jan 2019 20:54:44 +0100
Subject: Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv

---
 BDInfo/BDInfoSettings.cs                                                | 2 +-
 BDInfo/BDROM.cs                                                         | 2 +-
 BDInfo/LanguageCodes.cs                                                 | 2 +-
 BDInfo/TSCodecAC3.cs                                                    | 2 +-
 BDInfo/TSCodecAVC.cs                                                    | 2 +-
 BDInfo/TSCodecDTS.cs                                                    | 2 +-
 BDInfo/TSCodecDTSHD.cs                                                  | 2 +-
 BDInfo/TSCodecLPCM.cs                                                   | 2 +-
 BDInfo/TSCodecMPEG2.cs                                                  | 2 +-
 BDInfo/TSCodecMVC.cs                                                    | 2 +-
 BDInfo/TSCodecTrueHD.cs                                                 | 2 +-
 BDInfo/TSCodecVC1.cs                                                    | 2 +-
 BDInfo/TSInterleavedFile.cs                                             | 2 +-
 BDInfo/TSPlaylistFile.cs                                                | 2 +-
 BDInfo/TSStream.cs                                                      | 2 +-
 BDInfo/TSStreamBuffer.cs                                                | 2 +-
 BDInfo/TSStreamClip.cs                                                  | 2 +-
 BDInfo/TSStreamClipFile.cs                                              | 2 +-
 BDInfo/TSStreamFile.cs                                                  | 2 +-
 DvdLib/BigEndianBinaryReader.cs                                         | 2 +-
 DvdLib/Ifo/AudioAttributes.cs                                           | 2 +-
 DvdLib/Ifo/Cell.cs                                                      | 2 +-
 DvdLib/Ifo/CellPlaybackInfo.cs                                          | 2 +-
 DvdLib/Ifo/CellPositionInfo.cs                                          | 2 +-
 DvdLib/Ifo/Dvd.cs                                                       | 2 +-
 DvdLib/Ifo/PgcCommandTable.cs                                           | 2 +-
 DvdLib/Ifo/Program.cs                                                   | 2 +-
 DvdLib/Ifo/ProgramChain.cs                                              | 2 +-
 DvdLib/Ifo/Title.cs                                                     | 2 +-
 DvdLib/Ifo/UserOperation.cs                                             | 2 +-
 DvdLib/Ifo/VideoAttributes.cs                                           | 2 +-
 Emby.Dlna/Api/DlnaServerService.cs                                      | 2 +-
 Emby.Dlna/Api/DlnaService.cs                                            | 2 +-
 Emby.Dlna/Common/Argument.cs                                            | 2 +-
 Emby.Dlna/Common/DeviceIcon.cs                                          | 2 +-
 Emby.Dlna/Common/DeviceService.cs                                       | 2 +-
 Emby.Dlna/Common/ServiceAction.cs                                       | 2 +-
 Emby.Dlna/Common/StateVariable.cs                                       | 2 +-
 Emby.Dlna/Configuration/DlnaOptions.cs                                  | 2 +-
 Emby.Dlna/ConfigurationExtension.cs                                     | 2 +-
 Emby.Dlna/ConnectionManager/ConnectionManager.cs                        | 2 +-
 Emby.Dlna/ConnectionManager/ControlHandler.cs                           | 2 +-
 Emby.Dlna/ContentDirectory/ContentDirectory.cs                          | 2 +-
 Emby.Dlna/ContentDirectory/ControlHandler.cs                            | 2 +-
 Emby.Dlna/ControlRequest.cs                                             | 2 +-
 Emby.Dlna/ControlResponse.cs                                            | 2 +-
 Emby.Dlna/Didl/DidlBuilder.cs                                           | 2 +-
 Emby.Dlna/Didl/Filter.cs                                                | 2 +-
 Emby.Dlna/Didl/StringWriterWithEncoding.cs                              | 2 +-
 Emby.Dlna/DlnaManager.cs                                                | 2 +-
 Emby.Dlna/EventSubscriptionResponse.cs                                  | 2 +-
 Emby.Dlna/Eventing/EventManager.cs                                      | 2 +-
 Emby.Dlna/Eventing/EventSubscription.cs                                 | 2 +-
 Emby.Dlna/IConnectionManager.cs                                         | 2 +-
 Emby.Dlna/IContentDirectory.cs                                          | 2 +-
 Emby.Dlna/IEventManager.cs                                              | 2 +-
 Emby.Dlna/IMediaReceiverRegistrar.cs                                    | 2 +-
 Emby.Dlna/IUpnpService.cs                                               | 2 +-
 Emby.Dlna/Main/DlnaEntryPoint.cs                                        | 2 +-
 Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs              | 2 +-
 Emby.Dlna/PlayTo/CurrentIdEventArgs.cs                                  | 2 +-
 Emby.Dlna/PlayTo/Device.cs                                              | 2 +-
 Emby.Dlna/PlayTo/DeviceInfo.cs                                          | 2 +-
 Emby.Dlna/PlayTo/PlayToController.cs                                    | 2 +-
 Emby.Dlna/PlayTo/PlayToManager.cs                                       | 2 +-
 Emby.Dlna/PlayTo/PlaybackProgressEventArgs.cs                           | 2 +-
 Emby.Dlna/PlayTo/PlaybackStartEventArgs.cs                              | 2 +-
 Emby.Dlna/PlayTo/PlaybackStoppedEventArgs.cs                            | 2 +-
 Emby.Dlna/PlayTo/PlaylistItem.cs                                        | 2 +-
 Emby.Dlna/PlayTo/TRANSPORTSTATE.cs                                      | 2 +-
 Emby.Dlna/PlayTo/TransportCommands.cs                                   | 2 +-
 Emby.Dlna/PlayTo/TransportStateEventArgs.cs                             | 2 +-
 Emby.Dlna/PlayTo/UpnpContainer.cs                                       | 2 +-
 Emby.Dlna/PlayTo/uBaseObject.cs                                         | 2 +-
 Emby.Dlna/PlayTo/uParser.cs                                             | 2 +-
 Emby.Dlna/PlayTo/uParserObject.cs                                       | 2 +-
 Emby.Dlna/PlayTo/uPnpNamespaces.cs                                      | 2 +-
 Emby.Dlna/Profiles/DefaultProfile.cs                                    | 2 +-
 Emby.Dlna/Profiles/DenonAvrProfile.cs                                   | 2 +-
 Emby.Dlna/Profiles/DirectTvProfile.cs                                   | 2 +-
 Emby.Dlna/Profiles/DishHopperJoeyProfile.cs                             | 2 +-
 Emby.Dlna/Profiles/Foobar2000Profile.cs                                 | 2 +-
 Emby.Dlna/Profiles/LgTvProfile.cs                                       | 2 +-
 Emby.Dlna/Profiles/LinksysDMA2100Profile.cs                             | 2 +-
 Emby.Dlna/Profiles/MarantzProfile.cs                                    | 2 +-
 Emby.Dlna/Profiles/MediaMonkeyProfile.cs                                | 2 +-
 Emby.Dlna/Profiles/PanasonicVieraProfile.cs                             | 2 +-
 Emby.Dlna/Profiles/PopcornHourProfile.cs                                | 2 +-
 Emby.Dlna/Profiles/SamsungSmartTvProfile.cs                             | 2 +-
 Emby.Dlna/Profiles/SharpSmartTvProfile.cs                               | 2 +-
 Emby.Dlna/Profiles/SonyBlurayPlayer2013.cs                              | 2 +-
 Emby.Dlna/Profiles/SonyBlurayPlayer2014.cs                              | 2 +-
 Emby.Dlna/Profiles/SonyBlurayPlayer2015.cs                              | 2 +-
 Emby.Dlna/Profiles/SonyBlurayPlayer2016.cs                              | 2 +-
 Emby.Dlna/Profiles/SonyBlurayPlayerProfile.cs                           | 2 +-
 Emby.Dlna/Profiles/SonyBravia2010Profile.cs                             | 2 +-
 Emby.Dlna/Profiles/SonyBravia2011Profile.cs                             | 2 +-
 Emby.Dlna/Profiles/SonyBravia2012Profile.cs                             | 2 +-
 Emby.Dlna/Profiles/SonyBravia2013Profile.cs                             | 2 +-
 Emby.Dlna/Profiles/SonyBravia2014Profile.cs                             | 2 +-
 Emby.Dlna/Profiles/SonyPs3Profile.cs                                    | 2 +-
 Emby.Dlna/Profiles/SonyPs4Profile.cs                                    | 2 +-
 Emby.Dlna/Profiles/WdtvLiveProfile.cs                                   | 2 +-
 Emby.Dlna/Profiles/XboxOneProfile.cs                                    | 2 +-
 Emby.Dlna/Service/BaseControlHandler.cs                                 | 2 +-
 Emby.Dlna/Service/BaseService.cs                                        | 2 +-
 Emby.Dlna/Service/ControlErrorHandler.cs                                | 2 +-
 Emby.Dlna/Ssdp/DeviceDiscovery.cs                                       | 2 +-
 Emby.Dlna/Ssdp/Extensions.cs                                            | 2 +-
 Emby.Drawing.Skia/PercentPlayedDrawer.cs                                | 2 +-
 Emby.Drawing.Skia/PlayedIndicatorDrawer.cs                              | 2 +-
 Emby.Drawing.Skia/SkiaEncoder.cs                                        | 2 +-
 Emby.Drawing.Skia/UnplayedCountIndicator.cs                             | 2 +-
 Emby.Drawing/Common/ImageHeader.cs                                      | 2 +-
 Emby.Drawing/ImageProcessor.cs                                          | 2 +-
 Emby.Drawing/NullImageEncoder.cs                                        | 2 +-
 Emby.IsoMounting/IsoMounter/Configuration/PluginConfiguration.cs        | 2 +-
 Emby.IsoMounting/IsoMounter/Plugin.cs                                   | 2 +-
 Emby.Naming/Audio/AlbumParser.cs                                        | 2 +-
 Emby.Naming/Audio/AudioFileParser.cs                                    | 2 +-
 Emby.Naming/Audio/MultiPartResult.cs                                    | 2 +-
 Emby.Naming/AudioBook/AudioBookFileInfo.cs                              | 2 +-
 Emby.Naming/AudioBook/AudioBookFilePathParser.cs                        | 2 +-
 Emby.Naming/AudioBook/AudioBookFilePathParserResult.cs                  | 2 +-
 Emby.Naming/AudioBook/AudioBookInfo.cs                                  | 2 +-
 Emby.Naming/AudioBook/AudioBookListResolver.cs                          | 2 +-
 Emby.Naming/AudioBook/AudioBookResolver.cs                              | 2 +-
 Emby.Naming/Common/EpisodeExpression.cs                                 | 2 +-
 Emby.Naming/Common/MediaType.cs                                         | 2 +-
 Emby.Naming/Common/NamingOptions.cs                                     | 2 +-
 Emby.Naming/Extensions/StringExtensions.cs                              | 2 +-
 Emby.Naming/StringExtensions.cs                                         | 2 +-
 Emby.Naming/Subtitles/SubtitleInfo.cs                                   | 2 +-
 Emby.Naming/Subtitles/SubtitleParser.cs                                 | 2 +-
 Emby.Naming/TV/EpisodeInfo.cs                                           | 2 +-
 Emby.Naming/TV/EpisodePathParserResult.cs                               | 2 +-
 Emby.Naming/TV/EpisodeResolver.cs                                       | 2 +-
 Emby.Naming/TV/SeasonPathParser.cs                                      | 2 +-
 Emby.Naming/TV/SeasonPathParserResult.cs                                | 2 +-
 Emby.Naming/Video/CleanDateTimeResult.cs                                | 2 +-
 Emby.Naming/Video/CleanStringResult.cs                                  | 2 +-
 Emby.Naming/Video/ExtraResolver.cs                                      | 2 +-
 Emby.Naming/Video/ExtraResult.cs                                        | 2 +-
 Emby.Naming/Video/ExtraRule.cs                                          | 2 +-
 Emby.Naming/Video/ExtraRuleType.cs                                      | 2 +-
 Emby.Naming/Video/FileStack.cs                                          | 2 +-
 Emby.Naming/Video/FlagParser.cs                                         | 2 +-
 Emby.Naming/Video/Format3DResult.cs                                     | 2 +-
 Emby.Naming/Video/Format3DRule.cs                                       | 2 +-
 Emby.Naming/Video/StackResolver.cs                                      | 2 +-
 Emby.Naming/Video/StackResult.cs                                        | 2 +-
 Emby.Naming/Video/StubResolver.cs                                       | 2 +-
 Emby.Naming/Video/StubResult.cs                                         | 2 +-
 Emby.Naming/Video/StubTypeRule.cs                                       | 2 +-
 Emby.Naming/Video/VideoFileInfo.cs                                      | 2 +-
 Emby.Naming/Video/VideoInfo.cs                                          | 2 +-
 Emby.Naming/Video/VideoResolver.cs                                      | 2 +-
 Emby.Notifications/Api/NotificationsService.cs                          | 2 +-
 Emby.Notifications/CoreNotificationTypes.cs                             | 2 +-
 Emby.Notifications/NotificationConfigurationFactory.cs                  | 2 +-
 Emby.Notifications/NotificationManager.cs                               | 2 +-
 Emby.Notifications/Notifications.cs                                     | 2 +-
 Emby.Photos/PhotoProvider.cs                                            | 2 +-
 Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs           | 2 +-
 Emby.Server.Implementations/Activity/ActivityManager.cs                 | 2 +-
 Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs             | 2 +-
 Emby.Server.Implementations/Archiving/ZipClient.cs                      | 2 +-
 Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs    | 2 +-
 Emby.Server.Implementations/Browser/BrowserLauncher.cs                  | 2 +-
 .../Channels/ChannelDynamicMediaSourceProvider.cs                       | 2 +-
 Emby.Server.Implementations/Channels/ChannelImageProvider.cs            | 2 +-
 Emby.Server.Implementations/Channels/ChannelPostScanTask.cs             | 2 +-
 Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs    | 2 +-
 Emby.Server.Implementations/Collections/CollectionImageProvider.cs      | 2 +-
 Emby.Server.Implementations/Collections/CollectionManager.cs            | 2 +-
 Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs | 2 +-
 Emby.Server.Implementations/Cryptography/CryptographyProvider.cs        | 2 +-
 Emby.Server.Implementations/Data/BaseSqliteRepository.cs                | 2 +-
 Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs          | 2 +-
 Emby.Server.Implementations/Data/ManagedConnection.cs                   | 2 +-
 Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs  | 2 +-
 Emby.Server.Implementations/Data/SqliteExtensions.cs                    | 2 +-
 Emby.Server.Implementations/Data/SqliteUserRepository.cs                | 2 +-
 Emby.Server.Implementations/Data/TypeMapper.cs                          | 2 +-
 Emby.Server.Implementations/Diagnostics/CommonProcess.cs                | 2 +-
 Emby.Server.Implementations/Diagnostics/ProcessFactory.cs               | 2 +-
 Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs   | 2 +-
 Emby.Server.Implementations/EntryPoints/RefreshUsersMetadata.cs         | 2 +-
 Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs          | 2 +-
 Emby.Server.Implementations/EntryPoints/StartupWizard.cs                | 2 +-
 Emby.Server.Implementations/EntryPoints/SystemEvents.cs                 | 2 +-
 Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs          | 2 +-
 Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs       | 2 +-
 Emby.Server.Implementations/EnvironmentInfo/EnvironmentInfo.cs          | 2 +-
 Emby.Server.Implementations/FFMpeg/FFMpegInfo.cs                        | 2 +-
 Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs                 | 2 +-
 Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs                      | 2 +-
 Emby.Server.Implementations/HttpClientManager/HttpClientInfo.cs         | 2 +-
 Emby.Server.Implementations/HttpServer/FileWriter.cs                    | 2 +-
 Emby.Server.Implementations/HttpServer/IHttpListener.cs                 | 2 +-
 Emby.Server.Implementations/HttpServer/LoggerUtils.cs                   | 2 +-
 Emby.Server.Implementations/HttpServer/ResponseFilter.cs                | 2 +-
 Emby.Server.Implementations/HttpServer/Security/SessionContext.cs       | 2 +-
 Emby.Server.Implementations/HttpServer/StreamWriter.cs                  | 2 +-
 Emby.Server.Implementations/HttpServer/WebSocketConnection.cs           | 2 +-
 Emby.Server.Implementations/IO/ExtendedFileSystemInfo.cs                | 2 +-
 Emby.Server.Implementations/IO/FileRefresher.cs                         | 2 +-
 Emby.Server.Implementations/IO/IsoManager.cs                            | 2 +-
 Emby.Server.Implementations/IO/LibraryMonitor.cs                        | 2 +-
 Emby.Server.Implementations/IO/MbLinkShortcutHandler.cs                 | 2 +-
 Emby.Server.Implementations/IO/StreamHelper.cs                          | 2 +-
 Emby.Server.Implementations/IO/ThrottledStream.cs                       | 2 +-
 Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs          | 2 +-
 Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs         | 2 +-
 Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs    | 2 +-
 Emby.Server.Implementations/Library/ExclusiveLiveStream.cs              | 2 +-
 Emby.Server.Implementations/Library/LiveStreamHelper.cs                 | 2 +-
 Emby.Server.Implementations/Library/MediaStreamSelector.cs              | 2 +-
 Emby.Server.Implementations/Library/MusicManager.cs                     | 2 +-
 Emby.Server.Implementations/Library/PathExtensions.cs                   | 2 +-
 Emby.Server.Implementations/Library/ResolverHelper.cs                   | 2 +-
 .../Library/Resolvers/Audio/MusicAlbumResolver.cs                       | 2 +-
 .../Library/Resolvers/Audio/MusicArtistResolver.cs                      | 2 +-
 Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs      | 2 +-
 Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs     | 2 +-
 Emby.Server.Implementations/Library/Resolvers/FolderResolver.cs         | 2 +-
 Emby.Server.Implementations/Library/Resolvers/ItemResolver.cs           | 2 +-
 Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs     | 2 +-
 Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs          | 2 +-
 Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs       | 2 +-
 Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs  | 2 +-
 Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs     | 2 +-
 Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs          | 2 +-
 Emby.Server.Implementations/Library/UserDataManager.cs                  | 2 +-
 Emby.Server.Implementations/Library/UserViewManager.cs                  | 2 +-
 Emby.Server.Implementations/Library/Validators/ArtistsPostScanTask.cs   | 2 +-
 Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs      | 2 +-
 .../Library/Validators/GameGenresPostScanTask.cs                        | 2 +-
 Emby.Server.Implementations/Library/Validators/GameGenresValidator.cs   | 2 +-
 Emby.Server.Implementations/Library/Validators/GenresPostScanTask.cs    | 2 +-
 Emby.Server.Implementations/Library/Validators/GenresValidator.cs       | 2 +-
 .../Library/Validators/MusicGenresPostScanTask.cs                       | 2 +-
 Emby.Server.Implementations/Library/Validators/MusicGenresValidator.cs  | 2 +-
 Emby.Server.Implementations/Library/Validators/PeopleValidator.cs       | 2 +-
 Emby.Server.Implementations/Library/Validators/StudiosPostScanTask.cs   | 2 +-
 Emby.Server.Implementations/Library/Validators/StudiosValidator.cs      | 2 +-
 Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs             | 2 +-
 Emby.Server.Implementations/LiveTv/EmbyTV/EntryPoint.cs                 | 2 +-
 Emby.Server.Implementations/LiveTv/EmbyTV/IRecorder.cs                  | 2 +-
 Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs           | 2 +-
 Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs            | 2 +-
 Emby.Server.Implementations/LiveTv/EmbyTV/SeriesTimerManager.cs         | 2 +-
 Emby.Server.Implementations/LiveTv/LiveTvConfigurationFactory.cs        | 2 +-
 Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs         | 2 +-
 Emby.Server.Implementations/LiveTv/RefreshChannelsScheduledTask.cs      | 2 +-
 Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs          | 2 +-
 .../LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs                     | 2 +-
 Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs             | 2 +-
 Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs           | 2 +-
 Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs       | 2 +-
 Emby.Server.Implementations/Localization/TextLocalizer.cs               | 2 +-
 Emby.Server.Implementations/Net/IWebSocket.cs                           | 2 +-
 Emby.Server.Implementations/Net/SocketFactory.cs                        | 2 +-
 Emby.Server.Implementations/Net/UdpSocket.cs                            | 2 +-
 Emby.Server.Implementations/Net/WebSocketConnectEventArgs.cs            | 2 +-
 Emby.Server.Implementations/Networking/IPNetwork/BigIntegerExt.cs       | 2 +-
 Emby.Server.Implementations/Networking/IPNetwork/IPAddressCollection.cs | 2 +-
 Emby.Server.Implementations/Networking/IPNetwork/IPNetwork.cs           | 2 +-
 Emby.Server.Implementations/Networking/IPNetwork/IPNetworkCollection.cs | 2 +-
 Emby.Server.Implementations/Playlists/ManualPlaylistsFolder.cs          | 2 +-
 Emby.Server.Implementations/Playlists/PlaylistImageProvider.cs          | 2 +-
 Emby.Server.Implementations/Reflection/AssemblyInfo.cs                  | 2 +-
 Emby.Server.Implementations/ResourceFileManager.cs                      | 2 +-
 Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs         | 2 +-
 Emby.Server.Implementations/ScheduledTasks/DailyTrigger.cs              | 2 +-
 Emby.Server.Implementations/ScheduledTasks/IntervalTrigger.cs           | 2 +-
 Emby.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs   | 2 +-
 Emby.Server.Implementations/ScheduledTasks/StartupTrigger.cs            | 2 +-
 Emby.Server.Implementations/ScheduledTasks/SystemEventTrigger.cs        | 2 +-
 Emby.Server.Implementations/ScheduledTasks/TaskManager.cs               | 2 +-
 Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs | 2 +-
 Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs   | 2 +-
 Emby.Server.Implementations/ScheduledTasks/WeeklyTrigger.cs             | 2 +-
 Emby.Server.Implementations/Security/MBLicenseFile.cs                   | 2 +-
 Emby.Server.Implementations/Security/PluginSecurityManager.cs           | 2 +-
 Emby.Server.Implementations/Security/RegRecord.cs                       | 2 +-
 Emby.Server.Implementations/Serialization/XmlSerializer.cs              | 2 +-
 Emby.Server.Implementations/ServerApplicationPaths.cs                   | 2 +-
 Emby.Server.Implementations/Services/ServiceMethod.cs                   | 2 +-
 Emby.Server.Implementations/Services/UrlExtensions.cs                   | 2 +-
 Emby.Server.Implementations/Session/HttpSessionController.cs            | 2 +-
 Emby.Server.Implementations/Session/WebSocketController.cs              | 2 +-
 Emby.Server.Implementations/Sorting/AlbumComparer.cs                    | 2 +-
 Emby.Server.Implementations/Sorting/AlphanumComparator.cs               | 2 +-
 Emby.Server.Implementations/Sorting/ArtistComparer.cs                   | 2 +-
 Emby.Server.Implementations/Sorting/CommunityRatingComparer.cs          | 2 +-
 Emby.Server.Implementations/Sorting/CriticRatingComparer.cs             | 2 +-
 Emby.Server.Implementations/Sorting/DateCreatedComparer.cs              | 2 +-
 Emby.Server.Implementations/Sorting/DatePlayedComparer.cs               | 2 +-
 Emby.Server.Implementations/Sorting/GameSystemComparer.cs               | 2 +-
 Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs         | 2 +-
 Emby.Server.Implementations/Sorting/IsFolderComparer.cs                 | 2 +-
 Emby.Server.Implementations/Sorting/IsPlayedComparer.cs                 | 2 +-
 Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs               | 2 +-
 Emby.Server.Implementations/Sorting/NameComparer.cs                     | 2 +-
 Emby.Server.Implementations/Sorting/OfficialRatingComparer.cs           | 2 +-
 Emby.Server.Implementations/Sorting/PlayCountComparer.cs                | 2 +-
 Emby.Server.Implementations/Sorting/PlayersComparer.cs                  | 2 +-
 Emby.Server.Implementations/Sorting/PremiereDateComparer.cs             | 2 +-
 Emby.Server.Implementations/Sorting/ProductionYearComparer.cs           | 2 +-
 Emby.Server.Implementations/Sorting/RandomComparer.cs                   | 2 +-
 Emby.Server.Implementations/Sorting/RuntimeComparer.cs                  | 2 +-
 Emby.Server.Implementations/Sorting/SortNameComparer.cs                 | 2 +-
 Emby.Server.Implementations/Sorting/StartDateComparer.cs                | 2 +-
 Emby.Server.Implementations/Sorting/StudioComparer.cs                   | 2 +-
 Emby.Server.Implementations/StartupOptions.cs                           | 2 +-
 Emby.Server.Implementations/SystemEvents.cs                             | 2 +-
 Emby.Server.Implementations/TextEncoding/NLangDetect/ErrorCode.cs       | 2 +-
 .../TextEncoding/NLangDetect/Extensions/CharExtensions.cs               | 2 +-
 .../TextEncoding/NLangDetect/Extensions/RandomExtensions.cs             | 2 +-
 .../TextEncoding/NLangDetect/Extensions/UnicodeBlock.cs                 | 2 +-
 .../TextEncoding/NLangDetect/InternalException.cs                       | 2 +-
 .../TextEncoding/NLangDetect/LanguageDetector.cs                        | 2 +-
 .../TextEncoding/NLangDetect/NLangDetectException.cs                    | 2 +-
 Emby.Server.Implementations/TextEncoding/NLangDetect/ProbVector.cs      | 2 +-
 Emby.Server.Implementations/TextEncoding/TextEncodingDetect.cs          | 2 +-
 Emby.Server.Implementations/Threading/CommonTimer.cs                    | 2 +-
 Emby.Server.Implementations/Threading/TimerFactory.cs                   | 2 +-
 Emby.Server.Implementations/UserViews/CollectionFolderImageProvider.cs  | 2 +-
 Emby.Server.Implementations/UserViews/FolderImageProvider.cs            | 2 +-
 Emby.Server.Implementations/Xml/XmlReaderSettingsFactory.cs             | 2 +-
 Emby.XmlTv/Emby.XmlTv.Console/Classes/EntityExtensions.cs               | 2 +-
 Emby.XmlTv/Emby.XmlTv.Console/Program.cs                                | 2 +-
 Emby.XmlTv/Emby.XmlTv.Console/Properties/AssemblyInfo.cs                | 2 +-
 Emby.XmlTv/Emby.XmlTv.Test/Properties/AssemblyInfo.cs                   | 2 +-
 Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs                  | 2 +-
 Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs                  | 2 +-
 Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderTests.cs                          | 2 +-
 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvChannel.cs                          | 2 +-
 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCredit.cs                           | 2 +-
 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCreditType.cs                       | 2 +-
 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs                          | 2 +-
 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvIcon.cs                             | 2 +-
 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvLanguage.cs                         | 2 +-
 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvPremiere.cs                         | 2 +-
 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs                          | 2 +-
 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvRating.cs                           | 2 +-
 347 files changed, 347 insertions(+), 347 deletions(-)

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

diff --git a/BDInfo/BDInfoSettings.cs b/BDInfo/BDInfoSettings.cs
index 7abb67499..d127710f4 100644
--- a/BDInfo/BDInfoSettings.cs
+++ b/BDInfo/BDInfoSettings.cs
@@ -1,4 +1,4 @@
-
+
 namespace BDInfo
 {
     class BDInfoSettings
diff --git a/BDInfo/BDROM.cs b/BDInfo/BDROM.cs
index 7d8268222..0b2eefcc0 100644
--- a/BDInfo/BDROM.cs
+++ b/BDInfo/BDROM.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/LanguageCodes.cs b/BDInfo/LanguageCodes.cs
index 90d0bccc4..ab2693ffb 100644
--- a/BDInfo/LanguageCodes.cs
+++ b/BDInfo/LanguageCodes.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/TSCodecAC3.cs b/BDInfo/TSCodecAC3.cs
index 42128af1b..35d306a19 100644
--- a/BDInfo/TSCodecAC3.cs
+++ b/BDInfo/TSCodecAC3.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/TSCodecAVC.cs b/BDInfo/TSCodecAVC.cs
index 43c6d6f85..5833d169f 100644
--- a/BDInfo/TSCodecAVC.cs
+++ b/BDInfo/TSCodecAVC.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/TSCodecDTS.cs b/BDInfo/TSCodecDTS.cs
index 904dcd986..ff94cb702 100644
--- a/BDInfo/TSCodecDTS.cs
+++ b/BDInfo/TSCodecDTS.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/TSCodecDTSHD.cs b/BDInfo/TSCodecDTSHD.cs
index 3c5ad85cc..f2315d4c5 100644
--- a/BDInfo/TSCodecDTSHD.cs
+++ b/BDInfo/TSCodecDTSHD.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/TSCodecLPCM.cs b/BDInfo/TSCodecLPCM.cs
index d12674f0e..5709d8689 100644
--- a/BDInfo/TSCodecLPCM.cs
+++ b/BDInfo/TSCodecLPCM.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/TSCodecMPEG2.cs b/BDInfo/TSCodecMPEG2.cs
index 1d523528e..8bcd07d02 100644
--- a/BDInfo/TSCodecMPEG2.cs
+++ b/BDInfo/TSCodecMPEG2.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/TSCodecMVC.cs b/BDInfo/TSCodecMVC.cs
index 80fed3886..abff0c1b0 100644
--- a/BDInfo/TSCodecMVC.cs
+++ b/BDInfo/TSCodecMVC.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/TSCodecTrueHD.cs b/BDInfo/TSCodecTrueHD.cs
index 6ea78614c..5e81e162c 100644
--- a/BDInfo/TSCodecTrueHD.cs
+++ b/BDInfo/TSCodecTrueHD.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/TSCodecVC1.cs b/BDInfo/TSCodecVC1.cs
index ce9eabdb9..e2fbbf692 100644
--- a/BDInfo/TSCodecVC1.cs
+++ b/BDInfo/TSCodecVC1.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/TSInterleavedFile.cs b/BDInfo/TSInterleavedFile.cs
index 4bca9e76b..0f35cfb2a 100644
--- a/BDInfo/TSInterleavedFile.cs
+++ b/BDInfo/TSInterleavedFile.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/TSPlaylistFile.cs b/BDInfo/TSPlaylistFile.cs
index fb38ef862..aa1f175d3 100644
--- a/BDInfo/TSPlaylistFile.cs
+++ b/BDInfo/TSPlaylistFile.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/TSStream.cs b/BDInfo/TSStream.cs
index 250308b1a..98269a362 100644
--- a/BDInfo/TSStream.cs
+++ b/BDInfo/TSStream.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/TSStreamBuffer.cs b/BDInfo/TSStreamBuffer.cs
index 2f9094876..36f3149fa 100644
--- a/BDInfo/TSStreamBuffer.cs
+++ b/BDInfo/TSStreamBuffer.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/TSStreamClip.cs b/BDInfo/TSStreamClip.cs
index d7592a71a..23408859d 100644
--- a/BDInfo/TSStreamClip.cs
+++ b/BDInfo/TSStreamClip.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/TSStreamClipFile.cs b/BDInfo/TSStreamClipFile.cs
index 56ed8b581..6aed7e4d4 100644
--- a/BDInfo/TSStreamClipFile.cs
+++ b/BDInfo/TSStreamClipFile.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/BDInfo/TSStreamFile.cs b/BDInfo/TSStreamFile.cs
index 089196e49..29d105da0 100644
--- a/BDInfo/TSStreamFile.cs
+++ b/BDInfo/TSStreamFile.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
diff --git a/DvdLib/BigEndianBinaryReader.cs b/DvdLib/BigEndianBinaryReader.cs
index 7b581e340..b3b2eabd5 100644
--- a/DvdLib/BigEndianBinaryReader.cs
+++ b/DvdLib/BigEndianBinaryReader.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 namespace DvdLib
diff --git a/DvdLib/Ifo/AudioAttributes.cs b/DvdLib/Ifo/AudioAttributes.cs
index f0fa827b6..b76f9fc05 100644
--- a/DvdLib/Ifo/AudioAttributes.cs
+++ b/DvdLib/Ifo/AudioAttributes.cs
@@ -1,4 +1,4 @@
-namespace DvdLib.Ifo
+namespace DvdLib.Ifo
 {
     public enum AudioCodec
     {
diff --git a/DvdLib/Ifo/Cell.cs b/DvdLib/Ifo/Cell.cs
index bfa38123e..268ab897e 100644
--- a/DvdLib/Ifo/Cell.cs
+++ b/DvdLib/Ifo/Cell.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 
 namespace DvdLib.Ifo
 {
diff --git a/DvdLib/Ifo/CellPlaybackInfo.cs b/DvdLib/Ifo/CellPlaybackInfo.cs
index 95209aebc..e588e51ac 100644
--- a/DvdLib/Ifo/CellPlaybackInfo.cs
+++ b/DvdLib/Ifo/CellPlaybackInfo.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 
 namespace DvdLib.Ifo
 {
diff --git a/DvdLib/Ifo/CellPositionInfo.cs b/DvdLib/Ifo/CellPositionInfo.cs
index f8eb81dfc..2b973e083 100644
--- a/DvdLib/Ifo/CellPositionInfo.cs
+++ b/DvdLib/Ifo/CellPositionInfo.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 
 namespace DvdLib.Ifo
 {
diff --git a/DvdLib/Ifo/Dvd.cs b/DvdLib/Ifo/Dvd.cs
index 4c6b6a1d7..a8f2ab970 100644
--- a/DvdLib/Ifo/Dvd.cs
+++ b/DvdLib/Ifo/Dvd.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/DvdLib/Ifo/PgcCommandTable.cs b/DvdLib/Ifo/PgcCommandTable.cs
index 95d11b9bf..d329fcba2 100644
--- a/DvdLib/Ifo/PgcCommandTable.cs
+++ b/DvdLib/Ifo/PgcCommandTable.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace DvdLib.Ifo
 {
diff --git a/DvdLib/Ifo/Program.cs b/DvdLib/Ifo/Program.cs
index 6c211035f..af08afa35 100644
--- a/DvdLib/Ifo/Program.cs
+++ b/DvdLib/Ifo/Program.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace DvdLib.Ifo
 {
diff --git a/DvdLib/Ifo/ProgramChain.cs b/DvdLib/Ifo/ProgramChain.cs
index f3f1b05ce..0cdaad4cc 100644
--- a/DvdLib/Ifo/ProgramChain.cs
+++ b/DvdLib/Ifo/ProgramChain.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
diff --git a/DvdLib/Ifo/Title.cs b/DvdLib/Ifo/Title.cs
index 895a6cfd7..85be9daf1 100644
--- a/DvdLib/Ifo/Title.cs
+++ b/DvdLib/Ifo/Title.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 
 namespace DvdLib.Ifo
diff --git a/DvdLib/Ifo/UserOperation.cs b/DvdLib/Ifo/UserOperation.cs
index f7de818d4..757a5a05d 100644
--- a/DvdLib/Ifo/UserOperation.cs
+++ b/DvdLib/Ifo/UserOperation.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace DvdLib.Ifo
 {
diff --git a/DvdLib/Ifo/VideoAttributes.cs b/DvdLib/Ifo/VideoAttributes.cs
index 68468f748..8b3996715 100644
--- a/DvdLib/Ifo/VideoAttributes.cs
+++ b/DvdLib/Ifo/VideoAttributes.cs
@@ -1,4 +1,4 @@
-namespace DvdLib.Ifo
+namespace DvdLib.Ifo
 {
     public enum VideoCodec
     {
diff --git a/Emby.Dlna/Api/DlnaServerService.cs b/Emby.Dlna/Api/DlnaServerService.cs
index dd6607f9d..44c9ebc71 100644
--- a/Emby.Dlna/Api/DlnaServerService.cs
+++ b/Emby.Dlna/Api/DlnaServerService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Dlna/Api/DlnaService.cs b/Emby.Dlna/Api/DlnaService.cs
index 05e8c1c41..7f51f477a 100644
--- a/Emby.Dlna/Api/DlnaService.cs
+++ b/Emby.Dlna/Api/DlnaService.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Dlna;
diff --git a/Emby.Dlna/Common/Argument.cs b/Emby.Dlna/Common/Argument.cs
index 4da6b4850..3e325c41c 100644
--- a/Emby.Dlna/Common/Argument.cs
+++ b/Emby.Dlna/Common/Argument.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Dlna.Common
 {
     public class Argument
diff --git a/Emby.Dlna/Common/DeviceIcon.cs b/Emby.Dlna/Common/DeviceIcon.cs
index 27ae92d6f..3a91b952e 100644
--- a/Emby.Dlna/Common/DeviceIcon.cs
+++ b/Emby.Dlna/Common/DeviceIcon.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Dlna.Common
 {
     public class DeviceIcon
diff --git a/Emby.Dlna/Common/DeviceService.cs b/Emby.Dlna/Common/DeviceService.cs
index 0d91dbe76..c60d65291 100644
--- a/Emby.Dlna/Common/DeviceService.cs
+++ b/Emby.Dlna/Common/DeviceService.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Dlna.Common
 {
     public class DeviceService
diff --git a/Emby.Dlna/Common/ServiceAction.cs b/Emby.Dlna/Common/ServiceAction.cs
index 1bcc6a1d6..5e030d396 100644
--- a/Emby.Dlna/Common/ServiceAction.cs
+++ b/Emby.Dlna/Common/ServiceAction.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Emby.Dlna.Common
 {
diff --git a/Emby.Dlna/Common/StateVariable.cs b/Emby.Dlna/Common/StateVariable.cs
index 92a943eed..4ca84bf51 100644
--- a/Emby.Dlna/Common/StateVariable.cs
+++ b/Emby.Dlna/Common/StateVariable.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Emby.Dlna.Common
 {
diff --git a/Emby.Dlna/Configuration/DlnaOptions.cs b/Emby.Dlna/Configuration/DlnaOptions.cs
index 6ab337752..0ebb490a1 100644
--- a/Emby.Dlna/Configuration/DlnaOptions.cs
+++ b/Emby.Dlna/Configuration/DlnaOptions.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Dlna.Configuration
 {
     public class DlnaOptions
diff --git a/Emby.Dlna/ConfigurationExtension.cs b/Emby.Dlna/ConfigurationExtension.cs
index 82b2e0ba2..82d726e01 100644
--- a/Emby.Dlna/ConfigurationExtension.cs
+++ b/Emby.Dlna/ConfigurationExtension.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Emby.Dlna.Configuration;
 using MediaBrowser.Common.Configuration;
 
diff --git a/Emby.Dlna/ConnectionManager/ConnectionManager.cs b/Emby.Dlna/ConnectionManager/ConnectionManager.cs
index e26d98d70..cc427f2a1 100644
--- a/Emby.Dlna/ConnectionManager/ConnectionManager.cs
+++ b/Emby.Dlna/ConnectionManager/ConnectionManager.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Emby.Dlna.Service;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
diff --git a/Emby.Dlna/ConnectionManager/ControlHandler.cs b/Emby.Dlna/ConnectionManager/ControlHandler.cs
index a8c32fd99..16211c61f 100644
--- a/Emby.Dlna/ConnectionManager/ControlHandler.cs
+++ b/Emby.Dlna/ConnectionManager/ControlHandler.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Emby.Dlna.Service;
 using MediaBrowser.Common.Extensions;
diff --git a/Emby.Dlna/ContentDirectory/ContentDirectory.cs b/Emby.Dlna/ContentDirectory/ContentDirectory.cs
index 217b8cfce..cd21599d0 100644
--- a/Emby.Dlna/ContentDirectory/ContentDirectory.cs
+++ b/Emby.Dlna/ContentDirectory/ContentDirectory.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Emby.Dlna.Service;
 using MediaBrowser.Common.Net;
diff --git a/Emby.Dlna/ContentDirectory/ControlHandler.cs b/Emby.Dlna/ContentDirectory/ControlHandler.cs
index 97ae50245..61ee45f74 100644
--- a/Emby.Dlna/ContentDirectory/ControlHandler.cs
+++ b/Emby.Dlna/ContentDirectory/ControlHandler.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
diff --git a/Emby.Dlna/ControlRequest.cs b/Emby.Dlna/ControlRequest.cs
index 2b8ce844a..afd9a0b87 100644
--- a/Emby.Dlna/ControlRequest.cs
+++ b/Emby.Dlna/ControlRequest.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 
 namespace Emby.Dlna
diff --git a/Emby.Dlna/ControlResponse.cs b/Emby.Dlna/ControlResponse.cs
index 64a3f1244..d2b79fc58 100644
--- a/Emby.Dlna/ControlResponse.cs
+++ b/Emby.Dlna/ControlResponse.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Emby.Dlna
 {
diff --git a/Emby.Dlna/Didl/DidlBuilder.cs b/Emby.Dlna/Didl/DidlBuilder.cs
index 1e22a84f5..6ecb9f3b4 100644
--- a/Emby.Dlna/Didl/DidlBuilder.cs
+++ b/Emby.Dlna/Didl/DidlBuilder.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Dlna/Didl/Filter.cs b/Emby.Dlna/Didl/Filter.cs
index 1249e525d..a0e67870e 100644
--- a/Emby.Dlna/Didl/Filter.cs
+++ b/Emby.Dlna/Didl/Filter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Extensions;
 
 namespace Emby.Dlna.Didl
diff --git a/Emby.Dlna/Didl/StringWriterWithEncoding.cs b/Emby.Dlna/Didl/StringWriterWithEncoding.cs
index 23b5f017c..93ed323d0 100644
--- a/Emby.Dlna/Didl/StringWriterWithEncoding.cs
+++ b/Emby.Dlna/Didl/StringWriterWithEncoding.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 
diff --git a/Emby.Dlna/DlnaManager.cs b/Emby.Dlna/DlnaManager.cs
index 366a10cc3..2a65ce40a 100644
--- a/Emby.Dlna/DlnaManager.cs
+++ b/Emby.Dlna/DlnaManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Dlna/EventSubscriptionResponse.cs b/Emby.Dlna/EventSubscriptionResponse.cs
index 1c405e601..6dc1aacf4 100644
--- a/Emby.Dlna/EventSubscriptionResponse.cs
+++ b/Emby.Dlna/EventSubscriptionResponse.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Emby.Dlna
 {
diff --git a/Emby.Dlna/Eventing/EventManager.cs b/Emby.Dlna/Eventing/EventManager.cs
index 32bdec62f..a416ebb2b 100644
--- a/Emby.Dlna/Eventing/EventManager.cs
+++ b/Emby.Dlna/Eventing/EventManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/Emby.Dlna/Eventing/EventSubscription.cs b/Emby.Dlna/Eventing/EventSubscription.cs
index adb042d6c..4c72c4211 100644
--- a/Emby.Dlna/Eventing/EventSubscription.cs
+++ b/Emby.Dlna/Eventing/EventSubscription.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Emby.Dlna.Eventing
 {
diff --git a/Emby.Dlna/IConnectionManager.cs b/Emby.Dlna/IConnectionManager.cs
index 5f889a34c..855c4454d 100644
--- a/Emby.Dlna/IConnectionManager.cs
+++ b/Emby.Dlna/IConnectionManager.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Dlna
 {
     public interface IConnectionManager : IEventManager, IUpnpService
diff --git a/Emby.Dlna/IContentDirectory.cs b/Emby.Dlna/IContentDirectory.cs
index d63af4ef2..b54a17c00 100644
--- a/Emby.Dlna/IContentDirectory.cs
+++ b/Emby.Dlna/IContentDirectory.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Dlna
 {
     public interface IContentDirectory : IEventManager, IUpnpService
diff --git a/Emby.Dlna/IEventManager.cs b/Emby.Dlna/IEventManager.cs
index e90476fe3..4f67a1b9b 100644
--- a/Emby.Dlna/IEventManager.cs
+++ b/Emby.Dlna/IEventManager.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Dlna
 {
     public interface IEventManager
diff --git a/Emby.Dlna/IMediaReceiverRegistrar.cs b/Emby.Dlna/IMediaReceiverRegistrar.cs
index cb43221e5..5dde01f58 100644
--- a/Emby.Dlna/IMediaReceiverRegistrar.cs
+++ b/Emby.Dlna/IMediaReceiverRegistrar.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Dlna
 {
     public interface IMediaReceiverRegistrar : IEventManager, IUpnpService
diff --git a/Emby.Dlna/IUpnpService.cs b/Emby.Dlna/IUpnpService.cs
index 0a52e9acf..ab8aa4619 100644
--- a/Emby.Dlna/IUpnpService.cs
+++ b/Emby.Dlna/IUpnpService.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Emby.Dlna
 {
diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs
index 9c219ec0e..e0b4f025a 100644
--- a/Emby.Dlna/Main/DlnaEntryPoint.cs
+++ b/Emby.Dlna/Main/DlnaEntryPoint.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs b/Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs
index 929d29a27..2b84528ea 100644
--- a/Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs
+++ b/Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Emby.Dlna.Service;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
diff --git a/Emby.Dlna/PlayTo/CurrentIdEventArgs.cs b/Emby.Dlna/PlayTo/CurrentIdEventArgs.cs
index e148191f3..fdf435bcf 100644
--- a/Emby.Dlna/PlayTo/CurrentIdEventArgs.cs
+++ b/Emby.Dlna/PlayTo/CurrentIdEventArgs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Emby.Dlna.PlayTo
 {
diff --git a/Emby.Dlna/PlayTo/Device.cs b/Emby.Dlna/PlayTo/Device.cs
index 127c29c47..117646108 100644
--- a/Emby.Dlna/PlayTo/Device.cs
+++ b/Emby.Dlna/PlayTo/Device.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
diff --git a/Emby.Dlna/PlayTo/DeviceInfo.cs b/Emby.Dlna/PlayTo/DeviceInfo.cs
index 6642b3d7b..d81ce584b 100644
--- a/Emby.Dlna/PlayTo/DeviceInfo.cs
+++ b/Emby.Dlna/PlayTo/DeviceInfo.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Emby.Dlna.Common;
 using MediaBrowser.Model.Dlna;
 
diff --git a/Emby.Dlna/PlayTo/PlayToController.cs b/Emby.Dlna/PlayTo/PlayToController.cs
index 85937963d..49c944790 100644
--- a/Emby.Dlna/PlayTo/PlayToController.cs
+++ b/Emby.Dlna/PlayTo/PlayToController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
diff --git a/Emby.Dlna/PlayTo/PlayToManager.cs b/Emby.Dlna/PlayTo/PlayToManager.cs
index 177303d48..d8d289c59 100644
--- a/Emby.Dlna/PlayTo/PlayToManager.cs
+++ b/Emby.Dlna/PlayTo/PlayToManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Emby.Dlna/PlayTo/PlaybackProgressEventArgs.cs b/Emby.Dlna/PlayTo/PlaybackProgressEventArgs.cs
index 7f9fb5caf..ffa56419b 100644
--- a/Emby.Dlna/PlayTo/PlaybackProgressEventArgs.cs
+++ b/Emby.Dlna/PlayTo/PlaybackProgressEventArgs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Emby.Dlna.PlayTo
 {
diff --git a/Emby.Dlna/PlayTo/PlaybackStartEventArgs.cs b/Emby.Dlna/PlayTo/PlaybackStartEventArgs.cs
index 17d2540a5..8cd8b47ac 100644
--- a/Emby.Dlna/PlayTo/PlaybackStartEventArgs.cs
+++ b/Emby.Dlna/PlayTo/PlaybackStartEventArgs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Emby.Dlna.PlayTo
 {
diff --git a/Emby.Dlna/PlayTo/PlaybackStoppedEventArgs.cs b/Emby.Dlna/PlayTo/PlaybackStoppedEventArgs.cs
index 5dfaa9294..2afdc324d 100644
--- a/Emby.Dlna/PlayTo/PlaybackStoppedEventArgs.cs
+++ b/Emby.Dlna/PlayTo/PlaybackStoppedEventArgs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Emby.Dlna.PlayTo
 {
diff --git a/Emby.Dlna/PlayTo/PlaylistItem.cs b/Emby.Dlna/PlayTo/PlaylistItem.cs
index 6155fb239..1e62b61e9 100644
--- a/Emby.Dlna/PlayTo/PlaylistItem.cs
+++ b/Emby.Dlna/PlayTo/PlaylistItem.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.PlayTo
 {
diff --git a/Emby.Dlna/PlayTo/TRANSPORTSTATE.cs b/Emby.Dlna/PlayTo/TRANSPORTSTATE.cs
index 32fb46660..9f1690b04 100644
--- a/Emby.Dlna/PlayTo/TRANSPORTSTATE.cs
+++ b/Emby.Dlna/PlayTo/TRANSPORTSTATE.cs
@@ -1,4 +1,4 @@
-namespace Emby.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public enum TRANSPORTSTATE
     {
diff --git a/Emby.Dlna/PlayTo/TransportCommands.cs b/Emby.Dlna/PlayTo/TransportCommands.cs
index bb71c2835..bb6d69115 100644
--- a/Emby.Dlna/PlayTo/TransportCommands.cs
+++ b/Emby.Dlna/PlayTo/TransportCommands.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
diff --git a/Emby.Dlna/PlayTo/TransportStateEventArgs.cs b/Emby.Dlna/PlayTo/TransportStateEventArgs.cs
index c6a96f58c..7dcd39e10 100644
--- a/Emby.Dlna/PlayTo/TransportStateEventArgs.cs
+++ b/Emby.Dlna/PlayTo/TransportStateEventArgs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Emby.Dlna.PlayTo
 {
diff --git a/Emby.Dlna/PlayTo/UpnpContainer.cs b/Emby.Dlna/PlayTo/UpnpContainer.cs
index 4c07f3605..943e0347b 100644
--- a/Emby.Dlna/PlayTo/UpnpContainer.cs
+++ b/Emby.Dlna/PlayTo/UpnpContainer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml.Linq;
 using Emby.Dlna.Ssdp;
 
diff --git a/Emby.Dlna/PlayTo/uBaseObject.cs b/Emby.Dlna/PlayTo/uBaseObject.cs
index 3d80d7ed0..f29a126df 100644
--- a/Emby.Dlna/PlayTo/uBaseObject.cs
+++ b/Emby.Dlna/PlayTo/uBaseObject.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Emby.Dlna.PlayTo
 {
diff --git a/Emby.Dlna/PlayTo/uParser.cs b/Emby.Dlna/PlayTo/uParser.cs
index 4d26ee6b3..3a0ffffd4 100644
--- a/Emby.Dlna/PlayTo/uParser.cs
+++ b/Emby.Dlna/PlayTo/uParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
diff --git a/Emby.Dlna/PlayTo/uParserObject.cs b/Emby.Dlna/PlayTo/uParserObject.cs
index bdd67bca9..87a7f69c6 100644
--- a/Emby.Dlna/PlayTo/uParserObject.cs
+++ b/Emby.Dlna/PlayTo/uParserObject.cs
@@ -1,4 +1,4 @@
-using System.Xml.Linq;
+using System.Xml.Linq;
 
 namespace Emby.Dlna.PlayTo
 {
diff --git a/Emby.Dlna/PlayTo/uPnpNamespaces.cs b/Emby.Dlna/PlayTo/uPnpNamespaces.cs
index 81acb5e41..7132ecd15 100644
--- a/Emby.Dlna/PlayTo/uPnpNamespaces.cs
+++ b/Emby.Dlna/PlayTo/uPnpNamespaces.cs
@@ -1,4 +1,4 @@
-using System.Xml.Linq;
+using System.Xml.Linq;
 
 namespace Emby.Dlna.PlayTo
 {
diff --git a/Emby.Dlna/Profiles/DefaultProfile.cs b/Emby.Dlna/Profiles/DefaultProfile.cs
index 9c85a8393..ea50bd4a7 100644
--- a/Emby.Dlna/Profiles/DefaultProfile.cs
+++ b/Emby.Dlna/Profiles/DefaultProfile.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
diff --git a/Emby.Dlna/Profiles/DenonAvrProfile.cs b/Emby.Dlna/Profiles/DenonAvrProfile.cs
index b723accb2..a73885191 100644
--- a/Emby.Dlna/Profiles/DenonAvrProfile.cs
+++ b/Emby.Dlna/Profiles/DenonAvrProfile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/DirectTvProfile.cs b/Emby.Dlna/Profiles/DirectTvProfile.cs
index ec134905e..317c0976a 100644
--- a/Emby.Dlna/Profiles/DirectTvProfile.cs
+++ b/Emby.Dlna/Profiles/DirectTvProfile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/DishHopperJoeyProfile.cs b/Emby.Dlna/Profiles/DishHopperJoeyProfile.cs
index 586a9d89a..d501cce0d 100644
--- a/Emby.Dlna/Profiles/DishHopperJoeyProfile.cs
+++ b/Emby.Dlna/Profiles/DishHopperJoeyProfile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/Foobar2000Profile.cs b/Emby.Dlna/Profiles/Foobar2000Profile.cs
index 02be16f2a..947194bce 100644
--- a/Emby.Dlna/Profiles/Foobar2000Profile.cs
+++ b/Emby.Dlna/Profiles/Foobar2000Profile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/LgTvProfile.cs b/Emby.Dlna/Profiles/LgTvProfile.cs
index ac9305336..145685ab1 100644
--- a/Emby.Dlna/Profiles/LgTvProfile.cs
+++ b/Emby.Dlna/Profiles/LgTvProfile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/LinksysDMA2100Profile.cs b/Emby.Dlna/Profiles/LinksysDMA2100Profile.cs
index 480b0ae8e..3f0bb4263 100644
--- a/Emby.Dlna/Profiles/LinksysDMA2100Profile.cs
+++ b/Emby.Dlna/Profiles/LinksysDMA2100Profile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/MarantzProfile.cs b/Emby.Dlna/Profiles/MarantzProfile.cs
index 0ad679a9e..162e284be 100644
--- a/Emby.Dlna/Profiles/MarantzProfile.cs
+++ b/Emby.Dlna/Profiles/MarantzProfile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/MediaMonkeyProfile.cs b/Emby.Dlna/Profiles/MediaMonkeyProfile.cs
index e4053e878..53cae4e2f 100644
--- a/Emby.Dlna/Profiles/MediaMonkeyProfile.cs
+++ b/Emby.Dlna/Profiles/MediaMonkeyProfile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/PanasonicVieraProfile.cs b/Emby.Dlna/Profiles/PanasonicVieraProfile.cs
index 16fe65a9f..5f31ec484 100644
--- a/Emby.Dlna/Profiles/PanasonicVieraProfile.cs
+++ b/Emby.Dlna/Profiles/PanasonicVieraProfile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/PopcornHourProfile.cs b/Emby.Dlna/Profiles/PopcornHourProfile.cs
index 18467bace..aefe8c44f 100644
--- a/Emby.Dlna/Profiles/PopcornHourProfile.cs
+++ b/Emby.Dlna/Profiles/PopcornHourProfile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/SamsungSmartTvProfile.cs b/Emby.Dlna/Profiles/SamsungSmartTvProfile.cs
index 86b8837eb..51a1c8173 100644
--- a/Emby.Dlna/Profiles/SamsungSmartTvProfile.cs
+++ b/Emby.Dlna/Profiles/SamsungSmartTvProfile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/SharpSmartTvProfile.cs b/Emby.Dlna/Profiles/SharpSmartTvProfile.cs
index 9cf678d65..f840cfb34 100644
--- a/Emby.Dlna/Profiles/SharpSmartTvProfile.cs
+++ b/Emby.Dlna/Profiles/SharpSmartTvProfile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/SonyBlurayPlayer2013.cs b/Emby.Dlna/Profiles/SonyBlurayPlayer2013.cs
index 26a76bd2b..2af1d3b50 100644
--- a/Emby.Dlna/Profiles/SonyBlurayPlayer2013.cs
+++ b/Emby.Dlna/Profiles/SonyBlurayPlayer2013.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/SonyBlurayPlayer2014.cs b/Emby.Dlna/Profiles/SonyBlurayPlayer2014.cs
index ba6ec71f2..3de0b5192 100644
--- a/Emby.Dlna/Profiles/SonyBlurayPlayer2014.cs
+++ b/Emby.Dlna/Profiles/SonyBlurayPlayer2014.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/SonyBlurayPlayer2015.cs b/Emby.Dlna/Profiles/SonyBlurayPlayer2015.cs
index ddeb0f160..889484bea 100644
--- a/Emby.Dlna/Profiles/SonyBlurayPlayer2015.cs
+++ b/Emby.Dlna/Profiles/SonyBlurayPlayer2015.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/SonyBlurayPlayer2016.cs b/Emby.Dlna/Profiles/SonyBlurayPlayer2016.cs
index 10c3fbe38..acb90bd01 100644
--- a/Emby.Dlna/Profiles/SonyBlurayPlayer2016.cs
+++ b/Emby.Dlna/Profiles/SonyBlurayPlayer2016.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/SonyBlurayPlayerProfile.cs b/Emby.Dlna/Profiles/SonyBlurayPlayerProfile.cs
index 0cbc9369c..e1808b205 100644
--- a/Emby.Dlna/Profiles/SonyBlurayPlayerProfile.cs
+++ b/Emby.Dlna/Profiles/SonyBlurayPlayerProfile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/SonyBravia2010Profile.cs b/Emby.Dlna/Profiles/SonyBravia2010Profile.cs
index 7bfa5c70f..f8e8faa76 100644
--- a/Emby.Dlna/Profiles/SonyBravia2010Profile.cs
+++ b/Emby.Dlna/Profiles/SonyBravia2010Profile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/SonyBravia2011Profile.cs b/Emby.Dlna/Profiles/SonyBravia2011Profile.cs
index 90363c9b1..111f36e9b 100644
--- a/Emby.Dlna/Profiles/SonyBravia2011Profile.cs
+++ b/Emby.Dlna/Profiles/SonyBravia2011Profile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/SonyBravia2012Profile.cs b/Emby.Dlna/Profiles/SonyBravia2012Profile.cs
index 64c1e0d49..d5efe4270 100644
--- a/Emby.Dlna/Profiles/SonyBravia2012Profile.cs
+++ b/Emby.Dlna/Profiles/SonyBravia2012Profile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/SonyBravia2013Profile.cs b/Emby.Dlna/Profiles/SonyBravia2013Profile.cs
index b45f561aa..3b0228694 100644
--- a/Emby.Dlna/Profiles/SonyBravia2013Profile.cs
+++ b/Emby.Dlna/Profiles/SonyBravia2013Profile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/SonyBravia2014Profile.cs b/Emby.Dlna/Profiles/SonyBravia2014Profile.cs
index c0f8576f2..e860eae34 100644
--- a/Emby.Dlna/Profiles/SonyBravia2014Profile.cs
+++ b/Emby.Dlna/Profiles/SonyBravia2014Profile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/SonyPs3Profile.cs b/Emby.Dlna/Profiles/SonyPs3Profile.cs
index 735a783a4..88d064695 100644
--- a/Emby.Dlna/Profiles/SonyPs3Profile.cs
+++ b/Emby.Dlna/Profiles/SonyPs3Profile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/SonyPs4Profile.cs b/Emby.Dlna/Profiles/SonyPs4Profile.cs
index a65d55754..499cf8803 100644
--- a/Emby.Dlna/Profiles/SonyPs4Profile.cs
+++ b/Emby.Dlna/Profiles/SonyPs4Profile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/WdtvLiveProfile.cs b/Emby.Dlna/Profiles/WdtvLiveProfile.cs
index ed9e45bc7..bf7b1ab47 100644
--- a/Emby.Dlna/Profiles/WdtvLiveProfile.cs
+++ b/Emby.Dlna/Profiles/WdtvLiveProfile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Profiles/XboxOneProfile.cs b/Emby.Dlna/Profiles/XboxOneProfile.cs
index 14f7b430c..710b891e3 100644
--- a/Emby.Dlna/Profiles/XboxOneProfile.cs
+++ b/Emby.Dlna/Profiles/XboxOneProfile.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {
diff --git a/Emby.Dlna/Service/BaseControlHandler.cs b/Emby.Dlna/Service/BaseControlHandler.cs
index d3fc1d1f8..d65f8972b 100644
--- a/Emby.Dlna/Service/BaseControlHandler.cs
+++ b/Emby.Dlna/Service/BaseControlHandler.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Dlna/Service/BaseService.cs b/Emby.Dlna/Service/BaseService.cs
index d7357a45c..5359e94c4 100644
--- a/Emby.Dlna/Service/BaseService.cs
+++ b/Emby.Dlna/Service/BaseService.cs
@@ -1,4 +1,4 @@
-using Emby.Dlna.Eventing;
+using Emby.Dlna.Eventing;
 using MediaBrowser.Common.Net;
 using Microsoft.Extensions.Logging;
 
diff --git a/Emby.Dlna/Service/ControlErrorHandler.cs b/Emby.Dlna/Service/ControlErrorHandler.cs
index 96d65356c..e9c2c67b9 100644
--- a/Emby.Dlna/Service/ControlErrorHandler.cs
+++ b/Emby.Dlna/Service/ControlErrorHandler.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 using System.Xml;
diff --git a/Emby.Dlna/Ssdp/DeviceDiscovery.cs b/Emby.Dlna/Ssdp/DeviceDiscovery.cs
index c06274fd4..069d704b8 100644
--- a/Emby.Dlna/Ssdp/DeviceDiscovery.cs
+++ b/Emby.Dlna/Ssdp/DeviceDiscovery.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Controller.Configuration;
diff --git a/Emby.Dlna/Ssdp/Extensions.cs b/Emby.Dlna/Ssdp/Extensions.cs
index 134549456..c680c123e 100644
--- a/Emby.Dlna/Ssdp/Extensions.cs
+++ b/Emby.Dlna/Ssdp/Extensions.cs
@@ -1,4 +1,4 @@
-using System.Xml.Linq;
+using System.Xml.Linq;
 
 namespace Emby.Dlna.Ssdp
 {
diff --git a/Emby.Drawing.Skia/PercentPlayedDrawer.cs b/Emby.Drawing.Skia/PercentPlayedDrawer.cs
index 2b8a60cd2..a204999fe 100644
--- a/Emby.Drawing.Skia/PercentPlayedDrawer.cs
+++ b/Emby.Drawing.Skia/PercentPlayedDrawer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Drawing;
 using SkiaSharp;
 
diff --git a/Emby.Drawing.Skia/PlayedIndicatorDrawer.cs b/Emby.Drawing.Skia/PlayedIndicatorDrawer.cs
index ba0ba133b..7e9cb8c5c 100644
--- a/Emby.Drawing.Skia/PlayedIndicatorDrawer.cs
+++ b/Emby.Drawing.Skia/PlayedIndicatorDrawer.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.IO;
diff --git a/Emby.Drawing.Skia/SkiaEncoder.cs b/Emby.Drawing.Skia/SkiaEncoder.cs
index 2d6bdb16b..3f82fd4b7 100644
--- a/Emby.Drawing.Skia/SkiaEncoder.cs
+++ b/Emby.Drawing.Skia/SkiaEncoder.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Drawing.Skia/UnplayedCountIndicator.cs b/Emby.Drawing.Skia/UnplayedCountIndicator.cs
index 176248b5f..e1d1ecff8 100644
--- a/Emby.Drawing.Skia/UnplayedCountIndicator.cs
+++ b/Emby.Drawing.Skia/UnplayedCountIndicator.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Drawing;
diff --git a/Emby.Drawing/Common/ImageHeader.cs b/Emby.Drawing/Common/ImageHeader.cs
index 094e1ad45..6b604bc15 100644
--- a/Emby.Drawing/Common/ImageHeader.cs
+++ b/Emby.Drawing/Common/ImageHeader.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index cdc1f21d2..5b9b15857 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
diff --git a/Emby.Drawing/NullImageEncoder.cs b/Emby.Drawing/NullImageEncoder.cs
index 95ea42ecf..748ae6f2c 100644
--- a/Emby.Drawing/NullImageEncoder.cs
+++ b/Emby.Drawing/NullImageEncoder.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Model.Drawing;
 
diff --git a/Emby.IsoMounting/IsoMounter/Configuration/PluginConfiguration.cs b/Emby.IsoMounting/IsoMounter/Configuration/PluginConfiguration.cs
index c21a1d81f..4755e4e82 100644
--- a/Emby.IsoMounting/IsoMounter/Configuration/PluginConfiguration.cs
+++ b/Emby.IsoMounting/IsoMounter/Configuration/PluginConfiguration.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Plugins;
+using MediaBrowser.Model.Plugins;
 
 namespace IsoMounter.Configuration
 {
diff --git a/Emby.IsoMounting/IsoMounter/Plugin.cs b/Emby.IsoMounting/IsoMounter/Plugin.cs
index 6a2431393..bcacab906 100644
--- a/Emby.IsoMounting/IsoMounter/Plugin.cs
+++ b/Emby.IsoMounting/IsoMounter/Plugin.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using IsoMounter.Configuration;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Plugins;
diff --git a/Emby.Naming/Audio/AlbumParser.cs b/Emby.Naming/Audio/AlbumParser.cs
index 447c8b3ec..8cf8ec5e5 100644
--- a/Emby.Naming/Audio/AlbumParser.cs
+++ b/Emby.Naming/Audio/AlbumParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Naming/Audio/AudioFileParser.cs b/Emby.Naming/Audio/AudioFileParser.cs
index 20016915a..609eb779a 100644
--- a/Emby.Naming/Audio/AudioFileParser.cs
+++ b/Emby.Naming/Audio/AudioFileParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using Emby.Naming.Common;
diff --git a/Emby.Naming/Audio/MultiPartResult.cs b/Emby.Naming/Audio/MultiPartResult.cs
index fae0ae4d8..983b9fe67 100644
--- a/Emby.Naming/Audio/MultiPartResult.cs
+++ b/Emby.Naming/Audio/MultiPartResult.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Naming.Audio
 {
     public class MultiPartResult
diff --git a/Emby.Naming/AudioBook/AudioBookFileInfo.cs b/Emby.Naming/AudioBook/AudioBookFileInfo.cs
index 6f56737f7..5ece6771a 100644
--- a/Emby.Naming/AudioBook/AudioBookFileInfo.cs
+++ b/Emby.Naming/AudioBook/AudioBookFileInfo.cs
@@ -1,4 +1,4 @@
-
+
 using System;
 
 namespace Emby.Naming.AudioBook
diff --git a/Emby.Naming/AudioBook/AudioBookFilePathParser.cs b/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
index fbc3772fb..8c52fd9b9 100644
--- a/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
+++ b/Emby.Naming/AudioBook/AudioBookFilePathParser.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.IO;
 using System.Text.RegularExpressions;
 using Emby.Naming.Common;
diff --git a/Emby.Naming/AudioBook/AudioBookFilePathParserResult.cs b/Emby.Naming/AudioBook/AudioBookFilePathParserResult.cs
index ee4bfe632..3a8e3c31f 100644
--- a/Emby.Naming/AudioBook/AudioBookFilePathParserResult.cs
+++ b/Emby.Naming/AudioBook/AudioBookFilePathParserResult.cs
@@ -1,4 +1,4 @@
-namespace Emby.Naming.AudioBook
+namespace Emby.Naming.AudioBook
 {
     public class AudioBookFilePathParserResult
     {
diff --git a/Emby.Naming/AudioBook/AudioBookInfo.cs b/Emby.Naming/AudioBook/AudioBookInfo.cs
index 4ce8e16a6..f6e1d5be4 100644
--- a/Emby.Naming/AudioBook/AudioBookInfo.cs
+++ b/Emby.Naming/AudioBook/AudioBookInfo.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Emby.Naming.AudioBook
 {
diff --git a/Emby.Naming/AudioBook/AudioBookListResolver.cs b/Emby.Naming/AudioBook/AudioBookListResolver.cs
index af9d4fea6..4e3ad7cac 100644
--- a/Emby.Naming/AudioBook/AudioBookListResolver.cs
+++ b/Emby.Naming/AudioBook/AudioBookListResolver.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Emby.Naming.Common;
 using Emby.Naming.Video;
diff --git a/Emby.Naming/AudioBook/AudioBookResolver.cs b/Emby.Naming/AudioBook/AudioBookResolver.cs
index 3dbdba398..f8f13bc5e 100644
--- a/Emby.Naming/AudioBook/AudioBookResolver.cs
+++ b/Emby.Naming/AudioBook/AudioBookResolver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using Emby.Naming.Common;
diff --git a/Emby.Naming/Common/EpisodeExpression.cs b/Emby.Naming/Common/EpisodeExpression.cs
index e058210bb..ebaacd3a1 100644
--- a/Emby.Naming/Common/EpisodeExpression.cs
+++ b/Emby.Naming/Common/EpisodeExpression.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text.RegularExpressions;
 
 namespace Emby.Naming.Common
diff --git a/Emby.Naming/Common/MediaType.cs b/Emby.Naming/Common/MediaType.cs
index 2a3d433cf..2332b6455 100644
--- a/Emby.Naming/Common/MediaType.cs
+++ b/Emby.Naming/Common/MediaType.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Naming.Common
 {
     public enum MediaType
diff --git a/Emby.Naming/Common/NamingOptions.cs b/Emby.Naming/Common/NamingOptions.cs
index 63b828a5e..2ef0208ba 100644
--- a/Emby.Naming/Common/NamingOptions.cs
+++ b/Emby.Naming/Common/NamingOptions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using Emby.Naming.Video;
diff --git a/Emby.Naming/Extensions/StringExtensions.cs b/Emby.Naming/Extensions/StringExtensions.cs
index e773dbfe8..26c09aeb4 100644
--- a/Emby.Naming/Extensions/StringExtensions.cs
+++ b/Emby.Naming/Extensions/StringExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 
 namespace Emby.Naming.Extensions
diff --git a/Emby.Naming/StringExtensions.cs b/Emby.Naming/StringExtensions.cs
index 63532075e..7c61922af 100644
--- a/Emby.Naming/StringExtensions.cs
+++ b/Emby.Naming/StringExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 
 namespace Emby.Naming
diff --git a/Emby.Naming/Subtitles/SubtitleInfo.cs b/Emby.Naming/Subtitles/SubtitleInfo.cs
index 3ece0679e..6cb683a36 100644
--- a/Emby.Naming/Subtitles/SubtitleInfo.cs
+++ b/Emby.Naming/Subtitles/SubtitleInfo.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Naming.Subtitles
 {
     public class SubtitleInfo
diff --git a/Emby.Naming/Subtitles/SubtitleParser.cs b/Emby.Naming/Subtitles/SubtitleParser.cs
index 181154b07..ac9432d57 100644
--- a/Emby.Naming/Subtitles/SubtitleParser.cs
+++ b/Emby.Naming/Subtitles/SubtitleParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using Emby.Naming.Common;
diff --git a/Emby.Naming/TV/EpisodeInfo.cs b/Emby.Naming/TV/EpisodeInfo.cs
index 41397480e..ce77da14f 100644
--- a/Emby.Naming/TV/EpisodeInfo.cs
+++ b/Emby.Naming/TV/EpisodeInfo.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Naming.TV
 {
     public class EpisodeInfo
diff --git a/Emby.Naming/TV/EpisodePathParserResult.cs b/Emby.Naming/TV/EpisodePathParserResult.cs
index 9890c78a4..0d9e4dd8c 100644
--- a/Emby.Naming/TV/EpisodePathParserResult.cs
+++ b/Emby.Naming/TV/EpisodePathParserResult.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Naming.TV
 {
     public class EpisodePathParserResult
diff --git a/Emby.Naming/TV/EpisodeResolver.cs b/Emby.Naming/TV/EpisodeResolver.cs
index b0e83038d..49a3558bd 100644
--- a/Emby.Naming/TV/EpisodeResolver.cs
+++ b/Emby.Naming/TV/EpisodeResolver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using Emby.Naming.Common;
diff --git a/Emby.Naming/TV/SeasonPathParser.cs b/Emby.Naming/TV/SeasonPathParser.cs
index e3fb84f30..002bbe19c 100644
--- a/Emby.Naming/TV/SeasonPathParser.cs
+++ b/Emby.Naming/TV/SeasonPathParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Naming/TV/SeasonPathParserResult.cs b/Emby.Naming/TV/SeasonPathParserResult.cs
index 9a18d0a03..048b390ae 100644
--- a/Emby.Naming/TV/SeasonPathParserResult.cs
+++ b/Emby.Naming/TV/SeasonPathParserResult.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Naming.TV
 {
     public class SeasonPathParserResult
diff --git a/Emby.Naming/Video/CleanDateTimeResult.cs b/Emby.Naming/Video/CleanDateTimeResult.cs
index 946fd953c..a1794ed38 100644
--- a/Emby.Naming/Video/CleanDateTimeResult.cs
+++ b/Emby.Naming/Video/CleanDateTimeResult.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Naming.Video
 {
     public class CleanDateTimeResult
diff --git a/Emby.Naming/Video/CleanStringResult.cs b/Emby.Naming/Video/CleanStringResult.cs
index 0282863e0..0c1360a77 100644
--- a/Emby.Naming/Video/CleanStringResult.cs
+++ b/Emby.Naming/Video/CleanStringResult.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Naming.Video
 {
     public class CleanStringResult
diff --git a/Emby.Naming/Video/ExtraResolver.cs b/Emby.Naming/Video/ExtraResolver.cs
index 866a8044e..3459b689a 100644
--- a/Emby.Naming/Video/ExtraResolver.cs
+++ b/Emby.Naming/Video/ExtraResolver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
diff --git a/Emby.Naming/Video/ExtraResult.cs b/Emby.Naming/Video/ExtraResult.cs
index ab42d8e84..ff6f20c47 100644
--- a/Emby.Naming/Video/ExtraResult.cs
+++ b/Emby.Naming/Video/ExtraResult.cs
@@ -1,4 +1,4 @@
-namespace Emby.Naming.Video
+namespace Emby.Naming.Video
 {
     public class ExtraResult
     {
diff --git a/Emby.Naming/Video/ExtraRule.cs b/Emby.Naming/Video/ExtraRule.cs
index ef83b3cd6..b8eb8427e 100644
--- a/Emby.Naming/Video/ExtraRule.cs
+++ b/Emby.Naming/Video/ExtraRule.cs
@@ -1,4 +1,4 @@
-using Emby.Naming.Common;
+using Emby.Naming.Common;
 
 namespace Emby.Naming.Video
 {
diff --git a/Emby.Naming/Video/ExtraRuleType.cs b/Emby.Naming/Video/ExtraRuleType.cs
index 323c7cef6..eda315779 100644
--- a/Emby.Naming/Video/ExtraRuleType.cs
+++ b/Emby.Naming/Video/ExtraRuleType.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Naming.Video
 {
     public enum ExtraRuleType
diff --git a/Emby.Naming/Video/FileStack.cs b/Emby.Naming/Video/FileStack.cs
index 2feea4cb3..2df1e9aed 100644
--- a/Emby.Naming/Video/FileStack.cs
+++ b/Emby.Naming/Video/FileStack.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/Emby.Naming/Video/FlagParser.cs b/Emby.Naming/Video/FlagParser.cs
index f326f0754..bb129499b 100644
--- a/Emby.Naming/Video/FlagParser.cs
+++ b/Emby.Naming/Video/FlagParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using Emby.Naming.Common;
 
diff --git a/Emby.Naming/Video/Format3DResult.cs b/Emby.Naming/Video/Format3DResult.cs
index 147ccfc05..e12494079 100644
--- a/Emby.Naming/Video/Format3DResult.cs
+++ b/Emby.Naming/Video/Format3DResult.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Emby.Naming.Video
 {
diff --git a/Emby.Naming/Video/Format3DRule.cs b/Emby.Naming/Video/Format3DRule.cs
index 3c173efbc..7c815524f 100644
--- a/Emby.Naming/Video/Format3DRule.cs
+++ b/Emby.Naming/Video/Format3DRule.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Naming.Video
 {
     public class Format3DRule
diff --git a/Emby.Naming/Video/StackResolver.cs b/Emby.Naming/Video/StackResolver.cs
index 420f6a495..4893002c1 100644
--- a/Emby.Naming/Video/StackResolver.cs
+++ b/Emby.Naming/Video/StackResolver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Naming/Video/StackResult.cs b/Emby.Naming/Video/StackResult.cs
index 920a7dea7..de35d2825 100644
--- a/Emby.Naming/Video/StackResult.cs
+++ b/Emby.Naming/Video/StackResult.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Emby.Naming.Video
 {
diff --git a/Emby.Naming/Video/StubResolver.cs b/Emby.Naming/Video/StubResolver.cs
index d8c03a10f..7925f381d 100644
--- a/Emby.Naming/Video/StubResolver.cs
+++ b/Emby.Naming/Video/StubResolver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using Emby.Naming.Common;
diff --git a/Emby.Naming/Video/StubResult.cs b/Emby.Naming/Video/StubResult.cs
index c9d06c9a7..597681337 100644
--- a/Emby.Naming/Video/StubResult.cs
+++ b/Emby.Naming/Video/StubResult.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Emby.Naming.Video
 {
diff --git a/Emby.Naming/Video/StubTypeRule.cs b/Emby.Naming/Video/StubTypeRule.cs
index 66ebfc3a2..d8fee617e 100644
--- a/Emby.Naming/Video/StubTypeRule.cs
+++ b/Emby.Naming/Video/StubTypeRule.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Naming.Video
 {
     public class StubTypeRule
diff --git a/Emby.Naming/Video/VideoFileInfo.cs b/Emby.Naming/Video/VideoFileInfo.cs
index 3cdc483ff..d14d04b20 100644
--- a/Emby.Naming/Video/VideoFileInfo.cs
+++ b/Emby.Naming/Video/VideoFileInfo.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Naming.Video
 {
     /// <summary>
diff --git a/Emby.Naming/Video/VideoInfo.cs b/Emby.Naming/Video/VideoInfo.cs
index 033a8ae2d..d96d0e757 100644
--- a/Emby.Naming/Video/VideoInfo.cs
+++ b/Emby.Naming/Video/VideoInfo.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Emby.Naming.Video
 {
diff --git a/Emby.Naming/Video/VideoResolver.cs b/Emby.Naming/Video/VideoResolver.cs
index 5b43096fe..de8f96965 100644
--- a/Emby.Naming/Video/VideoResolver.cs
+++ b/Emby.Naming/Video/VideoResolver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using Emby.Naming.Common;
diff --git a/Emby.Notifications/Api/NotificationsService.cs b/Emby.Notifications/Api/NotificationsService.cs
index 37d3f4b20..83845558a 100644
--- a/Emby.Notifications/Api/NotificationsService.cs
+++ b/Emby.Notifications/Api/NotificationsService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
diff --git a/Emby.Notifications/CoreNotificationTypes.cs b/Emby.Notifications/CoreNotificationTypes.cs
index 0443aa416..158898084 100644
--- a/Emby.Notifications/CoreNotificationTypes.cs
+++ b/Emby.Notifications/CoreNotificationTypes.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Controller;
diff --git a/Emby.Notifications/NotificationConfigurationFactory.cs b/Emby.Notifications/NotificationConfigurationFactory.cs
index 62258315e..d08475f7d 100644
--- a/Emby.Notifications/NotificationConfigurationFactory.cs
+++ b/Emby.Notifications/NotificationConfigurationFactory.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.Notifications;
 
diff --git a/Emby.Notifications/NotificationManager.cs b/Emby.Notifications/NotificationManager.cs
index 7a88dccf5..3d1d4722d 100644
--- a/Emby.Notifications/NotificationManager.cs
+++ b/Emby.Notifications/NotificationManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
diff --git a/Emby.Notifications/Notifications.cs b/Emby.Notifications/Notifications.cs
index dc3ccfb38..fbdc39f94 100644
--- a/Emby.Notifications/Notifications.cs
+++ b/Emby.Notifications/Notifications.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
diff --git a/Emby.Photos/PhotoProvider.cs b/Emby.Photos/PhotoProvider.cs
index 16d3062fb..40480b2ae 100644
--- a/Emby.Photos/PhotoProvider.cs
+++ b/Emby.Photos/PhotoProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Threading;
diff --git a/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs b/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
index 4a05d1e56..90a0671f2 100644
--- a/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
+++ b/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/Emby.Server.Implementations/Activity/ActivityManager.cs b/Emby.Server.Implementations/Activity/ActivityManager.cs
index 718bdae50..e526acb0d 100644
--- a/Emby.Server.Implementations/Activity/ActivityManager.cs
+++ b/Emby.Server.Implementations/Activity/ActivityManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Activity;
diff --git a/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs b/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
index 3ad2d4b91..e4a2cd9df 100644
--- a/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
+++ b/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using MediaBrowser.Common.Configuration;
 
 namespace Emby.Server.Implementations.AppBase
diff --git a/Emby.Server.Implementations/Archiving/ZipClient.cs b/Emby.Server.Implementations/Archiving/ZipClient.cs
index fa335272a..84072cde6 100644
--- a/Emby.Server.Implementations/Archiving/ZipClient.cs
+++ b/Emby.Server.Implementations/Archiving/ZipClient.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using MediaBrowser.Model.IO;
 using SharpCompress.Archives.SevenZip;
 using SharpCompress.Archives.Tar;
diff --git a/Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs b/Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs
index 20fd4144a..b27f84848 100644
--- a/Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs
+++ b/Emby.Server.Implementations/Branding/BrandingConfigurationFactory.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.Branding;
 
diff --git a/Emby.Server.Implementations/Browser/BrowserLauncher.cs b/Emby.Server.Implementations/Browser/BrowserLauncher.cs
index 737569978..718129ef0 100644
--- a/Emby.Server.Implementations/Browser/BrowserLauncher.cs
+++ b/Emby.Server.Implementations/Browser/BrowserLauncher.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller;
 
 namespace Emby.Server.Implementations.Browser
diff --git a/Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs b/Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs
index a80b2c46c..c10f00f9b 100644
--- a/Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs
+++ b/Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Emby.Server.Implementations/Channels/ChannelImageProvider.cs b/Emby.Server.Implementations/Channels/ChannelImageProvider.cs
index 13244e9b7..bafa68818 100644
--- a/Emby.Server.Implementations/Channels/ChannelImageProvider.cs
+++ b/Emby.Server.Implementations/Channels/ChannelImageProvider.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs b/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs
index 35469a4ce..ad6c537ef 100644
--- a/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs
+++ b/Emby.Server.Implementations/Channels/ChannelPostScanTask.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs b/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
index 67fcd3695..844f77a1a 100644
--- a/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
+++ b/Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Emby.Server.Implementations/Collections/CollectionImageProvider.cs b/Emby.Server.Implementations/Collections/CollectionImageProvider.cs
index a061ebf79..6642d1ef4 100644
--- a/Emby.Server.Implementations/Collections/CollectionImageProvider.cs
+++ b/Emby.Server.Implementations/Collections/CollectionImageProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Emby.Server.Implementations.Images;
diff --git a/Emby.Server.Implementations/Collections/CollectionManager.cs b/Emby.Server.Implementations/Collections/CollectionManager.cs
index 6765dfbcc..213bb35e4 100644
--- a/Emby.Server.Implementations/Collections/CollectionManager.cs
+++ b/Emby.Server.Implementations/Collections/CollectionManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
index 6d8641243..55f40db8f 100644
--- a/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using Emby.Server.Implementations.AppBase;
diff --git a/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs b/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs
index 6402da0c9..09fdbc856 100644
--- a/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs
+++ b/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index bd66d76fd..0f432c36c 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
diff --git a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
index 35fae0283..dcfe14943 100644
--- a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
+++ b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Configuration;
diff --git a/Emby.Server.Implementations/Data/ManagedConnection.cs b/Emby.Server.Implementations/Data/ManagedConnection.cs
index 63d0ca59c..2f3dfc4d1 100644
--- a/Emby.Server.Implementations/Data/ManagedConnection.cs
+++ b/Emby.Server.Implementations/Data/ManagedConnection.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using SQLitePCL.pretty;
 
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index a7ea5d412..822573f20 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs
index 13bc0094c..5ff61d37c 100644
--- a/Emby.Server.Implementations/Data/SqliteExtensions.cs
+++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index 4305bdef6..bf00f2e65 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using MediaBrowser.Controller;
diff --git a/Emby.Server.Implementations/Data/TypeMapper.cs b/Emby.Server.Implementations/Data/TypeMapper.cs
index b43d82c41..fa6a29aa3 100644
--- a/Emby.Server.Implementations/Data/TypeMapper.cs
+++ b/Emby.Server.Implementations/Data/TypeMapper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Linq;
 using MediaBrowser.Model.Reflection;
diff --git a/Emby.Server.Implementations/Diagnostics/CommonProcess.cs b/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
index dbde12703..d8a798c46 100644
--- a/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
+++ b/Emby.Server.Implementations/Diagnostics/CommonProcess.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
diff --git a/Emby.Server.Implementations/Diagnostics/ProcessFactory.cs b/Emby.Server.Implementations/Diagnostics/ProcessFactory.cs
index a2c511cb9..14aadaaae 100644
--- a/Emby.Server.Implementations/Diagnostics/ProcessFactory.cs
+++ b/Emby.Server.Implementations/Diagnostics/ProcessFactory.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Diagnostics;
+using MediaBrowser.Model.Diagnostics;
 
 namespace Emby.Server.Implementations.Diagnostics
 {
diff --git a/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs b/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
index 8a450a5fe..0fc4c3858 100644
--- a/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
+++ b/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Emby.Server.Implementations/EntryPoints/RefreshUsersMetadata.cs b/Emby.Server.Implementations/EntryPoints/RefreshUsersMetadata.cs
index 7d0ca3552..b7565adec 100644
--- a/Emby.Server.Implementations/EntryPoints/RefreshUsersMetadata.cs
+++ b/Emby.Server.Implementations/EntryPoints/RefreshUsersMetadata.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
diff --git a/Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs b/Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
index 4e357bbbc..92ea3a8f4 100644
--- a/Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using MediaBrowser.Common.Plugins;
diff --git a/Emby.Server.Implementations/EntryPoints/StartupWizard.cs b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
index 3afec4296..05c8b07ab 100644
--- a/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
+++ b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
@@ -1,4 +1,4 @@
-using Emby.Server.Implementations.Browser;
+using Emby.Server.Implementations.Browser;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Plugins;
diff --git a/Emby.Server.Implementations/EntryPoints/SystemEvents.cs b/Emby.Server.Implementations/EntryPoints/SystemEvents.cs
index 2f9cd044f..72c8acd9f 100644
--- a/Emby.Server.Implementations/EntryPoints/SystemEvents.cs
+++ b/Emby.Server.Implementations/EntryPoints/SystemEvents.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.System;
diff --git a/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs b/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
index 13898a7b9..2c8246d13 100644
--- a/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
+++ b/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Emby.Server.Implementations.Udp;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Plugins;
diff --git a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
index 4c448ba34..d6cf39d62 100644
--- a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
diff --git a/Emby.Server.Implementations/EnvironmentInfo/EnvironmentInfo.cs b/Emby.Server.Implementations/EnvironmentInfo/EnvironmentInfo.cs
index b39790339..c8104150d 100644
--- a/Emby.Server.Implementations/EnvironmentInfo/EnvironmentInfo.cs
+++ b/Emby.Server.Implementations/EnvironmentInfo/EnvironmentInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Runtime.InteropServices;
 using MediaBrowser.Model.System;
 
diff --git a/Emby.Server.Implementations/FFMpeg/FFMpegInfo.cs b/Emby.Server.Implementations/FFMpeg/FFMpegInfo.cs
index 13e1c2bf1..60cd7b3d7 100644
--- a/Emby.Server.Implementations/FFMpeg/FFMpegInfo.cs
+++ b/Emby.Server.Implementations/FFMpeg/FFMpegInfo.cs
@@ -1,4 +1,4 @@
-namespace Emby.Server.Implementations.FFMpeg
+namespace Emby.Server.Implementations.FFMpeg
 {
     /// <summary>
     /// Class FFMpegInfo
diff --git a/Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs b/Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs
index f88033cfb..715a26913 100644
--- a/Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs
+++ b/Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs
@@ -1,4 +1,4 @@
-
+
 namespace Emby.Server.Implementations.FFMpeg
 {
     public class FFMpegInstallInfo
diff --git a/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs b/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs
index 3c87f72f7..9a4aec958 100644
--- a/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs
+++ b/Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Server.Implementations/HttpClientManager/HttpClientInfo.cs b/Emby.Server.Implementations/HttpClientManager/HttpClientInfo.cs
index 21cec9d2b..f747b01b9 100644
--- a/Emby.Server.Implementations/HttpClientManager/HttpClientInfo.cs
+++ b/Emby.Server.Implementations/HttpClientManager/HttpClientInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net.Http;
 
 namespace Emby.Server.Implementations.HttpClientManager
diff --git a/Emby.Server.Implementations/HttpServer/FileWriter.cs b/Emby.Server.Implementations/HttpServer/FileWriter.cs
index 247299da6..c32c91670 100644
--- a/Emby.Server.Implementations/HttpServer/FileWriter.cs
+++ b/Emby.Server.Implementations/HttpServer/FileWriter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
diff --git a/Emby.Server.Implementations/HttpServer/IHttpListener.cs b/Emby.Server.Implementations/HttpServer/IHttpListener.cs
index 88d531668..835091361 100644
--- a/Emby.Server.Implementations/HttpServer/IHttpListener.cs
+++ b/Emby.Server.Implementations/HttpServer/IHttpListener.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Emby.Server.Implementations/HttpServer/LoggerUtils.cs b/Emby.Server.Implementations/HttpServer/LoggerUtils.cs
index bf1079a2c..d22d9db26 100644
--- a/Emby.Server.Implementations/HttpServer/LoggerUtils.cs
+++ b/Emby.Server.Implementations/HttpServer/LoggerUtils.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using MediaBrowser.Model.Services;
 using Microsoft.Extensions.Logging;
diff --git a/Emby.Server.Implementations/HttpServer/ResponseFilter.cs b/Emby.Server.Implementations/HttpServer/ResponseFilter.cs
index 21bd9df75..edd2a394b 100644
--- a/Emby.Server.Implementations/HttpServer/ResponseFilter.cs
+++ b/Emby.Server.Implementations/HttpServer/ResponseFilter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.Text;
 using MediaBrowser.Model.Services;
diff --git a/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs b/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
index b53d56a48..2c7057222 100644
--- a/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
+++ b/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
diff --git a/Emby.Server.Implementations/HttpServer/StreamWriter.cs b/Emby.Server.Implementations/HttpServer/StreamWriter.cs
index 675590189..3269d44cf 100644
--- a/Emby.Server.Implementations/HttpServer/StreamWriter.cs
+++ b/Emby.Server.Implementations/HttpServer/StreamWriter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
diff --git a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
index d4ef2d810..1ad92a83f 100644
--- a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
+++ b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
diff --git a/Emby.Server.Implementations/IO/ExtendedFileSystemInfo.cs b/Emby.Server.Implementations/IO/ExtendedFileSystemInfo.cs
index c7192bf99..48b34a3a0 100644
--- a/Emby.Server.Implementations/IO/ExtendedFileSystemInfo.cs
+++ b/Emby.Server.Implementations/IO/ExtendedFileSystemInfo.cs
@@ -1,4 +1,4 @@
-namespace Emby.Server.Implementations.IO
+namespace Emby.Server.Implementations.IO
 {
     public class ExtendedFileSystemInfo
     {
diff --git a/Emby.Server.Implementations/IO/FileRefresher.cs b/Emby.Server.Implementations/IO/FileRefresher.cs
index b7f45c462..dcf26fdaf 100644
--- a/Emby.Server.Implementations/IO/FileRefresher.cs
+++ b/Emby.Server.Implementations/IO/FileRefresher.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Server.Implementations/IO/IsoManager.cs b/Emby.Server.Implementations/IO/IsoManager.cs
index e0cf32868..e82335d65 100644
--- a/Emby.Server.Implementations/IO/IsoManager.cs
+++ b/Emby.Server.Implementations/IO/IsoManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
diff --git a/Emby.Server.Implementations/IO/LibraryMonitor.cs b/Emby.Server.Implementations/IO/LibraryMonitor.cs
index deaa506cc..39ed1afa7 100644
--- a/Emby.Server.Implementations/IO/LibraryMonitor.cs
+++ b/Emby.Server.Implementations/IO/LibraryMonitor.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Emby.Server.Implementations/IO/MbLinkShortcutHandler.cs b/Emby.Server.Implementations/IO/MbLinkShortcutHandler.cs
index 3c89039f7..a306f94b3 100644
--- a/Emby.Server.Implementations/IO/MbLinkShortcutHandler.cs
+++ b/Emby.Server.Implementations/IO/MbLinkShortcutHandler.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using MediaBrowser.Model.IO;
 
diff --git a/Emby.Server.Implementations/IO/StreamHelper.cs b/Emby.Server.Implementations/IO/StreamHelper.cs
index b3854c79f..09cf4d4a3 100644
--- a/Emby.Server.Implementations/IO/StreamHelper.cs
+++ b/Emby.Server.Implementations/IO/StreamHelper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Emby.Server.Implementations/IO/ThrottledStream.cs b/Emby.Server.Implementations/IO/ThrottledStream.cs
index 070dc9038..81e8abc98 100644
--- a/Emby.Server.Implementations/IO/ThrottledStream.cs
+++ b/Emby.Server.Implementations/IO/ThrottledStream.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs b/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
index 5c0aa8a23..b99b98157 100644
--- a/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
+++ b/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
index 2af06c78f..c0a126b84 100644
--- a/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
+++ b/Emby.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Controller.Entities;
diff --git a/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs b/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs
index bf68f11b5..4013ac0c8 100644
--- a/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs
+++ b/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Authentication;
diff --git a/Emby.Server.Implementations/Library/ExclusiveLiveStream.cs b/Emby.Server.Implementations/Library/ExclusiveLiveStream.cs
index 2da50339a..45a33a296 100644
--- a/Emby.Server.Implementations/Library/ExclusiveLiveStream.cs
+++ b/Emby.Server.Implementations/Library/ExclusiveLiveStream.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
diff --git a/Emby.Server.Implementations/Library/LiveStreamHelper.cs b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
index ea1d1890c..c3082a78a 100644
--- a/Emby.Server.Implementations/Library/LiveStreamHelper.cs
+++ b/Emby.Server.Implementations/Library/LiveStreamHelper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
diff --git a/Emby.Server.Implementations/Library/MediaStreamSelector.cs b/Emby.Server.Implementations/Library/MediaStreamSelector.cs
index 3777023e7..0a6c8845d 100644
--- a/Emby.Server.Implementations/Library/MediaStreamSelector.cs
+++ b/Emby.Server.Implementations/Library/MediaStreamSelector.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Model.Configuration;
diff --git a/Emby.Server.Implementations/Library/MusicManager.cs b/Emby.Server.Implementations/Library/MusicManager.cs
index 46889e6d9..10602fea7 100644
--- a/Emby.Server.Implementations/Library/MusicManager.cs
+++ b/Emby.Server.Implementations/Library/MusicManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Controller.Dto;
diff --git a/Emby.Server.Implementations/Library/PathExtensions.cs b/Emby.Server.Implementations/Library/PathExtensions.cs
index 2d3019d17..6a3adda5a 100644
--- a/Emby.Server.Implementations/Library/PathExtensions.cs
+++ b/Emby.Server.Implementations/Library/PathExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text.RegularExpressions;
 
 namespace Emby.Server.Implementations.Library
diff --git a/Emby.Server.Implementations/Library/ResolverHelper.cs b/Emby.Server.Implementations/Library/ResolverHelper.cs
index 7bfc58fe3..7484fc743 100644
--- a/Emby.Server.Implementations/Library/ResolverHelper.cs
+++ b/Emby.Server.Implementations/Library/ResolverHelper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using MediaBrowser.Controller.Entities;
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index 64f78d511..3ce1da81a 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Emby.Naming.Audio;
 using MediaBrowser.Controller.Entities.Audio;
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
index ab1406c6f..74e9b8304 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.Audio;
diff --git a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
index e6b05a1af..bd5132c4b 100644
--- a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using Emby.Naming.Video;
diff --git a/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
index d7f80b3f4..f22554ee5 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using MediaBrowser.Controller.Entities;
diff --git a/Emby.Server.Implementations/Library/Resolvers/FolderResolver.cs b/Emby.Server.Implementations/Library/Resolvers/FolderResolver.cs
index 47e7f7344..e48b6c967 100644
--- a/Emby.Server.Implementations/Library/Resolvers/FolderResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/FolderResolver.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Resolvers;
 
diff --git a/Emby.Server.Implementations/Library/Resolvers/ItemResolver.cs b/Emby.Server.Implementations/Library/Resolvers/ItemResolver.cs
index 529916619..a6db40714 100644
--- a/Emby.Server.Implementations/Library/Resolvers/ItemResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/ItemResolver.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Resolvers;
 
diff --git a/Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs
index 53837cfca..82779f8d3 100644
--- a/Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
diff --git a/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs
index fb84e3ad5..78c1c6629 100644
--- a/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/PhotoResolver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using MediaBrowser.Controller.Drawing;
diff --git a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
index 4695940f1..c295894d3 100644
--- a/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using MediaBrowser.Controller.Library;
diff --git a/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs b/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs
index 2981eb8dc..fa8c89e88 100644
--- a/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using MediaBrowser.Controller;
diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
index 97dff0093..fed0904d1 100644
--- a/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
diff --git a/Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs
index 4da83af84..60752a85d 100644
--- a/Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.IO;
 
diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs
index 1e7ea469e..f2921e354 100644
--- a/Emby.Server.Implementations/Library/UserDataManager.cs
+++ b/Emby.Server.Implementations/Library/UserDataManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/Emby.Server.Implementations/Library/UserViewManager.cs b/Emby.Server.Implementations/Library/UserViewManager.cs
index 8b1f3ac80..9fa859bde 100644
--- a/Emby.Server.Implementations/Library/UserViewManager.cs
+++ b/Emby.Server.Implementations/Library/UserViewManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
diff --git a/Emby.Server.Implementations/Library/Validators/ArtistsPostScanTask.cs b/Emby.Server.Implementations/Library/Validators/ArtistsPostScanTask.cs
index 323219e3d..27261d449 100644
--- a/Emby.Server.Implementations/Library/Validators/ArtistsPostScanTask.cs
+++ b/Emby.Server.Implementations/Library/Validators/ArtistsPostScanTask.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
diff --git a/Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs b/Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs
index b490aa396..294348660 100644
--- a/Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs
+++ b/Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Emby.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs b/Emby.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs
index b4333a1dc..2b067951d 100644
--- a/Emby.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs
+++ b/Emby.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
diff --git a/Emby.Server.Implementations/Library/Validators/GameGenresValidator.cs b/Emby.Server.Implementations/Library/Validators/GameGenresValidator.cs
index c9c3674a0..f5ffa1e45 100644
--- a/Emby.Server.Implementations/Library/Validators/GameGenresValidator.cs
+++ b/Emby.Server.Implementations/Library/Validators/GameGenresValidator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
diff --git a/Emby.Server.Implementations/Library/Validators/GenresPostScanTask.cs b/Emby.Server.Implementations/Library/Validators/GenresPostScanTask.cs
index 55638a26f..056807300 100644
--- a/Emby.Server.Implementations/Library/Validators/GenresPostScanTask.cs
+++ b/Emby.Server.Implementations/Library/Validators/GenresPostScanTask.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
diff --git a/Emby.Server.Implementations/Library/Validators/GenresValidator.cs b/Emby.Server.Implementations/Library/Validators/GenresValidator.cs
index 6e24bd5c8..f8459c61f 100644
--- a/Emby.Server.Implementations/Library/Validators/GenresValidator.cs
+++ b/Emby.Server.Implementations/Library/Validators/GenresValidator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
diff --git a/Emby.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs b/Emby.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs
index ec4685ef6..d7ab92d30 100644
--- a/Emby.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs
+++ b/Emby.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
diff --git a/Emby.Server.Implementations/Library/Validators/MusicGenresValidator.cs b/Emby.Server.Implementations/Library/Validators/MusicGenresValidator.cs
index 9cead7b43..710e5d043 100644
--- a/Emby.Server.Implementations/Library/Validators/MusicGenresValidator.cs
+++ b/Emby.Server.Implementations/Library/Validators/MusicGenresValidator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
diff --git a/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs b/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs
index 7cef23799..0ea543ba0 100644
--- a/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs
+++ b/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Configuration;
diff --git a/Emby.Server.Implementations/Library/Validators/StudiosPostScanTask.cs b/Emby.Server.Implementations/Library/Validators/StudiosPostScanTask.cs
index 551275ec0..4aa5c7e72 100644
--- a/Emby.Server.Implementations/Library/Validators/StudiosPostScanTask.cs
+++ b/Emby.Server.Implementations/Library/Validators/StudiosPostScanTask.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
diff --git a/Emby.Server.Implementations/Library/Validators/StudiosValidator.cs b/Emby.Server.Implementations/Library/Validators/StudiosValidator.cs
index 409612be7..da4645a11 100644
--- a/Emby.Server.Implementations/Library/Validators/StudiosValidator.cs
+++ b/Emby.Server.Implementations/Library/Validators/StudiosValidator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Entities;
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs
index 32241812d..7d7ef21e3 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Net;
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EntryPoint.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EntryPoint.cs
index 139cf570e..982a54b68 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EntryPoint.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EntryPoint.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Plugins;
+using MediaBrowser.Controller.Plugins;
 
 namespace Emby.Server.Implementations.LiveTv.EmbyTV
 {
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/IRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/IRecorder.cs
index e639a312c..6eced3050 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/IRecorder.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/IRecorder.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
index ecf5343c7..1b8287ed1 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
index b5ae38839..ded3c7607 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using MediaBrowser.Controller.LiveTv;
 
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/SeriesTimerManager.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/SeriesTimerManager.cs
index cec04f58c..d2ad65a1e 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/SeriesTimerManager.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/SeriesTimerManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Serialization;
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvConfigurationFactory.cs b/Emby.Server.Implementations/LiveTv/LiveTvConfigurationFactory.cs
index c1773c1b1..f9b274acb 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvConfigurationFactory.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvConfigurationFactory.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.LiveTv;
 
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs b/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
index a9b00c4fb..cd1731de5 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
diff --git a/Emby.Server.Implementations/LiveTv/RefreshChannelsScheduledTask.cs b/Emby.Server.Implementations/LiveTv/RefreshChannelsScheduledTask.cs
index e1303125e..542951de4 100644
--- a/Emby.Server.Implementations/LiveTv/RefreshChannelsScheduledTask.cs
+++ b/Emby.Server.Implementations/LiveTv/RefreshChannelsScheduledTask.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Configuration;
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
index 7263572d5..ee86f66e6 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
index d0c0d9e76..1ec5894d0 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Text;
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
index f44bb8c20..1f8ca276e 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
index 20cb402d8..0772a6025 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
index 8ca91388f..b39a9f679 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Emby.Server.Implementations/Localization/TextLocalizer.cs b/Emby.Server.Implementations/Localization/TextLocalizer.cs
index 09445d428..96591e5e6 100644
--- a/Emby.Server.Implementations/Localization/TextLocalizer.cs
+++ b/Emby.Server.Implementations/Localization/TextLocalizer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.Linq;
 using System.Text;
diff --git a/Emby.Server.Implementations/Net/IWebSocket.cs b/Emby.Server.Implementations/Net/IWebSocket.cs
index 432b1e41a..4671de07c 100644
--- a/Emby.Server.Implementations/Net/IWebSocket.cs
+++ b/Emby.Server.Implementations/Net/IWebSocket.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Emby.Server.Implementations/Net/SocketFactory.cs b/Emby.Server.Implementations/Net/SocketFactory.cs
index bfb2e1c46..2e22fbbb8 100644
--- a/Emby.Server.Implementations/Net/SocketFactory.cs
+++ b/Emby.Server.Implementations/Net/SocketFactory.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Net;
 using System.Net.Sockets;
diff --git a/Emby.Server.Implementations/Net/UdpSocket.cs b/Emby.Server.Implementations/Net/UdpSocket.cs
index 39f25e024..cdfdb7210 100644
--- a/Emby.Server.Implementations/Net/UdpSocket.cs
+++ b/Emby.Server.Implementations/Net/UdpSocket.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
diff --git a/Emby.Server.Implementations/Net/WebSocketConnectEventArgs.cs b/Emby.Server.Implementations/Net/WebSocketConnectEventArgs.cs
index c6a1e0fe8..3ab8e854a 100644
--- a/Emby.Server.Implementations/Net/WebSocketConnectEventArgs.cs
+++ b/Emby.Server.Implementations/Net/WebSocketConnectEventArgs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Services;
 
 namespace Emby.Server.Implementations.Net
diff --git a/Emby.Server.Implementations/Networking/IPNetwork/BigIntegerExt.cs b/Emby.Server.Implementations/Networking/IPNetwork/BigIntegerExt.cs
index 50a3023a4..1a2ad665b 100644
--- a/Emby.Server.Implementations/Networking/IPNetwork/BigIntegerExt.cs
+++ b/Emby.Server.Implementations/Networking/IPNetwork/BigIntegerExt.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace System.Net
 {
diff --git a/Emby.Server.Implementations/Networking/IPNetwork/IPAddressCollection.cs b/Emby.Server.Implementations/Networking/IPNetwork/IPAddressCollection.cs
index 34a6001c6..c2a6305f6 100644
--- a/Emby.Server.Implementations/Networking/IPNetwork/IPAddressCollection.cs
+++ b/Emby.Server.Implementations/Networking/IPNetwork/IPAddressCollection.cs
@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using System.Numerics;
 
diff --git a/Emby.Server.Implementations/Networking/IPNetwork/IPNetwork.cs b/Emby.Server.Implementations/Networking/IPNetwork/IPNetwork.cs
index cb9ac8ffd..321d4a3c5 100644
--- a/Emby.Server.Implementations/Networking/IPNetwork/IPNetwork.cs
+++ b/Emby.Server.Implementations/Networking/IPNetwork/IPNetwork.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Net.Sockets;
 using System.Numerics;
diff --git a/Emby.Server.Implementations/Networking/IPNetwork/IPNetworkCollection.cs b/Emby.Server.Implementations/Networking/IPNetwork/IPNetworkCollection.cs
index 0201f6fc3..1827af77a 100644
--- a/Emby.Server.Implementations/Networking/IPNetwork/IPNetworkCollection.cs
+++ b/Emby.Server.Implementations/Networking/IPNetwork/IPNetworkCollection.cs
@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using System.Numerics;
 
diff --git a/Emby.Server.Implementations/Playlists/ManualPlaylistsFolder.cs b/Emby.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
index f2bc4c07d..f4decc856 100644
--- a/Emby.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
+++ b/Emby.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Playlists;
diff --git a/Emby.Server.Implementations/Playlists/PlaylistImageProvider.cs b/Emby.Server.Implementations/Playlists/PlaylistImageProvider.cs
index 7c3cad5df..223153164 100644
--- a/Emby.Server.Implementations/Playlists/PlaylistImageProvider.cs
+++ b/Emby.Server.Implementations/Playlists/PlaylistImageProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Emby.Server.Implementations.Images;
diff --git a/Emby.Server.Implementations/Reflection/AssemblyInfo.cs b/Emby.Server.Implementations/Reflection/AssemblyInfo.cs
index c3ce97d40..9d16fe43f 100644
--- a/Emby.Server.Implementations/Reflection/AssemblyInfo.cs
+++ b/Emby.Server.Implementations/Reflection/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Reflection;
 using MediaBrowser.Model.Reflection;
diff --git a/Emby.Server.Implementations/ResourceFileManager.cs b/Emby.Server.Implementations/ResourceFileManager.cs
index fd88c4bb5..f54e3205a 100644
--- a/Emby.Server.Implementations/ResourceFileManager.cs
+++ b/Emby.Server.Implementations/ResourceFileManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using MediaBrowser.Controller;
diff --git a/Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs b/Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
index fdc8ed9c4..0ae7ae96c 100644
--- a/Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Server.Implementations/ScheduledTasks/DailyTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/DailyTrigger.cs
index c2a69ba48..98685cebe 100644
--- a/Emby.Server.Implementations/ScheduledTasks/DailyTrigger.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/DailyTrigger.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.Threading;
 using MediaBrowser.Model.Tasks;
diff --git a/Emby.Server.Implementations/ScheduledTasks/IntervalTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/IntervalTrigger.cs
index edd3eb8c0..3a34da3af 100644
--- a/Emby.Server.Implementations/ScheduledTasks/IntervalTrigger.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/IntervalTrigger.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading;
 using MediaBrowser.Model.Tasks;
diff --git a/Emby.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs b/Emby.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs
index 1ba7c853c..f6fa64d13 100644
--- a/Emby.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Emby.Server.Implementations/ScheduledTasks/StartupTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/StartupTrigger.cs
index bcddb2b2a..08ff4f55f 100644
--- a/Emby.Server.Implementations/ScheduledTasks/StartupTrigger.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/StartupTrigger.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;
diff --git a/Emby.Server.Implementations/ScheduledTasks/SystemEventTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/SystemEventTrigger.cs
index 0d629786f..7a88fc2b0 100644
--- a/Emby.Server.Implementations/ScheduledTasks/SystemEventTrigger.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/SystemEventTrigger.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.Tasks;
diff --git a/Emby.Server.Implementations/ScheduledTasks/TaskManager.cs b/Emby.Server.Implementations/ScheduledTasks/TaskManager.cs
index c81025edd..754fb1633 100644
--- a/Emby.Server.Implementations/ScheduledTasks/TaskManager.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/TaskManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
index 93d1f1a94..2590f455c 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs
index 67ecdd147..a57fe4945 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
diff --git a/Emby.Server.Implementations/ScheduledTasks/WeeklyTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/WeeklyTrigger.cs
index 11e92b771..2a6a7b13c 100644
--- a/Emby.Server.Implementations/ScheduledTasks/WeeklyTrigger.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/WeeklyTrigger.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using MediaBrowser.Model.Tasks;
 using Microsoft.Extensions.Logging;
diff --git a/Emby.Server.Implementations/Security/MBLicenseFile.cs b/Emby.Server.Implementations/Security/MBLicenseFile.cs
index fc1c1f0bf..8273ec8b2 100644
--- a/Emby.Server.Implementations/Security/MBLicenseFile.cs
+++ b/Emby.Server.Implementations/Security/MBLicenseFile.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/Emby.Server.Implementations/Security/PluginSecurityManager.cs b/Emby.Server.Implementations/Security/PluginSecurityManager.cs
index ddff00628..cb224627c 100644
--- a/Emby.Server.Implementations/Security/PluginSecurityManager.cs
+++ b/Emby.Server.Implementations/Security/PluginSecurityManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Emby.Server.Implementations/Security/RegRecord.cs b/Emby.Server.Implementations/Security/RegRecord.cs
index 8363e9223..11a02e0e7 100644
--- a/Emby.Server.Implementations/Security/RegRecord.cs
+++ b/Emby.Server.Implementations/Security/RegRecord.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Emby.Server.Implementations.Security
 {
diff --git a/Emby.Server.Implementations/Serialization/XmlSerializer.cs b/Emby.Server.Implementations/Serialization/XmlSerializer.cs
index 5bacc754d..210b5dfdd 100644
--- a/Emby.Server.Implementations/Serialization/XmlSerializer.cs
+++ b/Emby.Server.Implementations/Serialization/XmlSerializer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml;
diff --git a/Emby.Server.Implementations/ServerApplicationPaths.cs b/Emby.Server.Implementations/ServerApplicationPaths.cs
index 933b67291..edea10a07 100644
--- a/Emby.Server.Implementations/ServerApplicationPaths.cs
+++ b/Emby.Server.Implementations/ServerApplicationPaths.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using Emby.Server.Implementations.AppBase;
 using MediaBrowser.Controller;
diff --git a/Emby.Server.Implementations/Services/ServiceMethod.cs b/Emby.Server.Implementations/Services/ServiceMethod.cs
index cc3a17a37..7add72815 100644
--- a/Emby.Server.Implementations/Services/ServiceMethod.cs
+++ b/Emby.Server.Implementations/Services/ServiceMethod.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Emby.Server.Implementations.Services
 {
diff --git a/Emby.Server.Implementations/Services/UrlExtensions.cs b/Emby.Server.Implementations/Services/UrlExtensions.cs
index bdef1760f..8899fbfa3 100644
--- a/Emby.Server.Implementations/Services/UrlExtensions.cs
+++ b/Emby.Server.Implementations/Services/UrlExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Emby.Server.Implementations.Services
 {
diff --git a/Emby.Server.Implementations/Session/HttpSessionController.cs b/Emby.Server.Implementations/Session/HttpSessionController.cs
index 56befdeca..9281f82b3 100644
--- a/Emby.Server.Implementations/Session/HttpSessionController.cs
+++ b/Emby.Server.Implementations/Session/HttpSessionController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
diff --git a/Emby.Server.Implementations/Session/WebSocketController.cs b/Emby.Server.Implementations/Session/WebSocketController.cs
index 3bfe57658..0d483c55f 100644
--- a/Emby.Server.Implementations/Session/WebSocketController.cs
+++ b/Emby.Server.Implementations/Session/WebSocketController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.WebSockets;
diff --git a/Emby.Server.Implementations/Sorting/AlbumComparer.cs b/Emby.Server.Implementations/Sorting/AlbumComparer.cs
index b64c60861..3831a0d2d 100644
--- a/Emby.Server.Implementations/Sorting/AlbumComparer.cs
+++ b/Emby.Server.Implementations/Sorting/AlbumComparer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Sorting;
diff --git a/Emby.Server.Implementations/Sorting/AlphanumComparator.cs b/Emby.Server.Implementations/Sorting/AlphanumComparator.cs
index 4bfcda1ac..f21f905df 100644
--- a/Emby.Server.Implementations/Sorting/AlphanumComparator.cs
+++ b/Emby.Server.Implementations/Sorting/AlphanumComparator.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text;
 using MediaBrowser.Controller.Sorting;
 
diff --git a/Emby.Server.Implementations/Sorting/ArtistComparer.cs b/Emby.Server.Implementations/Sorting/ArtistComparer.cs
index af0b332cc..9d5befc9a 100644
--- a/Emby.Server.Implementations/Sorting/ArtistComparer.cs
+++ b/Emby.Server.Implementations/Sorting/ArtistComparer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Sorting;
diff --git a/Emby.Server.Implementations/Sorting/CommunityRatingComparer.cs b/Emby.Server.Implementations/Sorting/CommunityRatingComparer.cs
index 60aa68425..87d3ae2d6 100644
--- a/Emby.Server.Implementations/Sorting/CommunityRatingComparer.cs
+++ b/Emby.Server.Implementations/Sorting/CommunityRatingComparer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
diff --git a/Emby.Server.Implementations/Sorting/CriticRatingComparer.cs b/Emby.Server.Implementations/Sorting/CriticRatingComparer.cs
index 5c4aeaf86..adb78dec5 100644
--- a/Emby.Server.Implementations/Sorting/CriticRatingComparer.cs
+++ b/Emby.Server.Implementations/Sorting/CriticRatingComparer.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 
diff --git a/Emby.Server.Implementations/Sorting/DateCreatedComparer.cs b/Emby.Server.Implementations/Sorting/DateCreatedComparer.cs
index 8ff438aca..8501bd9ee 100644
--- a/Emby.Server.Implementations/Sorting/DateCreatedComparer.cs
+++ b/Emby.Server.Implementations/Sorting/DateCreatedComparer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
diff --git a/Emby.Server.Implementations/Sorting/DatePlayedComparer.cs b/Emby.Server.Implementations/Sorting/DatePlayedComparer.cs
index dd961c23e..73f59f8cd 100644
--- a/Emby.Server.Implementations/Sorting/DatePlayedComparer.cs
+++ b/Emby.Server.Implementations/Sorting/DatePlayedComparer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Sorting;
diff --git a/Emby.Server.Implementations/Sorting/GameSystemComparer.cs b/Emby.Server.Implementations/Sorting/GameSystemComparer.cs
index fcd66f97f..2a04bae3c 100644
--- a/Emby.Server.Implementations/Sorting/GameSystemComparer.cs
+++ b/Emby.Server.Implementations/Sorting/GameSystemComparer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
diff --git a/Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs b/Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
index 919ac55df..66de05a6a 100644
--- a/Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
+++ b/Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
diff --git a/Emby.Server.Implementations/Sorting/IsFolderComparer.cs b/Emby.Server.Implementations/Sorting/IsFolderComparer.cs
index 8b6cbb2db..dfaa144cd 100644
--- a/Emby.Server.Implementations/Sorting/IsFolderComparer.cs
+++ b/Emby.Server.Implementations/Sorting/IsFolderComparer.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 
diff --git a/Emby.Server.Implementations/Sorting/IsPlayedComparer.cs b/Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
index 544cae845..da3f3dd25 100644
--- a/Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
+++ b/Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
diff --git a/Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs b/Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
index d145aa8dd..d99d0eff2 100644
--- a/Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
+++ b/Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
diff --git a/Emby.Server.Implementations/Sorting/NameComparer.cs b/Emby.Server.Implementations/Sorting/NameComparer.cs
index 7ba25c6c2..10fa4359a 100644
--- a/Emby.Server.Implementations/Sorting/NameComparer.cs
+++ b/Emby.Server.Implementations/Sorting/NameComparer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
diff --git a/Emby.Server.Implementations/Sorting/OfficialRatingComparer.cs b/Emby.Server.Implementations/Sorting/OfficialRatingComparer.cs
index 359ab607e..e8fa8edc8 100644
--- a/Emby.Server.Implementations/Sorting/OfficialRatingComparer.cs
+++ b/Emby.Server.Implementations/Sorting/OfficialRatingComparer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Globalization;
diff --git a/Emby.Server.Implementations/Sorting/PlayCountComparer.cs b/Emby.Server.Implementations/Sorting/PlayCountComparer.cs
index b7165ab8c..eb74ce1bd 100644
--- a/Emby.Server.Implementations/Sorting/PlayCountComparer.cs
+++ b/Emby.Server.Implementations/Sorting/PlayCountComparer.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
diff --git a/Emby.Server.Implementations/Sorting/PlayersComparer.cs b/Emby.Server.Implementations/Sorting/PlayersComparer.cs
index 5b50ea48a..e3652f36b 100644
--- a/Emby.Server.Implementations/Sorting/PlayersComparer.cs
+++ b/Emby.Server.Implementations/Sorting/PlayersComparer.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 
diff --git a/Emby.Server.Implementations/Sorting/PremiereDateComparer.cs b/Emby.Server.Implementations/Sorting/PremiereDateComparer.cs
index e36d65056..0c944a7a0 100644
--- a/Emby.Server.Implementations/Sorting/PremiereDateComparer.cs
+++ b/Emby.Server.Implementations/Sorting/PremiereDateComparer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
diff --git a/Emby.Server.Implementations/Sorting/ProductionYearComparer.cs b/Emby.Server.Implementations/Sorting/ProductionYearComparer.cs
index 0aa5e833b..472a07eb3 100644
--- a/Emby.Server.Implementations/Sorting/ProductionYearComparer.cs
+++ b/Emby.Server.Implementations/Sorting/ProductionYearComparer.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
 
diff --git a/Emby.Server.Implementations/Sorting/RandomComparer.cs b/Emby.Server.Implementations/Sorting/RandomComparer.cs
index de8e1d88f..bde8b4534 100644
--- a/Emby.Server.Implementations/Sorting/RandomComparer.cs
+++ b/Emby.Server.Implementations/Sorting/RandomComparer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
diff --git a/Emby.Server.Implementations/Sorting/RuntimeComparer.cs b/Emby.Server.Implementations/Sorting/RuntimeComparer.cs
index 08a25269a..1d2bdde26 100644
--- a/Emby.Server.Implementations/Sorting/RuntimeComparer.cs
+++ b/Emby.Server.Implementations/Sorting/RuntimeComparer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
diff --git a/Emby.Server.Implementations/Sorting/SortNameComparer.cs b/Emby.Server.Implementations/Sorting/SortNameComparer.cs
index 2b70d8b02..cc0571c78 100644
--- a/Emby.Server.Implementations/Sorting/SortNameComparer.cs
+++ b/Emby.Server.Implementations/Sorting/SortNameComparer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;
diff --git a/Emby.Server.Implementations/Sorting/StartDateComparer.cs b/Emby.Server.Implementations/Sorting/StartDateComparer.cs
index 9954daf19..aa040fa15 100644
--- a/Emby.Server.Implementations/Sorting/StartDateComparer.cs
+++ b/Emby.Server.Implementations/Sorting/StartDateComparer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Sorting;
diff --git a/Emby.Server.Implementations/Sorting/StudioComparer.cs b/Emby.Server.Implementations/Sorting/StudioComparer.cs
index 9b6c15b2b..617ed55d5 100644
--- a/Emby.Server.Implementations/Sorting/StudioComparer.cs
+++ b/Emby.Server.Implementations/Sorting/StudioComparer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
diff --git a/Emby.Server.Implementations/StartupOptions.cs b/Emby.Server.Implementations/StartupOptions.cs
index 2114d85bf..221263634 100644
--- a/Emby.Server.Implementations/StartupOptions.cs
+++ b/Emby.Server.Implementations/StartupOptions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 
 namespace Emby.Server.Implementations
diff --git a/Emby.Server.Implementations/SystemEvents.cs b/Emby.Server.Implementations/SystemEvents.cs
index 578338aee..1297200f9 100644
--- a/Emby.Server.Implementations/SystemEvents.cs
+++ b/Emby.Server.Implementations/SystemEvents.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.System;
 using Microsoft.Extensions.Logging;
 
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/ErrorCode.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/ErrorCode.cs
index cba084c8b..87f07fc9c 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/ErrorCode.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/ErrorCode.cs
@@ -1,4 +1,4 @@
-namespace NLangDetect.Core
+namespace NLangDetect.Core
 {
     public enum ErrorCode
     {
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/Extensions/CharExtensions.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/Extensions/CharExtensions.cs
index 24fc6cd87..6e58a0be8 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/Extensions/CharExtensions.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/Extensions/CharExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace NLangDetect.Core.Extensions
 {
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/Extensions/RandomExtensions.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/Extensions/RandomExtensions.cs
index ec8784df3..5b2fce60b 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/Extensions/RandomExtensions.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/Extensions/RandomExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace NLangDetect.Core.Extensions
 {
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/Extensions/UnicodeBlock.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/Extensions/UnicodeBlock.cs
index bda12fc2f..bcc81f968 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/Extensions/UnicodeBlock.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/Extensions/UnicodeBlock.cs
@@ -1,4 +1,4 @@
-namespace NLangDetect.Core.Extensions
+namespace NLangDetect.Core.Extensions
 {
     public enum UnicodeBlock
     {
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/InternalException.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/InternalException.cs
index 11e8f876d..6ed1efa88 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/InternalException.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/InternalException.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace NLangDetect.Core
 {
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/LanguageDetector.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/LanguageDetector.cs
index 044c7e759..98c4f623c 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/LanguageDetector.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/LanguageDetector.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Serialization;
 
 namespace NLangDetect.Core
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/NLangDetectException.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/NLangDetectException.cs
index 99825bcf3..800858bca 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/NLangDetectException.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/NLangDetectException.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace NLangDetect.Core
 {
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/ProbVector.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/ProbVector.cs
index 0684d91c3..7ad16108a 100644
--- a/Emby.Server.Implementations/TextEncoding/NLangDetect/ProbVector.cs
+++ b/Emby.Server.Implementations/TextEncoding/NLangDetect/ProbVector.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace NLangDetect.Core
diff --git a/Emby.Server.Implementations/TextEncoding/TextEncodingDetect.cs b/Emby.Server.Implementations/TextEncoding/TextEncodingDetect.cs
index 15f1ce91e..49a371efa 100644
--- a/Emby.Server.Implementations/TextEncoding/TextEncodingDetect.cs
+++ b/Emby.Server.Implementations/TextEncoding/TextEncodingDetect.cs
@@ -1,4 +1,4 @@
-namespace Emby.Server.Implementations.TextEncoding
+namespace Emby.Server.Implementations.TextEncoding
 {
     // Copyright 2015-2016 Jonathan Bennett <jon@autoitscript.com>
     //
diff --git a/Emby.Server.Implementations/Threading/CommonTimer.cs b/Emby.Server.Implementations/Threading/CommonTimer.cs
index 9451b07f3..5a05da564 100644
--- a/Emby.Server.Implementations/Threading/CommonTimer.cs
+++ b/Emby.Server.Implementations/Threading/CommonTimer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using MediaBrowser.Model.Threading;
 
diff --git a/Emby.Server.Implementations/Threading/TimerFactory.cs b/Emby.Server.Implementations/Threading/TimerFactory.cs
index 4ab6f6fc4..ca50064c7 100644
--- a/Emby.Server.Implementations/Threading/TimerFactory.cs
+++ b/Emby.Server.Implementations/Threading/TimerFactory.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Model.Threading;
 
 namespace Emby.Server.Implementations.Threading
diff --git a/Emby.Server.Implementations/UserViews/CollectionFolderImageProvider.cs b/Emby.Server.Implementations/UserViews/CollectionFolderImageProvider.cs
index 799c9794f..8788cfc26 100644
--- a/Emby.Server.Implementations/UserViews/CollectionFolderImageProvider.cs
+++ b/Emby.Server.Implementations/UserViews/CollectionFolderImageProvider.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Emby.Server.Implementations/UserViews/FolderImageProvider.cs b/Emby.Server.Implementations/UserViews/FolderImageProvider.cs
index 580eb89ad..7629f6039 100644
--- a/Emby.Server.Implementations/UserViews/FolderImageProvider.cs
+++ b/Emby.Server.Implementations/UserViews/FolderImageProvider.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Emby.Server.Implementations.Images;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Drawing;
diff --git a/Emby.Server.Implementations/Xml/XmlReaderSettingsFactory.cs b/Emby.Server.Implementations/Xml/XmlReaderSettingsFactory.cs
index 0f4e8af3c..308922e6d 100644
--- a/Emby.Server.Implementations/Xml/XmlReaderSettingsFactory.cs
+++ b/Emby.Server.Implementations/Xml/XmlReaderSettingsFactory.cs
@@ -1,4 +1,4 @@
-using System.Xml;
+using System.Xml;
 using MediaBrowser.Model.Xml;
 
 namespace Emby.Server.Implementations.Xml
diff --git a/Emby.XmlTv/Emby.XmlTv.Console/Classes/EntityExtensions.cs b/Emby.XmlTv/Emby.XmlTv.Console/Classes/EntityExtensions.cs
index 37fcf0eca..96e508f12 100644
--- a/Emby.XmlTv/Emby.XmlTv.Console/Classes/EntityExtensions.cs
+++ b/Emby.XmlTv/Emby.XmlTv.Console/Classes/EntityExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Text;
 
diff --git a/Emby.XmlTv/Emby.XmlTv.Console/Program.cs b/Emby.XmlTv/Emby.XmlTv.Console/Program.cs
index 056f5a589..3e0c7d125 100644
--- a/Emby.XmlTv/Emby.XmlTv.Console/Program.cs
+++ b/Emby.XmlTv/Emby.XmlTv.Console/Program.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
diff --git a/Emby.XmlTv/Emby.XmlTv.Console/Properties/AssemblyInfo.cs b/Emby.XmlTv/Emby.XmlTv.Console/Properties/AssemblyInfo.cs
index 4178a27a1..ff59f890f 100644
--- a/Emby.XmlTv/Emby.XmlTv.Console/Properties/AssemblyInfo.cs
+++ b/Emby.XmlTv/Emby.XmlTv.Console/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
diff --git a/Emby.XmlTv/Emby.XmlTv.Test/Properties/AssemblyInfo.cs b/Emby.XmlTv/Emby.XmlTv.Test/Properties/AssemblyInfo.cs
index e79fda8a8..902860363 100644
--- a/Emby.XmlTv/Emby.XmlTv.Test/Properties/AssemblyInfo.cs
+++ b/Emby.XmlTv/Emby.XmlTv.Test/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
diff --git a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs
index 2e4516be5..857cc339c 100644
--- a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs
+++ b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 using Emby.XmlTv.Classes;
diff --git a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs
index 77dabe13e..32a0431d2 100644
--- a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs
+++ b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Threading;
diff --git a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderTests.cs b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderTests.cs
index 1485cf06c..b1dffc59c 100644
--- a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderTests.cs
+++ b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Threading;
diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvChannel.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvChannel.cs
index 6821c2ec6..2673d711c 100644
--- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvChannel.cs
+++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvChannel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 
 namespace Emby.XmlTv.Entities
diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCredit.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCredit.cs
index a003cc05e..d959ce76f 100644
--- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCredit.cs
+++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCredit.cs
@@ -1,4 +1,4 @@
-namespace Emby.XmlTv.Entities
+namespace Emby.XmlTv.Entities
 {
     public class XmlTvCredit
     {
diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCreditType.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCreditType.cs
index c449cb700..31c7f5e44 100644
--- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCreditType.cs
+++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCreditType.cs
@@ -1,4 +1,4 @@
-namespace Emby.XmlTv.Entities
+namespace Emby.XmlTv.Entities
 {
     public enum XmlTvCreditType
     {
diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs
index fbe6b2cb6..47525b57c 100644
--- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs
+++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs
@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 
 namespace Emby.XmlTv.Entities
 {
diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvIcon.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvIcon.cs
index d8cb76679..77ef8d5fd 100644
--- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvIcon.cs
+++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvIcon.cs
@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 
 namespace Emby.XmlTv.Entities
 {
diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvLanguage.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvLanguage.cs
index 2dc20db4b..0fd5573cd 100644
--- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvLanguage.cs
+++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvLanguage.cs
@@ -1,4 +1,4 @@
-namespace Emby.XmlTv.Entities
+namespace Emby.XmlTv.Entities
 {
     public class XmlTvLanguage
     {
diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvPremiere.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvPremiere.cs
index 0b7377f54..a1920bc77 100644
--- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvPremiere.cs
+++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvPremiere.cs
@@ -1,4 +1,4 @@
-namespace Emby.XmlTv.Entities
+namespace Emby.XmlTv.Entities
 {
     public class XmlTvPremiere
     {
diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs
index b6614afc1..1725e17d7 100644
--- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs
+++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvRating.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvRating.cs
index ac6a4e823..e37113d7a 100644
--- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvRating.cs
+++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvRating.cs
@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 
 namespace Emby.XmlTv.Entities
 {
-- 
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 'Emby.Server.Implementations/Localization')

diff --git a/BDInfo/BDInfo.csproj b/BDInfo/BDInfo.csproj
index 5246e09cb..662583b3f 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 65490065d..e70b0b66c 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 5246e09cb..662583b3f 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 b2ac9c2df..7ddd7c1dc 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 b01bb8b08..a0892e8bb 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 3e19ddfe5..36e66d544 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 7505be4f7..55db1b1ae 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 58bb07ebd..95d99c692 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 7a560f256..af7fa3932 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 dab328485..54950658c 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 fb8d7a27f..5aef0580f 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 05a17f594..f2cea78b6 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 cf6fe76de..5d213c177 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 64fa8f090..74ad859ff 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 519cbfc9d..8243d4b72 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 a43c92318..d9f43a991 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 ea7ca84fa..a462539ad 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 3e19ddfe5..36e66d544 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 51e7568af..4e4eaf32e 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 fa76d2555..ce31eb806 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 b5a2610e1..96c4749ac 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 28de11e40..a6f247813 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 48b62fd81..2ffe473b2 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 c7717915d..e7c090631 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 5f2e024c5..9c65bddcd 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 666ae94fb..5c5f0d82c 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 db7c102e0..8b8136e1e 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 3e19ddfe5..36e66d544 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 3fd7d8df9..c9676553e 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 26028eca9..edfd5c9bb 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 3e5bc0290..e3493d9a2 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 2f7adbbd0..7ce28f228 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 01943cc30..d5814aec1 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 fe90f2462..a4de38cde 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 0737dc213..f06d4687b 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 680776103..2e08c15a7 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 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 'Emby.Server.Implementations/Localization')

diff --git a/DvdLib/Ifo/Dvd.cs b/DvdLib/Ifo/Dvd.cs
index 71ba2d5e4..f784be83e 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 5a8fd4068..ed2114e6a 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 62b261908..45ba44870 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 a416ebb2b..c17f64a57 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 e0b4f025a..1ab6014eb 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 a85720b5f..68aa0a6a7 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 85a37d7f8..c615b9fbc 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 d8d289c59..12280d1bf 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 a88c720a7..ac6c7e9db 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 8cf8ec5e5..7d029a9f4 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 b386593e7..590979794 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 260cb505c..9485d697b 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 002bbe19c..f1dcc50b8 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 702e7ae6f..74807ef53 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 99d0ed7ab..4fcd418f0 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 e9002abfb..3650900c3 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 edb73d2a1..d990e7149 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 7e7271371..972c5c52d 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 4f5950ac7..56e555937 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 f21daab62..f2ab28d4c 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 8877fc051..6cb820716 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 382861635..7faad05e3 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 bcfcc339c..7a8b09cf7 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 d6cf39d62..93e222ebe 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 255e1476f..8b0012410 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 784b39735..6ae56c2ad 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 ce9dc9ad9..3cfa2bc75 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 edd2a394b..ed8644e33 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 c037292ff..499a334fc 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 ae4adda7c..cab41e65b 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 2c7057222..81e11d312 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 2c92e6543..6a3204011 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 0d25cbc92..9f999cb7f 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 fb0f33a2f..321a82c78 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 0ee53281d..f48d59040 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 9730d552d..7f67d70a9 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 379927191..6efbefd5d 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 36f688c43..09d33342e 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 67eeec21d..8268802fb 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 0772a6025..638796e2e 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 353b938c6..c1ee059f4 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 998595ecd..b71e89c5a 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 21feaea33..16f39daf7 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 70d8376a9..b486c0ef7 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 ac47c9625..09c348e24 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 8273ec8b2..91fbb4a2c 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 210b5dfdd..22d6712ec 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 b34832f45..9afa7f502 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 2791ee2ac..0f2247a01 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 c1c42e3ec..dcf4f4172 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 8ad31c160..7e1993b71 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 e398b58cc..e60593198 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 7ad16108a..d7afb4113 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 d7dab8528..879c0a09b 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 68cb7821d..6ed6f127b 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 8234393c2..52e58ed8d 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 0e3d2ad65..45cb323d2 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 0c3431e97..4e2380cfa 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 6b7a64389..8598ea262 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 418ed18d6..369e9781f 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 6d4af16e7..bb525adc7 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 ded82c19b..234ada6c0 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 0b21472f0..dadac5e03 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 c56dc04ec..91cfcd0ce 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 bbee594f6..b40bccde6 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 643c0ddcf..cad5ed863 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 223761654..3080143ce 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 3bc43143f..edc43ef46 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 bb09d365e..ea8a79306 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 625f0b389..ff54bb393 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 a379efafa..b812a8ddc 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 622bba637..ab3196aba 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 0ee283325..821b11a5d 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 cc908b97b..df7c51f27 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 f4d0899b6..e4eabaf38 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 7b8964707..b72ad572a 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 7f312eaec..605504418 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 02ce71ec3..0606dbdb2 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 8281de764..2c18a02ef 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 b3d035be2..808c0ed65 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 ae7d17275..dc0c5f139 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 2335f0553..4f4054db4 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 84bd1f429..99c545cc0 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 b27df346c..87764bbf4 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 3957f9dbe..437572d57 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 77cba0f71..3891417c7 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 ec6ecaad3..915c260bf 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 71e979e2c..b67edf50a 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 45d3b11b6..80c93f157 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 79e61f6a7..63d99db9b 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 ff294966b..10d3e5e9d 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 88d9a346b..a1ad57ea5 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 95f1935a3..47d3d21bd 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 4753e8ea4..68020b9de 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 09c11899b..3a87c2778 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 9d63484a8..a7456bdc0 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 3c54b2d2f..3ad968449 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 5dab978c0..646d0a5be 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 618e5eb2d..44e4202bf 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 9d9d8fef3..dc6ce842e 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 9d537f3df..493729446 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 abdd0c7bf..7f3bc323e 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 945d9777d..8da6d4523 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 e37e867e5..38bb83694 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 49f73286d..08e541ecf 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 a29fd46df..3a40aed7b 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 0844862db..2cadaec86 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 c594cb923..39d2fa77a 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 dc0a785ec..c4edb43ff 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 33fefc29c..c4a132d45 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 4cdfb4b11..af36d1ebf 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 3ee1bf7dc..82fa14f49 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 958312633..f55c52b5b 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 3744df9b4..47cad3e1b 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 5ba695cc3..c76f8345a 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 57aea88a3..17f36d82d 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 571fc5035..700656b65 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 1251d19c0..b9894ca8f 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 c59756c77..3ad76ff23 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 d002c13b2..c78d186c5 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 98986333b..07b6331f2 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 310c71a0d..52e70b68b 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 02d3cf61f..c56d2ef38 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 f51f72dba..5f77ff565 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 321c440739ae7657349c6a8e672a88bea1d6753c Mon Sep 17 00:00:00 2001
From: Erwin de Haan <EraYaN@users.noreply.github.com>
Date: Thu, 17 Jan 2019 18:47:41 +0100
Subject: Reformat JustAMan review pt1 changes

Refs #575
---
 BDInfo/BDROM.cs                                      |  2 +-
 Emby.Dlna/ContentDirectory/ControlHandler.cs         |  2 +-
 Emby.Dlna/DlnaManager.cs                             |  4 ++--
 Emby.Dlna/Eventing/EventManager.cs                   |  4 ++--
 Emby.Dlna/PlayTo/PlayToController.cs                 | 14 +++++++-------
 Emby.Dlna/PlayTo/PlayToManager.cs                    |  6 +++---
 Emby.Drawing/ImageProcessor.cs                       |  2 +-
 Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs       |  2 +-
 Emby.Naming/Audio/MultiPartResult.cs                 |  1 -
 Emby.Naming/AudioBook/AudioBookFileInfo.cs           |  1 -
 Emby.Naming/Common/MediaType.cs                      |  1 -
 Emby.Naming/Subtitles/SubtitleInfo.cs                |  1 -
 Emby.Naming/TV/EpisodeInfo.cs                        |  1 -
 Emby.Naming/TV/EpisodePathParserResult.cs            |  1 -
 Emby.Naming/TV/SeasonPathParserResult.cs             |  1 -
 Emby.Naming/Video/CleanDateTimeResult.cs             |  1 -
 Emby.Naming/Video/CleanStringResult.cs               |  1 -
 Emby.Naming/Video/ExtraRuleType.cs                   |  1 -
 Emby.Naming/Video/Format3DRule.cs                    |  1 -
 Emby.Naming/Video/StubTypeRule.cs                    |  1 -
 Emby.Server.Implementations/ApplicationHost.cs       |  4 ++--
 .../Channels/ChannelManager.cs                       |  2 +-
 Emby.Server.Implementations/Data/SqliteExtensions.cs | 20 ++++++++++----------
 .../Data/SqliteItemRepository.cs                     |  2 +-
 Emby.Server.Implementations/Dto/DtoService.cs        |  2 +-
 .../EntryPoints/ExternalPortForwarding.cs            |  4 ++--
 .../EntryPoints/UserDataChangeNotifier.cs            |  2 +-
 .../FFMpeg/FFMpegInstallInfo.cs                      |  1 -
 .../HttpServer/HttpListenerHost.cs                   |  2 +-
 .../HttpServer/HttpResultFactory.cs                  |  6 +++---
 .../HttpServer/ResponseFilter.cs                     |  2 +-
 .../Library/LibraryManager.cs                        |  4 ++--
 .../Library/MediaSourceManager.cs                    |  4 ++--
 Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs  | 10 +++++-----
 .../LiveTv/Listings/SchedulesDirect.cs               | 10 +++++-----
 Emby.Server.Implementations/LiveTv/LiveTvManager.cs  |  6 +++---
 .../LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs     |  2 +-
 .../LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs  |  8 ++++----
 .../LiveTv/TunerHosts/M3uParser.cs                   | 16 ++++++++--------
 .../Localization/LocalizationManager.cs              |  2 +-
 .../Services/ServiceController.cs                    |  2 +-
 Emby.Server.Implementations/Services/ServiceExec.cs  |  2 +-
 .../Services/ServiceHandler.cs                       |  4 ++--
 .../TextEncoding/NLangDetect/Detector.cs             |  6 +++---
 .../TextEncoding/TextEncodingDetect.cs               |  2 +-
 .../UniversalDetector/Core/EscCharsetProber.cs       |  2 +-
 46 files changed, 81 insertions(+), 94 deletions(-)

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

diff --git a/BDInfo/BDROM.cs b/BDInfo/BDROM.cs
index 2fadf3b77..b747d996f 100644
--- a/BDInfo/BDROM.cs
+++ b/BDInfo/BDROM.cs
@@ -339,7 +339,7 @@ namespace BDInfo
                 throw new ArgumentNullException(nameof(path));
             }
 
-            var dir = _fileSystem.GetDirectoryInfo(path);
+            FileSystemMetadata dir = _fileSystem.GetDirectoryInfo(path);
 
             while (dir != null)
             {
diff --git a/Emby.Dlna/ContentDirectory/ControlHandler.cs b/Emby.Dlna/ContentDirectory/ControlHandler.cs
index ed2114e6a..2f6a0ecee 100644
--- a/Emby.Dlna/ContentDirectory/ControlHandler.cs
+++ b/Emby.Dlna/ContentDirectory/ControlHandler.cs
@@ -192,7 +192,7 @@ namespace Emby.Dlna.ContentDirectory
 
         public string GetValueOrDefault(IDictionary<string, string> sparams, string key, string defaultValue)
         {
-            if (sparams.TryGetValue(key, out var val))
+            if (sparams.TryGetValue(key, out string val))
             {
                 return val;
             }
diff --git a/Emby.Dlna/DlnaManager.cs b/Emby.Dlna/DlnaManager.cs
index 45ba44870..5e99416b3 100644
--- a/Emby.Dlna/DlnaManager.cs
+++ b/Emby.Dlna/DlnaManager.cs
@@ -239,7 +239,7 @@ namespace Emby.Dlna
                 return false;
             }
 
-            if (headers.TryGetValue(header.Name, out var value))
+            if (headers.TryGetValue(header.Name, out string value))
             {
                 switch (header.Match)
                 {
@@ -286,7 +286,7 @@ namespace Emby.Dlna
         {
             lock (_profiles)
             {
-                if (_profiles.TryGetValue(path, out var profileTuple))
+                if (_profiles.TryGetValue(path, out Tuple<InternalProfileInfo, DeviceProfile> profileTuple))
                 {
                     return profileTuple.Item2;
                 }
diff --git a/Emby.Dlna/Eventing/EventManager.cs b/Emby.Dlna/Eventing/EventManager.cs
index c17f64a57..b4ff3ec1d 100644
--- a/Emby.Dlna/Eventing/EventManager.cs
+++ b/Emby.Dlna/Eventing/EventManager.cs
@@ -95,7 +95,7 @@ namespace Emby.Dlna.Eventing
         {
             _logger.LogDebug("Cancelling event subscription {0}", subscriptionId);
 
-            _subscriptions.TryRemove(subscriptionId, out var sub);
+            _subscriptions.TryRemove(subscriptionId, out EventSubscription sub);
 
             return new EventSubscriptionResponse
             {
@@ -126,7 +126,7 @@ namespace Emby.Dlna.Eventing
 
         private EventSubscription GetSubscription(string id, bool throwOnMissing)
         {
-            if (!_subscriptions.TryGetValue(id, out var e) && throwOnMissing)
+            if (!_subscriptions.TryGetValue(id, out EventSubscription e) && throwOnMissing)
             {
                 throw new ResourceNotFoundException("Event with Id " + id + " not found.");
             }
diff --git a/Emby.Dlna/PlayTo/PlayToController.cs b/Emby.Dlna/PlayTo/PlayToController.cs
index c615b9fbc..409b8442c 100644
--- a/Emby.Dlna/PlayTo/PlayToController.cs
+++ b/Emby.Dlna/PlayTo/PlayToController.cs
@@ -98,11 +98,11 @@ namespace Emby.Dlna.PlayTo
         {
             var info = e.Argument;
 
-            info.Headers.TryGetValue("NTS", out var nts);
+            info.Headers.TryGetValue("NTS", out string nts);
 
-            if (!info.Headers.TryGetValue("USN", out var usn)) usn = string.Empty;
+            if (!info.Headers.TryGetValue("USN", out string usn)) usn = string.Empty;
 
-            if (!info.Headers.TryGetValue("NT", out var nt)) nt = string.Empty;
+            if (!info.Headers.TryGetValue("NT", out string nt)) nt = string.Empty;
 
             if (usn.IndexOf(_device.Properties.UUID, StringComparison.OrdinalIgnoreCase) != -1 &&
                 !_disposed)
@@ -636,7 +636,7 @@ namespace Emby.Dlna.PlayTo
                         return _device.ToggleMute(cancellationToken);
                     case GeneralCommandType.SetAudioStreamIndex:
                         {
-                            if (command.Arguments.TryGetValue("Index", out var arg))
+                            if (command.Arguments.TryGetValue("Index", out string arg))
                             {
                                 if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out var val))
                                 {
@@ -650,7 +650,7 @@ namespace Emby.Dlna.PlayTo
                         }
                     case GeneralCommandType.SetSubtitleStreamIndex:
                         {
-                            if (command.Arguments.TryGetValue("Index", out var arg))
+                            if (command.Arguments.TryGetValue("Index", out string arg))
                             {
                                 if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out var val))
                                 {
@@ -664,7 +664,7 @@ namespace Emby.Dlna.PlayTo
                         }
                     case GeneralCommandType.SetVolume:
                         {
-                            if (command.Arguments.TryGetValue("Volume", out var arg))
+                            if (command.Arguments.TryGetValue("Volume", out string arg))
                             {
                                 if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out var volume))
                                 {
@@ -837,7 +837,7 @@ namespace Emby.Dlna.PlayTo
                 if (index == -1) return request;
 
                 var query = url.Substring(index + 1);
-                var values = MyHttpUtility.ParseQueryString(query);
+                QueryParamCollection values = MyHttpUtility.ParseQueryString(query);
 
                 request.DeviceProfileId = values.Get("DeviceProfileId");
                 request.DeviceId = values.Get("DeviceId");
diff --git a/Emby.Dlna/PlayTo/PlayToManager.cs b/Emby.Dlna/PlayTo/PlayToManager.cs
index 12280d1bf..2836ee95d 100644
--- a/Emby.Dlna/PlayTo/PlayToManager.cs
+++ b/Emby.Dlna/PlayTo/PlayToManager.cs
@@ -78,9 +78,9 @@ namespace Emby.Dlna.PlayTo
 
             var info = e.Argument;
 
-            if (!info.Headers.TryGetValue("USN", out var usn)) usn = string.Empty;
+            if (!info.Headers.TryGetValue("USN", out string usn)) usn = string.Empty;
 
-            if (!info.Headers.TryGetValue("NT", out var nt)) nt = string.Empty;
+            if (!info.Headers.TryGetValue("NT", out string nt)) nt = string.Empty;
 
             string location = info.Location.ToString();
 
@@ -153,7 +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);
-            if (info.Headers.TryGetValue("USN", out var uuid))
+            if (info.Headers.TryGetValue("USN", out string uuid))
             {
                 uuid = GetUuid(uuid);
             }
diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index ac6c7e9db..28aae9cae 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -846,7 +846,7 @@ namespace Emby.Drawing
         {
             lock (_locks)
             {
-                if (_locks.TryGetValue(key, out var info))
+                if (_locks.TryGetValue(key, out LockInfo info))
                 {
                     info.Count++;
                 }
diff --git a/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs b/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs
index 4729b5b5a..ac486f167 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 var mountedISO))
+            if (MountISO(isoPath, out LinuxMount mountedISO))
             {
                 return Task.FromResult<IIsoMount>(mountedISO);
             }
diff --git a/Emby.Naming/Audio/MultiPartResult.cs b/Emby.Naming/Audio/MultiPartResult.cs
index 983b9fe67..b1fa6e563 100644
--- a/Emby.Naming/Audio/MultiPartResult.cs
+++ b/Emby.Naming/Audio/MultiPartResult.cs
@@ -1,4 +1,3 @@
-
 namespace Emby.Naming.Audio
 {
     public class MultiPartResult
diff --git a/Emby.Naming/AudioBook/AudioBookFileInfo.cs b/Emby.Naming/AudioBook/AudioBookFileInfo.cs
index 5ece6771a..de66a5402 100644
--- a/Emby.Naming/AudioBook/AudioBookFileInfo.cs
+++ b/Emby.Naming/AudioBook/AudioBookFileInfo.cs
@@ -1,4 +1,3 @@
-
 using System;
 
 namespace Emby.Naming.AudioBook
diff --git a/Emby.Naming/Common/MediaType.cs b/Emby.Naming/Common/MediaType.cs
index 2332b6455..49cc9ee39 100644
--- a/Emby.Naming/Common/MediaType.cs
+++ b/Emby.Naming/Common/MediaType.cs
@@ -1,4 +1,3 @@
-
 namespace Emby.Naming.Common
 {
     public enum MediaType
diff --git a/Emby.Naming/Subtitles/SubtitleInfo.cs b/Emby.Naming/Subtitles/SubtitleInfo.cs
index 6cb683a36..e4709dfbb 100644
--- a/Emby.Naming/Subtitles/SubtitleInfo.cs
+++ b/Emby.Naming/Subtitles/SubtitleInfo.cs
@@ -1,4 +1,3 @@
-
 namespace Emby.Naming.Subtitles
 {
     public class SubtitleInfo
diff --git a/Emby.Naming/TV/EpisodeInfo.cs b/Emby.Naming/TV/EpisodeInfo.cs
index ce77da14f..c8aca7a6f 100644
--- a/Emby.Naming/TV/EpisodeInfo.cs
+++ b/Emby.Naming/TV/EpisodeInfo.cs
@@ -1,4 +1,3 @@
-
 namespace Emby.Naming.TV
 {
     public class EpisodeInfo
diff --git a/Emby.Naming/TV/EpisodePathParserResult.cs b/Emby.Naming/TV/EpisodePathParserResult.cs
index 0d9e4dd8c..e1a48bfbc 100644
--- a/Emby.Naming/TV/EpisodePathParserResult.cs
+++ b/Emby.Naming/TV/EpisodePathParserResult.cs
@@ -1,4 +1,3 @@
-
 namespace Emby.Naming.TV
 {
     public class EpisodePathParserResult
diff --git a/Emby.Naming/TV/SeasonPathParserResult.cs b/Emby.Naming/TV/SeasonPathParserResult.cs
index 048b390ae..eab27a4a5 100644
--- a/Emby.Naming/TV/SeasonPathParserResult.cs
+++ b/Emby.Naming/TV/SeasonPathParserResult.cs
@@ -1,4 +1,3 @@
-
 namespace Emby.Naming.TV
 {
     public class SeasonPathParserResult
diff --git a/Emby.Naming/Video/CleanDateTimeResult.cs b/Emby.Naming/Video/CleanDateTimeResult.cs
index a1794ed38..6bf24e4d8 100644
--- a/Emby.Naming/Video/CleanDateTimeResult.cs
+++ b/Emby.Naming/Video/CleanDateTimeResult.cs
@@ -1,4 +1,3 @@
-
 namespace Emby.Naming.Video
 {
     public class CleanDateTimeResult
diff --git a/Emby.Naming/Video/CleanStringResult.cs b/Emby.Naming/Video/CleanStringResult.cs
index 0c1360a77..b3bc59712 100644
--- a/Emby.Naming/Video/CleanStringResult.cs
+++ b/Emby.Naming/Video/CleanStringResult.cs
@@ -1,4 +1,3 @@
-
 namespace Emby.Naming.Video
 {
     public class CleanStringResult
diff --git a/Emby.Naming/Video/ExtraRuleType.cs b/Emby.Naming/Video/ExtraRuleType.cs
index eda315779..565239ff9 100644
--- a/Emby.Naming/Video/ExtraRuleType.cs
+++ b/Emby.Naming/Video/ExtraRuleType.cs
@@ -1,4 +1,3 @@
-
 namespace Emby.Naming.Video
 {
     public enum ExtraRuleType
diff --git a/Emby.Naming/Video/Format3DRule.cs b/Emby.Naming/Video/Format3DRule.cs
index 7c815524f..dc260175a 100644
--- a/Emby.Naming/Video/Format3DRule.cs
+++ b/Emby.Naming/Video/Format3DRule.cs
@@ -1,4 +1,3 @@
-
 namespace Emby.Naming.Video
 {
     public class Format3DRule
diff --git a/Emby.Naming/Video/StubTypeRule.cs b/Emby.Naming/Video/StubTypeRule.cs
index d8fee617e..b46050085 100644
--- a/Emby.Naming/Video/StubTypeRule.cs
+++ b/Emby.Naming/Video/StubTypeRule.cs
@@ -1,4 +1,3 @@
-
 namespace Emby.Naming.Video
 {
     public class StubTypeRule
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 5530c1b9d..d4144d5c5 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1790,7 +1790,7 @@ namespace Emby.Server.Implementations
                     return false;
                 }
 
-                if (minRequiredVersions.TryGetValue(filename, out var minRequiredVersion))
+                if (minRequiredVersions.TryGetValue(filename, out Version minRequiredVersion))
                 {
                     try
                     {
@@ -2005,7 +2005,7 @@ namespace Emby.Server.Implementations
                 address = address.Substring(index + 1);
             }
 
-            if (NetworkManager.TryParseIpAddress(address.Trim('/'), out var result))
+            if (NetworkManager.TryParseIpAddress(address.Trim('/'), out IpAddressInfo result))
             {
                 return result;
             }
diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/Emby.Server.Implementations/Channels/ChannelManager.cs
index 3650900c3..f98e199e6 100644
--- a/Emby.Server.Implementations/Channels/ChannelManager.cs
+++ b/Emby.Server.Implementations/Channels/ChannelManager.cs
@@ -387,7 +387,7 @@ namespace Emby.Server.Implementations.Channels
 
         private async Task<IEnumerable<MediaSourceInfo>> GetChannelItemMediaSourcesInternal(IRequiresMediaInfoCallback channel, string id, CancellationToken cancellationToken)
         {
-            if (_channelItemMediaInfo.TryGetValue(id, out var cachedInfo))
+            if (_channelItemMediaInfo.TryGetValue(id, out Tuple<DateTime, List<MediaSourceInfo>> 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 d990e7149..a486cb1a0 100644
--- a/Emby.Server.Implementations/Data/SqliteExtensions.cs
+++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs
@@ -199,7 +199,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, double value)
         {
-            if (statement.BindParameters.TryGetValue(name, out var bindParam))
+            if (statement.BindParameters.TryGetValue(name, out IBindParameter bindParam))
             {
                 bindParam.Bind(value);
             }
@@ -211,7 +211,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, string value)
         {
-            if (statement.BindParameters.TryGetValue(name, out var bindParam))
+            if (statement.BindParameters.TryGetValue(name, out IBindParameter bindParam))
             {
                 if (value == null)
                 {
@@ -230,7 +230,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, bool value)
         {
-            if (statement.BindParameters.TryGetValue(name, out var bindParam))
+            if (statement.BindParameters.TryGetValue(name, out IBindParameter bindParam))
             {
                 bindParam.Bind(value);
             }
@@ -242,7 +242,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, float value)
         {
-            if (statement.BindParameters.TryGetValue(name, out var bindParam))
+            if (statement.BindParameters.TryGetValue(name, out IBindParameter bindParam))
             {
                 bindParam.Bind(value);
             }
@@ -254,7 +254,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, int value)
         {
-            if (statement.BindParameters.TryGetValue(name, out var bindParam))
+            if (statement.BindParameters.TryGetValue(name, out IBindParameter bindParam))
             {
                 bindParam.Bind(value);
             }
@@ -266,7 +266,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, Guid value)
         {
-            if (statement.BindParameters.TryGetValue(name, out var bindParam))
+            if (statement.BindParameters.TryGetValue(name, out IBindParameter bindParam))
             {
                 bindParam.Bind(value.ToGuidBlob());
             }
@@ -278,7 +278,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, DateTime value)
         {
-            if (statement.BindParameters.TryGetValue(name, out var bindParam))
+            if (statement.BindParameters.TryGetValue(name, out IBindParameter bindParam))
             {
                 bindParam.Bind(value.ToDateTimeParamValue());
             }
@@ -290,7 +290,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, long value)
         {
-            if (statement.BindParameters.TryGetValue(name, out var bindParam))
+            if (statement.BindParameters.TryGetValue(name, out IBindParameter bindParam))
             {
                 bindParam.Bind(value);
             }
@@ -302,7 +302,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBind(this IStatement statement, string name, byte[] value)
         {
-            if (statement.BindParameters.TryGetValue(name, out var bindParam))
+            if (statement.BindParameters.TryGetValue(name, out IBindParameter bindParam))
             {
                 bindParam.Bind(value);
             }
@@ -314,7 +314,7 @@ namespace Emby.Server.Implementations.Data
 
         public static void TryBindNull(this IStatement statement, string name)
         {
-            if (statement.BindParameters.TryGetValue(name, out var bindParam))
+            if (statement.BindParameters.TryGetValue(name, out IBindParameter bindParam))
             {
                 bindParam.BindNull();
             }
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 972c5c52d..727a9e868 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -5139,7 +5139,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
 
         private IEnumerable<string> MapIncludeItemTypes(string value)
         {
-            if (_types.TryGetValue(value, out var result))
+            if (_types.TryGetValue(value, out string[] result))
             {
                 return result;
             }
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 6cb820716..a45cde980 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -637,7 +637,7 @@ namespace Emby.Server.Implementations.Dto
                     Type = person.Type
                 };
 
-                if (dictionary.TryGetValue(person.Name, out var entity))
+                if (dictionary.TryGetValue(person.Name, out Person 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 7faad05e3..8755ee3a7 100644
--- a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
+++ b/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
@@ -108,9 +108,9 @@ namespace Emby.Server.Implementations.EntryPoints
 
             var info = e.Argument;
 
-            if (!info.Headers.TryGetValue("USN", out var usn)) usn = string.Empty;
+            if (!info.Headers.TryGetValue("USN", out string usn)) usn = string.Empty;
 
-            if (!info.Headers.TryGetValue("NT", out var nt)) nt = string.Empty;
+            if (!info.Headers.TryGetValue("NT", out string nt)) nt = string.Empty;
 
             // Filter device type
             if (usn.IndexOf("WANIPConnection:", StringComparison.OrdinalIgnoreCase) == -1 &&
diff --git a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
index 93e222ebe..9e71ffceb 100644
--- a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
@@ -62,7 +62,7 @@ namespace Emby.Server.Implementations.EntryPoints
                     UpdateTimer.Change(UpdateDuration, Timeout.Infinite);
                 }
 
-                if (!_changedItems.TryGetValue(e.UserId, out var keys))
+                if (!_changedItems.TryGetValue(e.UserId, out List<BaseItem> keys))
                 {
                     keys = new List<BaseItem>();
                     _changedItems[e.UserId] = keys;
diff --git a/Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs b/Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs
index 715a26913..fa9cb5e01 100644
--- a/Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs
+++ b/Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs
@@ -1,4 +1,3 @@
-
 namespace Emby.Server.Implementations.FFMpeg
 {
     public class FFMpegInstallInfo
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index 8ae66843c..163b54e39 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -700,7 +700,7 @@ namespace Emby.Server.Implementations.HttpServer
                 return null;
             }
 
-            var restPath = ServiceHandler.FindMatchingRestPath(httpReq.HttpMethod, pathInfo, out var contentType);
+            var restPath = ServiceHandler.FindMatchingRestPath(httpReq.HttpMethod, pathInfo, out string contentType);
 
             if (restPath != null)
             {
diff --git a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
index 3cfa2bc75..851250ecd 100644
--- a/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -96,7 +96,7 @@ namespace Emby.Server.Implementations.HttpServer
                 responseHeaders = new Dictionary<string, string>();
             }
 
-            if (addCachePrevention && !responseHeaders.TryGetValue("Expires", out var expires))
+            if (addCachePrevention && !responseHeaders.TryGetValue("Expires", out string expires))
             {
                 responseHeaders["Expires"] = "-1";
             }
@@ -142,7 +142,7 @@ namespace Emby.Server.Implementations.HttpServer
                 responseHeaders = new Dictionary<string, string>();
             }
 
-            if (addCachePrevention && !responseHeaders.TryGetValue("Expires", out var expires))
+            if (addCachePrevention && !responseHeaders.TryGetValue("Expires", out string expires))
             {
                 responseHeaders["Expires"] = "-1";
             }
@@ -186,7 +186,7 @@ namespace Emby.Server.Implementations.HttpServer
                 responseHeaders = new Dictionary<string, string>();
             }
 
-            if (addCachePrevention && !responseHeaders.TryGetValue("Expires", out var expires))
+            if (addCachePrevention && !responseHeaders.TryGetValue("Expires", out string expires))
             {
                 responseHeaders["Expires"] = "-1";
             }
diff --git a/Emby.Server.Implementations/HttpServer/ResponseFilter.cs b/Emby.Server.Implementations/HttpServer/ResponseFilter.cs
index ed8644e33..80386f35e 100644
--- a/Emby.Server.Implementations/HttpServer/ResponseFilter.cs
+++ b/Emby.Server.Implementations/HttpServer/ResponseFilter.cs
@@ -57,7 +57,7 @@ namespace Emby.Server.Implementations.HttpServer
 
                 // Content length has to be explicitly set on on HttpListenerResponse or it won't be happy
 
-                if (hasHeaders.Headers.TryGetValue("Content-Length", out var contentLength) && !string.IsNullOrEmpty(contentLength))
+                if (hasHeaders.Headers.TryGetValue("Content-Length", out string contentLength) && !string.IsNullOrEmpty(contentLength))
                 {
                     var length = long.Parse(contentLength, UsCulture);
 
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 9f999cb7f..073005a1e 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -432,7 +432,7 @@ namespace Emby.Server.Implementations.Library
                 ItemRepository.DeleteItem(child.Id, CancellationToken.None);
             }
 
-            _libraryItemsCache.TryRemove(item.Id, out var removed);
+            _libraryItemsCache.TryRemove(item.Id, out BaseItem removed);
 
             ReportItemRemoved(item, parent);
         }
@@ -1240,7 +1240,7 @@ namespace Emby.Server.Implementations.Library
                 throw new ArgumentNullException(nameof(id));
             }
 
-            if (LibraryItemsCache.TryGetValue(id, out var item))
+            if (LibraryItemsCache.TryGetValue(id, out BaseItem item))
             {
                 return item;
             }
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 321a82c78..e0ecb2bce 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -777,7 +777,7 @@ namespace Emby.Server.Implementations.Library
 
             try
             {
-                if (_openStreams.TryGetValue(id, out var info))
+                if (_openStreams.TryGetValue(id, out ILiveStream info))
                 {
                     return info;
                 }
@@ -809,7 +809,7 @@ namespace Emby.Server.Implementations.Library
 
             try
             {
-                if (_openStreams.TryGetValue(id, out var liveStream))
+                if (_openStreams.TryGetValue(id, out ILiveStream liveStream))
                 {
                     liveStream.ConsumerCount--;
 
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 4ec57096f..64e5affd7 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -473,7 +473,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         private static string GetMappedChannel(string channelId, NameValuePair[] mappings)
         {
-            foreach (var mapping in mappings)
+            foreach (NameValuePair mapping in mappings)
             {
                 if (StringHelper.EqualsIgnoreCase(mapping.Name, channelId))
                 {
@@ -1988,8 +1988,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 {
                     writer.WriteStartDocument(true);
                     writer.WriteStartElement("tvshow");
-
-                    if (timer.SeriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out var id))
+                    string id;
+                    if (timer.SeriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out id))
                     {
                         writer.WriteElementString("id", id);
                     }
@@ -2520,7 +2520,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (string.IsNullOrWhiteSpace(channelId) && !parent.ChannelId.Equals(Guid.Empty))
             {
-                if (!tempChannelCache.TryGetValue(parent.ChannelId, out var channel))
+                if (!tempChannelCache.TryGetValue(parent.ChannelId, out LiveTvChannel channel))
                 {
                     channel = _libraryManager.GetItemList(new InternalItemsQuery
                     {
@@ -2579,7 +2579,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (!programInfo.ChannelId.Equals(Guid.Empty))
             {
-                if (!tempChannelCache.TryGetValue(programInfo.ChannelId, out var channel))
+                if (!tempChannelCache.TryGetValue(programInfo.ChannelId, out LiveTvChannel channel))
                 {
                     channel = _libraryManager.GetItemList(new InternalItemsQuery
                     {
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index 05d92dfcb..d3066e916 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -137,7 +137,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
                     var images = await GetImageForPrograms(info, programIdsWithImages, cancellationToken).ConfigureAwait(false);
 
                     var programsInfo = new List<ProgramInfo>();
-                    foreach (var schedule in dailySchedules.SelectMany(d => d.programs))
+                    foreach (ScheduleDirect.Program schedule in dailySchedules.SelectMany(d => d.programs))
                     {
                         //_logger.LogDebug("Proccesing Schedule for statio ID " + stationID +
                         //              " which corresponds to channel " + channelNumber + " and program id " +
@@ -526,15 +526,15 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             try
             {
                 using (var httpResponse = await Get(options, false, info).ConfigureAwait(false))
-                using (var responce = httpResponse.Content)
+                using (Stream responce = httpResponse.Content)
                 {
                     var root = await _jsonSerializer.DeserializeFromStreamAsync<List<ScheduleDirect.Headends>>(responce).ConfigureAwait(false);
 
                     if (root != null)
                     {
-                        foreach (var headend in root)
+                        foreach (ScheduleDirect.Headends headend in root)
                         {
-                            foreach (var lineup in headend.lineups)
+                            foreach (ScheduleDirect.Lineup 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 (var map in root.map)
+                foreach (ScheduleDirect.Map map in root.map)
                 {
                     var channelNumber = GetChannelNumber(map);
 
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index 3f64a40d8..11d7facbe 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -540,7 +540,7 @@ namespace Emby.Server.Implementations.LiveTv
             var isNew = false;
             var forceUpdate = false;
 
-            if (!allExistingPrograms.TryGetValue(id, out var item))
+            if (!allExistingPrograms.TryGetValue(id, out LiveTvProgram item))
             {
                 isNew = true;
                 item = new LiveTvProgram
@@ -1951,7 +1951,7 @@ namespace Emby.Server.Implementations.LiveTv
 
                 foreach (var programDto in currentProgramDtos)
                 {
-                    if (currentChannelsDict.TryGetValue(programDto.ChannelId, out var channelDto))
+                    if (currentChannelsDict.TryGetValue(programDto.ChannelId, out BaseItemDto channelDto))
                     {
                         channelDto.CurrentProgram = programDto;
                     }
@@ -2315,7 +2315,7 @@ namespace Emby.Server.Implementations.LiveTv
 
             await provider.Validate(info, validateLogin, validateListings).ConfigureAwait(false);
 
-            var config = GetConfiguration();
+            LiveTvOptions config = GetConfiguration();
 
             var list = config.ListingProviders.ToList();
             int index = list.FindIndex(i => string.Equals(i.Id, info.Id, StringComparison.OrdinalIgnoreCase));
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index 09d33342e..e8e4bc723 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -118,7 +118,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             {
                 if (!string.IsNullOrEmpty(cacheKey))
                 {
-                    if (_modelCache.TryGetValue(cacheKey, out var response))
+                    if (_modelCache.TryGetValue(cacheKey, out DiscoverResponse response))
                     {
                         return response;
                     }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
index 8268802fb..2205c0ecc 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
@@ -132,7 +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);
 
-            ParseReturnMessage(response.Buffer, response.ReceivedBytes, out var returnVal);
+            ParseReturnMessage(response.Buffer, response.ReceivedBytes, out string returnVal);
 
             return string.Equals(returnVal, "none", StringComparison.OrdinalIgnoreCase);
         }
@@ -171,7 +171,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                     continue;
 
                 var commandList = commands.GetCommands();
-                foreach (var command in commandList)
+                foreach (Tuple<string, string> command in commandList)
                 {
                     var channelMsg = CreateSetMessage(i, command.Item1, command.Item2, lockKeyValue);
                     await tcpClient.SendToAsync(channelMsg, 0, channelMsg.Length, ipEndPoint, cancellationToken).ConfigureAwait(false);
@@ -214,13 +214,13 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 var commandList = commands.GetCommands();
                 var receiveBuffer = new byte[8192];
 
-                foreach (var command in commandList)
+                foreach (Tuple<string, string> 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);
                     var response = await tcpClient.ReceiveAsync(receiveBuffer, 0, receiveBuffer.Length, cancellationToken).ConfigureAwait(false);
                     // parse response to make sure it worked
-                    if (!ParseReturnMessage(response.Buffer, response.ReceivedBytes, out var returnVal))
+                    if (!ParseReturnMessage(response.Buffer, response.ReceivedBytes, out string returnVal))
                     {
                         return;
                     }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
index c1ee059f4..c77559c75 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
@@ -117,10 +117,10 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
             extInf = extInf.Trim();
 
-            var attributes = ParseExtInf(extInf, out var remaining);
+            var attributes = ParseExtInf(extInf, out string remaining);
             extInf = remaining;
 
-            if (attributes.TryGetValue("tvg-logo", out var value))
+            if (attributes.TryGetValue("tvg-logo", out string value))
             {
                 channel.ImageUrl = value;
             }
@@ -128,9 +128,9 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             channel.Name = GetChannelName(extInf, attributes);
             channel.Number = GetChannelNumber(extInf, attributes, mediaUrl);
 
-            attributes.TryGetValue("tvg-id", out var tvgId);
+            attributes.TryGetValue("tvg-id", out string tvgId);
 
-            attributes.TryGetValue("channel-id", out var channelId);
+            attributes.TryGetValue("channel-id", out string channelId);
 
             channel.TunerChannelId = string.IsNullOrWhiteSpace(tvgId) ? channelId : tvgId;
 
@@ -182,7 +182,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
             if (!IsValidChannelNumber(numberString))
             {
-                if (attributes.TryGetValue("tvg-id", out var value))
+                if (attributes.TryGetValue("tvg-id", out string value))
                 {
                     if (double.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var doubleValue))
                     {
@@ -198,7 +198,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
             if (!IsValidChannelNumber(numberString))
             {
-                if (attributes.TryGetValue("channel-id", out var value))
+                if (attributes.TryGetValue("channel-id", out string value))
                 {
                     numberString = value;
                 }
@@ -282,7 +282,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
             }
 
-            attributes.TryGetValue("tvg-name", out var name);
+            attributes.TryGetValue("tvg-name", out string name);
 
             if (string.IsNullOrWhiteSpace(name))
             {
@@ -291,7 +291,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
             if (string.IsNullOrWhiteSpace(name))
             {
-                attributes.TryGetValue("tvg-id", out name);
+                attributes.TryGetValue("tvg-id", string name);
             }
 
             if (string.IsNullOrWhiteSpace(name))
diff --git a/Emby.Server.Implementations/Localization/LocalizationManager.cs b/Emby.Server.Implementations/Localization/LocalizationManager.cs
index b71e89c5a..5d3c39af4 100644
--- a/Emby.Server.Implementations/Localization/LocalizationManager.cs
+++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs
@@ -360,7 +360,7 @@ namespace Emby.Server.Implementations.Localization
 
             var ratingsDictionary = GetParentalRatingsDictionary();
 
-            if (ratingsDictionary.TryGetValue(rating, out var value))
+            if (ratingsDictionary.TryGetValue(rating, out ParentalRating value))
             {
                 return value.Value;
             }
diff --git a/Emby.Server.Implementations/Services/ServiceController.cs b/Emby.Server.Implementations/Services/ServiceController.cs
index 9afa7f502..5796956d8 100644
--- a/Emby.Server.Implementations/Services/ServiceController.cs
+++ b/Emby.Server.Implementations/Services/ServiceController.cs
@@ -89,7 +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()));
 
-            if (!RestPathMap.TryGetValue(restPath.FirstMatchHashKey, out var pathsAtFirstMatch))
+            if (!RestPathMap.TryGetValue(restPath.FirstMatchHashKey, out List<RestPath> 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 0f2247a01..45c918fa1 100644
--- a/Emby.Server.Implementations/Services/ServiceExec.cs
+++ b/Emby.Server.Implementations/Services/ServiceExec.cs
@@ -73,7 +73,7 @@ namespace Emby.Server.Implementations.Services
         {
             var actionName = request.Verb ?? "POST";
 
-            if (ServiceExecGeneral.execMap.TryGetValue(ServiceMethod.Key(serviceType, actionName, requestName), out var actionContext))
+            if (execMap.TryGetValue(ServiceMethod.Key(serviceType, actionName, requestName), out ServiceMethod actionContext))
             {
                 if (actionContext.RequestFilters != null)
                 {
diff --git a/Emby.Server.Implementations/Services/ServiceHandler.cs b/Emby.Server.Implementations/Services/ServiceHandler.cs
index dcf4f4172..7e836e22c 100644
--- a/Emby.Server.Implementations/Services/ServiceHandler.cs
+++ b/Emby.Server.Implementations/Services/ServiceHandler.cs
@@ -62,7 +62,7 @@ namespace Emby.Server.Implementations.Services
         {
             if (this.RestPath == null)
             {
-                this.RestPath = FindMatchingRestPath(httpMethod, pathInfo, out var contentType);
+                this.RestPath = FindMatchingRestPath(httpMethod, pathInfo, out string contentType);
 
                 if (contentType != null)
                     ResponseContentType = contentType;
@@ -137,7 +137,7 @@ namespace Emby.Server.Implementations.Services
         public static object CreateRequest(IRequest httpReq, RestPath restPath, Dictionary<string, string> requestParams, object requestDto)
         {
             var pathInfo = !restPath.IsWildCardPath
-                ? GetSanitizedPathInfo(httpReq.PathInfo, out var contentType)
+                ? GetSanitizedPathInfo(httpReq.PathInfo, out string contentType)
                 : httpReq.PathInfo;
 
             return restPath.CreateRequest(pathInfo, requestParams, requestDto);
diff --git a/Emby.Server.Implementations/TextEncoding/NLangDetect/Detector.cs b/Emby.Server.Implementations/TextEncoding/NLangDetect/Detector.cs
index 097c7b8b7..991ee8688 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()
         {
-            var probabilities = GetProbabilities();
+            List<Language> probabilities = GetProbabilities();
 
             return
               probabilities.Count > 0
@@ -241,7 +241,7 @@ namespace NLangDetect.Core
         {
             CleanText();
 
-            var ngrams = ExtractNGrams();
+            List<string> ngrams = ExtractNGrams();
 
             if (ngrams.Count == 0)
             {
@@ -332,7 +332,7 @@ namespace NLangDetect.Core
                 return;
             }
 
-            var langProbMap = _wordLangProbMap[word];
+            ProbVector langProbMap = _wordLangProbMap[word];
             double weight = alpha / _BaseFreq;
 
             for (int i = 0; i < prob.Length; i++)
diff --git a/Emby.Server.Implementations/TextEncoding/TextEncodingDetect.cs b/Emby.Server.Implementations/TextEncoding/TextEncodingDetect.cs
index 03ff0863f..49a371efa 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
-            var encoding = CheckBom(buffer, size);
+            CharacterEncoding encoding = CheckBom(buffer, size);
             if (encoding != CharacterEncoding.None)
             {
                 return encoding;
diff --git a/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/EscCharsetProber.cs b/Emby.Server.Implementations/TextEncoding/UniversalDetector/Core/EscCharsetProber.cs
index b10c41c77..e8da73c1c 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)
                         {
-                            var t = codingSM[activeSM];
+                            CodingStateMachine t = codingSM[activeSM];
                             codingSM[activeSM] = codingSM[j];
                             codingSM[j] = t;
                         }
-- 
cgit v1.2.3