diff --git a/sites/programtv.onet.pl.channels.xml b/sites/programtv.onet.pl.channels.xml
index 190e047c..270e4e3f 100755
--- a/sites/programtv.onet.pl.channels.xml
+++ b/sites/programtv.onet.pl.channels.xml
@@ -1,234 +1,211 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site site="programtv.onet.pl">
   <channels>
-    <channel site_id="13th-street-250" xmltv_id="13thStreetDeutschland.us">13th Street Deutschland</channel>
-    <channel site_id="13-tv-312" xmltv_id="Telewizja13.pl">Telewizja 13</channel>
     <channel site_id="13-ulica-316" xmltv_id="13Ulica.us">13 Ulica</channel>
-    <channel site_id="2x2-604" xmltv_id="2x2.pl">2x2</channel>
+    <channel site_id="13th-street-250" xmltv_id="13thStreetDeutschland.us">13th Street Deutschland</channel>
     <channel site_id="360tunebox-302" xmltv_id="360TuneBox.us">360 Tune Box</channel>
     <channel site_id="3sat-248" xmltv_id="3sat.de">3sat</channel>
-    <channel site_id="4fun-tv-269" xmltv_id="4FunTV.pl">4Fun.TV</channel>
-    <channel site_id="4fun-fit-dance-244" xmltv_id="4FunDance.pl">4Fun Dance</channel>
-    <channel site_id="4fun-hits-283" xmltv_id="4FunGold.pl">4Fun Gold</channel>
+    <channel site_id="4fun-fit-dance-244" xmltv_id="4FunDance.pl">4 Fun Dance</channel>
+    <channel site_id="4fun-tv-269" xmltv_id="4FunTV.pl">4 Fun TV</channel>
     <channel site_id="active-family-300" xmltv_id="ActiveFamily.pl">Active Family</channel>
     <channel site_id="adult-channel-265" xmltv_id="AdultChannel.uk">Adult Channel</channel>
     <channel site_id="adventure-303" xmltv_id="Adventure.pl">Adventure</channel>
-    <channel site_id="ale-kino-319" xmltv_id="AleKinoPlus.pl">Ale Kino+</channel>
-    <channel site_id="al-jazeera-hd-609" xmltv_id="AlJazeeraEnglish.qa">Al Jazeera English</channel>
-    <channel site_id="amazing-tv-508" xmltv_id="AmazingTV.pl">Amazing TV</channel>
+    <channel site_id="ale-kino-319" xmltv_id="AleKinoPlus.pl">Ale Kino +</channel>
+    <channel site_id="al-jazeera-hd-609" xmltv_id="AljazeeraEnglish.qa">Aljazeera English</channel>
     <channel site_id="mgm-333" xmltv_id="AMCPolska.us">AMC Polska</channel>
     <channel site_id="animal-planet-hd-284" xmltv_id="AnimalPlanetPolska.us">Animal Planet Polska</channel>
-    <channel site_id="animal-planet-niem-264" xmltv_id="AnimalPlanetEurope.us">Animal Planet Europe</channel>
-    <channel site_id="ard-alpha-252" xmltv_id="ARDalpha.de">ARD-alpha</channel>
-    <channel site_id="arirang-tv-30" xmltv_id="ArirangTV.kr">Arirang TV</channel>
+    <channel site_id="ard-alpha-252" xmltv_id="ARDAlpha.de">ARD Alpha</channel>
+    <channel site_id="arirang-tv-30" xmltv_id="ArirangWorld.kr">Arirang World</channel>
     <channel site_id="arte-253" xmltv_id="ARTEDeutsch.fr">ARTE Deutsch</channel>
     <channel site_id="atv-251" xmltv_id="ATV.at">ATV</channel>
     <channel site_id="ab-moteurs-242" xmltv_id="Automotolachaine.fr">Automoto la chaîne</channel>
-    <channel site_id="axn-249" xmltv_id="AXNPolska.us">AXN Polska</channel>
     <channel site_id="axn-black-271" xmltv_id="AXNBlackPolska.us">AXN Black Polska</channel>
+    <channel site_id="axn-249" xmltv_id="AXNPolska.us">AXN Polska</channel>
     <channel site_id="axn-spin-294" xmltv_id="AXNSpinPolska.us">AXN Spin Polska</channel>
     <channel site_id="axn-white-272" xmltv_id="AXNWhitePolska.us">AXN White Polska</channel>
+    <channel site_id="baby-tv-285" xmltv_id="BabyTVEurope.uk">Baby TV Europe</channel>
     <channel site_id="babyfirsttv-282" xmltv_id="BabyFirstTV.us">BabyFirst TV</channel>
-    <channel site_id="baby-tv-285" xmltv_id="BabyTVEurope.uk">BabyTV Europe</channel>
     <channel site_id="bbc-brit-275" xmltv_id="BBCBritPolska.uk">BBC Brit Polska</channel>
-    <channel site_id="bbc-cbeebies-2" xmltv_id="CBeebiesPolska.uk">CBeebies Polska</channel>
     <channel site_id="bbc-earth-274" xmltv_id="BBCEarthPolska.uk">BBC Earth Polska</channel>
     <channel site_id="bbc-hd-261" xmltv_id="BBCFirstPolska.uk">BBC First Polska</channel>
     <channel site_id="bbc-lifestyle-277" xmltv_id="BBCLifestylePolska.uk">BBC Lifestyle Polska</channel>
     <channel site_id="bbc-world-news-254" xmltv_id="BBCWorldNewsEurope.uk">BBC World News Europe</channel>
-    <channel site_id="beate-uhse-tv-256" xmltv_id="BeateUhseTV.de">Beate-Uhse.TV</channel>
-    <channel site_id="belarus-24-678" xmltv_id="Belarus24.by">Беларусь 24</channel>
-    <channel site_id="belgia-tv1-268" xmltv_id="Een.be">Eén</channel>
-    <channel site_id="belsat-tv-289" xmltv_id="BelsatTV.pl">Белсат TV</channel>
+    <channel site_id="beate-uhse-tv-256" xmltv_id="BeateUhseTV.de">Beate Uhse TV</channel>
+    <channel site_id="belarus-24-678" xmltv_id="Belarus24.by">Belarus 24</channel>
+    <channel site_id="belsat-tv-289" xmltv_id="BelsatTV.pl">Belsat TV</channel>
     <channel site_id="bibel-tv-266" xmltv_id="BibelTV.de">Bibel TV</channel>
-    <channel site_id="bloomberg-ang-245" xmltv_id="BloombergTVUK.us">Bloomberg TV UK</channel>
+    <channel site_id="bloomberg-ang-245" xmltv_id="BloombergTVEurope.us">Bloomberg TV Europe</channel>
     <channel site_id="blue-hustler-280" xmltv_id="BlueHustlerEurope.us">Blue Hustler Europe</channel>
     <channel site_id="bollywood-hd-530" xmltv_id="BollywoodHD.ru">Bollywood HD</channel>
     <channel site_id="boomerang-270" xmltv_id="BoomerangPolska.us">Boomerang 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-4k-ultra-hd-638" xmltv_id="CanalPlus4KUltraHD.pl">Canal+ 4K Ultra HD</channel>
