From 515901fe4791203d9c3d132bee981cfb620dda2f Mon Sep 17 00:00:00 2001
From: Aleksandr Statciuk <github@oiya.xyz>
Date: Wed, 9 Mar 2022 20:45:33 +0300
Subject: [PATCH] Fixes validation issues

---
 .../guidatv.sky.it_it.channels.xml               |  2 +-
 sites/hd-plus.de/hd-plus.de_de.channels.xml      |  4 ++--
 sites/horizon.tv/horizon.tv_de.channels.xml      |  2 +-
 sites/ipko.com/ipko.com_al.channels.xml          |  2 +-
 sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml    |  8 ++++----
 sites/magentatv.de/magentatv.de_de.channels.xml  | 12 ++++++------
 .../ontvtonight.com_uk.channels.xml              |  2 +-
 .../programtv.onet.pl_pl.channels.xml            | 10 +++++-----
 sites/sky.com/sky.com_uk.channels.xml            | 12 ++++++------
 sites/sky.de/sky.de_de.channels.xml              | 16 ++++++++--------
 sites/tv.blue.ch/tv.blue.ch_ch.channels.xml      | 12 ++++++------
 .../tv2go.t-2.net/tv2go.t-2.net_si.channels.xml  |  2 +-
 sites/tvprofil.com/tvprofil.com_al.channels.xml  |  2 +-
 sites/tvtv.us/tvtv.us_us.channels.xml            |  2 +-
 14 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml b/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
index f717eb21..d2b9e922 100644
--- a/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
+++ b/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
@@ -101,7 +101,7 @@
     <channel lang="it" xmltv_id="RealTimeItalia.us" site_id="DTH#8173">Real Time Italia</channel>
     <channel lang="it" xmltv_id="Rete4.it" site_id="DTH#10464">Rete 4</channel>
     <channel lang="it" xmltv_id="RTDocumentary.ru" site_id="DTH#8873">RT Documentary</channel>
-    <channel lang="it" xmltv_id="RTL1025RadioVisione.it" site_id="DTH#6885">RTL 102.5 RadioVisione</channel>
+    <channel lang="it" xmltv_id="RTL1025Radiovisione.it" site_id="DTH#6885">RTL 102.5 RadioVisione</channel>
     <channel lang="it" xmltv_id="RTNews.ru" site_id="DTH#6886">RT News</channel>
     <channel lang="it" xmltv_id="SanMarinoRTV.sm" site_id="DTH#6861">San Marino RTV</channel>
     <channel lang="it" xmltv_id="SkyArte.it" site_id="DTH#7767">Sky Arte</channel>
diff --git a/sites/hd-plus.de/hd-plus.de_de.channels.xml b/sites/hd-plus.de/hd-plus.de_de.channels.xml
index 5e7a584f..06193689 100644
--- a/sites/hd-plus.de/hd-plus.de_de.channels.xml
+++ b/sites/hd-plus.de/hd-plus.de_de.channels.xml
@@ -87,8 +87,8 @@
     <channel lang="de" xmltv_id="SixxDeutschland.de" site_id="sixx-hd">Sixx Deutschland</channel>
     <channel lang="de" xmltv_id="SkyAtlantic.de" site_id="sky-atlantic-hd">Sky Atlantic</channel>
     <channel lang="de" xmltv_id="SkyCinemaAction.de" site_id="sky-action-hd">Sky Cinema Action</channel>
-    <channel lang="de" xmltv_id="SkyCinemaHits.de" site_id="sky-hits-hd">Sky Cinema Hits</channel>
-    <channel lang="de" xmltv_id="SkyCinemaNostalgie.de" site_id="sky-nostalgie">Sky Cinema Nostalgie</channel>
+    <channel lang="de" xmltv_id="SkyCinemaBestOf.de" site_id="sky-hits-hd">Sky Cinema Hits</channel>
+    <channel lang="de" xmltv_id="SkyCinemaSpecial.de" site_id="sky-nostalgie">Sky Cinema Nostalgie</channel>
     <channel lang="de" xmltv_id="SkyComedy.de" site_id="sky-comedy">Sky Comedy</channel>
     <channel lang="de" xmltv_id="SkyKrimi.de" site_id="sky-krimi">Sky Krimi</channel>
     <channel lang="de" xmltv_id="SkySport1.de" site_id="sky-sport-hd-1">Sky Sport 1</channel>
