From 956cc48a44969898b9d95f17f11d16e377e3c739 Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Mon, 20 Nov 2023 07:32:16 +0300
Subject: [PATCH] Fixes xmltv_id

---
 sites/bein.com/bein.com_ar.channels.xml       |  2 +-
 sites/bein.com/bein.com_en.channels.xml       |  2 +-
 sites/cosmote.gr/cosmote.gr.channels.xml      |  2 +-
 sites/dens.tv/dens.tv.channels.xml            |  4 ++--
 .../digiturk.com.tr.channels.xml              |  3 +--
 .../directv.com.ar.channels.xml               |  2 +-
 .../directv.com.uy.channels.xml               |  2 +-
 .../dsmart.com.tr/dsmart.com.tr.channels.xml  |  4 ++--
 sites/dstv.com/dstv.com_nga.channels.xml      |  2 +-
 .../foxtel.com.au/foxtel.com.au.channels.xml  | 22 +++++++++----------
 sites/gatotv.com/gatotv.com.channels.xml      |  2 +-
 sites/hd-plus.de/hd-plus.de.channels.xml      |  2 +-
 sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml    |  2 +-
 sites/magentatv.at/magentatv.at.channels.xml  |  2 +-
 .../maxtv.hrvatskitelekom.hr.channels.xml     |  2 +-
 sites/melita.com/melita.com.channels.xml      |  2 +-
 sites/meo.pt/meo.pt.channels.xml              |  2 +-
 sites/mi.tv/mi.tv_ar.channels.xml             |  2 +-
 sites/mts.rs/mts.rs.channels.xml              |  2 +-
 .../mujtvprogram.cz.channels.xml              |  2 +-
 sites/musor.tv/musor.tv.channels.xml          |  2 +-
 .../ontvtonight.com_au.channels.xml           | 16 +++++++-------
 .../programetv.ro/programetv.ro.channels.xml  |  2 +-
 .../programtv.onet.pl.channels.xml            |  2 +-
 .../proximusmwc.be.channels.xml               |  2 +-
 sites/telenet.tv/telenet.tv.channels.xml      |  2 +-
 .../turksatkablo.com.tr.channels.xml          |  2 +-
 sites/tv.blue.ch/tv.blue.ch.channels.xml      |  2 +-
 sites/tv.nu/tv.nu.channels.xml                |  2 +-
 .../tv2go.t-2.net/tv2go.t-2.net.channels.xml  |  2 +-
 .../tvplus.com.tr/tvplus.com.tr.channels.xml  |  2 +-
 sites/tvprofil.com/tvprofil.com.channels.xml  |  2 +-
 .../virginmedia.com.channels.xml              |  2 +-
 .../webtv.delta.nl.channels.xml               |  2 +-
 sites/ziggogo.tv/ziggogo.tv.channels.xml      |  2 +-
 35 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/sites/bein.com/bein.com_ar.channels.xml b/sites/bein.com/bein.com_ar.channels.xml
index 51e78aa5..565c213a 100644
--- a/sites/bein.com/bein.com_ar.channels.xml
+++ b/sites/bein.com/bein.com_ar.channels.xml
@@ -67,7 +67,7 @@
   <channel site="bein.com" lang="ar" xmltv_id="EuronewsEnglish.fr" site_id="entertainment#28">28</channel>
   <channel site="bein.com" lang="ar" xmltv_id="Fatafeat.ae" site_id="entertainment#17">17</channel>
   <channel site="bein.com" lang="ar" xmltv_id="FoodNetworkEMEA.us" site_id="entertainment#14">14</channel>
-  <channel site="bein.com" lang="ar" xmltv_id="FoxActionMoviesMiddleEast.hk" site_id="entertainment#6">6</channel>
+  <channel site="bein.com" lang="ar" xmltv_id="FoxActionMoviesMENA.hk" site_id="entertainment#6">6</channel>
   <channel site="bein.com" lang="ar" xmltv_id="FoxArabia.ae" site_id="entertainment#13">13</channel>
   <channel site="bein.com" lang="ar" xmltv_id="FoxMoviesMiddleEast.us" site_id="entertainment#5">5</channel>
   <channel site="bein.com" lang="ar" xmltv_id="HGTVArabia.us" site_id="entertainment#15">15</channel>
diff --git a/sites/bein.com/bein.com_en.channels.xml b/sites/bein.com/bein.com_en.channels.xml
index 8d0de082..466bf755 100644
--- a/sites/bein.com/bein.com_en.channels.xml
+++ b/sites/bein.com/bein.com_en.channels.xml
@@ -68,7 +68,7 @@
   <channel site="bein.com" lang="en" xmltv_id="EuronewsEnglish.fr" site_id="entertainment#27">27</channel>
   <channel site="bein.com" lang="en" xmltv_id="Fatafeat.ae" site_id="entertainment#17">17</channel>
   <channel site="bein.com" lang="en" xmltv_id="FoodNetworkEMEA.us" site_id="entertainment#14">14</channel>
-  <channel site="bein.com" lang="en" xmltv_id="FoxActionMoviesMiddleEast.hk" site_id="entertainment#6">6</channel>
+  <channel site="bein.com" lang="en" xmltv_id="FoxActionMoviesMENA.hk" site_id="entertainment#6">6</channel>
   <channel site="bein.com" lang="en" xmltv_id="FoxArabia.ae" site_id="entertainment#13">13</channel>
   <channel site="bein.com" lang="en" xmltv_id="FoxLifeMiddleEast.ae" site_id="entertainment#18">18</channel>
   <channel site="bein.com" lang="en" xmltv_id="FoxMoviesMiddleEast.us" site_id="entertainment#5">5</channel>
diff --git a/sites/cosmote.gr/cosmote.gr.channels.xml b/sites/cosmote.gr/cosmote.gr.channels.xml
index c739d76d..dd9e5729 100644
--- a/sites/cosmote.gr/cosmote.gr.channels.xml
+++ b/sites/cosmote.gr/cosmote.gr.channels.xml
@@ -76,7 +76,7 @@
   <channel site="cosmote.gr" lang="el" xmltv_id="CrimePlusInvestigation.uk" site_id="crime-and-investigation">Crime and Investigation</channel>
   <channel site="cosmote.gr" lang="el" xmltv_id="DisneyChannelMENA.uk" site_id="disney-channel">Disney Channel</channel>
   <channel site="cosmote.gr" lang="el" xmltv_id="EDGEsport.uk" site_id="edgesport-hd">EDGEsport HD</channel>
-  <channel site="cosmote.gr" lang="el" xmltv_id="EEurope.us" site_id="e-hd">E! HD</channel>
+  <channel site="cosmote.gr" lang="el" xmltv_id="EEurope.nl" site_id="e-hd">E! HD</channel>
   <channel site="cosmote.gr" lang="el" xmltv_id="ENAChannel.gr" site_id="tv100">TV100</channel>
   <channel site="cosmote.gr" lang="el" xmltv_id="ERTWorld.gr" site_id="ert-world">ERT WORLD</channel>
   <channel site="cosmote.gr" lang="el" xmltv_id="EuronewsEnglish.fr" site_id="euronews-english">Euronews English</channel>