-    <channel site_id="canal-discovery-307" xmltv_id="CanalPlusDokument.pl">Canal+ Dokument</channel>
-    <channel site_id="canal-family-296" xmltv_id="CanalPlusFamily.pl">Canal+ Family</channel>
-    <channel site_id="canal-film-320" xmltv_id="CanalPlusFilm.pl">Canal+ Film</channel>
-    <channel site_id="canal-seriale-293" xmltv_id="CanalPlusSeriale.pl">Canal+ Seriale</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-3-674" xmltv_id="CanalPlusSport3Polska.pl">Canal+ Sport 3 Polska</channel>
-    <channel site_id="canal-sport-4-675" xmltv_id="CanalPlusSport4Polska.pl">Canal+ Sport 4 Polska</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="CanalPlusDokument.pl">Canal + Dokument</channel>
+    <channel site_id="domo-106" xmltv_id="CanalPlusDomo.pl">Canal + Domo</channel>
+    <channel site_id="canal-family-296" xmltv_id="CanalPlusFamilyPolska.pl">Canal + Family Polska</channel>
+    <channel site_id="canal-film-320" xmltv_id="CanalPlusFilm.pl">Canal + Film</channel>
+    <channel site_id="kuchnia-489" xmltv_id="CanalPlusKuchnia.pl">Canal + Kuchnia</channel>
+    <channel site_id="canal-246" xmltv_id="CanalPlusPremium.pl">Canal + Premium</channel>
+    <channel site_id="canal-seriale-293" xmltv_id="CanalPlusSeriale.pl">Canal + Seriale</channel>
+    <channel site_id="canal-sport-2-15" xmltv_id="CanalPlusSport2Polska.pl">Canal + Sport 2 Polska</channel>
+    <channel site_id="canal-sport-3-674" xmltv_id="CanalPlusSport3Polska.pl">Canal + Sport 3 Polska</channel>
+    <channel site_id="canal-sport-4-675" xmltv_id="CanalPlusSport4Polska.pl">Canal + Sport 4 Polska</channel>
+    <channel site_id="canal-sport-14" xmltv_id="CanalPlusSportPolska.pl">Canal + Sport Polska</channel>
+    <channel site_id="canal-1-295" xmltv_id="CanalPlus1.pl">Canal + »1</channel>
     <channel site_id="cartoon-network-273" xmltv_id="CartoonNetworkPolska.us">Cartoon Network Polska</channel>
+    <channel site_id="bbc-cbeebies-2" xmltv_id="CBeebiesPolska.uk">CBeebies Polska</channel>
     <channel site_id="cbs-europa-317" xmltv_id="CBSEuropa.us">CBS Europa</channel>
     <channel site_id="cbs-reality-318" xmltv_id="CBSRealityPolska.us">CBS Reality Polska</channel>
     <channel site_id="cctv-news-291" xmltv_id="CGTN.cn">CGTN</channel>
-    <channel site_id="channel-one-russia-276" xmltv_id="Pervyykanal.ru">Первый канал</channel>
-    <channel site_id="cinemax-59" xmltv_id="CinemaxCentralEurope.us">Cinemax Central Europe</channel>
     <channel site_id="cinemax2-58" xmltv_id="Cinemax2CentralEurope.us">Cinemax 2 Central Europe</channel>
-    <channel site_id="ci-polsat-257" xmltv_id="CrimePlusInvestigationPolsat.us">Crime + Investigation Polsat</channel>
+    <channel site_id="cinemax-59" xmltv_id="CinemaxCentralEurope.us">Cinemax Central Europe</channel>
+    <channel site_id="mtv-dance-481" xmltv_id="ClubMTV.us">Club MTV</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>
-    <channel site_id="comedy-central-family-61" xmltv_id="ComedyCentralFamilyPolska.us">Comedy Central Family Polska</channel>
-    <channel site_id="ct-1-241" xmltv_id="CT1.cz">ČT1</channel>
-    <channel site_id="ct-2-243" xmltv_id="CT2.cz">ČT2</channel>
-    <channel site_id="czworka-polskie-radio-133" xmltv_id="Czworka.pl">Czwórka</channel>
-    <channel site_id="dami-skarzysko-kamienna-174" xmltv_id="TVDamiSkarzysko.pl">TV Dami Skarżysko</channel>
-    <channel site_id="das-erste-350" xmltv_id="DasErste.de">Das Erste</channel>
+    <channel site_id="ci-polsat-257" xmltv_id="CrimePlusInvestigationPolsat.us">Crime + Investigation Polsat</channel>
+    <channel site_id="ct-1-241" xmltv_id="CT1.cz">CT 1</channel>
+    <channel site_id="ct-2-243" xmltv_id="CT2.cz">CT 2</channel>
     <channel site_id="da-vinci-learning-83" xmltv_id="DaVinciPolska.de">Da Vinci Polska</channel>
+    <channel site_id="das-erste-350" xmltv_id="DasErste.de">Das Erste</channel>
     <channel site_id="deutsches-musik-fernsehen-119" xmltv_id="DeutschesMusikFernsehen.de">Deutsches Musik Fernsehen</channel>
-    <channel site_id="discovery-channel-202" xmltv_id="DiscoveryChannelPolska.us">Discovery Channel Polska</channel>
+    <channel site_id="disco-polo-music-191" xmltv_id="DiscoPoloMusic.pl">Disco Polo Music</channel>
     <channel site_id="discovery-channel-niem-358" xmltv_id="DiscoveryChannelDeutschland.us">Discovery Channel Deutschland</channel>
+    <channel site_id="discovery-channel-202" xmltv_id="DiscoveryChannelPolska.us">Discovery Channel Polska</channel>
     <channel site_id="discovery-historia-54" xmltv_id="DiscoveryHistoria.us">Discovery Historia</channel>
     <channel site_id="discovery-life-187" xmltv_id="DiscoveryLifePolska.us">Discovery Life Polska</channel>
     <channel site_id="discovery-science-53" xmltv_id="DiscoverySciencePolska.us">Discovery Science Polska</channel>
-    <channel site_id="disco-polo-music-191" xmltv_id="DiscoPoloMusic.pl">Disco Polo Music</channel>
     <channel site_id="disney-channel-478" xmltv_id="DisneyChannelPolska.us">Disney Channel Polska</channel>
-    <channel site_id="disney-junior-469" xmltv_id="DisneyJuniorPolska.us">Disney Junior Polska</channel>
+    <channel site_id="disney-junior-469" xmltv_id="DisneyJuniorTurkiyePolska.us">Disney Junior Türkiye &amp; Polska</channel>
     <channel site_id="disney-xd-235" xmltv_id="DisneyXDPolska.us">Disney XD Polska</channel>
     <channel site_id="dmax-428" xmltv_id="DMAXDeutschland.us">DMAX Deutschland</channel>
     <channel site_id="docubox-hd-175" xmltv_id="DocuBoxHD.us">DocuBox HD</channel>
-    <channel site_id="domo-106" xmltv_id="DomoPlus.pl">Domo+</channel>
     <channel site_id="dorcel-tv-507" xmltv_id="DorcelTV.nl">Dorcel TV</channel>
     <channel site_id="dorcel-xxx-506" xmltv_id="DorcelXXX.nl">Dorcel XXX</channel>
