diff --git a/sites/horizon.tv/horizon.tv_sk.channels.xml b/sites/horizon.tv/horizon.tv_sk.channels.xml
index 89066865..4a12e1a5 100644
--- a/sites/horizon.tv/horizon.tv_sk.channels.xml
+++ b/sites/horizon.tv/horizon.tv_sk.channels.xml
@@ -124,7 +124,7 @@
     <channel lang="sk" xmltv_id="TVPaprika.hu" site_id="SK#slk#lgi-obolite-sk-prod-master:10151">TV Paprika HU</channel>
     <channel lang="sk" xmltv_id="TVPPolonia.pl" site_id="SK#slk#lgi-obolite-sk-prod-master:10118">TVP Polonia</channel>
     <channel lang="sk" xmltv_id="TVRajHD.sk" site_id="SK#slk#lgi-obolite-sk-prod-master:10038">TV Raj HD</channel>
-    <channel lang="sk" xmltv_id="TVRHD.sk" site_id="SK#slk#lgi-obolite-sk-prod-master:10039">TV Ruzinov HD</channel>
+    <channel lang="sk" xmltv_id="TVRuzinovHD.sk" site_id="SK#slk#lgi-obolite-sk-prod-master:10039">TV Ruzinov HD</channel>
     <channel lang="sk" xmltv_id="TVRomana.sk" site_id="SK#slk#lgi-obolite-sk-prod-master:10184">TV Romana</channel>
     <channel lang="sk" xmltv_id="UATV.ua" site_id="SK#slk#lgi-obolite-sk-prod-master:10190">UATV</channel>
     <channel lang="sk" xmltv_id="Vremya.ru" site_id="SK#slk#lgi-obolite-sk-prod-master:10175">Vremja</channel>
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 3f7a9b64..d869f7b3 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
@@ -2,6 +2,7 @@
 <site site="m.tv.sms.cz">
   <channels>
     <channel lang="cz" xmltv_id="0porMovistarPlus.es" site_id="Cero">#0</channel>
+    <channel lang="cz" xmltv_id="24.sk" site_id="RTVS+24">RTVS 24</channel>
     <channel lang="cz" xmltv_id="360TuneBox.nl" site_id="360TuneBox">360 Tune Box</channel>
     <channel lang="cz" xmltv_id="3sat.de" site_id="3SAT">3sat</channel>
     <channel lang="cz" xmltv_id="4FunDance.pl" site_id="4Fun+Dance">4 Fun Dance</channel>
@@ -9,7 +10,6 @@
     <channel lang="cz" xmltv_id="4FunTV.pl" site_id="4Fun.TV">4 Fun TV</channel>
     <channel lang="cz" xmltv_id="5Kanal.ua" site_id="5+Kanal">5 Kanal</channel>
     <channel lang="cz" xmltv_id="7D7.ee" site_id="7D7TV">7D7</channel>
-    <channel lang="cz" xmltv_id="Channel8International.ru" site_id="8TV">8 Kanal International</channel>
     <channel lang="cz" xmltv_id="AdventureTV.pl" site_id="Adventure+TV+%28pl%29">Adventure</channel>
     <channel lang="cz" xmltv_id="AlibiIreland.ie" site_id="Alibi+SD+Ireland">Alibi Ireland</channel>
     <channel lang="cz" xmltv_id="AlJazeeraBalkans.qa" site_id="Al+Jazeera+Balkans">Aljazeera Balkans</channel>
@@ -19,8 +19,8 @@
     <channel lang="cz" xmltv_id="AnimalPlanetCzechRepublic.cz" site_id="AnimalPlanet">Animal Planet</channel>
     <channel lang="cz" xmltv_id="AnimalPlanetUK.uk" site_id="AnimalPlanet+UK">Animal Planet UK</channel>
     <channel lang="cz" xmltv_id="AnixeHDSerie.de" site_id="ANIXE+HD">Anixe HD Serie</channel>
-    <channel lang="cz" xmltv_id="ARDalpha.de" site_id="ARD-alpha">ARD Alpha</channel>
     <channel lang="cz" xmltv_id="ArcadiaTVWorldHD.li" site_id="ArcadiaTV">Arcadia TV</channel>
+    <channel lang="cz" xmltv_id="ARDalpha.de" site_id="ARD-alpha">ARD Alpha</channel>
     <channel lang="cz" xmltv_id="ArenaSport1.sk" site_id="Arena+Sport+1">Arena Sport 1</channel>
     <channel lang="cz" xmltv_id="ArenaSport2.sk" site_id="Arena+Sport+2">Arena Sport 2</channel>
     <channel lang="cz" xmltv_id="ArirangWorld.kr" site_id="Arirang">Arirang World</channel>
@@ -33,7 +33,7 @@
     <channel lang="cz" xmltv_id="AXNWhite.us" site_id="AXN+White">AXN White</channel>
     <channel lang="cz" xmltv_id="BabesTV.us" site_id="Babes+TV">Babes TV</channel>
     <channel lang="cz" xmltv_id="BabyTV.uk" site_id="Baby+TV">Baby TV Europe</channel>
-    <channel lang="cz" xmltv_id="BarrandovKrimi.cz" site_id="Barrandov+Krimi">Barrandov Krimi</channel>
+    <channel lang="cz" xmltv_id="BarrandovPlus.cz" site_id="Barrandov+Krimi">Barrandov Krimi</channel>
     <channel lang="cz" xmltv_id="BBCEntertainmentEurope.uk" site_id="BBC+Entertainment">BBC Entertainment Europe</channel>
     <channel lang="cz" xmltv_id="BBCFour.uk" site_id="BBC+Four">BBC Four</channel>
     <channel lang="cz" xmltv_id="BBCOne.uk" site_id="BBC+One">BBC One</channel>
@@ -51,19 +51,22 @@
     <channel lang="cz" xmltv_id="BVN.nl" site_id="BVN">BVN Europa</channel>
     <channel lang="cz" xmltv_id="Canal24Horas.es" site_id="Canal+24+Horas">Canal 24 Horas</channel>
     <channel lang="cz" xmltv_id="CanalPlusDomo.pl" site_id="Canal%2B+Domo">Canal + Domo</channel>
-    <channel lang="cz" xmltv_id="CanalPlusSport1.cz" site_id="Canal%2B+Sport">Canal+ Sport 1</channel>
     <channel lang="cz" xmltv_id="CanalPlusSeriesFrance.fr" site_id="Canal%2B+Series+HD">Canal + Séries France</channel>
+    <channel lang="cz" xmltv_id="CanalPlusSport1.cz" site_id="Canal%2B+Sport">Canal+ Sport 1</channel>
     <channel lang="cz" xmltv_id="CartoonNetworkCzechRepublic.cz" site_id="Cartoon+Network">Cartoon Network</channel>
     <channel lang="cz" xmltv_id="CartoonNetworkPoland.pl" site_id="Cartoon+Network+%28pl%29">Cartoon Network Polska</channel>
     <channel lang="cz" xmltv_id="CBBC.uk" site_id="CBBC">CBBC</channel>
     <channel lang="cz" xmltv_id="CBSRealityEurope.us" site_id="CBS+Reality">CBS Reality Europe</channel>
     <channel lang="cz" xmltv_id="CCTV4Europe.cn" site_id="CCTV4+Europe">CCTV 4 Europe</channel>
     <channel lang="cz" xmltv_id="CCTV9.cn" site_id="CCTV9">CCTV 9</channel>
-    <channel lang="cz" xmltv_id="CGTNArabic.cn" site_id="CCTV+Arabic">CGTN Arabic</channel>
     <channel lang="cz" xmltv_id="CGTN.cn" site_id="CNTV+Espanol">CGTN Español</channel>
+    <channel lang="cz" xmltv_id="CGTNArabic.cn" site_id="CCTV+Arabic">CGTN Arabic</channel>
     <channel lang="cz" xmltv_id="CGTNFrench.cn" site_id="CNTV+Francais">CGTN Français</channel>
     <channel lang="cz" xmltv_id="CGTNRussian.cn" site_id="CCTV+Russkij">CGTN Russkij</channel>
     <channel lang="cz" xmltv_id="Channel5.uk" site_id="Channel+5">Channel 5</channel>