diff --git a/sites/horizon.tv/horizon.tv_de.channels.xml b/sites/horizon.tv/horizon.tv_de.channels.xml
index d9d19a5a..6ab30add 100644
--- a/sites/horizon.tv/horizon.tv_de.channels.xml
+++ b/sites/horizon.tv/horizon.tv_de.channels.xml
@@ -181,7 +181,7 @@
     <channel lang="de" xmltv_id="SkyKrimi.de" site_id="SV_00133_00023">Sky Krimi HD</channel>
     <channel lang="de" xmltv_id="SkyNature.de" site_id="SV_00133_00015">Sky Nature HD</channel>
     <channel lang="de" xmltv_id="SkyOne.de" site_id="SV_00133_00147">Sky One HD</channel>
-    <channel lang="de" xmltv_id="SkyReplayDeutschland.de" site_id="Fox_HD">Sky Replay HD</channel>
+    <channel lang="de" xmltv_id="SkyReplay.de" site_id="Fox_HD">Sky Replay HD</channel>
     <channel lang="de" xmltv_id="SkySerienShows.de" site_id="SV_00133_00117">Sky Serien &amp; Shows HD</channel>
     <channel lang="de" xmltv_id="SkySport10HD.de" site_id="SV_00133_00338">Sky Sport 10 HD</channel>
     <channel lang="de" xmltv_id="SkySport11HD.de" site_id="SV_00133_00258">Sky Sport 11 HD</channel>
diff --git a/sites/ipko.com/ipko.com_al.channels.xml b/sites/ipko.com/ipko.com_al.channels.xml
index ca98b7df..48b53b71 100644
--- a/sites/ipko.com/ipko.com_al.channels.xml
+++ b/sites/ipko.com/ipko.com_al.channels.xml
@@ -34,7 +34,7 @@
     <channel lang="hr" xmltv_id="Rai1.it" site_id="378">Rai 1</channel>
     <channel lang="hr" xmltv_id="Rai2.it" site_id="379">Rai 2</channel>
     <channel lang="hr" xmltv_id="Rai3.it" site_id="380">Rai 3</channel>
-    <channel lang="hr" xmltv_id="RTK1.rs" site_id="402">RTK 1</channel>
+    <channel lang="hr" xmltv_id="RTK1.xk" site_id="402">RTK 1</channel>
     <channel lang="hr" xmltv_id="RTV21Sat.rs" site_id="255">RTV 21 Sat</channel>
     <channel lang="hr" xmltv_id="Stinet.al" site_id="406">Stinët</channel>
   </channels>
diff --git a/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml b/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
index 6b8c9112..1a36754e 100644
--- a/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
+++ b/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
@@ -380,17 +380,17 @@
     <channel lang="cz" xmltv_id="Sat1GoldDeutschland.de" site_id="SAT1+Gold">Sat. 1 Gold Deutschland</channel>
     <channel lang="cz" xmltv_id="Senzi.sk" site_id="SENZI">Senzi</channel>
     <channel lang="cz" xmltv_id="SixxDeutschland.de" site_id="Sixx">Sixx Deutschland</channel>
-    <channel lang="cz" xmltv_id="SkyArtsUK.uk" site_id="Sky+Arts+HD">Sky Arts UK</channel>
-    <channel lang="cz" xmltv_id="SkyAtlanticUK.uk" site_id="Sky+Atlantic+HD+UK">Sky Atlantic UK</channel>
+    <channel lang="cz" xmltv_id="SkyArts.uk" site_id="Sky+Arts+HD">Sky Arts UK</channel>
+    <channel lang="cz" xmltv_id="SkyAtlantic.uk" site_id="Sky+Atlantic+HD+UK">Sky Atlantic UK</channel>
     <channel lang="cz" xmltv_id="SkyCinemaAction.uk" site_id="Sky+Movies+Action+%26+Adventure+HD">Sky Cinema Action</channel>
     <channel lang="cz" xmltv_id="SkyCinemaDrama.uk" site_id="Sky+Movies+Drama+%26+Romance+HD">Sky Cinema Drama</channel>
     <channel lang="cz" xmltv_id="SkyCinemaFamily.uk" site_id="Sky+Movies+Family+HD">Sky Cinema Family</channel>
     <channel lang="cz" xmltv_id="SkyCinemaGreats.uk" site_id="Sky+Movies+Greats+HD">Sky Cinema Greats</channel>
     <channel lang="cz" xmltv_id="SkyCinemaHits.uk" site_id="Sky+Movies+Showcase+HD">Sky Cinema Hits</channel>
     <channel lang="cz" xmltv_id="SkyCinemaPremiere.uk" site_id="Sky+Movies+Premiere+HD">Sky Cinema Premiere</channel>