-    <channel site_id="dr-1-359" xmltv_id="DR1.dk">DR1</channel>
-    <channel site_id="dr-2-361" xmltv_id="DR2.dk">DR2</channel>
+    <channel site_id="dr-1-359" xmltv_id="DR1.dk">DR 1</channel>
+    <channel site_id="dr-2-361" xmltv_id="DR2.dk">DR 2</channel>
     <channel site_id="discovery-turbo-xtra-239" xmltv_id="DTXPolska.us">DTX 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="DuckTVSD.sk">Duck TV SD</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="ducktv-94" xmltv_id="DuckTVSD.sk">Duck TV SD</channel>
+    <channel site_id="dw-364" xmltv_id="DWDeutsch.de">DW Deutsch</channel>
+    <channel site_id="e-entertainment-73" xmltv_id="EEurope.us">E! Europe</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>
     <channel site_id="eleven-sports-212" xmltv_id="ElevenSports2Polska.uk">Eleven Sports 2 Polska</channel>
     <channel site_id="eleven-extra-531" xmltv_id="ElevenSports3Polska.uk">Eleven Sports 3 Polska</channel>
     <channel site_id="eleven-sports-4-607" xmltv_id="ElevenSports4Polska.uk">Eleven Sports 4 Polska</channel>
     <channel site_id="english-club-tv-148" xmltv_id="EnglishClubTV.uk">English Club TV</channel>
     <channel site_id="epic-drama-610" xmltv_id="EpicDrama.se">Epic Drama</channel>
-    <channel site_id="eroxxx-hd-512" xmltv_id="EroxxxHD.us">Eroxxx HD</channel>
     <channel site_id="erox-hd-520" xmltv_id="EroxHD.us">Erox HD</channel>
+    <channel site_id="eroxxx-hd-512" xmltv_id="EroxxxHD.us">Eroxxx HD</channel>
     <channel site_id="hip-hop-tv-511" xmltv_id="EskaRockTV.pl">Eska Rock TV</channel>
     <channel site_id="eska-tv-114" xmltv_id="EskaTV.pl">Eska TV</channel>
     <channel site_id="eska-tv-extra-597" xmltv_id="EskaTVExtra.pl">Eska TV Extra</channel>
-    <channel site_id="e-sport-555" xmltv_id="ESportTV.pl">E-Sport TV</channel>
     <channel site_id="eurochannel-180" xmltv_id="Eurochannel.us">Eurochannel</channel>
-    <channel site_id="euronews-367" xmltv_id="EuronewsEnglish.fr">Euronews English</channel>
-    <channel site_id="euronews-fr-665" xmltv_id="EuronewsFrancais.fr">Euronews Français</channel>
-    <channel site_id="eurosport-1-93" xmltv_id="Eurosport1Polska.fr">Eurosport 1 Polska</channel>
+    <channel site_id="euronews-367" xmltv_id="EuroNewsEnglish.fr">EuroNews English</channel>
+    <channel site_id="euronews-fr-665" xmltv_id="EuroNewsFrancais.fr">EuroNews Français</channel>
     <channel site_id="eurosport-niem-366" xmltv_id="Eurosport1Germany.fr">Eurosport 1 Germany</channel>
+    <channel site_id="eurosport-1-93" xmltv_id="Eurosport1Polska.fr">Eurosport 1 Polska</channel>
     <channel site_id="eurosport-2-76" xmltv_id="Eurosport2Polska.fr">Eurosport 2 Polska</channel>
     <channel site_id="ewtn-207" xmltv_id="EWTNEurope.us">EWTN Europe</channel>
     <channel site_id="extreme-sports-channel-231" xmltv_id="ExtremeSportsChannelPolska.nl">Extreme Sports Channel Polska</channel>
-    <channel site_id="e-entertainment-73" xmltv_id="EEurope.us">E! 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">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="fast-funbox-hd-104" xmltv_id="FastFunBoxHD.us">Fast &amp; FunBox HD</channel>
+    <channel site_id="fightklub-78" xmltv_id="FightKlub.hu">Fight Klub</channel>
     <channel site_id="fightbox-hd-453" xmltv_id="FightBoxHD.us">FightBox HD</channel>
-    <channel site_id="fightklub-78" xmltv_id="Fightklub.hu">Fightklub</channel>
     <channel site_id="filmbox-action-451" xmltv_id="FilmBoxAction.us">FilmBox Action</channel>
     <channel site_id="filmbox-arthouse-183" xmltv_id="FilmBoxArthouseWorldwide.us">FilmBox Arthouse Worldwide</channel>
     <channel site_id="filmbox-extra-hd-86" xmltv_id="FilmBoxExtraHDPolska.us">FilmBox Extra HD Polska</channel>
     <channel site_id="filmbox-family-103" xmltv_id="FilmBoxFamily.us">FilmBox Family</channel>
     <channel site_id="filmbox-premium-85" xmltv_id="FilmBoxPremiumPolska.us">FilmBox Premium Polska</channel>
     <channel site_id="fokus-tv-46" xmltv_id="FokusTV.pl">Fokus TV</channel>
-    <channel site_id="folx-tv-206" xmltv_id="FolxTV.de">Folx TV</channel>
+    <channel site_id="folx-tv-206" xmltv_id="Folx.de">Folx</channel>
     <channel site_id="polsat-food-157" xmltv_id="FoodNetworkPolska.us">Food Network Polska</channel>
-    <channel site_id="food-network-hd-240" xmltv_id="FoodNetworkEMEA.us">Food Network 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="france-24-491" xmltv_id="France24Francais.fr">France 24 Français</channel>
-    <channel site_id="france-24-en-70" xmltv_id="France24English.fr">France 24 English</channel>
+    <channel site_id="fox-127" xmltv_id="FoxPolska.us">Fox Polska</channel>
     <channel site_id="france-2-pl-329" xmltv_id="France2.fr">France 2</channel>
+    <channel site_id="france-24-en-70" xmltv_id="France24English.fr">France 24 English</channel>
+    <channel site_id="france-24-491" xmltv_id="France24Francais.fr">France 24 Français</channel>
     <channel site_id="franken-fernsehen-370" xmltv_id="FrankenFernsehen.de">Franken Fernsehen</channel>
     <channel site_id="funbox-4k-605" xmltv_id="FunBoxUHD.us">FunBox UHD</channel>
     <channel site_id="gametoon-hd-602" xmltv_id="Gametoon.us">Gametoon</channel>
-    <channel site_id="ginx-tv-503" xmltv_id="GinxeSportsTV.uk">Ginx eSports TV</channel>
+    <channel site_id="ginx-tv-503" xmltv_id="GinxeSportsTVInternational.uk">Ginx eSports TV International</channel>
     <channel site_id="god-tv-683" xmltv_id="GodTVUK.uk">God TV UK</channel>
-    <channel site_id="goldstar-tv-371" xmltv_id="GoldStarTV.de">GoldStar TV</channel>
+    <channel site_id="to-tv-88" xmltv_id="GoldTV.pl">Gold TV</channel>
     <channel site_id="golf-channel-553" xmltv_id="GolfChannelPolska.us">Golf Channel Polska</channel>
     <channel site_id="gotv-452" xmltv_id="GoTV.at">GoTV</channel>