+    <channel lang="cz" xmltv_id="Channel8International.ru" site_id="8TV">8 Kanal International</channel>
+    <channel lang="cz" xmltv_id="ChannelOne.ru" site_id="1TV">Perviy kanal</channel>
+    <channel lang="cz" xmltv_id="ChuckTV.sk" site_id="Chuck%20TV">Chuck TV</channel>
     <channel lang="cz" xmltv_id="Cinemax2CzechRepublic.cz" site_id="Cinemax+2">Cinemax 2</channel>
     <channel lang="cz" xmltv_id="CinemaxCzechRepublic.cz" site_id="Cinemax">Cinemax</channel>
     <channel lang="cz" xmltv_id="ClubMTVEurope.uk" site_id="Club+MTV">Club MTV</channel>
@@ -74,13 +77,12 @@
     <channel lang="cz" xmltv_id="ComedyCentralHungary.hu" site_id="Comedy+Central+%28hu%29">Comedy Central Hungary</channel>
     <channel lang="cz" xmltv_id="CoolTV.hu" site_id="Cool+TV">Cool TV</channel>
     <channel lang="cz" xmltv_id="CredoTV.ro" site_id="Credo">Credo TV</channel>
-    <channel lang="cz" xmltv_id="CrimePlusInvestigationUK.uk" site_id="Crime+and+Investigation+UK">Crime + Investigation UK</channel>
     <channel lang="cz" xmltv_id="CrimePlusInvestigationCZ.us" site_id="Crime+and+Investigation">Crime + Investigation CZ</channel>
+    <channel lang="cz" xmltv_id="CrimePlusInvestigationUK.uk" site_id="Crime+and+Investigation+UK">Crime + Investigation UK</channel>
     <channel lang="cz" xmltv_id="CSFilm.cz" site_id="CS+Film">CS Film</channel>
     <channel lang="cz" xmltv_id="CSHistory.cz" site_id="CS+History">CS History</channel>
     <channel lang="cz" xmltv_id="CSHorror.cz" site_id="CS+Horror">CS Horror</channel>
     <channel lang="cz" xmltv_id="CSMystery.cz" site_id="CS+Mystery">CS Mystery</channel>
-    <channel lang="cz" xmltv_id="ChuckTV.sk" site_id="Chuck%20TV">Chuck TV</channel>
     <channel lang="cz" xmltv_id="CT1.cz" site_id="%C8T1">CT 1</channel>
     <channel lang="cz" xmltv_id="CT2.cz" site_id="%C8T2">CT 2</channel>
     <channel lang="cz" xmltv_id="CT24.cz" site_id="%C8T24">CT 24</channel>
@@ -88,7 +90,6 @@
     <channel lang="cz" xmltv_id="CTart.cz" site_id="%C8T+art">CT art</channel>
     <channel lang="cz" xmltv_id="CTDecko.cz" site_id="%C8T+%3AD">CT :D</channel>
     <channel lang="cz" xmltv_id="CTSport.cz" site_id="%C8T4+Sport">CT Sport</channel>
-    <channel lang="cz" xmltv_id="Dajto.sk" site_id="TV+DAJTO">Dajto</channel>
     <channel lang="cz" xmltv_id="DasErste.de" site_id="ARD">Das Erste</channel>
     <channel lang="cz" xmltv_id="DaveUK.uk" site_id="Dave+SD+UK">Dave UK</channel>
     <channel lang="cz" xmltv_id="DeluxeLoungeHD.de" site_id="Deluxe+Lounge+HD">Deluxe Lounge</channel>
@@ -97,22 +98,23 @@
     <channel lang="cz" xmltv_id="DigiSport2Hungary.hu" site_id="Digi+Sport+2+HD">Digi Sport 2 Hungary</channel>
     <channel lang="cz" xmltv_id="DiscoveryChannelCzechRepublic.cz" site_id="Discovery">Discovery Channel</channel>
     <channel lang="cz" xmltv_id="DiscoveryScience.us" site_id="Discovery+Science">Discovery Science</channel>
-    <channel lang="cz" xmltv_id="DisneyChannelGermany.de" site_id="Disney+Channel+%28de%29">Disney Channel Deutschland</channel>
     <channel lang="cz" xmltv_id="DisneyChannelCzechRepublic.cz" site_id="Disney+Channel">Disney Channel</channel>
+    <channel lang="cz" xmltv_id="DisneyChannelGermany.de" site_id="Disney+Channel+%28de%29">Disney Channel Deutschland</channel>
     <channel lang="cz" xmltv_id="DisneyJuniorCzechRepublic.cz" site_id="Disney+Junior">Disney Junior</channel>
     <channel lang="cz" xmltv_id="DMSat.rs" site_id="DM+Sat">DM Sat</channel>
     <channel lang="cz" xmltv_id="DocuBoxHD.nl" site_id="DocuBox+HD">DocuBox HD</channel>
-    <channel lang="cz" xmltv_id="DomaCroatia.hr" site_id="Doma+TV">Doma Hrvatska</channel>
+    <channel lang="cz" xmltv_id="DomaTV.hr" site_id="Doma+TV">Doma Hrvatska</channel>
     <channel lang="cz" xmltv_id="DomKino.ru" site_id="Dom+Kino">Dom Kino</channel>
     <channel lang="cz" xmltv_id="DomKinoPremium.ru" site_id="Dom+Kino+Premium">Dom Kino Premium International</channel>
     <channel lang="cz" xmltv_id="DorcelTV.nl" site_id="Dorcel+TV">Dorcel TV</channel>
     <channel lang="cz" xmltv_id="DorcelXXX.nl" site_id="Dorcel+XXX">Dorcel XXX</channel>
     <channel lang="cz" xmltv_id="DTXEastEurope.us" site_id="DTX">DTX East Europe</channel>
     <channel lang="cz" xmltv_id="DuckTVPlus.sk" site_id="ducktv+plus">Duck TV Plus</channel>
-    <channel lang="cz" xmltv_id="DuckTVSD.sk" site_id="ducktv">Duck TV SD</channel>
+    <channel lang="cz" xmltv_id="DuckTV.sk" site_id="ducktv">Duck TV SD</channel>
     <channel lang="cz" xmltv_id="DunaTV.hu" site_id="Duna">Duna TV</channel>
     <channel lang="cz" xmltv_id="DunaWorld.hu" site_id="Duna+World">Duna World</channel>
     <channel lang="cz" xmltv_id="Dusk.nl" site_id="Dusk%21">Dusk</channel>
+    <channel lang="cz" xmltv_id="Dvojka.sk" site_id="STV2">RTVS 2</channel>
     <channel lang="cz" xmltv_id="DWDeutsch.de" site_id="Deutsche+Welle">DW Deutsch</channel>
     <channel lang="cz" xmltv_id="E4UK.uk" site_id="E4+HD+UK">E4 UK</channel>
     <channel lang="cz" xmltv_id="Eden.uk" site_id="Eden+HD">Eden</channel>
@@ -146,7 +148,6 @@
     <channel lang="cz" xmltv_id="FilmBoxExtraHDPoland.pl" site_id="Filmbox+Extra+HD+%28pl%29">FilmBox Extra HD Polska</channel>
     <channel lang="cz" xmltv_id="FilmBoxFamily.nl" site_id="Filmbox+Family">FilmBox Family</channel>
     <channel lang="cz" xmltv_id="FilmBoxPremiumHDCzechRepublicSlovakia.cz" site_id="Filmbox+Premium">FilmBox Premium Czechia</channel>
-    <!-- <channel lang="cz" xmltv_id="FilmBoxPremiumPoland.pl" site_id="Filmbox+Premium+%28pl%29">FilmBox Premium Polska</channel> -->
     <channel lang="cz" xmltv_id="FilmBoxStarsCzechRepublicSlovakia.cz" site_id="Filmbox+Stars">FilmBox Stars Czechia</channel>
     <channel lang="cz" xmltv_id="FilmCafeHungary.hu" site_id="Film+Caf%E9">Film Café Hungary</channel>
     <channel lang="cz" xmltv_id="FilmEurope.cz" site_id="Film+Europe">Film Europe</channel>