-    <channel lang="cz" xmltv_id="SkyCinemaScifiHorror.uk" site_id="Sky+SciFi+%26+Horror+SD">Sky Cinema Sci-fi Horror</channel>
+    <channel lang="cz" xmltv_id="SkyCinemaSciFiHorror.uk" site_id="Sky+SciFi+%26+Horror+SD">Sky Cinema Sci-fi Horror</channel>
     <channel lang="cz" xmltv_id="SkyCinemaSelect.uk" site_id="Sky+Movies+Select+HD">Sky Cinema Select</channel>
-    <channel lang="cz" xmltv_id="SkyComedyUK.uk" site_id="Sky+Movies+Comedy+HD">Sky Comedy UK</channel>
+    <channel lang="cz" xmltv_id="SkyComedy.uk" site_id="Sky+Movies+Comedy+HD">Sky Comedy UK</channel>
     <channel lang="cz" xmltv_id="SkyCrime.uk" site_id="Sky+Movies+Crime+%26+Thriller+HD">Sky Crime</channel>
     <channel lang="cz" xmltv_id="SkyHistory2.us" site_id="History2">Sky History 2</channel>
     <channel lang="cz" xmltv_id="SkyNewsInternational.uk" site_id="Sky+news">Sky News International</channel>
diff --git a/sites/magentatv.de/magentatv.de_de.channels.xml b/sites/magentatv.de/magentatv.de_de.channels.xml
index 83d4fa9d..8e7d7145 100644
--- a/sites/magentatv.de/magentatv.de_de.channels.xml
+++ b/sites/magentatv.de/magentatv.de_de.channels.xml
@@ -180,11 +180,11 @@
     <channel lang="de" xmltv_id="SkyCinemaThriller.de" site_id="4356">Sky Cinema Thriller</channel>
     <channel lang="de" xmltv_id="SkyComedy.de" site_id="4925">Sky Comedy</channel>
     <channel lang="de" xmltv_id="SkyCrime.de" site_id="4924">Sky Crime</channel>
-    <channel lang="de" xmltv_id="SkyDocumentariesDeutschland.de" site_id="5143">Sky Documentaries</channel>
+    <channel lang="de" xmltv_id="SkyDocumentaries.de" site_id="5143">Sky Documentaries</channel>
     <channel lang="de" xmltv_id="SkyKrimi.de" site_id="201">SkyKrimi</channel>
-    <channel lang="de" xmltv_id="SkyNatureDeutschland.de" site_id="5142">Sky Nature</channel>
+    <channel lang="de" xmltv_id="SkyNature.de" site_id="5142">Sky Nature</channel>
     <channel lang="de" xmltv_id="SkyOne.de" site_id="576">Sky One</channel>
-    <channel lang="de" xmltv_id="SkyReplayDeutschland.de" site_id="3756">Sky Replay</channel>
+    <channel lang="de" xmltv_id="SkyReplay.de" site_id="3756">Sky Replay</channel>
     <channel lang="de" xmltv_id="SkySport1.de" site_id="31">Sky Sport 1</channel>
     <channel lang="de" xmltv_id="SkySport10.de" site_id="261">Sky Sport 10</channel>
     <channel lang="de" xmltv_id="SkySport11.de" site_id="187">Sky Sport 11</channel>
@@ -240,9 +240,9 @@
     <channel lang="de" xmltv_id="UniversalTVDeutschland.us" site_id="185">Universal TV</channel>
     <channel lang="de" xmltv_id="VoxDeutschland.de" site_id="385">VOX</channel>
     <channel lang="de" xmltv_id="Voxup.de" site_id="3930">VOXup</channel>
-    <channel lang="de" xmltv_id="WarnerTVComedyDeutschland.us" site_id="181">Warner TV Comedy</channel>
-    <channel lang="de" xmltv_id="WarnerTVFilmDeutschland.us" site_id="184">Warner TV Film</channel>
-    <channel lang="de" xmltv_id="WarnerTVSerieDeutschland.us" site_id="53">Warner TV Serie</channel>
+    <channel lang="de" xmltv_id="WarnerTVComedy.de" site_id="181">Warner TV Comedy</channel>
+    <channel lang="de" xmltv_id="WarnerTVFilm.de" site_id="184">Warner TV Film</channel>
+    <channel lang="de" xmltv_id="WarnerTVSerie.de" site_id="53">Warner TV Serie</channel>
     <channel lang="de" xmltv_id="WDRFernsehenAachen.de" site_id="160">WDR Fernsehen Aachen</channel>
     <channel lang="de" xmltv_id="WDRFernsehenBielefeld.de" site_id="158">WDR Fernsehen Bielefeld</channel>
     <channel lang="de" xmltv_id="WDRFernsehenBonn.de" site_id="155">WDR Fernsehen Bonn</channel>