diff --git a/sites/dens.tv/dens.tv.channels.xml b/sites/dens.tv/dens.tv.channels.xml
index 4b39d675..5117cd0e 100644
--- a/sites/dens.tv/dens.tv.channels.xml
+++ b/sites/dens.tv/dens.tv.channels.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
-  <channel site="dens.tv" lang="id" xmltv_id="" site_id="3">Live Streaming 1</channel>
+  <!-- <channel site="dens.tv" lang="id" xmltv_id="" site_id="3">Live Streaming 1</channel>
   <channel site="dens.tv" lang="id" xmltv_id="" site_id="22">RTV</channel>
   <channel site="dens.tv" lang="id" xmltv_id="" site_id="78">TBN</channel>
   <channel site="dens.tv" lang="id" xmltv_id="" site_id="104">FREEDOM</channel>
   <channel site="dens.tv" lang="id" xmltv_id="" site_id="120">MotoRRacing TV</channel>
   <channel site="dens.tv" lang="id" xmltv_id="" site_id="123">W-Sport</channel>
   <channel site="dens.tv" lang="id" xmltv_id="" site_id="127">crema.tv</channel>
-  <channel site="dens.tv" lang="id" xmltv_id="" site_id="130">Dance TV</channel>
+  <channel site="dens.tv" lang="id" xmltv_id="" site_id="130">Dance TV</channel> -->
   <channel site="dens.tv" lang="id" xmltv_id="ANTV.id" site_id="8">antv</channel>
   <channel site="dens.tv" lang="id" xmltv_id="AlJazeera.qa" site_id="27">Al Jazeera Arabic</channel>
   <channel site="dens.tv" lang="id" xmltv_id="AlJazeeraEnglish.qa" site_id="56">Al Jazeera English</channel>
diff --git a/sites/digiturk.com.tr/digiturk.com.tr.channels.xml b/sites/digiturk.com.tr/digiturk.com.tr.channels.xml
index 6e9774ec..7783f416 100644
--- a/sites/digiturk.com.tr/digiturk.com.tr.channels.xml
+++ b/sites/digiturk.com.tr/digiturk.com.tr.channels.xml
@@ -134,10 +134,9 @@
   <channel site="digiturk.com.tr" lang="tr" xmltv_id="TV100.tr" site_id="37">TV 100 HD</channel>
   <channel site="digiturk.com.tr" lang="tr" xmltv_id="TV8.tr" site_id="28">TV8 HD</channel>
   <channel site="digiturk.com.tr" lang="tr" xmltv_id="TV85.tr" site_id="55">TV 8,5</channel>
-  <channel site="digiturk.com.tr" lang="tr" xmltv_id="TVNet.tr" site_id="39">TVNET HD</channel>
+  <channel site="digiturk.com.tr" lang="tr" xmltv_id="TVNET.tr" site_id="39">TVNET HD</channel>
   <channel site="digiturk.com.tr" lang="tr" xmltv_id="UlkeTV.tr" site_id="38">Ülke TV HD</channel>
   <channel site="digiturk.com.tr" lang="tr" xmltv_id="UlusalKanal.tr" site_id="52">ULUSAL TV</channel>
-  <channel site="digiturk.com.tr" lang="tr" xmltv_id="VavTV.tr" site_id="67">Meltem TV</channel>
   <channel site="digiturk.com.tr" lang="tr" xmltv_id="VavTV.tr" site_id="67">VAV TV</channel>
   <channel site="digiturk.com.tr" lang="tr" xmltv_id="Yaban.tr" site_id="189">Yaban TV</channel>
 </channels>
diff --git a/sites/directv.com.ar/directv.com.ar.channels.xml b/sites/directv.com.ar/directv.com.ar.channels.xml
index d6694a2b..59256357 100644
--- a/sites/directv.com.ar/directv.com.ar.channels.xml
+++ b/sites/directv.com.ar/directv.com.ar.channels.xml
@@ -293,7 +293,7 @@
   <channel site="directv.com.ar" lang="es" xmltv_id="DiscoveryKidsPanregional.us" site_id="330#KIDS">Discovery Kids (Sur)</channel>
   <channel site="directv.com.ar" lang="es" xmltv_id="DiscoveryTheaterLatinAmerica.us" site_id="1731#DISTHD">Discovery Theater HD</channel>
   <channel site="directv.com.ar" lang="es" xmltv_id="DiscoveryTurboPanregional.us" site_id="736#TRBO">Discovery Turbo</channel>
-  <channel site="directv.com.ar" lang="es" xmltv_id="DiscoveryWorldPanregional.us" site_id="1738#DISWHD">Discovery World HD</channel>
+  <channel site="directv.com.ar" lang="es" xmltv_id="DiscoveryWorldLatinAmerica.us" site_id="1738#DISWHD">Discovery World HD</channel>
   <channel site="directv.com.ar" lang="es" xmltv_id="DisneyChannelSouth.us" site_id="312#DSNY">Disney Channel (Sur)</channel>
   <channel site="directv.com.ar" lang="es" xmltv_id="DisneyJuniorSouth.us" site_id="315#DSJR">Disney Junior Sur</channel>
   <channel site="directv.com.ar" lang="es" xmltv_id="DNews.us" site_id="700#DNEW">DNews</channel>
diff --git a/sites/directv.com.uy/directv.com.uy.channels.xml b/sites/directv.com.uy/directv.com.uy.channels.xml
index 68a73df5..96b49b2a 100644
--- a/sites/directv.com.uy/directv.com.uy.channels.xml
+++ b/sites/directv.com.uy/directv.com.uy.channels.xml
@@ -41,7 +41,7 @@
   <channel site="directv.com.uy" lang="es" xmltv_id="DiscoveryKidsPanregional.us" site_id="330#KIDS">Discovery Kids (Sur)</channel>
   <channel site="directv.com.uy" lang="es" xmltv_id="DiscoveryTheaterLatinAmerica.us" site_id="1731#DISTHD">Discovery Theater HD</channel>
   <channel site="directv.com.uy" lang="es" xmltv_id="DiscoveryTurboPanregional.us" site_id="736#TRBO">Discovery Turbo</channel>
-  <channel site="directv.com.uy" lang="es" xmltv_id="DiscoveryWorldPanregional.us" site_id="1738#DISWHD">Discovery World HD</channel>
+  <channel site="directv.com.uy" lang="es" xmltv_id="DiscoveryWorldLatinAmerica.us" site_id="1738#DISWHD">Discovery World HD</channel>
   <channel site="directv.com.uy" lang="es" xmltv_id="DisneyChannelSouth.us" site_id="312#DSNY">Disney Channel (Sur)</channel>
   <channel site="directv.com.uy" lang="es" xmltv_id="DisneyJuniorSouth.us" site_id="315#DSJR">Disney Junior Sur</channel>
   <channel site="directv.com.uy" lang="es" xmltv_id="DWEspanol.de" site_id="770#DW">Deutsche Welle</channel>
diff --git a/sites/dsmart.com.tr/dsmart.com.tr.channels.xml b/sites/dsmart.com.tr/dsmart.com.tr.channels.xml
index fbba489d..92f014e4 100644
--- a/sites/dsmart.com.tr/dsmart.com.tr.channels.xml
+++ b/sites/dsmart.com.tr/dsmart.com.tr.channels.xml
@@ -106,7 +106,7 @@
   <channel site="dsmart.com.tr" lang="tr" xmltv_id="InsightTV.nl" site_id="66#5dfc6dc2cfef0b201d222aa0">Insight TV</channel>
   <channel site="dsmart.com.tr" lang="tr" xmltv_id="KadirgaTV.tr" site_id="128#59dca8b8cfef0b4d80a47c32">Kadırga TV</channel>
   <channel site="dsmart.com.tr" lang="tr" xmltv_id="Kanal26.tr" site_id="148#59dcbc08cfef0b4d80a49624">Kanal 26</channel>