-    <channel site_id="hamburg-1-373" xmltv_id="Hamburg1.de">Hamburg 1</channel>
+    <channel site_id="hbo2-24" xmltv_id="HBO2Polska.us">HBO 2 Polska</channel>
+    <channel site_id="hbo-3-25" xmltv_id="HBO3Polska.us">HBO 3 Polska</channel>
     <channel site_id="hbo-23" xmltv_id="HBOPolska.us">HBO Polska</channel>
-    <channel site_id="hbo2-24" xmltv_id="HBO2Polska.us">HBO2 Polska</channel>
-    <channel site_id="hbo-3-25" xmltv_id="HBO3Polska.us">HBO3 Polska</channel>
     <channel site_id="heimatkanal-372" xmltv_id="Heimatkanal.de">Heimatkanal</channel>
     <channel site_id="tvn-meteo-active-79" xmltv_id="HGTVPolska.us">HGTV Polska</channel>
-    <channel site_id="history-91" xmltv_id="HistoryPolska.us">History Polska</channel>
     <channel site_id="h2-203" xmltv_id="History2Polska.us">History 2 Polska</channel>
     <channel site_id="history-hd-niem-458" xmltv_id="HistoryHDDeutschland.us">History HD Deutschland</channel>
-    <channel site_id="hr-374" xmltv_id="hrfernsehen.de">hr-fernsehen</channel>
-    <channel site_id="hse-24-457" xmltv_id="HSE24.de">HSE24</channel>
+    <channel site_id="history-91" xmltv_id="HistoryPolska.us">History Polska</channel>
+    <channel site_id="tvr-132" xmltv_id="HomeTV.pl">Home TV</channel>
+    <channel site_id="hr-374" xmltv_id="HRFernsehen.de">HR Fernsehen</channel>
     <channel site_id="hustler-hd-138" xmltv_id="HustlerHDEurope.us">Hustler HD Europe</channel>
     <channel site_id="hustler-tv-107" xmltv_id="HustlerTVEurope.us">Hustler TV Europe</channel>
-    <channel site_id="id-117" xmltv_id="InvestigationDiscoveryPolska.us">Investigation Discovery Polska</channel>
     <channel site_id="insight-tv-uhd-682" xmltv_id="InsightUHD.nl">Insight UHD</channel>
     <channel site_id="inspiration-tv-649" xmltv_id="InspirationTV.us">Inspiration TV</channel>
-    <channel site_id="itvs-661" xmltv_id="iTVS.pl">iTVS</channel>
+    <channel site_id="id-117" xmltv_id="InvestigationDiscoveryPolska.us">Investigation Discovery Polska</channel>
+    <channel site_id="polsat-jimjam-89" xmltv_id="JimJamPolsat.uk">JimJam Polsat</channel>
     <channel site_id="junior-niem-375" xmltv_id="Junior.de">Junior</channel>
     <channel site_id="kabel-eins-376" xmltv_id="KabelEinsDeutschland.de">Kabel Eins Deutschland</channel>
-    <channel site_id="ki-ka-377" xmltv_id="KiKA.de">KiKA</channel>
+    <channel site_id="ki-ka-377" xmltv_id="KIKA.de">KIKA</channel>
     <channel site_id="kino-polska-324" xmltv_id="KinoPolska.pl">Kino Polska</channel>
     <channel site_id="kino-polska-muzyka-426" xmltv_id="KinoPolskaMuzyka.pl">Kino Polska Muzyka</channel>
     <channel site_id="filmbox-84" xmltv_id="KinoTV.us">Kino TV</channel>
-    <channel site_id="kuchnia-489" xmltv_id="KuchniaPlus.pl">Kuchnia+</channel>
     <channel site_id="lifetime-50" xmltv_id="LifetimePolska.us">Lifetime Polska</channel>
-    <channel site_id="liubimoe-kino-608" xmltv_id="LyubimoeKino.ru">Любимое Кино</channel>
-    <channel site_id="love-81" xmltv_id="LOVE.pl">LOVE</channel>
-    <channel site_id="lubelska-tv-210" xmltv_id="Lubelskatv.pl">Lubelska.tv</channel>
+    <channel site_id="liubimoe-kino-608" xmltv_id="LubimoeKino.ru">Lubimoe Kino</channel>
+    <channel site_id="m-6-215" xmltv_id="M6.fr">M6</channel>
     <channel site_id="mcm-top-459" xmltv_id="MCMTop.fr">MCM Top</channel>
-    <channel site_id="mdr-381" xmltv_id="MDR.de">MDR</channel>
     <channel site_id="metro-535" xmltv_id="Metro.pl">Metro</channel>
     <channel site_id="mezzo-234" xmltv_id="Mezzo.fr">Mezzo</channel>
     <channel site_id="mezzo-live-hd-398" xmltv_id="MezzoLiveHD.fr">Mezzo Live HD</channel>
-    <channel site_id="minimini-236" xmltv_id="MiniMiniPlus.pl">MiniMini+</channel>
+    <channel site_id="minimini-236" xmltv_id="MiniMiniPlus.pl">MiniMini +</channel>
     <channel site_id="motorvision-341" xmltv_id="MotorvisionTV.de">Motorvision TV</channel>
     <channel site_id="motowizja-178" xmltv_id="Motowizja.pl">Motowizja</channel>
-    <channel site_id="mtv-dance-481" xmltv_id="ClubMTV.us">Club MTV</channel>
-    <channel site_id="mtv-europe-118" xmltv_id="MTVEurope.us">MTV Europe</channel>
+    <channel site_id="vh1-classic-european-345" xmltv_id="MTV80s.us">MTV 80s</channel>
+    <channel site_id="mtv-rocks-344" xmltv_id="MTV90s.us">MTV 90s</channel>
     <channel site_id="mtv-germany-382" xmltv_id="MTVGermany.us">MTV Germany</channel>
     <channel site_id="mtv-hits-476" xmltv_id="MTVHitsEurope.us">MTV Hits Europe</channel>
     <channel site_id="mtv-live-hd-105" xmltv_id="MTVLiveHD.us">MTV Live HD</channel>
-    <channel site_id="viva-polska-10" xmltv_id="MTVMusicPolska.us">MTV Music Polska</channel>
     <channel site_id="mtv-polska-7" xmltv_id="MTVPolska.us">MTV Polska</channel>
-    <channel site_id="mtv-rocks-344" xmltv_id="MTV90s.us">MTV 90s</channel>
-    <channel site_id="music-box-538" xmltv_id="MusicBoxUA.ua">Music Box UA</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="myZenTV.fr">myZen TV</channel>
+    <channel site_id="music-box-538" xmltv_id="MusicBoxUkraina.ua">Music Box Ukraina</channel>
+    <channel site_id="myzen-tv-hd-396" xmltv_id="MyZenTV.fr">MyZen TV</channel>
+    <channel site_id="muenchen-tv-486" xmltv_id="MunchenTV.de">München TV</channel>
+    <channel site_id="nsport-19" xmltv_id="NSportPlus.pl">N Sport +</channel>
+    <channel site_id="n-tv-388" xmltv_id="NTV.de">N-TV</channel>
+    <channel site_id="nat-geo-people-625" xmltv_id="NatGeoPeople.us">Nat Geo People</channel>
     <channel site_id="national-geographic-channel-32" xmltv_id="NationalGeographicPolska.us">National Geographic Polska</channel>
     <channel site_id="nat-geo-wild-77" xmltv_id="NationalGeographicWildPolska.us">National Geographic Wild Polska</channel>