@@ -198,12 +199,14 @@
     <channel lang="cz" xmltv_id="ITV4.uk" site_id="ITV4">ITV 4</channel>
     <channel lang="cz" xmltv_id="ITVLondon.uk" site_id="ITV+HD+London">ITV London</channel>
     <channel lang="cz" xmltv_id="IzauraTV.hu" site_id="Izaura+TV">Izaura TV</channel>
+    <channel lang="cz" xmltv_id="Jednotka.sk" site_id="STV1">RTVS 1</channel>
     <channel lang="cz" xmltv_id="JimJamEurope.uk" site_id="Jim+Jam">JimJam Europe</channel>
-    <channel lang="cz" xmltv_id="JojCinema.sk" site_id="JOJ+Cinema">Joj Cinema</channel>
-    <channel lang="cz" xmltv_id="JojFamily.sk" site_id="JOJ+Family">Joj Family</channel>
+    <channel lang="cz" xmltv_id="JOJCinema.sk" site_id="JOJ+Cinema">Joj Cinema</channel>
+    <channel lang="cz" xmltv_id="JOJFamily.sk" site_id="JOJ+Family">Joj Family</channel>
     <channel lang="cz" xmltv_id="Jojko.sk" site_id="Jojko">Jojko</channel>
-    <channel lang="cz" xmltv_id="JojPlus.sk" site_id="JOJ+Plus">Joj Plus</channel>
-    <channel lang="cz" xmltv_id="JojSport.sk" site_id="JOJ+%8Aport">Joj Šport</channel>
+    <channel lang="cz" xmltv_id="JOJPlus.sk" site_id="JOJ+Plus">Joj Plus</channel>
+    <channel lang="cz" xmltv_id="JOJSport.sk" site_id="JOJ+%8Aport">Joj Šport</channel>
+    <channel lang="cz" xmltv_id="JOJWAU.sk" site_id="WAU">Wau TV</channel>
     <channel lang="cz" xmltv_id="JugotonTV.hr" site_id="Jugoton">Jugoton TV</channel>
     <channel lang="cz" xmltv_id="JurnalTV.md" site_id="Jurnal+TV+Moldova">Jurnal TV</channel>
     <channel lang="cz" xmltv_id="K2.ua" site_id="K2+UA">K2</channel>
@@ -226,6 +229,9 @@
     <channel lang="cz" xmltv_id="M2.hu" site_id="M2">M2</channel>
     <channel lang="cz" xmltv_id="M4Sport.hu" site_id="M4+Sport">M4 Sport</channel>
     <channel lang="cz" xmltv_id="M5.hu" site_id="M5+HD">M5</channel>
+    <channel lang="cz" xmltv_id="Markiza.sk" site_id="Mark%EDza">TV Markíza</channel>
+    <channel lang="cz" xmltv_id="MarkizaDajto.sk" site_id="TV+DAJTO">Dajto</channel>
+    <channel lang="cz" xmltv_id="MarkizaDoma.sk" site_id="Doma">TV Doma</channel>
     <channel lang="cz" xmltv_id="MarkizaInternational.sk" site_id="Mark%EDza+International">Markíza International</channel>
     <channel lang="cz" xmltv_id="MarkizaKrimi.sk" site_id="Mark%EDza+KRIMI">Markíza Krimi</channel>
     <channel lang="cz" xmltv_id="MediasetExtra.it" site_id="Mediaset+Extra">Mediaset Extra</channel>
@@ -246,8 +252,8 @@
     <channel lang="cz" xmltv_id="MTV00s.uk" site_id="MTV00s">MTV 00s</channel>
     <channel lang="cz" xmltv_id="MTV80s.uk" site_id="MTV80s">MTV 80s</channel>
     <channel lang="cz" xmltv_id="MTV90s.uk" site_id="MTV90s">MTV 90s</channel>
-    <channel lang="cz" xmltv_id="MTVHitsEurope.uk" site_id="MTV+Hits">MTV Hits Europe</channel>
     <channel lang="cz" xmltv_id="MTVGlobal.cz" site_id="MTV+%28hu%29">MTV Hungary</channel>
+    <channel lang="cz" xmltv_id="MTVHitsEurope.uk" site_id="MTV+Hits">MTV Hits Europe</channel>
     <channel lang="cz" xmltv_id="MTVLive.uk" site_id="MTV+Live">MTV Live</channel>
     <channel lang="cz" xmltv_id="MTVUK.uk" site_id="MTV+UK+HD">MTV UK</channel>
     <channel lang="cz" xmltv_id="MusicBoxUkraina.ua" site_id="Music+Box">Music Box Ukraina</channel>
@@ -282,6 +288,7 @@
     <channel lang="cz" xmltv_id="NovelaTV.pl" site_id="Novela+tv">Novela TV</channel>
     <channel lang="cz" xmltv_id="ntv.de" site_id="n-tv">N-TV</channel>
     <channel lang="cz" xmltv_id="NutaTV.pl" site_id="Nuta.TV">Nuta TV</channel>
+    <channel lang="cz" xmltv_id="O.ru" site_id="Telekanal+O">Telekanal O!</channel>
     <channel lang="cz" xmltv_id="O2TVFotbal.cz" site_id="O2TV+Fotbal">O2 TV Fotbal</channel>
     <channel lang="cz" xmltv_id="O2TVSport.cz" site_id="O2+Sport">O2 TV Sport</channel>
     <channel lang="cz" xmltv_id="O2TVSport2.cz" site_id="O2+Sport2">O2 TV Sport 2</channel>
@@ -303,7 +310,6 @@
     <channel lang="cz" xmltv_id="ParkTV.sk" site_id="Park+TV">Park TV</channel>
     <channel lang="cz" xmltv_id="PassionXXX.nl" site_id="Passion+XXX">Passion XXX</channel>
     <channel lang="cz" xmltv_id="PaxTV.hu" site_id="Pax+TV">Pax TV</channel>
-    <channel lang="cz" xmltv_id="ChannelOne.ru" site_id="1TV">Perviy kanal</channel>
     <channel lang="cz" xmltv_id="Phoenix.de" site_id="Phoenix">Phoenix</channel>
     <channel lang="cz" xmltv_id="PickUK.uk" site_id="Pick+TV">Pick UK</channel>
     <channel lang="cz" xmltv_id="PlayboyTVEurope.us" site_id="Playboy+TV">Playboy TV Europe</channel>
@@ -356,17 +362,16 @@
     <channel lang="cz" xmltv_id="Relax.cz" site_id="RELAX">Relax</channel>
     <channel lang="cz" xmltv_id="Rete4.it" site_id="Rete+4">Rete 4</channel>
     <channel lang="cz" xmltv_id="RetroMusicTV.cz" site_id="Retro+Music">Retro Music TV</channel>
-    <channel lang="cz" xmltv_id="Rik.sk" site_id="Rik+TV">Rik</channel>
-    <channel lang="cz" xmltv_id="Russia24.ru" site_id="Russia+24">Rossiya 24</channel>
+    <channel lang="cz" xmltv_id="TVRiK.sk" site_id="Rik+TV">Rik</channel>
     <channel lang="cz" xmltv_id="RTDoc.ru" site_id="Russia+Today+Doc">RT Documentary</channel>
     <channel lang="cz" xmltv_id="RTGTV.ru" site_id="Russian+Travel+Guide">RTG TV</channel>
     <channel lang="cz" xmltv_id="RTL2Croatia.hr" site_id="RTL+2+%28hr%29">RTL 2 Hrvatska</channel>
     <channel lang="cz" xmltv_id="RTL4.nl" site_id="RTL+4">RTL 4</channel>
     <channel lang="cz" xmltv_id="RTL5.nl" site_id="RTL+5">RTL 5</channel>
     <channel lang="cz" xmltv_id="RTLCrimeCroatia.hr" site_id="RTL+Crime+%28hr%29">RTL Crime Hrvatska</channel>
+    <channel lang="cz" xmltv_id="RTLCroatia.hr" site_id="RTL+%28hr%29">RTL Hrvatska</channel>
     <channel lang="cz" xmltv_id="RTLGermany.de" site_id="RTL">RTL Deutschland</channel>
     <channel lang="cz" xmltv_id="RTLGold.hu" site_id="RTL+Gold">RTL Gold</channel>
