diff --git a/sites/programtv.onet.pl.channels.xml b/sites/programtv.onet.pl.channels.xml
index 9dd30a5f..6f13427a 100755
--- a/sites/programtv.onet.pl.channels.xml
+++ b/sites/programtv.onet.pl.channels.xml
@@ -61,29 +61,28 @@
     <channel site_id="boomerang-hd-616" xmltv_id="BoomerangHDPolska.us">Boomerang HD Polska</channel>
     <channel site_id="br-255" xmltv_id="BR.de">BR</channel>
     <channel site_id="brazzers-tv-europe-279" xmltv_id="BrazzersTVEurope.us">Brazzers TV Europe</channel>
-    <channel site_id="canal-246" xmltv_id="CANALPlusPolska.pl">CANAL+ Polska</channel>
-    <channel site_id="canal-1-295" xmltv_id="CANALPlus1.pl">CANAL+ 1</channel>
-    <channel site_id="canal-1-hd-299" xmltv_id="CANALPlus1HD.pl">CANAL+ 1 HD</channel>
-    <channel site_id="canal-4k-ultra-hd-638" xmltv_id="CANALPlus4KUltraHD.pl">CANAL+ 4K Ultra HD</channel>
-    <channel site_id="canal-discovery-307" xmltv_id="CANALPlusDokumenty.pl">CANAL+ Dokumenty</channel>
-    <channel site_id="canal-discovery-hd-308" xmltv_id="CANALPlusDokumentyHD.pl">CANAL+ Dokumenty HD</channel>
-    <channel site_id="canal-family-296" xmltv_id="CANALPlusFamily.pl">CANAL+ Family</channel>
-    <channel site_id="canal-family-hd-297" xmltv_id="CANALPlusFamilyHD.pl">CANAL+ Family HD</channel>
-    <channel site_id="canal-film-320" xmltv_id="CANALPlusFilm.pl">CANAL+ Film</channel>
-    <channel site_id="canal-film-hd-278" xmltv_id="CANALPlusFilmHD.pl">CANAL+ Film HD</channel>
-    <channel site_id="canal-hd-288" xmltv_id="CANALPlusHDPolska.pl">CANAL+ HD Polska</channel>
-    <channel site_id="canal-seriale-293" xmltv_id="CANALPlusSeriale.pl">CANAL+ Seriale</channel>
-    <channel site_id="canal-seriale-hd-298" xmltv_id="CANALPlusSerialeHD.pl">CANAL+ Seriale HD</channel>
-    <channel site_id="canal-sport-14" xmltv_id="CANALPlusSportPolska.pl">CANAL+ Sport Polska</channel>
-    <channel site_id="canal-sport-2-15" xmltv_id="CANALPlusSport2Polska.pl">CANAL+ Sport 2 Polska</channel>
-    <channel site_id="canal-sport-2-hd-13" xmltv_id="CANALPlusSport2HDPolska.pl">CANAL+ Sport 2 HD Polska</channel>
-    <channel site_id="canal-sport-3-674" xmltv_id="CANALPlusSport3Polska.pl">CANAL+ Sport 3 Polska</channel>
-    <channel site_id="canal-sport-3-hd-676" xmltv_id="CANALPlusSport3HDPolska.pl">CANAL+ Sport 3 HD Polska</channel>
-    <channel site_id="canal-sport-4-675" xmltv_id="CANALPlusSport4Polska.pl">CANAL+ Sport 4 Polska</channel>
-    <channel site_id="canal-sport-4-hd-677" xmltv_id="CANALPlusSport4HDPolska.pl">CANAL+ Sport 4 HD Polska</channel>
-    <channel site_id="canal-sport-hd-12" xmltv_id="CANALPlusSportHDPolska.pl">CANAL+ Sport HD Polska</channel>
+    <channel site_id="canal-246" xmltv_id="CanalPlusPolska.pl">CANAL+ Polska</channel>
+    <channel site_id="canal-1-295" xmltv_id="CanalPlus1.pl">CANAL+ 1</channel>
+    <channel site_id="canal-1-hd-299" xmltv_id="CanalPlus1HD.pl">CANAL+ 1 HD</channel>
+    <channel site_id="canal-4k-ultra-hd-638" xmltv_id="CanalPlus4KUltraHD.pl">CANAL+ 4K Ultra HD</channel>
+    <channel site_id="canal-discovery-307" xmltv_id="CanalPlusDokumenty.pl">CANAL+ Dokumenty</channel>
+    <channel site_id="canal-discovery-hd-308" xmltv_id="CanalPlusDokumentyHD.pl">CANAL+ Dokumenty HD</channel>
+    <channel site_id="canal-family-296" xmltv_id="CanalPlusFamily.pl">CANAL+ Family</channel>
+    <channel site_id="canal-family-hd-297" xmltv_id="CanalPlusFamilyHD.pl">CANAL+ Family HD</channel>
+    <channel site_id="canal-film-320" xmltv_id="CanalPlusFilm.pl">CANAL+ Film</channel>
+    <channel site_id="canal-film-hd-278" xmltv_id="CanalPlusFilmHD.pl">CANAL+ Film HD</channel>
+    <channel site_id="canal-hd-288" xmltv_id="CanalPlusHDPolska.pl">CANAL+ HD Polska</channel>
+    <channel site_id="canal-seriale-293" xmltv_id="CanalPlusSeriale.pl">CANAL+ Seriale</channel>
+    <channel site_id="canal-seriale-hd-298" xmltv_id="CanalPlusSerialeHD.pl">CANAL+ Seriale HD</channel>
+    <channel site_id="canal-sport-14" xmltv_id="CanalPlusSportPolska.pl">CANAL+ Sport Polska</channel>
+    <channel site_id="canal-sport-2-15" xmltv_id="CanalPlusSport2Polska.pl">CANAL+ Sport 2 Polska</channel>
+    <channel site_id="canal-sport-2-hd-13" xmltv_id="CanalPlusSport2HDPolska.pl">CANAL+ Sport 2 HD Polska</channel>
+    <channel site_id="canal-sport-3-674" xmltv_id="CanalPlusSport3Polska.pl">CANAL+ Sport 3 Polska</channel>
+    <channel site_id="canal-sport-3-hd-676" xmltv_id="CanalPlusSport3HDPolska.pl">CANAL+ Sport 3 HD Polska</channel>
+    <channel site_id="canal-sport-4-675" xmltv_id="CanalPlusSport4Polska.pl">CANAL+ Sport 4 Polska</channel>
+    <channel site_id="canal-sport-4-hd-677" xmltv_id="CanalPlusSport4HDPolska.pl">CANAL+ Sport 4 HD Polska</channel>
+    <channel site_id="canal-sport-hd-12" xmltv_id="CanalPlusSportHDPolska.pl">CANAL+ Sport HD Polska</channel>
     <channel site_id="cartoon-network-273" xmltv_id="CartoonNetworkPolska.us">Cartoon Network Polska</channel>