-    <channel site_id="nat-geo-people-625" xmltv_id="NatGeoPeoplePolska.us">Nat Geo People Polska</channel>
     <channel site_id="nautical-channel-116" xmltv_id="NauticalChannel.it">Nautical Channel</channel>
-    <channel site_id="ndr-383" xmltv_id="NDRFernsehen.de">NDR Fernsehen</channel>
     <channel site_id="nhk-world-tv-11" xmltv_id="NHKWorldJapan.jp">NHK World Japan</channel>
+    <channel site_id="nick-jr-45" xmltv_id="NickJrCentralEasternEurope.us">Nick Jr Central &amp; Eastern Europe</channel>
     <channel site_id="nick-488" xmltv_id="NickelodeonDeutschland.us">Nickelodeon Deutschland</channel>
     <channel site_id="nickelodeon-42" xmltv_id="NickelodeonPolska.us">Nickelodeon Polska</channel>
+    <channel site_id="viva-polska-10" xmltv_id="NickMusic.us">NickMusic</channel>
     <channel site_id="nickelodeon-hd-44" xmltv_id="NicktoonsPolska.us">Nicktoons Polska</channel>
-    <channel site_id="nick-jr-45" xmltv_id="NickJrCentralEasternEurope.us">Nick Jr Central &amp; Eastern Europe</channel>
     <channel site_id="rtl-nitro-545" xmltv_id="NitroDeutschland.de">Nitro Deutschland</channel>
-    <channel site_id="nova-331" xmltv_id="Nova.cz">Nova</channel>
     <channel site_id="novela-tv-461" xmltv_id="NovelaTV.pl">Novela TV</channel>
     <channel site_id="nowa-tv-528" xmltv_id="NowaTV.pl">Nowa TV</channel>
     <channel site_id="npo-1-385" xmltv_id="NPO1.nl">NPO 1</channel>
     <channel site_id="npo-2-505" xmltv_id="NPO2.nl">NPO 2</channel>
     <channel site_id="npo-3-387" xmltv_id="NPO3.nl">NPO 3</channel>
-    <channel site_id="ntl-radomsko-184" xmltv_id="NTLRadomsko.pl">NTL Radomsko</channel>
-    <channel site_id="nuta-tv-214" xmltv_id="NutaTV.pl">Nuta.TV</channel>
-    <channel site_id="nsport-19" xmltv_id="nSportPlus.pl">nSport+</channel>
-    <channel site_id="n-tv-388" xmltv_id="ntv.de">n-tv</channel>
+    <channel site_id="nuta-tv-214" xmltv_id="NutaTV.pl">Nuta TV</channel>
     <channel site_id="einsfestival-363" xmltv_id="One.de">One</channel>
-    <channel site_id="ontv-137" xmltv_id="ONTV.pl">ONTV</channel>
     <channel site_id="orf-1-390" xmltv_id="ORF1.at">ORF 1</channel>
     <channel site_id="orf-2-393" xmltv_id="ORF2.at">ORF 2</channel>
     <channel site_id="outdoor-channel-hd-389" xmltv_id="OutdoorChannel.us">Outdoor Channel</channel>
     <channel site_id="paramount-channel-hd-65" xmltv_id="ParamountChannelPolska.us">Paramount Channel Polska</channel>
+    <channel site_id="channel-one-russia-276" xmltv_id="PerviykanalEuropa.ru">Perviy kanal Europa</channel>
     <channel site_id="phoenix-391" xmltv_id="Phoenix.de">Phoenix</channel>
-    <channel site_id="planete-349" xmltv_id="PlanetePlusPolska.fr">Planete+ Polska</channel>
+    <channel site_id="planete-349" xmltv_id="PlanetePlusPolska.fr">Planete + Polska</channel>
     <channel site_id="playboy-tv-482" xmltv_id="PlayboyTVEurope.us">Playboy TV Europe</channel>
-    <channel site_id="polsat-sport-fight-hd-648" xmltv_id="Polonia1.pl">Polonia 1</channel>
     <channel site_id="polo-tv-135" xmltv_id="PoloTV.pl">Polo TV</channel>
+    <channel site_id="polsat-sport-fight-hd-648" xmltv_id="Polonia1.pl">Polonia 1</channel>
     <channel site_id="polsat-38" xmltv_id="Polsat.pl">Polsat</channel>
     <channel site_id="polsat-1-36" xmltv_id="Polsat1.pl">Polsat 1</channel>
     <channel site_id="polsat-2-327" xmltv_id="Polsat2.pl">Polsat 2</channel>
@@ -236,7 +213,6 @@
     <channel site_id="polsat-doku-548" xmltv_id="PolsatDoku.pl">Polsat Doku</channel>
     <channel site_id="polsat-film-123" xmltv_id="PolsatFilm.pl">Polsat Film</channel>
     <channel site_id="polsat-games-653" xmltv_id="PolsatGames.pl">Polsat Games</channel>
-    <channel site_id="polsat-jimjam-89" xmltv_id="PolsatJimJam.pl">Polsat JimJam</channel>
     <channel site_id="polsat-music-564" xmltv_id="PolsatMusic.pl">Polsat Music</channel>
     <channel site_id="polsat-news-100" xmltv_id="PolsatNews.pl">Polsat News</channel>
     <channel site_id="polsat-news-2-471" xmltv_id="PolsatNews2.pl">Polsat News 2</channel>
@@ -253,119 +229,97 @@
     <channel site_id="polsat-sport-premium-4-646" xmltv_id="PolsatSportPremium4.pl">Polsat Sport Premium 4</channel>
     <channel site_id="polsat-sport-premium-5-642" xmltv_id="PolsatSportPremium5.pl">Polsat Sport Premium 5</channel>
     <channel site_id="polsat-sport-premium-6-641" xmltv_id="PolsatSportPremium6.pl">Polsat Sport Premium 6</channel>
-    <channel site_id="polsat-viasat-explore-hd-82" xmltv_id="PolsatViasatExplore.se">Polsat Viasat Explore</channel>
-    <channel site_id="polsat-viasat-history-hd-71" xmltv_id="PolsatViasatHistory.se">Polsat Viasat History</channel>
-    <channel site_id="polsat-viasat-nature-413" xmltv_id="PolsatViasatNature.se">Polsat Viasat Nature</channel>
     <channel site_id="power-tv-176" xmltv_id="PowerTV.pl">Power TV</channel>
     <channel site_id="private-tv-351" xmltv_id="PrivateTV.nl">Private TV</channel>
     <channel site_id="pro-7-395" xmltv_id="ProSiebenDeutschland.de">ProSieben Deutschland</channel>
     <channel site_id="puls-2-439" xmltv_id="Puls2.pl">Puls 2</channel>
     <channel site_id="qvc-397" xmltv_id="QVCDeutschland.us">QVC Deutschland</channel>