-    <channel lang="cz" xmltv_id="RTLCroatia.hr" site_id="RTL+%28hr%29">RTL Hrvatska</channel>
     <channel lang="cz" xmltv_id="RTLII.hu" site_id="RTL2+%28hu%29">RTL II</channel>
     <channel lang="cz" xmltv_id="RTLKlub.hu" site_id="RTL+klub">RTL Klub</channel>
     <channel lang="cz" xmltv_id="RTLKockica.hr" site_id="RTL+Kockica+%28hr%29">RTL Kockica</channel>
@@ -376,11 +381,7 @@
     <channel lang="cz" xmltv_id="RTLZweiGermany.de" site_id="RTL2">RTL Zwei Deutschland</channel>
     <channel lang="cz" xmltv_id="RTRPlaneta.ru" site_id="RTR">RTR Planeta</channel>
     <channel lang="cz" xmltv_id="RTVi.ru" site_id="RTVi">RTVi Europe</channel>
-    <channel lang="cz" xmltv_id="RTVS1.sk" site_id="STV1">RTVS 1</channel>
-    <channel lang="cz" xmltv_id="RTVS2.sk" site_id="STV2">RTVS 2</channel>
-    <channel lang="cz" xmltv_id="RTVS3.sk" site_id="Trojka">RTVS 3</channel>
-    <channel lang="cz" xmltv_id="RTVS24.sk" site_id="RTVS+24">RTVS 24</channel>
-    <channel lang="cz" xmltv_id="RTVSSport.sk" site_id="RTVS+%8Aport">RTVS Šport</channel>
+    <channel lang="cz" xmltv_id="Russia24.ru" site_id="Russia+24">Rossiya 24</channel>
     <channel lang="cz" xmltv_id="Sat1Germany.de" site_id="SAT1">Sat. 1 Deutschland</channel>
     <channel lang="cz" xmltv_id="Sat1GoldGermany.de" site_id="SAT1+Gold">Sat. 1 Gold Deutschland</channel>
     <channel lang="cz" xmltv_id="Senzi.sk" site_id="SENZI">Senzi</channel>
@@ -398,8 +399,8 @@
     <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.uk" site_id="History2">Sky History 2</channel>
-    <channel lang="cz" xmltv_id="SkyNewsInternational.uk" site_id="Sky+news">Sky News International</channel>
     <channel lang="cz" xmltv_id="SkyNews.uk" site_id="Sky+News+HD+UK">Sky News UK</channel>
+    <channel lang="cz" xmltv_id="SkyNewsInternational.uk" site_id="Sky+news">Sky News International</channel>
     <channel lang="cz" xmltv_id="SkyOneUK.uk" site_id="Sky1+HD+UK">Sky One UK</channel>
     <channel lang="cz" xmltv_id="SkySportsCricket.uk" site_id="Sky+Sports+Cricket+HD">Sky Sports Cricket</channel>
     <channel lang="cz" xmltv_id="SkySportsF1.uk" site_id="Sky+Sports+F1+HD">Sky Sports F1</channel>
@@ -409,22 +410,22 @@
     <channel lang="cz" xmltv_id="SkySportsNews.uk" site_id="Sky+Sports+News">Sky Sports News UK</channel>
     <channel lang="cz" xmltv_id="SkySportsPremierLeague.uk" site_id="Sky+Sports+Premier+League+HD">Sky Sports Premier League UK</channel>
     <channel lang="cz" xmltv_id="SkyWitnessUK.uk" site_id="Sky+Living+HD">Sky Witness UK</channel>
+    <channel lang="cz" xmltv_id="SlagerMuzika.cz" site_id="%8Al%E1gr+Muzika">Slágr Muzika</channel>
+    <channel lang="cz" xmltv_id="SlagerOriginal.cz" site_id="%8Al%E1gr+Origin%E1l">Slágr Original</channel>
+    <channel lang="cz" xmltv_id="SlagerPremium.cz" site_id="%8Al%E1gr+Premium">Slágr Premium</channel>
     <channel lang="cz" xmltv_id="SlagerTV.hu" site_id="Sl%E1ger+TV">Sláger TV</channel>
-    <channel lang="cz" xmltv_id="SlagrOriginal.cz" site_id="%8Al%E1gr+Origin%E1l">Slágr Original</channel>
-    <channel lang="cz" xmltv_id="Slagr2.cz" site_id="%8Al%E1gr+2">Slágr 2</channel>
-    <channel lang="cz" xmltv_id="SlagrMuzika.cz" site_id="%8Al%E1gr+Muzika">Slágr Muzika</channel>
-    <channel lang="cz" xmltv_id="SlagrPremium.cz" site_id="%8Al%E1gr+Premium">Slágr Premium</channel>
     <channel lang="cz" xmltv_id="SonyMaxHungary.hu" site_id="Sony+Max">Sony Max Hungary</channel>
     <channel lang="cz" xmltv_id="SonyMovieChannelHungary.hu" site_id="Sony+Movie">Sony Movie Channel Hungary</channel>
     <channel lang="cz" xmltv_id="SorozatPlus.hu" site_id="Sorozat%2B">Sorozat +</channel>
+    <channel lang="cz" xmltv_id="Spektrum.cz" site_id="Spektrum">Spektrum Czech</channel>
     <channel lang="cz" xmltv_id="Spektrum.hu" site_id="Spektrum+%28hu%29">Spektrum</channel>
-    <channel lang="cz" xmltv_id="SpektrumCzech.hu" site_id="Spektrum">Spektrum Czech</channel>
+    <channel lang="cz" xmltv_id="SpektrumHome.cz" site_id="Spektrum+Home">Spektrum Home Czech</channel>
     <channel lang="cz" xmltv_id="SpektrumHome.hu" site_id="Spektrum+Home+%28hu%29">Spektrum Home</channel>
-    <channel lang="cz" xmltv_id="SpektrumHomeCzech.hu" site_id="Spektrum+Home">Spektrum Home Czech</channel>
-    <channel lang="cz" xmltv_id="Sport1Czechia.hu" site_id="Sport1">Sport 1 Czechia</channel>
-    <channel lang="cz" xmltv_id="Sport1Hungary.hu" site_id="Sport1+%28hu%29">Sport 1 Hungary</channel>
-    <channel lang="cz" xmltv_id="Sport2Czechia.hu" site_id="Sport2">Sport 2 Czechia</channel>
-    <channel lang="cz" xmltv_id="Sport2Hungary.hu" site_id="Sport2+%28hu%29">Sport 2 Hungary</channel>
+    <channel lang="cz" xmltv_id="Sport.sk" site_id="RTVS+%8Aport">RTVS Šport</channel>
+    <channel lang="cz" xmltv_id="Sport1.cz" site_id="Sport1">Sport 1 Czechia</channel>
+    <channel lang="cz" xmltv_id="Sport1.hu" site_id="Sport1+%28hu%29">Sport 1 Hungary</channel>
+    <channel lang="cz" xmltv_id="Sport2.cz" site_id="Sport2">Sport 2 Czechia</channel>
+    <channel lang="cz" xmltv_id="Sport2.hu" site_id="Sport2+%28hu%29">Sport 2 Hungary</channel>
     <channel lang="cz" xmltv_id="Sport5.cz" site_id="Sport+5">Sport 5</channel>
     <channel lang="cz" xmltv_id="StarsTV.pl" site_id="Stars+TV">Stars TV</channel>
     <channel lang="cz" xmltv_id="StingrayClassica.ca" site_id="Brava+HDTV">Stingray Classica</channel>
@@ -444,7 +445,7 @@
     <channel lang="cz" xmltv_id="TBNPoland.pl" site_id="TBN+Poland">TBN Polska</channel>
     <channel lang="cz" xmltv_id="TCMCentralEasternEurope.us" site_id="TCM">TCM Central &amp; Eastern Europe</channel>
     <channel lang="cz" xmltv_id="Telecafe.ru" site_id="Telecafe">Telecafé International</channel>
-    <channel lang="cz" xmltv_id="O.ru" site_id="Telekanal+O">Telekanal O!</channel>
+    <channel lang="cz" xmltv_id="TelevizeSeznam.cz" site_id="Seznam.cz+TV">TV Seznam</channel>
     <channel lang="cz" xmltv_id="TF1.fr" site_id="TF1">TF 1</channel>
     <channel lang="cz" xmltv_id="TheFishingHuntingChannel.hu" site_id="The+Fishing+and+Hunting">The Fishing &amp; Hunting Channel</channel>
     <channel lang="cz" xmltv_id="TLCPanregional.us" site_id="TLC">TLC Pan Regional</channel>