-  <channel site="dsmart.com.tr" lang="tr" xmltv_id="Kanal3.tr[closed:2021-01-04]" site_id="120#59dca70bcfef0b4d80a47b86">Kanal 3</channel>
+  <channel site="dsmart.com.tr" lang="tr" xmltv_id="Kanal3.tr" site_id="120#59dca70bcfef0b4d80a47b86">Kanal 3</channel>
   <channel site="dsmart.com.tr" lang="tr" xmltv_id="Kanal42.tr" site_id="141#59dcab38cfef0b4d80a47e24">Kanal 42</channel>
   <channel site="dsmart.com.tr" lang="tr" xmltv_id="Kanal7.tr" site_id="194#58d29bb0eefad3db9c606239">Kanal 7 SD</channel>
   <channel site="dsmart.com.tr" lang="tr" xmltv_id="Kanal7.tr" site_id="26#58d29bb0eefad3db9c60629c">Kanal 7</channel>
@@ -164,7 +164,7 @@
   <channel site="dsmart.com.tr" lang="tr" xmltv_id="TatlisesTV.tr" site_id="103#644a774dcfef0b02d28abccb">Tatlıses Tv</channel>
   <channel site="dsmart.com.tr" lang="tr" xmltv_id="TAYTV.tr" site_id="71#59dca4d8cfef0b4d80a47b7a">TAY TV</channel>
   <channel site="dsmart.com.tr" lang="tr" xmltv_id="Tele1.tr" site_id="162#59dcbddccfef0b4d80a49642">Tele 1</channel>
-  <channel site="dsmart.com.tr" lang="tr" xmltv_id="TempoTV.tr[closed:2003-10-17]" site_id="144#61f935e5cfef0b1593123810">Tempo Tv</channel>
+  <channel site="dsmart.com.tr" lang="tr" xmltv_id="TempoTV.tr" site_id="144#61f935e5cfef0b1593123810">Tempo Tv</channel>
   <channel site="dsmart.com.tr" lang="tr" xmltv_id="Teve2.tr" site_id="20#58d29bb0eefad3db9c6062a1">teve2</channel>
   <channel site="dsmart.com.tr" lang="tr" xmltv_id="Teve2.tr" site_id="203#58d29bb0eefad3db9c60627a">teve2 SD</channel>
   <channel site="dsmart.com.tr" lang="tr" xmltv_id="TGRTBelgesel.tr" site_id="122#59dca751cfef0b4d80a47b88">TGRT Belgesel</channel>
diff --git a/sites/dstv.com/dstv.com_nga.channels.xml b/sites/dstv.com/dstv.com_nga.channels.xml
index f4c560c5..58d68ed1 100644
--- a/sites/dstv.com/dstv.com_nga.channels.xml
+++ b/sites/dstv.com/dstv.com_nga.channels.xml
@@ -151,7 +151,7 @@
   <channel site="dstv.com" lang="en" xmltv_id="WapTV.ng" site_id="nga#262">WAP TV</channel>
   <channel site="dstv.com" lang="en" xmltv_id="WasafiTV.tz" site_id="nga#296">Wasafi TV</channel>
   <channel site="dstv.com" lang="en" xmltv_id="WazobiaMaxTVNigeria.ng" site_id="nga#259">Wazobia Max</channel>
-  <channel site="dstv.com" lang="en" xmltv_id="WWEChannel.za" site_id="nga#128">WWE Channel</channel>
+  <channel site="dstv.com" lang="en" xmltv_id="WWEChannelAfrica.za" site_id="nga#128">WWE Channel</channel>
   <channel site="dstv.com" lang="en" xmltv_id="ZeeWorld.za" site_id="nga#166">Zee World</channel>
   <channel site="dstv.com" lang="fr" xmltv_id="CGTNFrench.cn" site_id="nga#449">CGTN French</channel>
   <channel site="dstv.com" lang="pt" xmltv_id="RTPInternacional.pt" site_id="nga#525">RTPi (P)</channel>
diff --git a/sites/foxtel.com.au/foxtel.com.au.channels.xml b/sites/foxtel.com.au/foxtel.com.au.channels.xml
index 00f8b8d6..b08a4ef3 100644
--- a/sites/foxtel.com.au/foxtel.com.au.channels.xml
+++ b/sites/foxtel.com.au/foxtel.com.au.channels.xml
@@ -97,22 +97,22 @@
   <channel site="foxtel.com.au" lang="en" xmltv_id="ExpoChannel.au" site_id="EXPO/EXP">EXPO</channel>
   <channel site="foxtel.com.au" lang="en" xmltv_id="Fox8.au" site_id="FOX8/FOX">FOX8</channel>
   <channel site="foxtel.com.au" lang="en" xmltv_id="Fox8Plus2.au" site_id="FOX82/FO2">FOX8+2</channel>
-  <channel site="foxtel.com.au" lang="en" xmltv_id="FoxClassics.au" site_id="Classics/FKC">Classics</channel>
-  <channel site="foxtel.com.au" lang="en" xmltv_id="FoxClassicsPlus2.au" site_id="Classics-2/CL2">Classics +2</channel>
-  <channel site="foxtel.com.au" lang="en" xmltv_id="FoxComedy.au" site_id="Comedy/HIT">Comedy</channel>
-  <channel site="foxtel.com.au" lang="en" xmltv_id="FoxComedyPlus2.au" site_id="Comedy-2/HI2">Comedy +2</channel>
+  <channel site="foxtel.com.au" lang="en" xmltv_id="Classics.au" site_id="Classics/FKC">Classics</channel>
+  <channel site="foxtel.com.au" lang="en" xmltv_id="ClassicsPlus2.au" site_id="Classics-2/CL2">Classics +2</channel>
+  <channel site="foxtel.com.au" lang="en" xmltv_id="Comedy.au" site_id="Comedy/HIT">Comedy</channel>
+  <channel site="foxtel.com.au" lang="en" xmltv_id="ComedyPlus2.au" site_id="Comedy-2/HI2">Comedy +2</channel>
   <channel site="foxtel.com.au" lang="en" xmltv_id="FoxCricket.au" site_id="FOX-CRICKET/FS1">FOX CRICKET</channel>
-  <channel site="foxtel.com.au" lang="en" xmltv_id="FoxCrime.au" site_id="Crime/IOI">Crime</channel>
+  <channel site="foxtel.com.au" lang="en" xmltv_id="Crime.au" site_id="Crime/IOI">Crime</channel>
   <channel site="foxtel.com.au" lang="en" xmltv_id="FoxCrimePlus2.au" site_id="Crime-2/IO2">Crime +2</channel>
   <channel site="foxtel.com.au" lang="en" xmltv_id="FoxFooty.au" site_id="Fox-Footy/FAF">Fox Footy</channel>
   <channel site="foxtel.com.au" lang="en" xmltv_id="FoxLeague.au" site_id="FOX-LEAGUE/SP2">FOX LEAGUE</channel>
   <channel site="foxtel.com.au" lang="en" xmltv_id="FoxNewsChannel.us" site_id="FOX-News/FNC">FOX News</channel>