diff --git a/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml b/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml
index 5e7dfff8..8d7f63a5 100644
--- a/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml
+++ b/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml
@@ -81,7 +81,7 @@
     <channel lang="en" xmltv_id="RTUK.ru" site_id="uk#69036669/russia-today">RT UK</channel>
     <channel lang="en" xmltv_id="SangatTV.uk" site_id="uk#69042021/sangat">Sangat TV</channel>
     <channel lang="en" xmltv_id="SBNInternational.us" site_id="uk#69043552/sonlife-network-eu">SBN International</channel>
-    <channel lang="en" xmltv_id="SkyArtsUK.uk" site_id="uk#69035314/sky-arts">Sky Arts UK</channel>
+    <channel lang="en" xmltv_id="SkyArts.uk" site_id="uk#69035314/sky-arts">Sky Arts UK</channel>
     <channel lang="en" xmltv_id="SkyOneUK.uk" site_id="uk#69036865/sky-one">Sky One UK</channel>
     <channel lang="en" xmltv_id="SmithsonianChannelUK.us" site_id="uk#7051414680/smithsonian">Smithsonian Channel UK</channel>
     <channel lang="en" xmltv_id="SonyChannelUK.us" site_id="uk#69041546/sony-channel">Sony Channel UK</channel>
diff --git a/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml b/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
index 5f47b905..04135cc6 100644
--- a/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
+++ b/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
@@ -244,7 +244,7 @@
     <channel lang="pl" xmltv_id="RomanceTVPolska.de" site_id="romance-tv-129">Romance TV Polska</channel>
     <channel lang="pl" xmltv_id="Rossiya24.ru" site_id="rossija-24-124">Rossiya 24</channel>
     <channel lang="pl" xmltv_id="RTDocumentary.ru" site_id="rt-documentary-474">RT Documentary</channel>
-    <channel lang="pl" xmltv_id="RTL1025RadioVisione.it" site_id="rtl-102-5-43">RTL 102.5 RadioVisione</channel>
+    <channel lang="pl" xmltv_id="RTL1025Radiovisione.it" site_id="rtl-102-5-43">RTL 102.5 RadioVisione</channel>
     <channel lang="pl" xmltv_id="RTLDeutschland.de" site_id="rtl-401">RTL Deutschland</channel>
     <channel lang="pl" xmltv_id="RTLZweiDeutschland.de" site_id="rtl-2-399">RTL Zwei Deutschland</channel>
     <channel lang="pl" xmltv_id="RTNews.ru" site_id="russia-today-115">RT News</channel>
@@ -256,10 +256,10 @@
     <channel lang="pl" xmltv_id="ScifiPolska.us" site_id="scifi-universal-20">Scifi Polska</channel>
     <channel lang="pl" xmltv_id="SixxDeutschland.de" site_id="sixx-447">Sixx Deutschland</channel>
     <channel lang="pl" xmltv_id="SkyCinemaAction.de" site_id="sky-action-368">Sky Cinema Action</channel>
-    <channel lang="pl" xmltv_id="SkyCinemaComedy.de" site_id="sky-comedy-348">Sky Cinema Comedy</channel>
-    <channel lang="pl" xmltv_id="SkyCinemaHits.de" site_id="sky-hits-365">Sky Cinema Hits</channel>
-    <channel lang="pl" xmltv_id="SkyCinemaNostalgie.de" site_id="sky-nostalgie-421">Sky Cinema Nostalgie</channel>
-    <channel lang="pl" xmltv_id="SkyCinemaPlus24.de" site_id="sky-cinema-24-369">Sky Cinema +24</channel>
+    <channel lang="pl" xmltv_id="SkyCinemaFun.de" site_id="sky-comedy-348">Sky Cinema Comedy</channel>
+    <channel lang="pl" xmltv_id="SkyCinemaBestOf.de" site_id="sky-hits-365">Sky Cinema Hits</channel>
+    <channel lang="pl" xmltv_id="SkyCinemaSpecial.de" site_id="sky-nostalgie-421">Sky Cinema Nostalgie</channel>
+    <channel lang="pl" xmltv_id="SkyCinemaUnoPlus24.it" site_id="sky-cinema-24-369">Sky Cinema +24</channel>
     <channel lang="pl" xmltv_id="SkyKrimi.de" site_id="sky-krimi-422">Sky Krimi</channel>
     <channel lang="pl" xmltv_id="SkyNewsInternational.uk" site_id="sky-news-340">Sky News International</channel>
     <channel lang="pl" xmltv_id="SkySport1.de" site_id="sky-sport-1-441">Sky Sport 1</channel>