@@ -452,6 +453,7 @@
     <channel lang="cz" xmltv_id="TraceSportStars.fr" site_id="Trace+Sports">Trace Sport Stars</channel>
     <channel lang="cz" xmltv_id="TravelChannelEMEA.uk" site_id="Travel+Channel">Travel Channel Europe</channel>
     <channel lang="cz" xmltv_id="TravelxpHDEurope.in" site_id="Travelxp+HD">Travelxp HD Europe</channel>
+    <channel lang="cz" xmltv_id="Trojka.sk" site_id="Trojka">RTVS 3</channel>
     <channel lang="cz" xmltv_id="TrueAmateurs.uk" site_id="True+Amateurs">True Amateurs</channel>
     <channel lang="cz" xmltv_id="TTV.pl" site_id="TTV">TTV</channel>
     <channel lang="cz" xmltv_id="TukiTV.sk" site_id="%8Duki">Tuki TV</channel>
@@ -466,28 +468,26 @@
     <channel lang="cz" xmltv_id="TV5MondeEurope.fr" site_id="TV5monde+%28en%29">TV5Monde Europe</channel>
     <channel lang="cz" xmltv_id="TV6.pl" site_id="TV6">TV 6</channel>
     <channel lang="cz" xmltv_id="TV7.sk" site_id="TV7">TV 7</channel>
+    <channel lang="cz" xmltv_id="TV8.sk" site_id="TV8">TV Osem</channel>
     <channel lang="cz" xmltv_id="TVBarrandov.cz" site_id="Barrandov">TV Barrandov</channel>
     <channel lang="cz" xmltv_id="TVC.pl" site_id="TVC">TVC</channel>
     <channel lang="cz" xmltv_id="TVCentral.sk" site_id="CETV">TV Central</channel>
     <channel lang="cz" xmltv_id="TVCGSat.me" site_id="TVCG+SAT">TVCG Sat</channel>
-    <channel lang="cz" xmltv_id="TVDoma.sk" site_id="Doma">TV Doma</channel>
     <channel lang="cz" xmltv_id="TVEInternacionalEuropeAsia.es" site_id="TVE">TVE Internacional Europa</channel>
     <channel lang="cz" xmltv_id="TVJOJ.sk" site_id="JOJ">TV Joj</channel>
     <channel lang="cz" xmltv_id="TVLux.sk" site_id="Lux">TV Lux</channel>
-    <channel lang="cz" xmltv_id="TVMarkiza.sk" site_id="Mark%EDza">TV Markíza</channel>
     <channel lang="cz" xmltv_id="TVN.pl" site_id="TVN">TVN</channel>
     <channel lang="cz" xmltv_id="TVN24.pl" site_id="TVN24">TVN 24</channel>
     <channel lang="cz" xmltv_id="TVN7.pl" site_id="TVN7">TVN 7</channel>
     <channel lang="cz" xmltv_id="TVNatura.cz" site_id="TV+Natura">TV Natura</channel>
-    <channel lang="cz" xmltv_id="TVNOE.cz" site_id="Noe">TV Noe</channel>
+    <channel lang="cz" xmltv_id="TVNoe.cz" site_id="Noe">TV Noe</channel>
     <channel lang="cz" xmltv_id="TVNova.cz" site_id="Nova">TV Nova</channel>
     <channel lang="cz" xmltv_id="TVNTurbo.pl" site_id="TVN+Turbo">TVN Turbo</channel>
-    <channel lang="cz" xmltv_id="TVOSEM.sk" site_id="TV8">TV Osem</channel>
     <channel lang="cz" xmltv_id="TVP1.pl" site_id="TVP1">TVP 1</channel>
     <channel lang="cz" xmltv_id="TVP2.pl" site_id="TVP2">TVP 2</channel>
     <channel lang="cz" xmltv_id="TVPABC.pl" site_id="TVP+ABC">TVP ABC</channel>
+    <channel lang="cz" xmltv_id="TVPaprika.cz" site_id="Paprika">TV Paprika Czech Republic</channel>
     <channel lang="cz" xmltv_id="TVPaprika.hu" site_id="Paprika+%28hu%29">TV Paprika</channel>
-    <channel lang="cz" xmltv_id="TVPaprikaCzechRepublic.cz" site_id="Paprika">TV Paprika Czech Republic</channel>
     <channel lang="cz" xmltv_id="TVPHD.pl" site_id="TVP+HD">TVP HD</channel>
     <channel lang="cz" xmltv_id="TVPHistoria.pl" site_id="TVP+Historia">TVP Historia</channel>
     <channel lang="cz" xmltv_id="TVPInfo.pl" site_id="TVP+Info">TVP Info</channel>
@@ -503,7 +503,6 @@
     <channel lang="cz" xmltv_id="TVRomana.sk" site_id="Romana">TV Romana</channel>
     <channel lang="cz" xmltv_id="TVS.pl" site_id="TVS">TVS</channel>
     <channel lang="cz" xmltv_id="TVSeverka.sk" site_id="Severka">TV Severka</channel>
-    <channel lang="cz" xmltv_id="TVSeznam.cz" site_id="Seznam.cz+TV">TV Seznam</channel>
     <channel lang="cz" xmltv_id="TVSlovenija1.si" site_id="Slovenija+1">TV Slovenija 1</channel>
     <channel lang="cz" xmltv_id="TVSlovenija2.si" site_id="Slovenija+2">TV Slovenija 2</channel>
     <channel lang="cz" xmltv_id="TVTrwam.pl" site_id="TV+Trwam">TV TRWAM</channel>
@@ -520,7 +519,6 @@
     <channel lang="cz" xmltv_id="VTV3.vn" site_id="VTV3">VTV 3</channel>
     <channel lang="cz" xmltv_id="VTV4.vn" site_id="VTV4">VTV 4</channel>
     <channel lang="cz" xmltv_id="WaterPlanet.pl" site_id="Water+Planet">Water Planet</channel>
-    <channel lang="cz" xmltv_id="TVWAU.sk" site_id="WAU">Wau TV</channel>
     <channel lang="cz" xmltv_id="Welt.de" site_id="Welt">Welt</channel>
     <channel lang="cz" xmltv_id="WildTV.ca" site_id="Wild+TV">Wild TV</channel>
     <channel lang="cz" xmltv_id="WPolscePL.pl" site_id="wPolsce.pl">W Polsce PL</channel>
@@ -530,5 +528,7 @@
     <channel lang="cz" xmltv_id="ZDFneo.de" site_id="ZDFneo">ZDF Neo</channel>
     <channel lang="cz" xmltv_id="Zoom.ua" site_id="ZOOM">Zoom</channel>
     <channel lang="cz" xmltv_id="ZoomTV.pl" site_id="Zoom+TV">Zoom TV</channel>
+    <!-- <channel lang="cz" xmltv_id="" site_id="%8Al%E1gr+2">Slágr 2</channel> -->
+    <!-- <channel lang="cz" xmltv_id="" site_id="Filmbox+Premium+%28pl%29">FilmBox Premium Polska</channel> -->
   </channels>
 </site>
diff --git a/sites/magticom.ge/magticom.ge_ge.channels.xml b/sites/magticom.ge/magticom.ge_ge.channels.xml
index 48258303..db5e8d64 100644
--- a/sites/magticom.ge/magticom.ge_ge.channels.xml
+++ b/sites/magticom.ge/magticom.ge_ge.channels.xml
@@ -32,7 +32,7 @@
     <channel lang="ru" xmltv_id="DomKino.ru" site_id="185">Dom Kino</channel>
     <channel lang="ru" xmltv_id="DomKinoPremium.ru" site_id="269">Dom Kino Premium</channel>
     <channel lang="ru" xmltv_id="DTXRussia.ru" site_id="45">DTX Rossiya</channel>