-  <channel site="foxtel.com.au" lang="en" xmltv_id="FoxSciFi.au" site_id="Sci-Fi/FIS">Sci Fi</channel>
-  <channel site="foxtel.com.au" lang="en" xmltv_id="FoxSciFiPlus2.au" site_id="Sci-Fi--2/FI2">Sci Fi +2</channel>
-  <channel site="foxtel.com.au" lang="en" xmltv_id="FoxShowcase.au" site_id="Showcase/SHC">Showcase</channel>
-  <channel site="foxtel.com.au" lang="en" xmltv_id="FoxShowcasePlus2.au" site_id="Showcase-2/SW2">Showcase +2</channel>
-  <channel site="foxtel.com.au" lang="en" xmltv_id="FoxSleuth.au" site_id="Sleuth/FSU">Sleuth</channel>
-  <channel site="foxtel.com.au" lang="en" xmltv_id="FoxSleuthPlus2.au" site_id="Sleuth-2/FS2">Sleuth +2</channel>
+  <channel site="foxtel.com.au" lang="en" xmltv_id="SciFi.au" site_id="Sci-Fi/FIS">Sci Fi</channel>
+  <channel site="foxtel.com.au" lang="en" xmltv_id="SciFiPlus2.au" site_id="Sci-Fi--2/FI2">Sci Fi +2</channel>
+  <channel site="foxtel.com.au" lang="en" xmltv_id="Showcase.au" site_id="Showcase/SHC">Showcase</channel>
+  <channel site="foxtel.com.au" lang="en" xmltv_id="ShowcasePlus2.au" site_id="Showcase-2/SW2">Showcase +2</channel>
+  <channel site="foxtel.com.au" lang="en" xmltv_id="Sleuth.au" site_id="Sleuth/FSU">Sleuth</channel>
+  <channel site="foxtel.com.au" lang="en" xmltv_id="SleuthPlus2.au" site_id="Sleuth-2/FS2">Sleuth +2</channel>
   <channel site="foxtel.com.au" lang="en" xmltv_id="FoxSports503.au" site_id="FOX-SPORTS-503/FS3">FOX SPORTS 503</channel>
   <channel site="foxtel.com.au" lang="en" xmltv_id="FoxSports505.au" site_id="FOX-SPORTS-505/FSP">FOX SPORTS 505</channel>
   <channel site="foxtel.com.au" lang="en" xmltv_id="FoxSports506.au" site_id="FOX-SPORTS-506/SPS">FOX SPORTS 506</channel>
diff --git a/sites/gatotv.com/gatotv.com.channels.xml b/sites/gatotv.com/gatotv.com.channels.xml
index 5bf1e835..a6403ffa 100644
--- a/sites/gatotv.com/gatotv.com.channels.xml
+++ b/sites/gatotv.com/gatotv.com.channels.xml
@@ -229,7 +229,7 @@
   <channel site="gatotv.com" lang="es" xmltv_id="DiscoveryWorldLatinAmerica.us" site_id="discovery_world_latinoamerica">Discovery World Lat.</channel>
   <channel site="gatotv.com" lang="es" xmltv_id="DisneyChannel.es" site_id="disney_channel_espana">Disney Channel España</channel>
   <channel site="gatotv.com" lang="es" xmltv_id="DisneyChannelCenter.us" site_id="disney_channel_centro">Disney Channel Centro</channel>
-  <channel site="gatotv.com" lang="es" xmltv_id="DisneyChannelLatinAmerica.us" site_id="disney_channel_mexico">Disney Channel México</channel>
+  <channel site="gatotv.com" lang="es" xmltv_id="DisneyChannelNorth.us" site_id="disney_channel_mexico">Disney Channel México</channel>
   <channel site="gatotv.com" lang="es" xmltv_id="DisneyChannelSouth.us" site_id="disney_channel_sur">Disney Channel Sur</channel>
   <channel site="gatotv.com" lang="es" xmltv_id="DisneyJunior.es" site_id="disney_junior_espana">Disney Junior España</channel>
   <channel site="gatotv.com" lang="es" xmltv_id="DisneyJuniorNorth.us" site_id="disney_junior_norte">Disney Junior Norte</channel>
diff --git a/sites/hd-plus.de/hd-plus.de.channels.xml b/sites/hd-plus.de/hd-plus.de.channels.xml
index b0c706d4..bb29ac23 100644
--- a/sites/hd-plus.de/hd-plus.de.channels.xml
+++ b/sites/hd-plus.de/hd-plus.de.channels.xml
@@ -24,7 +24,7 @@
   <channel site="hd-plus.de" lang="de" xmltv_id="DiscoveryChannel.de" site_id="discovery-channel-hd">Discovery Channel Deutschland</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="DisneyChannel.de" site_id="disney-channel-hd">Disney Channel Deutschland</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="DMAX.de" site_id="dmax-hd">DMAX Deutschland</channel>
-  <channel site="hd-plus.de" lang="de" xmltv_id="EEurope.us" site_id="e-entertainment-hd">E! Europe</channel>
+  <channel site="hd-plus.de" lang="de" xmltv_id="EEurope.nl" site_id="e-entertainment-hd">E! Europe</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="EuronewsGerman.fr" site_id="euronews">EuroNews Deutsch</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="Eurosport1.de" site_id="eurosport-hd">Eurosport 1 Germany</channel>
   <channel site="hd-plus.de" lang="de" xmltv_id="EWTN.de" site_id="ewtn">EWTN auf Deutsch</channel>
diff --git a/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml b/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
index 2a999c81..d7f179ee 100644
--- a/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
+++ b/sites/m.tv.sms.cz/m.tv.sms.cz.channels.xml
@@ -54,7 +54,7 @@
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="Duna.hu" site_id="Duna">Duna TV</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="DunaWorld.hu" site_id="Duna+World">Duna World</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="Dvojka.sk" site_id="STV2">RTVS 2</channel>
-  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="EEurope.us" site_id="E%21+Entertainment">E! Europe</channel>
+  <channel site="m.tv.sms.cz" lang="cs" xmltv_id="EEurope.nl" site_id="E%21+Entertainment">E! Europe</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="EnterFilm.ua" site_id="Enter+Film">Enter Film</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="EpicDrama.se" site_id="Epic+Drama">Epic Drama</channel>
   <channel site="m.tv.sms.cz" lang="cs" xmltv_id="EskaTV.pl" site_id="Eska+TV">Eska TV</channel>
diff --git a/sites/magentatv.at/magentatv.at.channels.xml b/sites/magentatv.at/magentatv.at.channels.xml
index ba80cf38..1a777b8f 100644
--- a/sites/magentatv.at/magentatv.at.channels.xml
+++ b/sites/magentatv.at/magentatv.at.channels.xml
@@ -24,7 +24,7 @@
   <channel site="magentatv.at" lang="de" xmltv_id="DeluxeMusic.de" site_id="Deluxe_Music_HD">DELUXE MUSIC</channel>
   <channel site="magentatv.at" lang="de" xmltv_id="DisneyChannel.de" site_id="Disney_Channel">Disney Channel Deutschland</channel>
   <channel site="magentatv.at" lang="de" xmltv_id="DMAX.de" site_id="DMAX_HD">DMAX Austria</channel>
-  <channel site="magentatv.at" lang="de" xmltv_id="EEurope.us" site_id="E__Entertainment_HD">E! Europe</channel>
+  <channel site="magentatv.at" lang="de" xmltv_id="EEurope.nl" site_id="E__Entertainment_HD">E! Europe</channel>
   <channel site="magentatv.at" lang="de" xmltv_id="eSports1.de" site_id="Sport_1_US_HD">eSPORTS1 HD</channel>
   <channel site="magentatv.at" lang="de" xmltv_id="EuronewsGerman.fr" site_id="Euronews">euronews (D)</channel>
   <channel site="magentatv.at" lang="de" xmltv_id="Eurosport1.de" site_id="Eurosport_1_HD">Eurosport 1 Germany</channel>