-    <channel site_id="cartoon-network-tnt-313" xmltv_id="CartoonNetworkTNTPolska.us">Cartoon Network/TNT Polska</channel>
     <channel site_id="cartoon-network-hd-310" xmltv_id="CartoonNetworkHDPolska.us">Cartoon Network HD Polska</channel>
     <channel site_id="cbs-europa-317" xmltv_id="CBSEuropa.us">CBS Europa</channel>
     <channel site_id="cbs-europa-hd-309" xmltv_id="CBSHDEuropa.us">CBS HD Europa</channel>
@@ -94,8 +93,8 @@
     <channel site_id="cinemax2-58" xmltv_id="Cinemax2CentralEurope.us">Cinemax 2 Central Europe</channel>
     <channel site_id="cinemax2-hd-56" xmltv_id="Cinemax2HDCentralEurope.us">Cinemax 2 HD Central Europe</channel>
     <channel site_id="cinemax-hd-57" xmltv_id="CinemaxHDCentralEurope.us">Cinemax HD Central Europe</channel>
-    <channel site_id="ci-polsat-257" xmltv_id="CrimePlusInvestigationPolsat.us">Crime+Investigation Polsat</channel>
-    <channel site_id="ci-polsat-hd-640" xmltv_id="CrimePlusInvestigationPolsatHD.us">Crime+Investigation Polsat HD</channel>
+    <channel site_id="ci-polsat-257" xmltv_id="CrimeInvestigationPolsat.us">Crime &amp; Investigation Polsat</channel>
+    <channel site_id="ci-polsat-hd-640" xmltv_id="CrimeInvestigationPolsatHD.us">Crime &amp; Investigation Polsat HD</channel>
     <channel site_id="cnbc-247" xmltv_id="CNBCEurope.us">CNBC Europe</channel>
     <channel site_id="cnn-258" xmltv_id="CNNInternationalEurope.us">CNN International Europe</channel>
     <channel site_id="comedy-central-63" xmltv_id="ComedyCentralPolska.us">Comedy Central Polska</channel>