-    <channel site_id="q-polska-hd-666" xmltv_id="QPolska.pl">Q Polska</channel>
     <channel site_id="rai-1-338" xmltv_id="Rai1.it">Rai 1</channel>
     <channel site_id="rai-2-336" xmltv_id="Rai2.it">Rai 2</channel>
     <channel site_id="rbb-466" xmltv_id="RBBBerlin.de">RBB Berlin</channel>
     <channel site_id="reality-kings-tv-223" xmltv_id="RealityKingsTV.us">Reality Kings TV</channel>
     <channel site_id="record-tv-64" xmltv_id="RecordTVEuropa.br">Record TV Europa</channel>
+    <channel site_id="etv-473" xmltv_id="RedCarpet.pl">Red Carpet</channel>
     <channel site_id="redlight-hd-498" xmltv_id="RedlightHD.nl">Redlight HD</channel>
-    <channel site_id="etv-473" xmltv_id="RedCarpetTV.pl">Red Carpet TV</channel>
+    <channel site_id="tv-relax-496" xmltv_id="Relax.cz">Relax</channel>
     <channel site_id="rfm-tv-95" xmltv_id="RFMTV.fr">RFM TV</channel>
-    <channel site_id="rnf-487" xmltv_id="RheinNeckarFernsehen.de">Rhein-Neckar Fernsehen</channel>
+    <channel site_id="rheinmaintv-468" xmltv_id="RheinMainTV.de">RheinMain TV</channel>
     <channel site_id="romance-tv-129" xmltv_id="RomanceTVPolska.de">Romance TV Polska</channel>
-    <channel site_id="rossija-24-124" xmltv_id="Rossiya24.ru">Россия 24</channel>
-    <channel site_id="rtl-401" xmltv_id="RTLDeutschland.de">RTL Deutschland</channel>
-    <channel site_id="rtl-2-399" xmltv_id="RTLZweiDeutschland.de">RTL Zwei Deutschland</channel>
-    <channel site_id="rtl-102-5-43" xmltv_id="RTL1025.it">RTL 102.5</channel>
-    <channel site_id="rtl-hd-204" xmltv_id="RTLDeutschland.de">RTL Deutschland</channel>
-    <channel site_id="rtr-planeta-470" xmltv_id="RTRPlaneta.ru">РТР-Планета</channel>
-    <channel site_id="rts-deux-411" xmltv_id="RTSDeux.ch">RTS Deux</channel>
-    <channel site_id="rts-un-410" xmltv_id="RTSUn.ch">RTS Un</channel>
+    <channel site_id="rossija-24-124" xmltv_id="Rossiya24.ru">Rossiya 24</channel>
     <channel site_id="rt-documentary-474" xmltv_id="RTDocumentary.ru">RT Documentary</channel>
-    <channel site_id="russia-today-115" xmltv_id="RT.ru">RT</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="russia-today-115" xmltv_id="RTNews.ru">RT News</channel>
+    <channel site_id="rtl-102-5-43" xmltv_id="RTL1025RadioVisione.it">RTL 102.5 RadioVisione</channel>
+    <channel site_id="rtl-401" xmltv_id="RTLDeutschland.de">RTL Deutschland</channel>
+    <channel site_id="rtl-hd-204" xmltv_id="RTLDeutschland.de">RTL Deutschland</channel>
+    <channel site_id="rtl-2-399" xmltv_id="RTLZweiDeutschland.de">RTL Zwei Deutschland</channel>
+    <channel site_id="rtr-planeta-470" xmltv_id="RTRPlaneta.ru">RTR Planeta</channel>
+    <channel site_id="rts-un-410" xmltv_id="RTS1.ch">RTS 1</channel>
+    <channel site_id="rts-deux-411" xmltv_id="RTS2.ch">RTS 2</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="sky-action-368" xmltv_id="SkyCinemaAction.de">Sky Cinema Action</channel>
-    <channel site_id="sky-cinema-480" xmltv_id="SkyCinema.de">Sky Cinema</channel>
+    <channel site_id="scifi-universal-20" xmltv_id="ScifiPolska.us">Scifi Polska</channel>
+    <channel site_id="sixx-447" xmltv_id="SixxDeutschland.de">Sixx Deutschland</channel>
     <channel site_id="sky-cinema-24-369" xmltv_id="SkyCinemaPlus24.de">Sky Cinema +24</channel>
+    <channel site_id="sky-action-368" xmltv_id="SkyCinemaAction.de">Sky Cinema Action</channel>
     <channel site_id="sky-comedy-348" xmltv_id="SkyCinemaComedy.de">Sky Cinema Comedy</channel>
-    <channel site_id="sky-fussball-bundesliga-449" xmltv_id="SkyFussballBundesliga.de">Sky Fußball Bundesliga</channel>
     <channel site_id="sky-hits-365" xmltv_id="SkyCinemaHits.de">Sky Cinema Hits</channel>
-    <channel site_id="sky-krimi-422" xmltv_id="SkyKrimi.de">Sky Krimi</channel>
-    <channel site_id="sky-news-340" xmltv_id="SkyNewsInternational.uk">Sky News International</channel>
     <channel site_id="sky-nostalgie-421" xmltv_id="SkyCinemaNostalgie.de">Sky Cinema Nostalgie</channel>
     <channel site_id="sky-select-423" xmltv_id="SkyCinemaSelect.uk">Sky Cinema Select</channel>
+    <channel site_id="sky-krimi-422" xmltv_id="SkyKrimi.de">Sky Krimi</channel>
+    <channel site_id="sky-news-340" xmltv_id="SkyNewsInternational.uk">Sky News International</channel>
     <channel site_id="sky-sport-1-441" xmltv_id="SkySport1.de">Sky Sport 1</channel>
     <channel site_id="sky-sport-2-443" xmltv_id="SkySport2.de">Sky Sport 2</channel>
-    <channel site_id="sky-sport-austria-444" xmltv_id="SkySportAustria.de">Sky Sport Austria</channel>
+    <channel site_id="sky-sport-austria-444" xmltv_id="SkySportAustria1.de">Sky Sport Austria 1</channel>
     <channel site_id="spiegel-geschichte-379" xmltv_id="SpiegelGeschichte.de">Spiegel Geschichte</channel>
-    <channel site_id="sportklub-29" xmltv_id="SportKlubPolska.hu">Sport Klub Polska</channel>
     <channel site_id="sport-1-362" xmltv_id="Sport1.de">Sport 1</channel>
-    <channel site_id="spreekanal-502" xmltv_id="Spreekanal.de">Spreekanal</channel>
+    <channel site_id="sportklub-29" xmltv_id="SportKlubPolska.hu">Sport Klub Polska</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="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="classica-259" xmltv_id="StingrayClassica.ca">Stingray Classica</channel>
     <channel site_id="c-music-tv-260" xmltv_id="StingrayCMusic.ca">Stingray CMusic</channel>
     <channel site_id="djazz-tv-196" xmltv_id="StingrayDjazz.ca">Stingray Djazz</channel>
-    <channel site_id="festival-4k-544" xmltv_id="StingrayFestival4K.ca">Stingray Festival 4K</channel>
-    <channel site_id="stingray-iconcert-601" xmltv_id="StingrayiConcerts.ca">Stingray iConcerts</channel>
+    <channel site_id="stingray-iconcert-601" xmltv_id="StingrayIConcerts.ca">Stingray IConcerts</channel>
     <channel site_id="stingray-juicebox-hd-655" xmltv_id="StingrayJuicebox.ca">Stingray Juicebox</channel>
     <channel site_id="stingray-loud-hd-654" xmltv_id="StingrayLoud.ca">Stingray Loud</channel>
     <channel site_id="stingray-retro-668" xmltv_id="StingrayRetro.ca">Stingray Retro</channel>