diff --git a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml
index 49c507ce..f3e8174e 100644
--- a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml
+++ b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.channels.xml
@@ -67,7 +67,7 @@
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="DaVinci.de" site_id="423">Da Vinci</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="DMSat.rs" site_id="270">DM Sat</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="DomaTV.hr" site_id="92">Doma Hrvatska</channel>
-  <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="EEurope.us" site_id="317">E! Europe</channel>
+  <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="EEurope.nl" site_id="317">E! Europe</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="EpicDrama.se" site_id="638">Epic Drama</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="Federalnatelevizija.ba" site_id="279">Federalna TV</channel>
   <channel site="maxtv.hrvatskitelekom.hr" lang="hr" xmltv_id="FoxCrime.hr" site_id="359">Fox Crime Hrvatska</channel>
diff --git a/sites/melita.com/melita.com.channels.xml b/sites/melita.com/melita.com.channels.xml
index 76e95505..cfb62084 100644
--- a/sites/melita.com/melita.com.channels.xml
+++ b/sites/melita.com/melita.com.channels.xml
@@ -32,7 +32,7 @@
   <channel site="melita.com" lang="en" xmltv_id="DubaiOne.ae" site_id="b41afdcb-2204-48ee-b40a-a0db64e4bd91">Dubai One</channel>
   <channel site="melita.com" lang="en" xmltv_id="ducktv.sk" site_id="aeb3011d-9106-4621-b5e8-693dec45f33e">Duck TV</channel>
   <channel site="melita.com" lang="en" xmltv_id="DWEnglish.de" site_id="8a1ea95b-49fb-4fe8-9fc9-06d0f7567f76">Deutsche Welle HD</channel>
-  <channel site="melita.com" lang="en" xmltv_id="EEurope.us" site_id="60338dfb-5bf1-4824-a1f9-92ff5f78d105">E! Entertainment HD</channel>
+  <channel site="melita.com" lang="en" xmltv_id="EEurope.nl" site_id="60338dfb-5bf1-4824-a1f9-92ff5f78d105">E! Entertainment HD</channel>
   <channel site="melita.com" lang="en" xmltv_id="EuronewsEnglish.fr" site_id="aa11df2b-37b0-442d-a7d6-fab4ef03e48f">Euronews HD</channel>
   <channel site="melita.com" lang="en" xmltv_id="Eurosport1.fr" site_id="9b2ff2da-b9d9-4ef7-be19-c16f7b6981f3">Eurosport HD</channel>
   <channel site="melita.com" lang="en" xmltv_id="Eurosport2.fr" site_id="ddd38bf4-0324-4a46-9174-b7023c632c60">Eurosport 2</channel>
diff --git a/sites/meo.pt/meo.pt.channels.xml b/sites/meo.pt/meo.pt.channels.xml
index 653c06d8..b967c7e2 100644
--- a/sites/meo.pt/meo.pt.channels.xml
+++ b/sites/meo.pt/meo.pt.channels.xml
@@ -69,7 +69,7 @@
   <channel site="meo.pt" lang="pt" xmltv_id="DogTV.us" site_id="DOGTV">Dog TV</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="DWDeutsch.de" site_id="DWTVA">DW Deutsch</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="DWEnglish.de" site_id="DW-TV">DW English</channel>
-  <channel site="meo.pt" lang="pt" xmltv_id="EEurope.us" site_id="E!">E!</channel>
+  <channel site="meo.pt" lang="pt" xmltv_id="EEurope.nl" site_id="E!">E!</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="Eleven1.pt" site_id="ELEVEN1">Eleven 1</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="Eleven2.pt" site_id="ELEVEN2">Eleven 2</channel>
   <channel site="meo.pt" lang="pt" xmltv_id="Eleven3.pt" site_id="ELEVEN3">Eleven 3</channel>
diff --git a/sites/mi.tv/mi.tv_ar.channels.xml b/sites/mi.tv/mi.tv_ar.channels.xml
index 4298d85c..d8b079ee 100644
--- a/sites/mi.tv/mi.tv_ar.channels.xml
+++ b/sites/mi.tv/mi.tv_ar.channels.xml
@@ -49,7 +49,7 @@
   <channel site="mi.tv" lang="es" xmltv_id="DiscoveryScienceLatinAmerica.us" site_id="ar#discovery-science">Discovery Science</channel>
   <channel site="mi.tv" lang="es" xmltv_id="DiscoveryTheaterLatinAmerica.us" site_id="ar#discovery-hd-theater">Discovery Theater HD</channel>
   <channel site="mi.tv" lang="es" xmltv_id="DiscoveryTurboPanregional.us" site_id="ar#discovery-turbo">Discovery Turbo</channel>
-  <channel site="mi.tv" lang="es" xmltv_id="DiscoveryWorldPanregional.us" site_id="ar#discovery-world-hd">Discovery World HD</channel>
+  <channel site="mi.tv" lang="es" xmltv_id="DiscoveryWorldLatinAmerica.us" site_id="ar#discovery-world-hd">Discovery World HD</channel>
   <channel site="mi.tv" lang="es" xmltv_id="DisneyChannelSouth.us" site_id="ar#disney">Disney Channel</channel>
   <channel site="mi.tv" lang="es" xmltv_id="EAndes.us" site_id="ar#entertainment">E!</channel>
   <channel site="mi.tv" lang="es" xmltv_id="ElGourmetSouth.ar" site_id="ar#el-gourmet">El Gourmet</channel>
diff --git a/sites/mts.rs/mts.rs.channels.xml b/sites/mts.rs/mts.rs.channels.xml
index f9e62ec4..1aabf684 100644
--- a/sites/mts.rs/mts.rs.channels.xml
+++ b/sites/mts.rs/mts.rs.channels.xml
@@ -64,7 +64,7 @@
   <channel site="mts.rs" lang="sr" xmltv_id="DunavTV.rs" site_id="143#648">Dunav TV</channel>
   <channel site="mts.rs" lang="sr" xmltv_id="DunaWorld.hu" site_id="676#491">Duna World</channel>
   <channel site="mts.rs" lang="sr" xmltv_id="EDUTV.rs" site_id="365#323">eduTV</channel>
-  <channel site="mts.rs" lang="sr" xmltv_id="EEurope.us" site_id="289#574">E! Europe</channel>
+  <channel site="mts.rs" lang="sr" xmltv_id="EEurope.nl" site_id="289#574">E! Europe</channel>
   <channel site="mts.rs" lang="sr" xmltv_id="EpicDrama.se" site_id="240#389">Epic Drama</channel>
   <channel site="mts.rs" lang="sr" xmltv_id="EuronewsEnglish.fr" site_id="665#337">EuroNews English</channel>
   <channel site="mts.rs" lang="sr" xmltv_id="EuronewsSerbia.rs" site_id="112#818">EuroNews Serbia</channel>
diff --git a/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml b/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml
index a556e449..4753810a 100644
--- a/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml
+++ b/sites/mujtvprogram.cz/mujtvprogram.cz.channels.xml
@@ -80,7 +80,7 @@
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="DisneyChannel.cz" site_id="31">Disney Channel</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="ducktv.sk" site_id="273">Duck TV</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="Duna.hu" site_id="243">Duna SK</channel>
-  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="EEurope.us" site_id="410">E! Europe</channel>
+  <channel site="mujtvprogram.cz" lang="cs" xmltv_id="EEurope.nl" site_id="410">E! Europe</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="EpicDrama.se" site_id="601">Epic Drama HD</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="Eurosport1.fr" site_id="16">Eurosport 1</channel>
   <channel site="mujtvprogram.cz" lang="cs" xmltv_id="Eurosport2.fr" site_id="25">Eurosport 2</channel>