@@ -141,8 +140,8 @@
     <channel site_id="discovery-turbo-xtra-hd-189" xmltv_id="DTXHDPolska.us">DTX HD Polska</channel>
     <channel site_id="dw-364" xmltv_id="DWDeutsch.de">DW Deutsch</channel>
     <channel site_id="dlaciebie-tv-442" xmltv_id="dlaCiebietv.pl">dlaCiebie.tv</channel>
-    <channel site_id="ducktv-94" xmltv_id="ducktv.sk">ducktv</channel>
-    <channel site_id="ducktv-hd-151" xmltv_id="ducktvHD.sk">ducktv HD</channel>
+    <channel site_id="ducktv-94" xmltv_id="DuckTV.sk">Duck TV</channel>
+    <channel site_id="ducktv-hd-151" xmltv_id="DuckTVHD.sk">Duck TV HD</channel>
     <channel site_id="einslive-427" xmltv_id="1LIVE.de">1LIVE</channel>
     <channel site_id="eleven-208" xmltv_id="ElevenSports1Polska.uk">Eleven Sports 1 Polska</channel>
     <channel site_id="eleven-sports-1-4k-667" xmltv_id="ElevenSports1Polska4K.uk">Eleven Sports 1 Polska 4K</channel>
@@ -181,8 +180,8 @@
     <channel site_id="e-entertainment-73" xmltv_id="EEurope.us">E! Europe</channel>
     <channel site_id="e-entertainment-hd-169" xmltv_id="EHDEurope.us">E! HD Europe</channel>
     <channel site_id="fashionbox-hd-171" xmltv_id="FashionBoxHD.us">FashionBox HD</channel>
-    <channel site_id="fashion-tv-233" xmltv_id="FashionTVEurope.fr">Fashion TV Europe</channel>
-    <channel site_id="fashion-tv-hd-125" xmltv_id="FashionTVHDEurope.fr">Fashion TV HD Europe</channel>
+    <channel site_id="fashion-tv-233" xmltv_id="FashionTVEurope.fr">FashionTV Europe</channel>
+    <channel site_id="fashion-tv-hd-125" xmltv_id="FashionTVHDEurope.fr">FashionTV HD Europe</channel>
     <channel site_id="fast-funbox-hd-104" xmltv_id="FastFunBoxHD.us">Fast&amp;Fun Box HD</channel>
     <channel site_id="fightbox-436" xmltv_id="FightBox.us">FightBox</channel>
     <channel site_id="fightbox-hd-453" xmltv_id="FightBoxHD.us">FightBox HD</channel>
@@ -199,7 +198,7 @@
     <channel site_id="folx-tv-206" xmltv_id="FolxTV.de">Folx TV</channel>
     <channel site_id="polsat-food-157" xmltv_id="FoodNetworkPolska.us">Food Network Polska</channel>
     <channel site_id="polsat-food-network-hd-209" xmltv_id="FoodNetworkHDPolska.us">Food Network HD Polska</channel>
-    <channel site_id="food-network-hd-240" xmltv_id="FoodNetworkHD.us">Food Network HD</channel>
+    <channel site_id="food-network-hd-240" xmltv_id="FoodNetworkHDEMEA.us">Food Network HD EMEA</channel>
     <channel site_id="fox-127" xmltv_id="FoxPolska.us">Fox Polska</channel>
     <channel site_id="fox-comedy-75" xmltv_id="FoxComedyPolska.us">Fox Comedy Polska</channel>
     <channel site_id="fox-comedy-hd-405" xmltv_id="FoxComedyHDPolska.us">Fox Comedy HD Polska</channel>