-    <channel lang="ru" xmltv_id="DuckTVSD.sk" site_id="251">Duck TV SD</channel>
+    <channel lang="ru" xmltv_id="DuckTV.sk" site_id="251">Duck TV SD</channel>
     <channel lang="ka" xmltv_id="EnkiBenki.ge" site_id="83">Enki Benki</channel>
     <channel lang="ka" xmltv_id="EroxHD.nl" site_id="2">Erox HD</channel>
     <channel lang="ka" xmltv_id="Ertsulovneba.ge" site_id="72">Ertsulovneba</channel>
diff --git a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml
index 01c4e82b..be4bbf63 100644
--- a/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml
+++ b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml
@@ -40,7 +40,7 @@
     <channel lang="hr" xmltv_id="DasErste.de" site_id="261">Das Erste</channel>
     <channel lang="hr" xmltv_id="DaVinci.de" site_id="423">Da Vinci</channel>
     <channel lang="hr" xmltv_id="DMSat.rs" site_id="270">DM Sat</channel>
-    <channel lang="hr" xmltv_id="DomaCroatia.hr" site_id="92">Doma Hrvatska</channel>
+    <channel lang="hr" xmltv_id="DomaTV.hr" site_id="92">Doma Hrvatska</channel>
     <channel lang="hr" xmltv_id="DWEnglish.de" site_id="265">DW English</channel>
     <channel lang="hr" xmltv_id="EEurope.us" site_id="317">E! Europe</channel>
     <channel lang="hr" xmltv_id="EpicDrama.se" site_id="638">Epic Drama</channel>
diff --git a/sites/melita.com/melita.com_mt.channels.xml b/sites/melita.com/melita.com_mt.channels.xml
index 28709ddf..ab875a95 100644
--- a/sites/melita.com/melita.com_mt.channels.xml
+++ b/sites/melita.com/melita.com_mt.channels.xml
@@ -37,7 +37,7 @@
     <channel lang="en" xmltv_id="DisneyJuniorGreece.gr" site_id="b21b88e9-159f-49e3-911a-40b442fbb95c">Disney Junior</channel>
     <channel lang="en" xmltv_id="DTXEastEurope.us" site_id="f4554e89-1dc7-4086-bd62-7891b7dfb79f">Discovery Turbo Xtra HD</channel>
     <channel lang="en" xmltv_id="DubaiOne.ae" site_id="b41afdcb-2204-48ee-b40a-a0db64e4bd91">Dubai One</channel>
-    <channel lang="en" xmltv_id="DuckTVSD.sk" site_id="aeb3011d-9106-4621-b5e8-693dec45f33e">Duck TV</channel>
+    <channel lang="en" xmltv_id="DuckTV.sk" site_id="aeb3011d-9106-4621-b5e8-693dec45f33e">Duck TV</channel>
     <channel lang="en" xmltv_id="DWEnglish.de" site_id="8a1ea95b-49fb-4fe8-9fc9-06d0f7567f76">Deutsche Welle HD</channel>
     <channel lang="en" xmltv_id="EEurope.us" site_id="60338dfb-5bf1-4824-a1f9-92ff5f78d105">E! Entertainment HD</channel>
     <channel lang="en" xmltv_id="EuronewsEnglish.fr" site_id="aa11df2b-37b0-442d-a7d6-fab4ef03e48f">Euronews HD</channel>
diff --git a/sites/mts.rs/mts.rs_rs.channels.xml b/sites/mts.rs/mts.rs_rs.channels.xml
index 1611413e..2dce5518 100644
--- a/sites/mts.rs/mts.rs_rs.channels.xml
+++ b/sites/mts.rs/mts.rs_rs.channels.xml
@@ -61,7 +61,7 @@
     <channel lang="sr" xmltv_id="DocuBoxHD.nl" site_id="359#140">DocuBox HD</channel>
     <channel lang="sr" xmltv_id="DoxTV.hr" site_id="128#660">Dox TV</channel>
     <channel lang="sr" xmltv_id="DTXEastEurope.us" site_id="322#804">DTX East Europe</channel>
-    <channel lang="sr" xmltv_id="DuckTVSD.sk" site_id="403#324">Duck TV SD</channel>
+    <channel lang="sr" xmltv_id="DuckTV.sk" site_id="403#324">Duck TV SD</channel>
     <channel lang="sr" xmltv_id="DunaTV.hu" site_id="675#471">Duna TV</channel>
     <channel lang="sr" xmltv_id="DunavTV.rs" site_id="143#648">Dunav TV</channel>
     <channel lang="sr" xmltv_id="DunaWorld.hu" site_id="676#491">Duna World</channel>
diff --git a/sites/musor.tv/musor.tv_hu.channels.xml b/sites/musor.tv/musor.tv_hu.channels.xml
index d2c5e40d..ccff6bec 100644
--- a/sites/musor.tv/musor.tv_hu.channels.xml
+++ b/sites/musor.tv/musor.tv_hu.channels.xml
@@ -139,8 +139,8 @@
     <channel lang="hu" xmltv_id="SpektrumHome.hu" site_id="SPEKTRUMHOME">Spektrum Home (HD)</channel>
     <channel lang="hu" xmltv_id="SpilerTV1.hu" site_id="SPILER_TV">Spíler1 TV (HD)</channel>
     <channel lang="hu" xmltv_id="SpilerTV2.hu" site_id="SPILER2_TV">Spíler2 TV (HD)</channel>
-    <channel lang="hu" xmltv_id="Sport1Hungary.hu" site_id="SPORT1">Sport 1 (HD)</channel>
-    <channel lang="hu" xmltv_id="Sport2Hungary.hu" site_id="SPORT2">Sport 2 (HD)</channel>
+    <channel lang="hu" xmltv_id="Sport1.hu" site_id="SPORT1">Sport 1 (HD)</channel>
+    <channel lang="hu" xmltv_id="Sport2.hu" site_id="SPORT2">Sport 2 (HD)</channel>
     <channel lang="hu" xmltv_id="StingrayClassica.ca" site_id="CLASSICA">Stingray Classica HD</channel>
     <channel lang="hu" xmltv_id="StingrayCMusic.ca" site_id="CMUSIC">Stingray C Music</channel>
     <channel lang="hu" xmltv_id="StingrayiConcerts.ca" site_id="ICONCERTS">Stingray iConcerts HD</channel>
diff --git a/sites/programetv.ro/programetv.ro_ro.channels.xml b/sites/programetv.ro/programetv.ro_ro.channels.xml
index d550e629..f5467a6c 100644
--- a/sites/programetv.ro/programetv.ro_ro.channels.xml
+++ b/sites/programetv.ro/programetv.ro_ro.channels.xml
@@ -60,7 +60,7 @@
     <channel lang="ro" xmltv_id="DocuBoxHD.nl" site_id="docu-box-hd">DocuBox HD</channel>
     <channel lang="ro" xmltv_id="DorcelTV.nl" site_id="dorcel-tv">Dorcel TV</channel>
     <channel lang="ro" xmltv_id="DTXEastEurope.us" site_id="discovery-turbo-xtra-hd">DTX</channel>
-    <channel lang="ro" xmltv_id="DuckTVSD.sk" site_id="duck-tv">Duck TV</channel>
+    <channel lang="ro" xmltv_id="DuckTV.sk" site_id="duck-tv">Duck TV</channel>
     <channel lang="ro" xmltv_id="DunaTV.hu" site_id="duna">Duna TV</channel>
     <channel lang="ro" xmltv_id="DunaWorld.hu" site_id="duna-world-hd">Duna World</channel>
     <channel lang="ro" xmltv_id="DWEnglish.de" site_id="deutsche-welle">DW</channel>
@@ -211,7 +211,7 @@
     <channel lang="ro" xmltv_id="TV4.hu" site_id="tv4">TV 4</channel>
     <channel lang="ro" xmltv_id="TV5MondeEurope.fr" site_id="tv5-monde-europe">TV5Monde Europe</channel>
     <channel lang="ro" xmltv_id="TVEInternacionalEuropeAsia.es" site_id="tve">TVE</channel>