diff --git a/sites/musor.tv/musor.tv.channels.xml b/sites/musor.tv/musor.tv.channels.xml
index 313b1af9..f9395eb2 100644
--- a/sites/musor.tv/musor.tv.channels.xml
+++ b/sites/musor.tv/musor.tv.channels.xml
@@ -3,7 +3,7 @@
   <!-- <channel site="musor.tv" lang="hu" xmltv_id="" site_id="DTX">Discovery Turbo Xtra (DTX)</channel> -->
   <!-- <channel site="musor.tv" lang="hu" xmltv_id="" site_id="FILMBOX">Filmbox</channel> -->
   <channel site="musor.tv" lang="en" xmltv_id="ClubMTVEurope.uk" site_id="CLUB_MTV">club MTV</channel>
-  <channel site="musor.tv" lang="en" xmltv_id="EEurope.us" site_id="E_ENTERTAINMENT">E! Entertainment</channel>
+  <channel site="musor.tv" lang="en" xmltv_id="EEurope.nl" site_id="E_ENTERTAINMENT">E! Entertainment</channel>
   <channel site="musor.tv" lang="en" xmltv_id="EnglishClubTV.uk" site_id="ENGLISH_CLUB_TV">English Club TV</channel>
   <channel site="musor.tv" lang="en" xmltv_id="ExtremeSportsChannel.nl" site_id="EXTREMESP">Extreme Sports Channel</channel>
   <channel site="musor.tv" lang="en" xmltv_id="FightBox.nl" site_id="FIGHTBOX_EN">Fightbox</channel>
diff --git a/sites/ontvtonight.com/ontvtonight.com_au.channels.xml b/sites/ontvtonight.com/ontvtonight.com_au.channels.xml
index 67e5c079..771eaa9c 100644
--- a/sites/ontvtonight.com/ontvtonight.com_au.channels.xml
+++ b/sites/ontvtonight.com/ontvtonight.com_au.channels.xml
@@ -20,17 +20,17 @@
   <channel site="ontvtonight.com" lang="en" xmltv_id="Channel9Sydney.au" site_id="au#2749/9-hd">Nine</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="ESPN.au" site_id="au#3226/espn-hd">ESPN Australia</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="Fox8.au" site_id="au#3182/fox8-hd">Fox 8</channel>
-  <channel site="ontvtonight.com" lang="en" xmltv_id="FoxArena.au" site_id="au#3154/fox-arena">Fox Arena</channel>
-  <channel site="ontvtonight.com" lang="en" xmltv_id="FoxClassics.au" site_id="au#3185/fox-classics">Fox Classics</channel>
-  <channel site="ontvtonight.com" lang="en" xmltv_id="FoxComedy.au" site_id="au#3192/fox-comedy">Fox Comedy</channel>
-  <channel site="ontvtonight.com" lang="en" xmltv_id="FoxCrime.au" site_id="au#3234/fox-crime">Fox Crime</channel>
+  <channel site="ontvtonight.com" lang="en" xmltv_id="Arena.au" site_id="au#3154/fox-arena">Fox Arena</channel>
+  <channel site="ontvtonight.com" lang="en" xmltv_id="Classics.au" site_id="au#3185/fox-classics">Fox Classics</channel>
+  <channel site="ontvtonight.com" lang="en" xmltv_id="Comedy.au" site_id="au#3192/fox-comedy">Fox Comedy</channel>
+  <channel site="ontvtonight.com" lang="en" xmltv_id="Crime.au" site_id="au#3234/fox-crime">Fox Crime</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="Docos.au" site_id="au#3257/fox-docos-hd">Fox Docos</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="FoxFunny.au" site_id="au#3319/fox-funny-hd">Fox Funny</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="FoxNewsChannel.us" site_id="au#3186/fox-news">Fox News</channel>
-  <channel site="ontvtonight.com" lang="en" xmltv_id="FoxOne.au" site_id="au#3318/fox-one-hd">Fox One</channel>
-  <channel site="ontvtonight.com" lang="en" xmltv_id="FoxSciFi.au" site_id="au#3322/fox-scifi-hd">Fox SciFi</channel>
-  <channel site="ontvtonight.com" lang="en" xmltv_id="FoxShowcase.au" site_id="au#3212/fox-showcase-hd">Fox Showcase</channel>
-  <channel site="ontvtonight.com" lang="en" xmltv_id="FoxSleuth.au" site_id="au#3323/fox-sleuth-hd">Fox Sleuth</channel>
+  <channel site="ontvtonight.com" lang="en" xmltv_id="FoxtelOne.au" site_id="au#3318/fox-one-hd">Fox One</channel>
+  <channel site="ontvtonight.com" lang="en" xmltv_id="SciFi.au" site_id="au#3322/fox-scifi-hd">Fox SciFi</channel>
+  <channel site="ontvtonight.com" lang="en" xmltv_id="Showcase.au" site_id="au#3212/fox-showcase-hd">Fox Showcase</channel>
+  <channel site="ontvtonight.com" lang="en" xmltv_id="Sleuth.au" site_id="au#3323/fox-sleuth-hd">Fox Sleuth</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="FoxtelMoviesAction.au" site_id="au#3144/foxtel-movies-action-hd">Foxtel Movies Action</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="FoxtelMoviesComedy.au" site_id="au#3198/foxtel-movies-comedy-hd">Foxtel Movies Comedy</channel>
   <channel site="ontvtonight.com" lang="en" xmltv_id="FoxtelMoviesDrama.au" site_id="au#3201/foxtel-movies-drama-hd">Foxtel Movies Drama</channel>
diff --git a/sites/programetv.ro/programetv.ro.channels.xml b/sites/programetv.ro/programetv.ro.channels.xml
index a4584a1d..19c3c047 100644
--- a/sites/programetv.ro/programetv.ro.channels.xml
+++ b/sites/programetv.ro/programetv.ro.channels.xml
@@ -66,7 +66,7 @@
   <channel site="programetv.ro" lang="ro" xmltv_id="Duna.hu" site_id="duna">Duna TV</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="DunaWorld.hu" site_id="duna-world-hd">Duna World</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="DWEnglish.de" site_id="deutsche-welle">DW</channel>
-  <channel site="programetv.ro" lang="ro" xmltv_id="EEurope.us" site_id="e-entertainment">E!</channel>
+  <channel site="programetv.ro" lang="ro" xmltv_id="EEurope.nl" site_id="e-entertainment">E!</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="EpicDrama.se" site_id="epic-drama">Epic Drama</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="ErdelyTV.ro" site_id="erdely-tv">Erdély TV</channel>
   <channel site="programetv.ro" lang="ro" xmltv_id="EroX.nl" site_id="erox-hd">Erox HD</channel>