-    <channel site_id="stopklatka-tv-185" xmltv_id="Stopklatka.pl">Stopklatka</channel>
+    <channel site_id="stopklatka-tv-185" xmltv_id="StopklatkaTV.pl">Stopklatka TV</channel>
     <channel site_id="sundance-channel-237" xmltv_id="SundanceTVEurope.us">Sundance TV Europe</channel>
-    <channel site_id="superstacja-69" xmltv_id="Superstacja.pl">Superstacja</channel>
     <channel site_id="super-polsat-541" xmltv_id="SuperPolsat.pl">Super Polsat</channel>
     <channel site_id="super-rtl-400" xmltv_id="SuperRTLDeutschland.de">Super RTL Deutschland</channel>
-    <channel site_id="swr-408" xmltv_id="SWRFernsehen.de">SWR Fernsehen</channel>
+    <channel site_id="superstacja-69" xmltv_id="Superstacja.pl">Superstacja</channel>
     <channel site_id="syfy-402" xmltv_id="SyfyDeutschland.us">Syfy Deutschland</channel>
-    <channel site_id="sixx-447" xmltv_id="SixxDeutschland.de">Sixx Deutschland</channel>
     <channel site_id="tbn-polska-598" xmltv_id="TBNPolska.us">TBN Polska</channel>
-    <channel site_id="telewizja-pomerania-41" xmltv_id="TelewizjaPomerania.pl">Telewizja Pomerania</channel>
     <channel site_id="tele-5-352" xmltv_id="Tele5.pl">Tele 5</channel>
     <channel site_id="tele-5-niem-448" xmltv_id="Tele5.de">Tele 5</channel>
-    <channel site_id="tf-1-463" xmltv_id="TF1.fr">TF1</channel>
+    <channel site_id="teletoon-232" xmltv_id="TeletoonPlusHDPolska.fr">Teletoon + HD Polska</channel>
+    <channel site_id="tf-1-463" xmltv_id="TF1.fr">TF 1</channel>
     <channel site_id="tlc-238" xmltv_id="TLCPolska.us">TLC Polska</channel>
     <channel site_id="tnt-72" xmltv_id="TNTPolska.us">TNT Polska</channel>
-    <channel site_id="top-kids-225" xmltv_id="TopKids.pl">Top Kids</channel>
-    <channel site_id="top-kids-jr-hd-664" xmltv_id="TopKidsJr.pl">Top Kids Jr</channel>
-    <channel site_id="to-tv-88" xmltv_id="GoldTV.pl">Gold TV</channel>
-    <channel site_id="toya-467" xmltv_id="TVTOYA.pl">TV TOYA</channel>
     <channel site_id="trace-urban-483" xmltv_id="TraceUrban.fr">Trace Urban</channel>
+    <channel site_id="travel-channel-201" xmltv_id="TravelChannelPolska.us">Travel Channel Polska</channel>
     <channel site_id="travelxp-4k-659" xmltv_id="Travelxp4KEurope.in">Travelxp 4K Europe</channel>
     <channel site_id="travelxp-hd-656" xmltv_id="TravelxpHDEurope.in">Travelxp HD Europe</channel>
-    <channel site_id="travel-channel-201" xmltv_id="TravelChannelPolska.us">Travel Channel Polska</channel>
     <channel site_id="ttv-624" xmltv_id="TTV.pl">TTV</channel>
-    <channel site_id="tv-berlin-414" xmltv_id="tvberlin.de">tv.berlin</channel>
+    <channel site_id="tv-4-360" xmltv_id="TV4.pl">TV 4</channel>
+    <channel site_id="tv-6-429" xmltv_id="TV6.pl">TV 6</channel>
+    <channel site_id="nova-331" xmltv_id="TVNova.cz">TV Nova</channel>
+    <channel site_id="tvo-600" xmltv_id="TVOkazje.pl">TV Okazje</channel>
+    <channel site_id="tv-puls-332" xmltv_id="TVPuls.pl">TV Puls</channel>
+    <channel site_id="tv-republika-18" xmltv_id="TVRepublika.pl">TV Republika</channel>
+    <channel site_id="tv-trwam-108" xmltv_id="TVTRWAM.pl">TV TRWAM</channel>
+    <channel site_id="tv-5-monde-europe-412" xmltv_id="TV5MondeEurope.fr">TV5Monde Europe</channel>
     <channel site_id="tve-330" xmltv_id="TVEInternacionalEuropa.es">TVE Internacional Europa</channel>
-    <channel site_id="tvn-357" xmltv_id="TVN.pa">TVN</channel>
-    <channel site_id="tvn-24-biznes-i-swiat-6" xmltv_id="TVN24BiS.pl">TVN24 BiS</channel>
-    <channel site_id="tvn-24-347" xmltv_id="TVN24.pl">TVN24</channel>
+    <channel site_id="tvn-357" xmltv_id="TVN.pl">TVN</channel>
+    <channel site_id="tvn-24-347" xmltv_id="TVN24.pl">TVN 24</channel>
+    <channel site_id="tvn-24-biznes-i-swiat-6" xmltv_id="TVN24BiS.pl">TVN 24 BiS</channel>
     <channel site_id="tvn-7-326" xmltv_id="TVN7.pl">TVN 7</channel>
-    <channel site_id="tvn-fabula-4" xmltv_id="TVNFabula.pl">TVN Fabuła</channel>
+    <channel site_id="tvn-fabula-4" xmltv_id="TVNFabula.pl">TVN Fabula</channel>
     <channel site_id="tvn-style-472" xmltv_id="TVNStyle.pl">TVN Style</channel>
     <channel site_id="tvn-turbo-346" xmltv_id="TVNTurbo.pl">TVN Turbo</channel>