diff --git a/sites/sky.com/sky.com_uk.channels.xml b/sites/sky.com/sky.com_uk.channels.xml
index ce5aabc2..0cc7e6c3 100644
--- a/sites/sky.com/sky.com_uk.channels.xml
+++ b/sites/sky.com/sky.com_uk.channels.xml
@@ -193,29 +193,29 @@
     <channel lang="en" xmltv_id="SETAsia.in" site_id="4045">Sony TV</channel>
     <channel lang="en" xmltv_id="SangatTV.uk" site_id="3355">Sangat TV</channel>
     <channel lang="en" xmltv_id="SikhChannel.uk" site_id="3650">Sikh Channel</channel>
-    <channel lang="en" xmltv_id="SkyArtsUK.uk" site_id="1752">Sky Arts UK</channel>
+    <channel lang="en" xmltv_id="SkyArts.uk" site_id="1752">Sky Arts UK</channel>
     <channel lang="en" xmltv_id="SkyAtlanticHD.uk" site_id="4053">Sky Atlantic HD</channel>
     <channel lang="en" xmltv_id="SkyCinemaActionHD.uk" site_id="1001">Sky Cinema Action HD</channel>
     <channel lang="en" xmltv_id="SkyCinemaAnimationHD.uk" site_id="1199">Sky Cinema Animation HD</channel>
     <channel lang="en" xmltv_id="SkyCinemaComedyHD.uk" site_id="1002">Sky Cinema Comedy HD</channel>
     <channel lang="en" xmltv_id="SkyCinemaDramaHD.uk" site_id="1816">Sky Cinema Drama HD</channel>
     <channel lang="en" xmltv_id="SkyCinemaFamilyHD.uk" site_id="1808">Sky Cinema Family HD</channel>
-    <channel lang="en" xmltv_id="SkyCinemaFeelGoodHD.uk" site_id="4020">Sky Cinema Feel Good HD</channel>
+    <channel lang="en" xmltv_id="SkyCinemaSelect.uk" site_id="4020">Sky Cinema Feel Good HD</channel>
     <channel lang="en" xmltv_id="SkyCinemaGreatsHD.uk" site_id="1815">Sky Cinema Greats HD</channel>
     <channel lang="en" xmltv_id="SkyCinemaHitsHD.uk" site_id="4033">Sky Cinema Hits HD</channel>
     <channel lang="en" xmltv_id="SkyCinemaPremiereHD.uk" site_id="1409">Sky Cinema Premiere HD</channel>
     <channel lang="en" xmltv_id="SkyCinemaSciFiHorrorHD.uk" site_id="4017">Sky Cinema Sci-Fi Horror HD</channel>
-    <channel lang="en" xmltv_id="SkyCinemaScifiHorror.uk" site_id="1807">Sky Cinema Sci-Fi Horror</channel>
+    <channel lang="en" xmltv_id="SkyCinemaSciFiHorror.uk" site_id="1807">Sky Cinema Sci-Fi Horror</channel>
     <channel lang="en" xmltv_id="SkyCinemaThrillerHD.uk" site_id="1818">Sky Cinema Thriller HD</channel>
     <channel lang="en" xmltv_id="SkyComedyHD.uk" site_id="1143">Sky Comedy HD</channel>
     <channel lang="en" xmltv_id="SkyCrime.uk" site_id="2207">Sky Crime</channel>
-    <channel lang="en" xmltv_id="SkyDocumentariesUK.uk" site_id="1136">Sky Documentaries</channel>
+    <channel lang="en" xmltv_id="SkyDocumentaries.uk" site_id="1136">Sky Documentaries</channel>
     <channel lang="en" xmltv_id="SkyHistory.us" site_id="4086">Sky History</channel>    
     <channel lang="en" xmltv_id="SkyHistory2.us" site_id="1879">Sky History 2</channel>
     <channel lang="en" xmltv_id="SkyMaxHD.uk" site_id="4061">Sky Max HD</channel>