diff --git a/sites/programtv.onet.pl/programtv.onet.pl.channels.xml b/sites/programtv.onet.pl/programtv.onet.pl.channels.xml
index 726cc034..42f54a71 100644
--- a/sites/programtv.onet.pl/programtv.onet.pl.channels.xml
+++ b/sites/programtv.onet.pl/programtv.onet.pl.channels.xml
@@ -148,7 +148,7 @@
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="DTX.pl" site_id="discovery-turbo-xtra-239">DTX Polska</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="ducktv.sk" site_id="ducktv-94">Duck TV SD</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="Een.be" site_id="belgia-tv1-268">Één</channel>
-  <channel site="programtv.onet.pl" lang="pl" xmltv_id="EEurope.us" site_id="e-entertainment-73">E! Europe</channel>
+  <channel site="programtv.onet.pl" lang="pl" xmltv_id="EEurope.nl" site_id="e-entertainment-73">E! Europe</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="ElevenSports1.pl" site_id="eleven-208">Eleven Sports 1 Polska</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="ElevenSports2.pl" site_id="eleven-sports-212">Eleven Sports 2 Polska</channel>
   <channel site="programtv.onet.pl" lang="pl" xmltv_id="ElevenSports3.pl" site_id="eleven-extra-531">Eleven Sports 3 Polska</channel>
diff --git a/sites/proximusmwc.be/proximusmwc.be.channels.xml b/sites/proximusmwc.be/proximusmwc.be.channels.xml
index 16d5f789..24d648fe 100644
--- a/sites/proximusmwc.be/proximusmwc.be.channels.xml
+++ b/sites/proximusmwc.be/proximusmwc.be.channels.xml
@@ -141,7 +141,7 @@
   <channel site="proximusmwc.be" lang="nl" xmltv_id="DuskTV.nl" site_id="UID0628">Dusk</channel>
   <channel site="proximusmwc.be" lang="nl" xmltv_id="EclipsTV.be" site_id="UID0211">Eclips</channel>
   <channel site="proximusmwc.be" lang="nl" xmltv_id="Een.be" site_id="UID50037">één</channel>
-  <channel site="proximusmwc.be" lang="nl" xmltv_id="EEurope.us" site_id="UID50128">E! N</channel>
+  <channel site="proximusmwc.be" lang="nl" xmltv_id="EEurope.nl" site_id="UID50128">E! N</channel>
   <channel site="proximusmwc.be" lang="nl" xmltv_id="Eleven1.be" site_id="UID0641">ES1 N</channel>
   <channel site="proximusmwc.be" lang="nl" xmltv_id="Eleven2.be" site_id="UID0643">ES2 N</channel>
   <channel site="proximusmwc.be" lang="nl" xmltv_id="Eleven3.be" site_id="UID0649">ES3 N</channel>
diff --git a/sites/telenet.tv/telenet.tv.channels.xml b/sites/telenet.tv/telenet.tv.channels.xml
index 3107226c..e7d352a8 100644
--- a/sites/telenet.tv/telenet.tv.channels.xml
+++ b/sites/telenet.tv/telenet.tv.channels.xml
@@ -65,7 +65,7 @@
   <channel site="telenet.tv" lang="nl" xmltv_id="DobbitTVNL.be" site_id="dobbittv">Dobbit TV NL</channel>
   <channel site="telenet.tv" lang="nl" xmltv_id="EclipsTV.be" site_id="evenaar">Eclips TV</channel>
   <channel site="telenet.tv" lang="nl" xmltv_id="Een.be" site_id="eenhd">Één</channel>
-  <channel site="telenet.tv" lang="nl" xmltv_id="EEurope.us" site_id="e">E! Europe</channel>
+  <channel site="telenet.tv" lang="nl" xmltv_id="EEurope.nl" site_id="e">E! Europe</channel>
   <channel site="telenet.tv" lang="nl" xmltv_id="Eleven1.be" site_id="11football">Eleven Sports 1 NL</channel>
   <channel site="telenet.tv" lang="nl" xmltv_id="Eleven2.be" site_id="11sports">Eleven Sports 2 NL</channel>
   <channel site="telenet.tv" lang="nl" xmltv_id="Eleven3.be" site_id="11sports3">Eleven Sports 3 NL</channel>
diff --git a/sites/turksatkablo.com.tr/turksatkablo.com.tr.channels.xml b/sites/turksatkablo.com.tr/turksatkablo.com.tr.channels.xml
index 3a7d5678..e4d2b7db 100644
--- a/sites/turksatkablo.com.tr/turksatkablo.com.tr.channels.xml
+++ b/sites/turksatkablo.com.tr/turksatkablo.com.tr.channels.xml
@@ -139,7 +139,7 @@
   <channel site="turksatkablo.com.tr" lang="tr" xmltv_id="TV5MondeEurope.fr" site_id="184">TV 5 Monde Europe</channel>
   <channel site="turksatkablo.com.tr" lang="tr" xmltv_id="TV8.tr" site_id="1446">TV 8</channel>
   <channel site="turksatkablo.com.tr" lang="tr" xmltv_id="TV85.tr" site_id="1849">TV 8.5</channel>
-  <channel site="turksatkablo.com.tr" lang="tr" xmltv_id="TVNet.tr" site_id="1419">TV Net</channel>
+  <channel site="turksatkablo.com.tr" lang="tr" xmltv_id="TVNET.tr" site_id="1419">TV Net</channel>
   <channel site="turksatkablo.com.tr" lang="tr" xmltv_id="FREEDOM.ua" site_id="1977">UA TV</channel>
   <channel site="turksatkablo.com.tr" lang="tr" xmltv_id="UcanKusTV.tr" site_id="1455">UçanKus TV</channel>
   <channel site="turksatkablo.com.tr" lang="tr" xmltv_id="UlkeTV.tr" site_id="1402">Ülke TV</channel>
diff --git a/sites/tv.blue.ch/tv.blue.ch.channels.xml b/sites/tv.blue.ch/tv.blue.ch.channels.xml
index a13a7b3e..efe0e7b4 100644
--- a/sites/tv.blue.ch/tv.blue.ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch.channels.xml
@@ -416,7 +416,7 @@
   <channel site="tv.blue.ch" lang="en" xmltv_id="DWEnglish.de" site_id="142">DW English</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="E4.uk" site_id="146">E4 UK</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="EDGEsport.uk" site_id="1722">Edge Sport</channel>
-  <channel site="tv.blue.ch" lang="en" xmltv_id="EEurope.us" site_id="145">E! Europe</channel>
+  <channel site="tv.blue.ch" lang="en" xmltv_id="EEurope.nl" site_id="145">E! Europe</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="EnglishClubTV.uk" site_id="1398">English Club TV</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="EuronewsEnglish.fr" site_id="164">EuroNews English</channel>
   <channel site="tv.blue.ch" lang="en" xmltv_id="Eurosport1.fr" site_id="1488">Eurosport 1</channel>
diff --git a/sites/tv.nu/tv.nu.channels.xml b/sites/tv.nu/tv.nu.channels.xml
index c300a7bb..f7e83340 100644
--- a/sites/tv.nu/tv.nu.channels.xml
+++ b/sites/tv.nu/tv.nu.channels.xml
@@ -52,7 +52,7 @@
   <channel site="tv.nu" lang="sv" xmltv_id="DR2.dk" site_id="dr2">DR2</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="DRRamasjang.dk" site_id="dr-ramasjang">DR Ramasjang</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="DWEnglish.de" site_id="dw">DW</channel>
-  <channel site="tv.nu" lang="sv" xmltv_id="EEurope.us" site_id="e">E!</channel>
+  <channel site="tv.nu" lang="sv" xmltv_id="EEurope.nl" site_id="e">E!</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="eSports1.de" site_id="esportsone">eSportsone</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="EuronewsEnglish.fr" site_id="euro-news">Euro News</channel>
   <channel site="tv.nu" lang="sv" xmltv_id="Eurosport1.fr" site_id="eurosport-1">Eurosport 1</channel>