-    <channel lang="ro" xmltv_id="TVPaprikaRomania.ro" site_id="tv-paprika">TV Paprika</channel>
+    <channel lang="ro" xmltv_id="TVPaprika.ro" site_id="tv-paprika">TV Paprika</channel>
     <channel lang="ro" xmltv_id="TVR1.ro" site_id="tvr-1">TVR 1</channel>
     <channel lang="ro" xmltv_id="TVR2.ro" site_id="tvr-2">TVR 2</channel>
     <channel lang="ro" xmltv_id="TVR3.ro" site_id="tvr-3">TVR 3</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 0f7f0adb..1103005b 100644
--- a/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
+++ b/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
@@ -85,7 +85,7 @@
     <channel lang="pl" xmltv_id="DorcelXXX.nl" site_id="dorcel-xxx-506">Dorcel XXX</channel>
     <channel lang="pl" xmltv_id="DTXPoland.pl" site_id="discovery-turbo-xtra-239">DTX Polska</channel>
     <channel lang="pl" xmltv_id="DuckTVHD.sk" site_id="ducktv-hd-151">Duck TV HD</channel>
-    <channel lang="pl" xmltv_id="DuckTVSD.sk" site_id="ducktv-94">Duck TV SD</channel>
+    <channel lang="pl" xmltv_id="DuckTV.sk" site_id="ducktv-94">Duck TV SD</channel>
     <channel lang="pl" xmltv_id="DWDeutsch.de" site_id="dw-364">DW Deutsch</channel>
     <channel lang="pl" xmltv_id="Een.be" site_id="belgia-tv1-268">Één</channel>
     <channel lang="pl" xmltv_id="EEurope.us" site_id="e-entertainment-73">E! Europe</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
index bdd9df40..bfb0de55 100644
--- a/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ee-en.channels.xml
@@ -24,7 +24,7 @@
     <channel lang="en" xmltv_id="DomKino.ru" site_id="95">Dom Kino International</channel>
     <channel lang="en" xmltv_id="TVRain.ru" site_id="828">Dozhd</channel>
     <channel lang="en" xmltv_id="DTXRussia.ru" site_id="217">DTX</channel>
-    <channel lang="en" xmltv_id="DuckTVSD.sk" site_id="1108">Duck TV SD</channel>
+    <channel lang="en" xmltv_id="DuckTV.sk" site_id="1108">Duck TV SD</channel>
     <channel lang="en" xmltv_id="Duo3.ee" site_id="257">Duo 3</channel>
     <channel lang="en" xmltv_id="Duo4.ee" site_id="101">Duo 4</channel>
     <channel lang="en" xmltv_id="Duo5.ee" site_id="728">Duo 5</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml
index fed3e1f2..7d6e91ab 100644
--- a/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ee-et.channels.xml
@@ -24,7 +24,7 @@
     <channel lang="et" xmltv_id="DomKino.ru" site_id="95">Dom Kino</channel>
     <channel lang="et" xmltv_id="TVRain.ru" site_id="828">Dozhd</channel>
     <channel lang="et" xmltv_id="DTXRussia.ru" site_id="217">DTX</channel>
-    <channel lang="et" xmltv_id="DuckTVSD.sk" site_id="1108">Duck TV</channel>
+    <channel lang="et" xmltv_id="DuckTV.sk" site_id="1108">Duck TV</channel>
     <channel lang="et" xmltv_id="Duo3.ee" site_id="257">Duo 3</channel>
     <channel lang="et" xmltv_id="Duo4.ee" site_id="101">Duo 4</channel>
     <channel lang="et" xmltv_id="Duo5.ee" site_id="728">Duo 5</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml b/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml
index c2e28f02..b7d3695e 100644
--- a/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ee-ru.channels.xml
@@ -24,7 +24,7 @@
     <channel lang="ru" xmltv_id="DomKino.ru" site_id="95">Dom Kino International</channel>
     <channel lang="ru" xmltv_id="TVRain.ru" site_id="828">Dozhd</channel>
     <channel lang="ru" xmltv_id="DTXRussia.ru" site_id="217">DTX Rossiya</channel>
-    <channel lang="ru" xmltv_id="DuckTVSD.sk" site_id="1108">Duck TV SD</channel>
+    <channel lang="ru" xmltv_id="DuckTV.sk" site_id="1108">Duck TV SD</channel>
     <channel lang="ru" xmltv_id="Duo3.ee" site_id="257">Duo 3</channel>
     <channel lang="ru" xmltv_id="Duo4.ee" site_id="101">Duo 4</channel>
     <channel lang="ru" xmltv_id="Duo5.ee" site_id="728">Duo 5</channel>
diff --git a/sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml b/sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml
index a589343d..2a60cfd6 100644
--- a/sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml
+++ b/sites/turksatkablo.com.tr/turksatkablo.com.tr_tr.channels.xml
@@ -48,7 +48,7 @@
     <channel lang="tr" xmltv_id="DiyanetTV.tr" site_id="338">Diyanet TV</channel>
     <channel lang="tr" xmltv_id="DMAXTurkey.tr" site_id="1911">DMAX Türkiye</channel>
     <channel lang="tr" xmltv_id="DocuBoxHD.nl" site_id="437">DocuBox HD</channel>
-    <channel lang="tr" xmltv_id="DuckTVSD.sk" site_id="358">Duck TV SD</channel>
+    <channel lang="tr" xmltv_id="DuckTV.sk" site_id="358">Duck TV SD</channel>
     <channel lang="tr" xmltv_id="DWDeutsch.de" site_id="1882">DW Deutsch</channel>
     <channel lang="tr" xmltv_id="DWEnglish.de" site_id="175">DW English</channel>
     <channel lang="tr" xmltv_id="EBATVIlkokul.tr" site_id="2073">EBA TV Ilkokul</channel>
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 ade27c58..3c60ff56 100644
--- a/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
+++ b/sites/tv.blue.ch/tv.blue.ch_ch.channels.xml
@@ -54,7 +54,7 @@
     <channel lang="de" xmltv_id="DiscoveryChannelGermany.de" site_id="122">Discovery Channel Deutschland</channel>
     <channel lang="de" xmltv_id="DisneyChannelGermany.de" site_id="128">Disney Channel Deutschland</channel>
     <channel lang="de" xmltv_id="DMAXGermany.de" site_id="136">DMAX Deutschland</channel>
-    <channel lang="de" xmltv_id="DuckTVSD.sk" site_id="1626">Duck TV SD</channel>
+    <channel lang="de" xmltv_id="DuckTV.sk" site_id="1626">Duck TV SD</channel>
     <channel lang="de" xmltv_id="DWDeutsch.de" site_id="1447">DW Deutsch</channel>
     <channel lang="de" xmltv_id="EGermany.us" site_id="143">E! Deutschland</channel>
     <channel lang="de" xmltv_id="eSports1.de" site_id="1553">ESports 1</channel>
diff --git a/sites/tv.yettel.hu/tv.yettel.hu_hu.channels.xml b/sites/tv.yettel.hu/tv.yettel.hu_hu.channels.xml
index 03cb5f5e..61c5f80e 100644
--- a/sites/tv.yettel.hu/tv.yettel.hu_hu.channels.xml
+++ b/sites/tv.yettel.hu/tv.yettel.hu_hu.channels.xml
@@ -60,8 +60,8 @@
     <channel lang="hu" xmltv_id="SpektrumHome.hu" site_id="LCH79">Spektrum Home</channel>
     <channel lang="hu" xmltv_id="SpilerTV1.hu" site_id="LCH71">Spíler1 TV</channel>
     <channel lang="hu" xmltv_id="SpilerTV2.hu" site_id="LCH170">Spíler2 TV</channel>
-    <channel lang="hu" xmltv_id="Sport1Hungary.hu" site_id="LCH41">Sport1</channel>
-    <channel lang="hu" xmltv_id="Sport2Hungary.hu" site_id="LCH84">Sport2</channel>
+    <channel lang="hu" xmltv_id="Sport1.hu" site_id="LCH41">Sport1</channel>
+    <channel lang="hu" xmltv_id="Sport2.hu" site_id="LCH84">Sport2</channel>
     <channel lang="hu" xmltv_id="SuperTV2.hu" site_id="LCH12">Super TV2</channel>
     <channel lang="hu" xmltv_id="TeenNickHungary.hu" site_id="LCH177">TeenNick</channel>
     <channel lang="hu" xmltv_id="TLCHungary.hu" site_id="LCH145">TLC</channel>