-    <channel lang="en" xmltv_id="SkyNatureUK.uk" site_id="1165">Sky Nature</channel>
+    <channel lang="en" xmltv_id="SkyNature.uk" site_id="1165">Sky Nature</channel>
     <channel lang="en" xmltv_id="SkyNewsUK.uk" site_id="1404">Sky News</channel>
-    <channel lang="en" xmltv_id="SkyReplayUK.uk" site_id="1833">Sky Replay</channel>
+    <channel lang="en" xmltv_id="SkyReplay.uk" site_id="1833">Sky Replay</channel>
     <channel lang="en" xmltv_id="SkyShowcaseHD.uk" site_id="1275">Sky Showcase HD</channel>
     <channel lang="en" xmltv_id="SkySportsArena.uk" site_id="3940">Sky Sports Arena</channel>
     <channel lang="en" xmltv_id="SkySportsBoxOffice.uk" site_id="1034">Sky Sports Box Office</channel>
diff --git a/sites/sky.de/sky.de_de.channels.xml b/sites/sky.de/sky.de_de.channels.xml
index f1465f27..e05ffe23 100644
--- a/sites/sky.de/sky.de_de.channels.xml
+++ b/sites/sky.de/sky.de_de.channels.xml
@@ -50,11 +50,11 @@
     <channel lang="de" xmltv_id="SkyCinemaThriller.de" site_id="784">Sky Cinema Thriller</channel>
     <channel lang="de" xmltv_id="SkyComedy.de" site_id="854">Sky Comedy</channel>
     <channel lang="de" xmltv_id="SkyCrime.de" site_id="855">Sky Crime</channel>
-    <channel lang="de" xmltv_id="SkyDocumentariesDeutschland.de" site_id="876">Sky Documentaries Deutschland</channel>
+    <channel lang="de" xmltv_id="SkyDocumentaries.de" site_id="876">Sky Documentaries Deutschland</channel>
     <channel lang="de" xmltv_id="SkyKrimi.de" site_id="753">Sky Krimi HD</channel>
-    <channel lang="de" xmltv_id="SkyNatureDeutschland.de" site_id="875">Sky Nature Deutschland</channel>
+    <channel lang="de" xmltv_id="SkyNature.de" site_id="875">Sky Nature Deutschland</channel>
     <channel lang="de" xmltv_id="SkyOne.de" site_id="535">Sky One</channel>
-    <channel lang="de" xmltv_id="SkyReplayDeutschland.de" site_id="888">Sky Replay Deutschland</channel>
+    <channel lang="de" xmltv_id="SkyReplay.de" site_id="888">Sky Replay Deutschland</channel>
     <channel lang="de" xmltv_id="SkySport1.de" site_id="149">Sky Sport 1</channel>
     <channel lang="de" xmltv_id="SkySport10.de" site_id="158">Sky Sport 10</channel>
     <channel lang="de" xmltv_id="SkySport11.de" site_id="159">Sky Sport 11</channel>
@@ -114,10 +114,10 @@
     <channel lang="de" xmltv_id="SportdigitalFussball.de" site_id="114">Sportdigital Fussball</channel>
     <channel lang="de" xmltv_id="SyfyDeutschland.us" site_id="115">Syfy Deutschland</channel>
     <channel lang="de" xmltv_id="UniversalTVDeutschland.us" site_id="172">Universal TV Deutschland</channel>
-    <channel lang="de" xmltv_id="WarnerTVComedyDeutschland.us" site_id="674">Warner TV Comedy Deutschland</channel>
-    <channel lang="de" xmltv_id="WarnerTVComedyDeutschlandHD.us" site_id="522">Warner TV Comedy Deutschland HD</channel>
-    <channel lang="de" xmltv_id="WarnerTVFilmDeutschland.us" site_id="762">Warner TV Film Deutschland</channel>
-    <channel lang="de" xmltv_id="WarnerTVFilmDeutschlandHD.us" site_id="689">Warner TV Film Deutschland HD</channel>
-    <channel lang="de" xmltv_id="WarnerTVSerieDeutschland.us" site_id="6">Warner TV Serie Deutschland</channel>
+    <channel lang="de" xmltv_id="WarnerTVComedy.de" site_id="674">Warner TV Comedy Deutschland</channel>
+    <channel lang="de" xmltv_id="WarnerTVComedyHD.de" site_id="522">Warner TV Comedy Deutschland HD</channel>
+    <channel lang="de" xmltv_id="WarnerTVFilm.de" site_id="762">Warner TV Film Deutschland</channel>
+    <channel lang="de" xmltv_id="WarnerTVFilmHD.de" site_id="689">Warner TV Film Deutschland HD</channel>
+    <channel lang="de" xmltv_id="WarnerTVSerie.de" site_id="6">Warner TV Serie Deutschland</channel>
   </channels>
 </site>