@@ -284,7 +283,7 @@
     <channel site_id="music-box-hd-539" xmltv_id="MusicBoxHDUkraina.ua">Music Box HD Ukraina</channel>
     <channel site_id="m-6-215" xmltv_id="M6.fr">M6</channel>
     <channel site_id="muenchen-tv-486" xmltv_id="munchentv.de">münchen.tv</channel>
-    <channel site_id="myzen-tv-hd-396" xmltv_id="MyZenTVHD.fr">MyZen TV HD</channel>
+    <channel site_id="myzen-tv-hd-396" xmltv_id="myZenTVHD.fr">myZen TV HD</channel>
     <channel site_id="national-geographic-channel-32" xmltv_id="NationalGeographicPolska.us">National Geographic Polska</channel>
     <channel site_id="national-geographic-channel-hd-34" xmltv_id="NationalGeographicHDPolska.us">National Geographic HD Polska</channel>
     <channel site_id="nat-geo-wild-77" xmltv_id="NatGeoWildPolska.us">Nat Geo Wild Polska</channel>
@@ -407,7 +406,7 @@
     <channel site_id="russia-today-115" xmltv_id="RT.ru">RT</channel>
     <channel site_id="russia-today-hd-164" xmltv_id="RTHD.ru">RT HD</channel>
     <channel site_id="rheinmaintv-468" xmltv_id="RheinMainTV.de">Rhein-Main TV</channel>
-    <channel site_id="sat-1-404" xmltv_id="SAT1Deutschland.de">SAT.1 Deutschland</channel>
+    <channel site_id="sat-1-404" xmltv_id="Sat1Deutschland.de">Sat.1 Deutschland</channel>
     <channel site_id="sbn-630" xmltv_id="SBNInternational.us">SBN International</channel>
     <channel site_id="scifi-universal-20" xmltv_id="SciFiPolska.us">Sci Fi Polska</channel>
     <channel site_id="sci-fi-hd-628" xmltv_id="SciFiHDPolska.us">Sci Fi HD Polska</channel>
@@ -432,8 +431,8 @@
     <channel site_id="spreekanal-502" xmltv_id="Spreekanal.de">Spreekanal</channel>
     <channel site_id="srf-1-406" xmltv_id="SRF1.ch">SRF 1</channel>
     <channel site_id="srf-zwei-407" xmltv_id="SRFZwei.ch">SRF Zwei</channel>
-    <channel site_id="stars-tv-149" xmltv_id="StarsTV.pl">Stars.TV</channel>
-    <channel site_id="stars-tv-hd-122" xmltv_id="StarsTVHD.pl">Stars.TV HD</channel>
+    <channel site_id="stars-tv-149" xmltv_id="StarsTV.pl">Stars TV</channel>
+    <channel site_id="stars-tv-hd-122" xmltv_id="StarsTVHD.pl">Stars TV HD</channel>
     <channel site_id="classica-259" xmltv_id="StingrayClassica.ca">Stingray Classica</channel>
     <channel site_id="classica-hd-281" xmltv_id="StingrayClassicaHD.ca">Stingray Classica HD</channel>
     <channel site_id="c-music-tv-260" xmltv_id="StingrayCMusic.ca">Stingray CMusic</channel>
@@ -547,7 +546,7 @@
     <channel site_id="tv-puls-hd-197" xmltv_id="TVPulsHD.pl">TV Puls HD</channel>
     <channel site_id="tv-regio-679" xmltv_id="TVRegio.pl">TV Regio</channel>
     <channel site_id="tv-regionalna-lubin-166" xmltv_id="TVRegionalnaLubin.pl">TV Regionalna Lubin</channel>
-    <channel site_id="tv-relax-496" xmltv_id="TelevizeRELAX.cz">Televize RELAX</channel>
+    <channel site_id="tv-relax-496" xmltv_id="Relax.cz">Relax</channel>
     <channel site_id="tv-republika-18" xmltv_id="TVRepublika.pl">TV Republika</channel>
     <channel site_id="tv-republika-hd-16" xmltv_id="TVRepublikaHD.pl">TV Republika HD</channel>
     <channel site_id="tv-trwam-108" xmltv_id="TVTrwam.pl">TV Trwam</channel>