diff --git a/Emby.Dlna/Profiles/DefaultProfile.cs b/Emby.Dlna/Profiles/DefaultProfile.cs
index 4007d8870d..ddc575700f 100644
--- a/Emby.Dlna/Profiles/DefaultProfile.cs
+++ b/Emby.Dlna/Profiles/DefaultProfile.cs
@@ -18,8 +18,8 @@ namespace Emby.Dlna.Profiles
             ModelDescription = "UPnP/AV 1.0 Compliant Media Server";
             ModelName = "Emby Server";
             ModelNumber = "01";
-            ModelUrl = "https://emby.media";
-            ManufacturerUrl = "https://emby.media";
+            ModelUrl = "https://github.com/jellyfin/jellyfin";
+            ManufacturerUrl = "https://github.com/jellyfin/jellyfin";
 
             AlbumArtPn = "JPEG_SM";
 
diff --git a/Emby.Dlna/Profiles/Xml/Default.xml b/Emby.Dlna/Profiles/Xml/Default.xml
index cdbf3bbe5b..5d23a71ffe 100644
--- a/Emby.Dlna/Profiles/Xml/Default.xml
+++ b/Emby.Dlna/Profiles/Xml/Default.xml
@@ -2,11 +2,11 @@
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Name>Generic Device</Name>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
@@ -57,4 +57,4 @@
     <SubtitleProfile format="subrip" method="Embed" />
     <SubtitleProfile format="vtt" method="Embed" />
   </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Denon AVR.xml b/Emby.Dlna/Profiles/Xml/Denon AVR.xml
index 14e89d0063..ff341e56f6 100644
--- a/Emby.Dlna/Profiles/Xml/Denon AVR.xml	
+++ b/Emby.Dlna/Profiles/Xml/Denon AVR.xml	
@@ -7,11 +7,11 @@
     <Headers />
   </Identification>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
@@ -64,4 +64,4 @@
     <SubtitleProfile format="subrip" method="Embed" />
     <SubtitleProfile format="vtt" method="Embed" />
   </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml b/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml
index cfd2edfae9..211d5a1311 100644
--- a/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml	
+++ b/Emby.Dlna/Profiles/Xml/DirecTV HD-DVR.xml	
@@ -8,11 +8,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
@@ -63,4 +63,4 @@
   <SubtitleProfiles>
     <SubtitleProfile format="srt" method="Embed" />
   </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml b/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml
index d95b8dc96b..865f8dd6ab 100644
--- a/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml	
+++ b/Emby.Dlna/Profiles/Xml/Dish Hopper-Joey.xml	
@@ -9,11 +9,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
@@ -92,4 +92,4 @@
   <SubtitleProfiles>
     <SubtitleProfile format="srt" method="Embed" />
   </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/LG Smart TV.xml b/Emby.Dlna/Profiles/Xml/LG Smart TV.xml
index 1c579321b1..ee4634e76e 100644
--- a/Emby.Dlna/Profiles/Xml/LG Smart TV.xml	
+++ b/Emby.Dlna/Profiles/Xml/LG Smart TV.xml	
@@ -8,11 +8,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
@@ -88,4 +88,4 @@
     <SubtitleProfile format="srt" method="Embed" />
     <SubtitleProfile format="srt" method="External" />
   </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml b/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml
index d98f2bb07f..17dc336a75 100644
--- a/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml	
+++ b/Emby.Dlna/Profiles/Xml/Linksys DMA2100.xml	
@@ -6,11 +6,11 @@
     <Headers />
   </Identification>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
@@ -50,4 +50,4 @@
   <SubtitleProfiles>
     <SubtitleProfile format="srt" method="Embed" />
   </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Marantz.xml b/Emby.Dlna/Profiles/Xml/Marantz.xml
index 81bea492f6..b672d77a51 100644
--- a/Emby.Dlna/Profiles/Xml/Marantz.xml
+++ b/Emby.Dlna/Profiles/Xml/Marantz.xml
@@ -8,11 +8,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
@@ -58,4 +58,4 @@
     <SubtitleProfile format="subrip" method="Embed" />
     <SubtitleProfile format="vtt" method="Embed" />
   </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/MediaMonkey.xml b/Emby.Dlna/Profiles/Xml/MediaMonkey.xml
index a144b34754..83ddb6ac0a 100644
--- a/Emby.Dlna/Profiles/Xml/MediaMonkey.xml
+++ b/Emby.Dlna/Profiles/Xml/MediaMonkey.xml
@@ -8,11 +8,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
@@ -58,4 +58,4 @@
     <SubtitleProfile format="subrip" method="Embed" />
     <SubtitleProfile format="vtt" method="Embed" />
   </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml b/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml
index 47a1304448..59d1fdd177 100644
--- a/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml	
+++ b/Emby.Dlna/Profiles/Xml/Panasonic Viera.xml	
@@ -9,11 +9,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
@@ -83,4 +83,4 @@
     <SubtitleProfile format="srt" method="Embed" />
     <SubtitleProfile format="srt" method="External" />
   </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+</Profile>