\ No newline at end of file
diff --git a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
index af720a8a..6dd98b2b 100644
--- a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
@@ -185,9 +185,9 @@
     <channel lang="de" xmltv_id="VolksmusikTV.de" site_id="1766">Volksmusik TV</channel>
     <channel lang="de" xmltv_id="VoxDeutschland.de" site_id="651">Vox Deutschland</channel>
     <channel lang="de" xmltv_id="Voxup.de" site_id="1612">Voxup</channel>
-    <channel lang="de" xmltv_id="WarnerTVComedy.us" site_id="611">Warner TV Comedy</channel>
-    <channel lang="de" xmltv_id="WarnerTVFilm.us" site_id="610">Warner TV Film</channel>
-    <channel lang="de" xmltv_id="WarnerTVSerie.us" site_id="612">Warner TV Serie</channel>
+    <channel lang="de" xmltv_id="WarnerTVComedy.de" site_id="611">Warner TV Comedy</channel>
+    <channel lang="de" xmltv_id="WarnerTVFilm.de" site_id="610">Warner TV Film</channel>
+    <channel lang="de" xmltv_id="WarnerTVSerie.de" site_id="612">Warner TV Serie</channel>
     <channel lang="de" xmltv_id="WDRFernsehenKoln.de" site_id="654">WDR Fernsehen Köln</channel>
     <channel lang="de" xmltv_id="Welt.de" site_id="277">Welt</channel>
     <channel lang="de" xmltv_id="WeltderWunderTV.de" site_id="655">Welt der Wunder TV</channel>
@@ -507,7 +507,7 @@
     <channel lang="it" xmltv_id="Rete4.it" site_id="348">Rete 4</channel>
     <channel lang="it" xmltv_id="RSILa1.ch" site_id="356">RSI La 1</channel>
     <channel lang="it" xmltv_id="RSILa2.ch" site_id="357">RSI La 2</channel>
-    <channel lang="it" xmltv_id="RTL1025RadioVisione.it" site_id="1489">RTL 102.5 RadioVisione</channel>
+    <channel lang="it" xmltv_id="RTL1025Radiovisione.it" site_id="1489">RTL 102.5 RadioVisione</channel>
     <channel lang="it" xmltv_id="SanMarinoRTV.sm" site_id="1719">San Marino RTV</channel>
     <channel lang="it" xmltv_id="SenatoTV.it" site_id="1671">Senato TV</channel>
     <channel lang="it" xmltv_id="SkyTG24.it" site_id="393">Sky TG 24</channel>
@@ -530,7 +530,7 @@
     <channel lang="ku" xmltv_id="KurdistanTV.iq" site_id="235">Kurdistan TV</channel>
     <channel lang="ku" xmltv_id="Rudaw.iq" site_id="372">Rûdaw</channel>
     <channel lang="ku" xmltv_id="TRTKurdi.tr" site_id="619">TRT Kurdî</channel>
-    <channel lang="nl" xmltv_id="BVNTVEuropa.nl" site_id="56">BVN TV Europa</channel>
+    <channel lang="nl" xmltv_id="BVNEuropa.nl" site_id="56">BVN TV Europa</channel>
     <channel lang="pl" xmltv_id="TVPPolonia.pl" site_id="629">TVP Polonia</channel>
     <channel lang="pt" xmltv_id="RecordTVEuropa.br" site_id="347">Record TV Europa</channel>
     <channel lang="pt" xmltv_id="RTP3.pt" site_id="1484">RTP 3</channel>
@@ -556,7 +556,7 @@
     <channel lang="sq" xmltv_id="FirstChannel.rs" site_id="1688">First Channel</channel>
     <channel lang="sq" xmltv_id="Kohavision.rs" site_id="234">Kohavision</channel>
     <channel lang="sq" xmltv_id="Ora.al" site_id="1878">Ora</channel>