diff --git a/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml b/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml
index 044c3ead..59b7ba00 100644
--- a/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml
+++ b/sites/tvmusor.hu/tvmusor.hu_hu.channels.xml
@@ -23,7 +23,7 @@
     <channel lang="hu" xmltv_id="DiscoveryChannelHungary.hu" site_id="83">Discovery Channel</channel>
     <channel lang="hu" xmltv_id="DiscoveryScience.us" site_id="85">Discovery Science</channel>
     <channel lang="hu" xmltv_id="DisneyChannelHungary.hu" site_id="35">Disney Channel</channel>
-    <channel lang="hu" xmltv_id="DuckTVSD.sk" site_id="156">Duck TV</channel>
+    <channel lang="hu" xmltv_id="DuckTV.sk" site_id="156">Duck TV</channel>
     <channel lang="hu" xmltv_id="DunaTV.hu" site_id="6">Duna TV</channel>
     <channel lang="hu" xmltv_id="DunaWorld.hu" site_id="103">Duna World</channel>
     <channel lang="hu" xmltv_id="EuronewsEnglish.fr" site_id="71">EuroNews</channel>
@@ -72,8 +72,8 @@
     <channel lang="hu" xmltv_id="SorozatPlus.hu" site_id="179">Sorozat +</channel>
     <channel lang="hu" xmltv_id="Spektrum.hu" site_id="9">Spektrum</channel>
     <channel lang="hu" xmltv_id="SpilerTV1.hu" site_id="305">Spíler TV 1</channel>
-    <channel lang="hu" xmltv_id="Sport1Hungary.hu" site_id="90">Sport 1</channel>
-    <channel lang="hu" xmltv_id="Sport2Hungary.hu" site_id="44">Sport 2</channel>
+    <channel lang="hu" xmltv_id="Sport1.hu" site_id="90">Sport 1</channel>
+    <channel lang="hu" xmltv_id="Sport2.hu" site_id="44">Sport 2</channel>
     <channel lang="hu" xmltv_id="Story4.hu" site_id="228">Story 5</channel>
     <channel lang="hu" xmltv_id="SuperTV2.hu" site_id="244">Super TV 2</channel>
     <channel lang="hu" xmltv_id="TeenNickHungary.hu" site_id="312">TeenNick</channel>
diff --git a/sites/tvprofil.com/tvprofil.com_ba.channels.xml b/sites/tvprofil.com/tvprofil.com_ba.channels.xml
index b212f8d6..597ea5f6 100644
--- a/sites/tvprofil.com/tvprofil.com_ba.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com_ba.channels.xml
@@ -28,7 +28,7 @@
     <channel lang="hr" xmltv_id="DaVinci.de" site_id="ba/tvprogram#da-vinci-learning">Da Vinci</channel>
     <channel lang="hr" xmltv_id="DecijaTV.rs" site_id="ba/tvprogram#decija-tv">Decija TV</channel>
     <channel lang="hr" xmltv_id="DokuTV.hr" site_id="ba/tvprogram#doku-tv">Doku TV</channel>
-    <channel lang="hr" xmltv_id="DomaCroatia.hr" site_id="ba/tvprogram#doma-tv">Doma Hrvatska</channel>
+    <channel lang="hr" xmltv_id="DomaTV.hr" site_id="ba/tvprogram#doma-tv">Doma Hrvatska</channel>
     <channel lang="hr" xmltv_id="DoxTV.cn" site_id="ba/tvprogram#dox-tv">Dox TV</channel>
     <channel lang="hr" xmltv_id="DrFit.bg" site_id="ba/tvprogram#dr-fit">Dr. Fit Channel</channel>
     <channel lang="hr" xmltv_id="DTXEastEurope.us" site_id="ba/tvprogram#discovery-turbo-extra">DTX</channel>
diff --git a/sites/tvprofil.com/tvprofil.com_bg.channels.xml b/sites/tvprofil.com/tvprofil.com_bg.channels.xml
index bc33c79a..341a4fc9 100644
--- a/sites/tvprofil.com/tvprofil.com_bg.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com_bg.channels.xml
@@ -72,7 +72,6 @@
     <channel lang="bg" xmltv_id="NationalGeographicWildBulgaria.bg" site_id="bg/tv-programa#nat-geo-wild-bg">National Geographic Wild Bulgaria</channel>
     <channel lang="bg" xmltv_id="NicktoonsHungary.hu" site_id="bg/tv-programa#nicktoons-hu">Nicktoons Hungary</channel>
     <channel lang="bg" xmltv_id="PassionXXX.nl" site_id="bg/tv-programa#passion-xxx">Passion XXX</channel>
-    <channel lang="bg" xmltv_id="RingTV.sk" site_id="bg/tv-programa#ring-tv">Ring TV</channel>
     <channel lang="bg" xmltv_id="XXL.fr" site_id="bg/tv-programa#xxl">XXL</channel>
   </channels>
 </site>
\ No newline at end of file
diff --git a/sites/tvprofil.com/tvprofil.com_hu.channels.xml b/sites/tvprofil.com/tvprofil.com_hu.channels.xml
index 7b96c077..a6786e5f 100644
--- a/sites/tvprofil.com/tvprofil.com_hu.channels.xml
+++ b/sites/tvprofil.com/tvprofil.com_hu.channels.xml
@@ -52,8 +52,8 @@
     <channel lang="hr" xmltv_id="SpektrumHome.hu" site_id="hu/tvmusor#spektrum-home-hu">Spektrum Home</channel>
     <channel lang="hr" xmltv_id="SpilerTV1.hu" site_id="hu/tvmusor#spiler-tv">Spíler TV 1</channel>
     <channel lang="hr" xmltv_id="SpilerTV2.hu" site_id="hu/tvmusor#spiler2-tv">Spíler TV 2</channel>
-    <channel lang="hr" xmltv_id="Sport1Hungary.hu" site_id="hu/tvmusor#sport-1-hu">Sport 1 Hungary</channel>
-    <channel lang="hr" xmltv_id="Sport2Hungary.hu" site_id="hu/tvmusor#sport-2-hu">Sport 2 Hungary</channel>
+    <channel lang="hr" xmltv_id="Sport1.hu" site_id="hu/tvmusor#sport-1-hu">Sport 1 Hungary</channel>
+    <channel lang="hr" xmltv_id="Sport2.hu" site_id="hu/tvmusor#sport-2-hu">Sport 2 Hungary</channel>
     <channel lang="hr" xmltv_id="Story4.hu" site_id="hu/tvmusor#story4">Story 4</channel>
     <channel lang="hr" xmltv_id="SuperTV2.hu" site_id="hu/tvmusor#super-tv2">Super TV 2</channel>
     <channel lang="hr" xmltv_id="TheFishingHuntingChannel.hu" site_id="hu/tvmusor#fishing-hunting">The Fishing &amp; Hunting Channel</channel>
diff --git a/sites/vivacom.bg/vivacom.bg_bg.channels.xml b/sites/vivacom.bg/vivacom.bg_bg.channels.xml
index 6d7d849a..2dcf7c11 100644
--- a/sites/vivacom.bg/vivacom.bg_bg.channels.xml
+++ b/sites/vivacom.bg/vivacom.bg_bg.channels.xml
@@ -56,7 +56,7 @@
     <channel lang="en" xmltv_id="DMSat.rs" site_id="12#DM Sat">DM Sat</channel>
     <channel lang="bg" xmltv_id="DocuBoxHD.nl" site_id="16#DocuBox HD">DocuBox HD</channel>
     <channel lang="bg" xmltv_id="DorcelTV.nl" site_id="21#Dorcel HD">Dorcel TV</channel>
-    <channel lang="bg" xmltv_id="DuckTVSD.sk" site_id="8#Duck TV">Duck TV</channel>
+    <channel lang="bg" xmltv_id="DuckTV.sk" site_id="8#Duck TV">Duck TV</channel>
     <channel lang="en" xmltv_id="DWEnglish.de" site_id="21#Deutsche Welle">DW</channel>
     <channel lang="bg" xmltv_id="EKids.bg" site_id="8#E Kids">EKids</channel>
     <channel lang="en" xmltv_id="EnglishClubTV.uk" site_id="9#English Club TV">English Club TV</channel>