-    <channel site_id="tvp-1-321" xmltv_id="TVP1.pl">TVP1</channel>
-    <channel site_id="tvp-2-323" xmltv_id="TVP2.pl">TVP2</channel>
-    <channel site_id="tvp-3-172" xmltv_id="TVP3.pl">TVP3</channel>
-    <channel site_id="tvp-3-bialystok-5" xmltv_id="TVP3Bialystok.pl">TVP3 Białystok</channel>
-    <channel site_id="tvp-3-bydgoszcz-378" xmltv_id="TVP3Bydgoszcz.pl">TVP3 Bydgoszcz</channel>
-    <channel site_id="tvp-3-gdansk-386" xmltv_id="TVP3Gdansk.pl">TVP3 Gdańsk</channel>
-    <channel site_id="tvp-3-gorzow-wielkopolski-342" xmltv_id="TVP3GorzowWielkopolski.pl">TVP3 Gorzów Wielkopolski</channel>
-    <channel site_id="tvp-3-katowice-394" xmltv_id="TVP3Katowice.pl">TVP3 Katowice</channel>
-    <channel site_id="tvp-3-kielce-475" xmltv_id="TVP3Kielce.pl">TVP3 Kielce</channel>
-    <channel site_id="tvp-3-krakow-403" xmltv_id="TVP3Krakow.pl">TVP3 Kraków</channel>
-    <channel site_id="tvp-3-lublin-409" xmltv_id="TVP3Lublin.pl">TVP3 Lublin</channel>
-    <channel site_id="tvp-3-lodz-416" xmltv_id="TVP3Lodz.pl">TVP3 Łódź</channel>
-    <channel site_id="tvp-3-olsztyn-339" xmltv_id="TVP3Olsztyn.pl">TVP3 Olsztyn</channel>
-    <channel site_id="tvp-3-opole-335" xmltv_id="TVP3Opole.pl">TVP3 Opole</channel>
-    <channel site_id="tvp-3-poznan-425" xmltv_id="TVP3Poznan.pl">TVP3 Poznań</channel>
-    <channel site_id="tvp-3-rzeszow-433" xmltv_id="TVP3Rzeszow.pl">TVP3 Rzeszów</channel>
-    <channel site_id="tvp-3-szczecin-440" xmltv_id="TVP3Szczecin.pl">TVP3 Szczecin</channel>
-    <channel site_id="tvp-3-warszawa-446" xmltv_id="TVP3Warszawa.pl">TVP3 Warszawa</channel>
-    <channel site_id="tvp-3-wroclaw-454" xmltv_id="TVP3Wroclaw.pl">TVP3 Wrocław</channel>
+    <channel site_id="tvp-1-321" xmltv_id="TVP1.pl">TVP 1</channel>
+    <channel site_id="tvp-2-323" xmltv_id="TVP2.pl">TVP 2</channel>
+    <channel site_id="tvp-3-172" xmltv_id="TVP3Warszawa.pl">TVP 3 Warszawa</channel>
     <channel site_id="tvp-abc-182" xmltv_id="TVPABC.pl">TVP ABC</channel>
     <channel site_id="tvp-hd-101" xmltv_id="TVPHD.pl">TVP HD</channel>
     <channel site_id="tvp-historia-74" xmltv_id="TVPHistoria.pl">TVP Historia</channel>
@@ -375,41 +329,24 @@
     <channel site_id="tvp-rozrywka-159" xmltv_id="TVPRozrywka.pl">TVP Rozrywka</channel>
     <channel site_id="tvp-seriale-130" xmltv_id="TVPSeriale.pl">TVP Seriale</channel>
     <channel site_id="tvp-sport-40" xmltv_id="TVPSport.pl">TVP Sport</channel>
-    <channel site_id="tvr-132" xmltv_id="HomeTV.pl">Home TV</channel>
     <channel site_id="tvs-90" xmltv_id="TVS.pl">TVS</channel>
-    <channel site_id="tvt-500" xmltv_id="TVT.pl">TVT</channel>
-    <channel site_id="tv-4-360" xmltv_id="TV4.pl">TV4</channel>
-    <channel site_id="tv-5-monde-europe-412" xmltv_id="TV5MondeEurope.fr">TV5Monde Europe</channel>
-    <channel site_id="tv-6-429" xmltv_id="TV6.pl">TV6</channel>
-    <channel site_id="tv-asta-495" xmltv_id="TVASTA.pl">TV ASTA</channel>
-    <channel site_id="tvo-600" xmltv_id="TVOkazje.pl">TV Okazje</channel>
-    <channel site_id="tv-puls-332" xmltv_id="TVPuls.pl">TV Puls</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="Relax.cz">Relax</channel>
-    <channel site_id="tv-republika-18" xmltv_id="TVRepublika.pl">TV Republika</channel>
-    <channel site_id="tv-trwam-108" xmltv_id="TVTrwam.pl">TV Trwam</channel>
-    <channel site_id="twoja-tv-514" xmltv_id="TwojaTV.pl">Twoja.TV</channel>
-    <channel site_id="twoja-telewizja-morska-490" xmltv_id="TwojaTelewizjaMorska.pl">Twoja Telewizja Morska</channel>
-    <channel site_id="teletoon-232" xmltv_id="teleTOONPlusPolska.fr">teleTOON+ Polska</channel>
-    <channel site_id="tvregionalna-pl-622" xmltv_id="TVRegionalna.pl">TV Regionalna</channel>
-    <channel site_id="uatv-549" xmltv_id="UATV.ua">UATV</channel>
-    <channel site_id="ultra-tv-4k-669" xmltv_id="Ultra4K.de">Ultra 4K</channel>
+    <channel site_id="uatv-549" xmltv_id="UATV.ua">UA TV</channel>
     <channel site_id="vh1-9" xmltv_id="VH1Polska.us">VH1 Polska</channel>
-    <channel site_id="vh1-classic-european-345" xmltv_id="MTV80s.us">MTV 80s</channel>
+    <channel site_id="polsat-viasat-explore-hd-82" xmltv_id="ViasatExplorePolsat.se">Viasat Explore Polsat</channel>
+    <channel site_id="polsat-viasat-history-hd-71" xmltv_id="ViasatHistoryPolsat.se">Viasat History Polsat</channel>
+    <channel site_id="polsat-viasat-nature-413" xmltv_id="ViasatNaturePolsat.se">Viasat Nature Polsat</channel>
     <channel site_id="vivid-red-hd-627" xmltv_id="VividRed.us">Vivid Red</channel>
     <channel site_id="vivid-touch-636" xmltv_id="VividTouch.us">Vivid Touch</channel>
     <channel site_id="vox-418" xmltv_id="VoxDeutschland.de">Vox Deutschland</channel>
     <channel site_id="vox-music-tv-193" xmltv_id="VoxMusicTV.pl">Vox Music TV</channel>
+    <channel site_id="wpolsce-pl-635" xmltv_id="WPolscePL.pl">W Polsce PL</channel>
     <channel site_id="water-planet-415" xmltv_id="WaterPlanet.pl">Water Planet</channel>
-    <channel site_id="wdr-420" xmltv_id="WDRFernsehen.de">WDR Fernsehen</channel>
+    <channel site_id="einslive-427" xmltv_id="WDR1Live.de">WDR 1 Live</channel>
     <channel site_id="n-24-384" xmltv_id="Welt.de">Welt</channel>
-    <channel site_id="wp-532" xmltv_id="WirtualnaPolska.pl">Wirtualna Polska</channel>
-    <channel site_id="wtk-492" xmltv_id="WTK.pl">WTK</channel>
-    <channel site_id="wpolsce-pl-635" xmltv_id="wPolscepl.pl">wPolsce.pl</channel>
+    <channel site_id="wp-532" xmltv_id="WPTV.pl">WP TV</channel>
     <channel site_id="zdf-417" xmltv_id="ZDF.de">ZDF</channel>
-    <channel site_id="zdf-info-430" xmltv_id="ZDFinfo.de">ZDFinfo</channel>
+    <channel site_id="zdf-info-430" xmltv_id="ZDFInfo.de">ZDF Info</channel>
     <channel site_id="zoom-tv-526" xmltv_id="ZoomTV.pl">Zoom TV</channel>
-    <channel site_id="echo-24-687" xmltv_id="Echo24.cz">Echo24</channel>
+    <channel site_id="belgia-tv1-268" xmltv_id="Een.be">Één</channel>
   </channels>
 </site>
\ No newline at end of file