-    <channel lang="sq" xmltv_id="RTK1.rs" site_id="358">RTK 1</channel>
+    <channel lang="sq" xmltv_id="RTK1.xk" site_id="358">RTK 1</channel>
     <channel lang="sq" xmltv_id="RTSH3.al" site_id="1681">RTSH 3</channel>
     <channel lang="sq" xmltv_id="RTV21Sat.rs" site_id="370">RTV 21 Sat</channel>
     <channel lang="sq" xmltv_id="SyriTV.al" site_id="1879">Syri TV</channel>
diff --git a/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml b/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
index 43614fd0..c920fd7c 100644
--- a/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
+++ b/sites/tv2go.t-2.net/tv2go.t-2.net_si.channels.xml
@@ -190,7 +190,7 @@
     <channel lang="sl" xmltv_id="Rai1.it" site_id="1000625">Rai 1</channel>
     <channel lang="sl" xmltv_id="Rai2.it" site_id="1000626">Rai 2</channel>
     <channel lang="sl" xmltv_id="Rai3.it" site_id="1000627">Rai 3</channel>
-    <channel lang="sl" xmltv_id="RTK1.rs" site_id="2000000015">RTK 1</channel>
+    <channel lang="sl" xmltv_id="RTK1.xk" site_id="2000000015">RTK 1</channel>
     <channel lang="sl" xmltv_id="RTL2Hrvatska.de" site_id="1000322">RTL 2 Hrvatska</channel>
     <channel lang="sl" xmltv_id="RTLDeutschland.de" site_id="70">RTL Deutschland</channel>
     <channel lang="sl" xmltv_id="RTLHrvatska.de" site_id="1000314">RTL Hrvatska</channel>
diff --git a/sites/tvprofil.com/tvprofil.com_al.channels.xml b/sites/tvprofil.com/tvprofil.com_al.channels.xml
index 9ad4e767..1b3e7c6c 100644
--- a/sites/tvprofil.com/tvprofil.com_al.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com_al.channels.xml
@@ -116,7 +116,7 @@
     <channel lang="hr" xmltv_id="ReportTV.al" site_id="al/programacioni#report-tv">Report TV</channel>
     <channel lang="hr" xmltv_id="Rete4.it" site_id="al/programacioni#rete-4">Rete 4</channel>
     <channel lang="hr" xmltv_id="RTDocumentary.ru" site_id="al/programacioni#rt-documentary">RT Documentary</channel>
-    <channel lang="hr" xmltv_id="RTK1.rs" site_id="al/programacioni#rtk-1">RTK 1</channel>
+    <channel lang="hr" xmltv_id="RTK1.xk" site_id="al/programacioni#rtk-1">RTK 1</channel>
     <channel lang="hr" xmltv_id="RTNews.ru" site_id="al/programacioni#russia-today">RT News</channel>
     <channel lang="hr" xmltv_id="RTS1.rs" site_id="al/programacioni#rts1">RTS 1</channel>
     <channel lang="hr" xmltv_id="RTSH1.al" site_id="al/programacioni#rtsh">RTSH 1</channel>
diff --git a/sites/tvtv.us/tvtv.us_us.channels.xml b/sites/tvtv.us/tvtv.us_us.channels.xml
index 003684e0..3de8fc60 100644
--- a/sites/tvtv.us/tvtv.us_us.channels.xml
+++ b/sites/tvtv.us/tvtv.us_us.channels.xml
@@ -1149,7 +1149,7 @@
     <channel lang="en" xmltv_id="SkyLinkTV.us" site_id="49492">Sky Link TV</channel>
     <channel lang="en" xmltv_id="SkyNewsArabia.uk" site_id="99085">Sky News Arabia</channel>
     <channel lang="en" xmltv_id="SmartLifeStyleTV.us" site_id="88293">Smart LifeStyle TV</channel>
-    <channel lang="en" xmltv_id="SonLifeBroadcastingNetwork.us" site_id="67676">SonLife Broadcasting Network</channel>
+    <channel lang="en" xmltv_id="SBNDomestic.us" site_id="67676">SonLife Broadcasting Network</channel>
     <channel lang="en" xmltv_id="SonyMix.in" site_id="80171">Sony Mix</channel>
     <channel lang="en" xmltv_id="SonyMovies.us" site_id="17063">Sony Movies</channel>
     <channel lang="en" xmltv_id="SonySABTVUSA.in" site_id="16030">Sony SAB TV USA</channel>