diff --git a/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml b/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
index 39da5f85..54ca4b58 100644
--- a/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
+++ b/sites/tv2go.t-2.net/tv2go.t-2.net.channels.xml
@@ -57,7 +57,7 @@
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="Duna.hu" site_id="1000648">Duna TV</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="DunaWorld.hu" site_id="1000786">Duna World</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="DuskTV.nl" site_id="1000373">Dusk</channel>
-  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="EEurope.us" site_id="1000161">E! Europe</channel>
+  <channel site="tv2go.t-2.net" lang="sl" xmltv_id="EEurope.nl" site_id="1000161">E! Europe</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="ELTA2.ba" site_id="1000179">Elta 2</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="ELTAHD.ba" site_id="1000240">Elta TV</channel>
   <channel site="tv2go.t-2.net" lang="sl" xmltv_id="EpicDrama.se" site_id="1000501">Epic Drama</channel>
diff --git a/sites/tvplus.com.tr/tvplus.com.tr.channels.xml b/sites/tvplus.com.tr/tvplus.com.tr.channels.xml
index 552b20ad..1abdf433 100644
--- a/sites/tvplus.com.tr/tvplus.com.tr.channels.xml
+++ b/sites/tvplus.com.tr/tvplus.com.tr.channels.xml
@@ -138,7 +138,7 @@
   <channel site="tvplus.com.tr" lang="tr" xmltv_id="TV4.tr" site_id="2889">TV 4</channel>
   <channel site="tvplus.com.tr" lang="tr" xmltv_id="TV8.tr" site_id="134">TV 8</channel>
   <channel site="tvplus.com.tr" lang="tr" xmltv_id="TV85.tr" site_id="188">TV 8.5</channel>
-  <channel site="tvplus.com.tr" lang="tr" xmltv_id="TVNet.tr" site_id="92">TV Net</channel>
+  <channel site="tvplus.com.tr" lang="tr" xmltv_id="TVNET.tr" site_id="92">TV Net</channel>
   <channel site="tvplus.com.tr" lang="tr" xmltv_id="UcanKusTV.tr" site_id="207">UçanKus TV</channel>
   <channel site="tvplus.com.tr" lang="tr" xmltv_id="UlkeTV.tr" site_id="145">Ülke TV</channel>
   <channel site="tvplus.com.tr" lang="tr" xmltv_id="UlusalKanal.tr" site_id="2240">Ulusal Kanal</channel>
diff --git a/sites/tvprofil.com/tvprofil.com.channels.xml b/sites/tvprofil.com/tvprofil.com.channels.xml
index d56aa084..599b481b 100644
--- a/sites/tvprofil.com/tvprofil.com.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com.channels.xml
@@ -187,7 +187,7 @@
   <channel site="tvprofil.com" lang="hr" xmltv_id="ducktv.sk" site_id="al/programacioni#ducktv">Duck TV HD</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="DuskTV.nl" site_id="ba/tvprogram#dusk">Dusk</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="DWEnglish.de" site_id="al/programacioni#deutchewelle">DW English</channel>
-  <channel site="tvprofil.com" lang="hr" xmltv_id="EEurope.us" site_id="al/programacioni#entertainment">E! Europe</channel>
+  <channel site="tvprofil.com" lang="hr" xmltv_id="EEurope.nl" site_id="al/programacioni#entertainment">E! Europe</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="EnglishClubTV.uk" site_id="al/programacioni#club-tv">English Club TV</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="EpicDrama.se" site_id="ba/tvprogram#epic-drama">Epic Drama</channel>
   <channel site="tvprofil.com" lang="hr" xmltv_id="EroX.nl" site_id="al/programacioni#erox-hd">Erox HD</channel>
diff --git a/sites/virginmedia.com/virginmedia.com.channels.xml b/sites/virginmedia.com/virginmedia.com.channels.xml
index 0af087c5..dccaaed6 100644
--- a/sites/virginmedia.com/virginmedia.com.channels.xml
+++ b/sites/virginmedia.com/virginmedia.com.channels.xml
@@ -61,7 +61,7 @@
   <channel site="virginmedia.com" lang="en" xmltv_id="E4.uk" site_id="1464">E4 UK</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="E4Extra.uk" site_id="265">E4 Extra</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="Eden.uk" site_id="1573">Eden</channel>
-  <channel site="virginmedia.com" lang="en" xmltv_id="EEurope.us" site_id="2059">E! Europe</channel>
+  <channel site="virginmedia.com" lang="en" xmltv_id="EEurope.nl" site_id="2059">E! Europe</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="EuronewsEnglish.fr" site_id="354">EuroNews English</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="Eurosport1.uk" site_id="2084">Eurosport 1 UK</channel>
   <channel site="virginmedia.com" lang="en" xmltv_id="Eurosport2.uk" site_id="2085">Eurosport 2 UK</channel>
diff --git a/sites/webtv.delta.nl/webtv.delta.nl.channels.xml b/sites/webtv.delta.nl/webtv.delta.nl.channels.xml
index 6bcf207b..a56bbcb8 100644
--- a/sites/webtv.delta.nl/webtv.delta.nl.channels.xml
+++ b/sites/webtv.delta.nl/webtv.delta.nl.channels.xml
@@ -84,7 +84,7 @@
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="DisneyChannel.nl" site_id="52">Disney Channel</channel>
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="DorcelTV.nl" site_id="3127">Dorcel TV</channel>
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="DuskTV.nl" site_id="3043">Dusk Deluxe!</channel>
-  <channel site="webtv.delta.nl" lang="nl" xmltv_id="EEurope.us" site_id="3114">E! Pop of Culture</channel>
+  <channel site="webtv.delta.nl" lang="nl" xmltv_id="EEurope.nl" site_id="3114">E! Pop of Culture</channel>
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="ESPN2.nl" site_id="3037">ESPN 2</channel>
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="ESPN3.nl" site_id="3038">ESPN 3</channel>
   <channel site="webtv.delta.nl" lang="nl" xmltv_id="ESPN.nl" site_id="3036">ESPN 1</channel>
diff --git a/sites/ziggogo.tv/ziggogo.tv.channels.xml b/sites/ziggogo.tv/ziggogo.tv.channels.xml
index ab657fc9..307b4d8a 100644
--- a/sites/ziggogo.tv/ziggogo.tv.channels.xml
+++ b/sites/ziggogo.tv/ziggogo.tv.channels.xml
@@ -50,7 +50,7 @@
   <channel site="ziggogo.tv" lang="nl" xmltv_id="DisneyChannel.nl" site_id="NL_000027_019330">Disney Channel Nederland</channel>
   <channel site="ziggogo.tv" lang="nl" xmltv_id="DuskTV.nl" site_id="NL_000174_019311">Dusk</channel>
   <channel site="ziggogo.tv" lang="nl" xmltv_id="Een.be" site_id="NL_000031_019362">Één</channel>
-  <channel site="ziggogo.tv" lang="nl" xmltv_id="EEurope.us" site_id="NL_000061_019331">E! Europe</channel>
+  <channel site="ziggogo.tv" lang="nl" xmltv_id="EEurope.nl" site_id="NL_000061_019331">E! Europe</channel>
   <channel site="ziggogo.tv" lang="nl" xmltv_id="ESPN2.nl" site_id="NL_000108_019561">ESPN 2 Nederland</channel>
   <channel site="ziggogo.tv" lang="nl" xmltv_id="ESPN3.nl" site_id="NL_000109_019464">ESPN 3 Nederland</channel>
   <channel site="ziggogo.tv" lang="nl" xmltv_id="ESPN4.nl" site_id="NL_000110_019562">ESPN 4 Netherlands</channel>