diff --git a/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml b/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml
index a695de8fde..a435d1484d 100644
--- a/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml	
+++ b/Emby.Dlna/Profiles/Xml/Popcorn Hour.xml	
@@ -2,11 +2,11 @@
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Name>Popcorn Hour</Name>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
diff --git a/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml b/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml
index 6f7a59efcc..89167c9aa8 100644
--- a/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml	
+++ b/Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml	
@@ -8,11 +8,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
diff --git a/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml b/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml
index 73c4d2ff57..c9d428e571 100644
--- a/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sharp Smart TV.xml	
@@ -8,11 +8,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
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 9219569b8f..0cb0c52c23 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml	
@@ -12,11 +12,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <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://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
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 d7a53832df..602c54f618 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2014.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2014.xml	
@@ -12,11 +12,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <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://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
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 316aa6de2b..701aba85ff 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2015.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2015.xml	
@@ -10,11 +10,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <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://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
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 f6e93a1914..5f90126782 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2016.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player 2016.xml	
@@ -10,11 +10,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <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://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
diff --git a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml
index f9212cccb1..765d5d5fe5 100644
--- a/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony Blu-ray Player.xml	
@@ -10,11 +10,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Microsoft Corporation</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <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://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
diff --git a/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml b/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml
index d603010d0a..01d4bc0860 100644
--- a/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony PlayStation 3.xml	
@@ -9,11 +9,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
diff --git a/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml b/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml
index 9540debff0..47aa844881 100644
--- a/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml	
+++ b/Emby.Dlna/Profiles/Xml/Sony PlayStation 4.xml	
@@ -9,11 +9,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>true</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
diff --git a/Emby.Dlna/Profiles/Xml/WDTV Live.xml b/Emby.Dlna/Profiles/Xml/WDTV Live.xml
index 79d9ba2ce0..f7e43368a9 100644
--- a/Emby.Dlna/Profiles/Xml/WDTV Live.xml	
+++ b/Emby.Dlna/Profiles/Xml/WDTV Live.xml	
@@ -9,11 +9,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
diff --git a/Emby.Dlna/Profiles/Xml/Xbox One.xml b/Emby.Dlna/Profiles/Xml/Xbox One.xml
index b05b21455e..a9a3028543 100644
--- a/Emby.Dlna/Profiles/Xml/Xbox One.xml	
+++ b/Emby.Dlna/Profiles/Xml/Xbox One.xml	
@@ -9,11 +9,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
diff --git a/Emby.Dlna/Profiles/Xml/foobar2000.xml b/Emby.Dlna/Profiles/Xml/foobar2000.xml
index 56c04e1e70..ba0fcf7393 100644
--- a/Emby.Dlna/Profiles/Xml/foobar2000.xml
+++ b/Emby.Dlna/Profiles/Xml/foobar2000.xml
@@ -8,11 +8,11 @@
     </Headers>
   </Identification>
   <Manufacturer>Emby</Manufacturer>
-  <ManufacturerUrl>https://emby.media</ManufacturerUrl>
+  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
   <ModelName>Emby Server</ModelName>
   <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
   <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://emby.media</ModelUrl>
+  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
   <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
   <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
   <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
@@ -63,4 +63,4 @@
     <SubtitleProfile format="subrip" method="Embed" />
     <SubtitleProfile format="vtt" method="Embed" />
   </SubtitleProfiles>
-</Profile>
\ No newline at end of file
+</Profile>
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index d21abb74e8..167f2a84b2 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -279,7 +279,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         public string HomePageUrl
         {
-            get { return "https://emby.media"; }
+            get { return "https://github.com/jellyfin/jellyfin"; }
         }
 
         public async Task RefreshSeriesTimers(CancellationToken cancellationToken, IProgress<double> progress)
diff --git a/Emby.Server.Implementations/News/NewsEntryPoint.cs b/Emby.Server.Implementations/News/NewsEntryPoint.cs
index 3ce3d23151..38a2505934 100644
--- a/Emby.Server.Implementations/News/NewsEntryPoint.cs
+++ b/Emby.Server.Implementations/News/NewsEntryPoint.cs
@@ -82,7 +82,7 @@ namespace Emby.Server.Implementations.News
 
             var requestOptions = new HttpRequestOptions
             {
-                Url = "https://emby.media/community/index.php?/blog/rss/1-media-browser-developers-blog",
+                Url = "https://github.com/jellyfin/jellyfin",
                 Progress = new SimpleProgress<double>(),
                 UserAgent = "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.42 Safari/537.36",
                 BufferContent = false
diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
index 6266e717ea..e68ce19deb 100644
--- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
@@ -301,9 +301,9 @@ namespace MediaBrowser.Providers.Movies
 
         public static string AdjustImageLanguage(string imageLanguage, string requestLanguage)
         {
-            if (!string.IsNullOrEmpty(imageLanguage) 
-                && !string.IsNullOrEmpty(requestLanguage) 
-                && requestLanguage.Length > 2 
+            if (!string.IsNullOrEmpty(imageLanguage)
+                && !string.IsNullOrEmpty(requestLanguage)
+                && requestLanguage.Length > 2
                 && imageLanguage.Length == 2
                 && requestLanguage.StartsWith(imageLanguage, StringComparison.OrdinalIgnoreCase))
             {
diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
index 505fec65fb..f6ea9b4b23 100644
--- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
@@ -777,7 +777,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
                             //Logger.Debug("Verifying custom provider tagname {0}", tagName);
                             XmlConvert.VerifyName(tagName);
                             //Logger.Debug("Saving custom provider tagname {0}", tagName);
-                            
+
                             writer.WriteElementString(GetTagForProviderKey(providerKey), providerId);
                         }
                         catch (ArgumentException)