diff --git a/sites/magentatv.at/magentatv.at_at.channels.xml b/sites/magentatv.at/magentatv.at_at.channels.xml
index e310eaae..679fdcce 100644
--- a/sites/magentatv.at/magentatv.at_at.channels.xml
+++ b/sites/magentatv.at/magentatv.at_at.channels.xml
@@ -4,60 +4,78 @@
     <channel lang="de" xmltv_id="123TV.de" site_id="123_tv">1-2-3.tv</channel>
     <channel lang="de" xmltv_id="13thStreetDeutschland.us" site_id="13TH_STREET_HD">13th Street HD</channel>
     <channel lang="de" xmltv_id="3sat.de" site_id="3sat_HD">3sat</channel>
-    <channel lang="de" xmltv_id="Alarabiya.ae" site_id="Al_Jazeera">Al Jazeera</channel>
     <channel lang="de" xmltv_id="ARDAlpha.de" site_id="ARD_alpha_HD">ARD-alpha</channel>
     <channel lang="de" xmltv_id="ARTEDeutsch.fr" site_id="arte_HD">ARTE Deutsch</channel>
     <channel lang="de" xmltv_id="ATV.at" site_id="ATV_HD">ATV</channel>
     <channel lang="de" xmltv_id="ATV2.at" site_id="ATV_II_HD">ATV 2</channel>
+    <channel lang="de" xmltv_id="Alarabiya.ae" site_id="Al_Jazeera">Al Jazeera</channel>
+    <channel lang="de" xmltv_id="AutoMotorundSport.de" site_id="Auto_Motor_und_Sport_Channel_HD">Auto Motor und Sport</channel>
+    <channel lang="de" xmltv_id="BBCEntertainmentEurope.uk" site_id="BBC_Entertainment">BBC Entertainment Europe</channel>
+    <channel lang="de" xmltv_id="BBCWorldNewsEurope.uk" site_id="BBC_World">BBC World News Europe</channel>
     <channel lang="de" xmltv_id="BabyTVEurope.uk" site_id="Baby_TV">Baby TV</channel>
+    <channel lang="de" xmltv_id="Bergblick.de" site_id="Planet_HD">Bergblick</channel>
     <channel lang="de" xmltv_id="BibelTV.de" site_id="Bibel_TV_HD">Bibel TV</channel>
     <channel lang="de" xmltv_id="BloombergTVEurope.us" site_id="Bloomberg_Europe">Bloomberg</channel>
     <channel lang="de" xmltv_id="BlueHustlerEurope.us" site_id="Blue_Hustler">Blue Hustler Europe</channel>
+    <channel lang="de" xmltv_id="BonGusto.de" site_id="Bongusto_HD">Bon Gusto</channel>
     <channel lang="de" xmltv_id="BoomerangDeutschland.us" site_id="Disney_XD">Boomerang</channel>
-    <channel lang="de" xmltv_id="CartoonNetworkDeutschland.us" site_id="Cartoon_Network_HD">Cartoon Network</channel>
+    <channel lang="de" xmltv_id="CCTV4Europe.cn" site_id="CCTV4">CCTV 4 Europe</channel>
     <channel lang="de" xmltv_id="CGTN.cn" site_id="CCTV_News">CGTN</channel>
     <channel lang="de" xmltv_id="CNBCEurope.us" site_id="CNBC">CNBC</channel>
     <channel lang="de" xmltv_id="CNNInternationalEurope.us" site_id="CNN">CNN</channel>
+    <channel lang="de" xmltv_id="CartoonNetworkDeutschland.us" site_id="Cartoon_Network_HD">Cartoon Network</channel>
+    <channel lang="de" xmltv_id="ClubMTV.us" site_id="MTV_Dance">Club MTV</channel>
     <channel lang="de" xmltv_id="ComedyCentralDeutschland.us" site_id="Comedy_Central_VIVA_HD">COMEDY CENTRAL</channel>
     <channel lang="de" xmltv_id="CrimePlusInvestigationDeutschland.us" site_id="A_E_HD">Crime + Investigation</channel>
+    <channel lang="de" xmltv_id="DMAXAustria.us" site_id="DMAX_HD">DMAX Austria</channel>
     <channel lang="de" xmltv_id="DasErste.de" site_id="Das_Erste_HD">Das Erste</channel>
     <channel lang="de" xmltv_id="DeluxeMusic.de" site_id="Deluxe_Music_HD">DELUXE MUSIC</channel>
     <channel lang="de" xmltv_id="DisneyChannelDeutschland.us" site_id="Disney_Channel">Disney Channel Deutschland</channel>
-    <channel lang="de" xmltv_id="DMAXAustria.us" site_id="DMAX_HD">DMAX Austria</channel>
+    <channel lang="de" xmltv_id="DunaTV.hu" site_id="Duna_TV">Duna TV</channel>
+    <channel lang="de" xmltv_id="EEurope.us" site_id="E__Entertainment_HD">E! Europe</channel>
     <channel lang="de" xmltv_id="ESports1.de" site_id="Sport_1_US_HD">eSPORTS1 HD</channel>
     <channel lang="de" xmltv_id="EuronewsDeutsch.fr" site_id="Euronews">euronews (D)</channel>
     <channel lang="de" xmltv_id="Eurosport1Germany.fr" site_id="Eurosport_1_HD">Eurosport 1 Germany</channel>
     <channel lang="de" xmltv_id="EvilAngelTV.us" site_id="Evil_Angel_HD">Evil Angel TV</channel>
+    <channel lang="de" xmltv_id="ExtremeSportsChannel.nl" site_id="Extreme_Sports_Channel">Extreme Sports Channel</channel>
     <channel lang="de" xmltv_id="FashionTVEurope.fr" site_id="Fashion_TV_HD">Fashion TV</channel>
+    <channel lang="de" xmltv_id="FilmKlub.rs" site_id="Film_Klub">Film Klub</channel>
     <channel lang="de" xmltv_id="FixFoxi.de" site_id="fix___foxi">Fix&amp;Foxi</channel>
     <channel lang="de" xmltv_id="France24Francais.fr" site_id="France_24">France 24 (en francais)</channel>
     <channel lang="de" xmltv_id="GeoTV.de" site_id="GEO_Television_HD">GEO TV HD</channel>
-    <channel lang="de" xmltv_id="Haberturk.tr" site_id="Habertuerk_TV">Habertürk</channel>
-    <channel lang="de" xmltv_id="Hayat.ba" site_id="Hayat">Hayat TV</channel>
-    <channel lang="de" xmltv_id="Heimatkanal.de" site_id="Heimatkanal">Heimatkanal</channel>
+    <channel lang="de" xmltv_id="GoTV.at" site_id="gotv">GoTV</channel>
+    <channel lang="de" xmltv_id="GuteLauneTV.de" site_id="Gute_Laune_TV">Gute Laune TV</channel>
     <channel lang="de" xmltv_id="HGTVDeutschland.us" site_id="HGTV">HOME &amp; GARDEN TV HD</channel>
     <channel lang="de" xmltv_id="HRFernsehen.de" site_id="hessen_fernsehen_HD">HR Fernsehen</channel>
     <channel lang="de" xmltv_id="HRT1.hr" site_id="HRT_TV_1">HRT TV 1</channel>
     <channel lang="de" xmltv_id="HSE.de" site_id="HSE24_HD">HSE</channel>
     <channel lang="de" xmltv_id="HSEExtra.de" site_id="HSE24_Extra_HD">HSE Extra</channel>
     <channel lang="de" xmltv_id="HSETrend.de" site_id="HSE24_Trend">HSE Trend</channel>
+    <channel lang="de" xmltv_id="Haberturk.tr" site_id="Habertuerk_TV">Habertürk</channel>
+    <channel lang="de" xmltv_id="Hayat.ba" site_id="Hayat">Hayat TV</channel>
+    <channel lang="de" xmltv_id="Heimatkanal.de" site_id="Heimatkanal">Heimatkanal</channel>
     <channel lang="de" xmltv_id="HustlerTVEurope.us" site_id="Hustler_TV">Hustler TV Europe</channel>
+    <channel lang="de" xmltv_id="KIKA.de" site_id="KI_KA_HD">KIKA</channel>
     <channel lang="de" xmltv_id="KabelEinsAustria.de" site_id="kabel_eins_HD">Kabel Eins Austria</channel>
     <channel lang="de" xmltv_id="KabelEinsDokuAustria.de" site_id="kabel_eins_classics_HD">Kabel Eins Classics</channel>
     <channel lang="de" xmltv_id="KabelEinsDokuDeutschland.de" site_id="kabel_eins_Doku_HD">Kabel Eins Doku Austria</channel>
-    <channel lang="de" xmltv_id="KIKA.de" site_id="KI_KA_HD">KIKA</channel>
     <channel lang="de" xmltv_id="KinoweltTV.de" site_id="Kinowelt_TV_HD">Kinowelt TV HD</channel>
-    <channel lang="de" xmltv_id="MotorvisionTV.de" site_id="Motorvision_HD">Motorvision</channel>
+    <channel lang="de" xmltv_id="KroneTV.at" site_id="krone_tv_HD">Krone TV</channel>
+    <channel lang="de" xmltv_id="MTV00s.us" site_id="VH_1_Europe">MTV 00s</channel>
+    <channel lang="de" xmltv_id="MTV80s.us" site_id="VH_1_Classic">MTV 80s</channel>
+    <channel lang="de" xmltv_id="MTV90s.us" site_id="MTV_90s">MTV 90s</channel>
     <channel lang="de" xmltv_id="MTVGermany.us" site_id="MTV_HD">MTV</channel>
+    <channel lang="de" xmltv_id="MTVHitsEurope.us" site_id="MTVhits_">MTV Hits Europe</channel>
+    <channel lang="de" xmltv_id="MTVLiveHD.us" site_id="MTV_live_HD">MTV Live HD</channel>
+    <channel lang="de" xmltv_id="MelodieTV.at" site_id="Melodie_TV">Melodie TV</channel>
+    <channel lang="de" xmltv_id="MotorvisionTV.de" site_id="Motorvision_HD">Motorvision</channel>
     <channel lang="de" xmltv_id="N24Doku.de" site_id="N24_Austria">N24 Doku</channel>
+    <channel lang="de" xmltv_id="NTVAustria.de" site_id="n_tv_HD">N-TV Austria</channel>
     <channel lang="de" xmltv_id="NationalGeographicDeutschland.us" site_id="Nat_Geo_HD">NatGeo HD</channel>
     <channel lang="de" xmltv_id="NationalGeographicWildDeutschland.us" site_id="Nat_Geo_People_HD">National Geographic Wild HD</channel>
-    <channel lang="de" xmltv_id="NickelodeonDeutschland.us" site_id="Nickelodeon_HD">Nick HD</channel>
     <channel lang="de" xmltv_id="NickJrEurope.us" site_id="Nick_Junior">Nick.Jr.</channel>
+    <channel lang="de" xmltv_id="NickelodeonDeutschland.us" site_id="Nickelodeon_HD">Nick HD</channel>
     <channel lang="de" xmltv_id="NitroAustria.de" site_id="RTL_Nitro_HD">Nitro Austria</channel>
-    <channel lang="de" xmltv_id="NTVAustria.de" site_id="n_tv_HD">N-TV Austria</channel>
-    <channel lang="de" xmltv_id="Oe24TV.at" site_id="oe24_TV_HD">Oe24 TV</channel>
-    <channel lang="de" xmltv_id="One.de" site_id="EinsFestival_HD">One</channel>
     <channel lang="de" xmltv_id="ORF1.at" site_id="ORF_eins_HD">ORF 1</channel>
     <channel lang="de" xmltv_id="ORF2Burgenland.at" site_id="ORF2_Burgenland_HD">ORF 2 Burgenland</channel>
     <channel lang="de" xmltv_id="ORF2Europe.at" site_id="ORF2_Europa">ORF 2 Europe</channel>
@@ -71,6 +89,9 @@
     <channel lang="de" xmltv_id="ORF2Wien.at" site_id="ORF2_Wien_HD">ORF 2 Wien</channel>
     <channel lang="de" xmltv_id="ORFIII.at" site_id="ORF_III_HD">ORF III</channel>
     <channel lang="de" xmltv_id="ORFSportPlus.at" site_id="ORF_Sport__HD">ORF Sport +</channel>
+    <channel lang="de" xmltv_id="Oe24TV.at" site_id="oe24_TV_HD">Oe24 TV</channel>
+    <channel lang="de" xmltv_id="OktoTV.at" site_id="OKTO_HD">Okto TV</channel>
+    <channel lang="de" xmltv_id="One.de" site_id="EinsFestival_HD">One</channel>
     <channel lang="de" xmltv_id="Phoenix.de" site_id="Phoenix_HD">Phoenix</channel>
     <channel lang="de" xmltv_id="PinkExtra.rs" site_id="Pink_Extra">Pink Extra</channel>
     <channel lang="de" xmltv_id="PinkFilm.rs" site_id="Pink_Film">Pink Film</channel>
@@ -79,16 +100,13 @@
     <channel lang="de" xmltv_id="ProSiebenAustria.de" site_id="ProSieben_HD">ProSieben Austria</channel>
     <channel lang="de" xmltv_id="ProSiebenFun.de" site_id="ProSieben_FUN_HD">ProSieben FUN HD</channel>
     <channel lang="de" xmltv_id="ProSiebenMaxxAustria.de" site_id="ProSieben_Maxx_HD">ProSieben Maxx Austria</channel>
+    <channel lang="de" xmltv_id="Puls24.at" site_id="PULS24_HD">Puls 24</channel>
     <channel lang="de" xmltv_id="QVC2Deutsch.us" site_id="QVC_2_HD">QVC2 Deutsch</channel>
     <channel lang="de" xmltv_id="QVCDeutschland.us" site_id="QVC_HD">QVC Deutschland</channel>
     <channel lang="de" xmltv_id="QVCStyleDeutschland.us" site_id="QVC_Beauty_Style">QVC Style Deutschland</channel>
     <channel lang="de" xmltv_id="QVCZwei.us" site_id="QVC_Plus">QVC ZWEI</channel>
-    <channel lang="de" xmltv_id="Rai1.it" site_id="RAI_Uno">Rai Uno</channel>
-    <channel lang="de" xmltv_id="Rai2.it" site_id="RAI_Due">Rai Due</channel>
-    <channel lang="de" xmltv_id="Rai3.it" site_id="RAI_Tre">Rai Tre</channel>
+    <channel lang="de" xmltv_id="R9.at" site_id="R9_HD">R9</channel>
     <channel lang="de" xmltv_id="RBBBerlin.de" site_id="RBB_Berlin_HD">RBB Berlin</channel>
-    <channel lang="de" xmltv_id="RiC.de" site_id="RiC">RiC</channel>
-    <channel lang="de" xmltv_id="RomanceTVDeutschland.de" site_id="Romance_TV_HD">Romance TV</channel>
     <channel lang="de" xmltv_id="RTLAustria.de" site_id="RTL_HD">RTL Austria</channel>
     <channel lang="de" xmltv_id="RTLCrimeDeutschland.de" site_id="RTL_Crime_HD">RTL Crime Deutschland</channel>
     <channel lang="de" xmltv_id="RTLLivingDeutschland.de" site_id="RTL_Living_HD">RTL Living Deutschland</channel>
@@ -96,9 +114,17 @@
     <channel lang="de" xmltv_id="RTLUp.de" site_id="RTLplus_HD">RTLup</channel>
     <channel lang="de" xmltv_id="RTLZweiAustria.de" site_id="RTL_II_HD">RTL Zwei Austria</channel>
     <channel lang="de" xmltv_id="RTRPlaneta.ru" site_id="RTR_Planeta">RTR Planeta</channel>
+    <channel lang="de" xmltv_id="Rai1.it" site_id="RAI_Uno">Rai Uno</channel>
+    <channel lang="de" xmltv_id="Rai2.it" site_id="RAI_Due">Rai Due</channel>
+    <channel lang="de" xmltv_id="Rai3.it" site_id="RAI_Tre">Rai Tre</channel>
+    <channel lang="de" xmltv_id="RiC.de" site_id="RiC">RiC</channel>
+    <channel lang="de" xmltv_id="RomanceTVDeutschland.de" site_id="Romance_TV_HD">Romance TV</channel>
+    <channel lang="de" xmltv_id="SRFernsehen.de" site_id="SR_HD">SR Fernsehen HD</channel>
+    <channel lang="de" xmltv_id="SWRFernsehenRheinlandPfalz.de" site_id="SWR_HD">SWR Fernsehen RP</channel>
     <channel lang="de" xmltv_id="Sat1Emotions.de" site_id="Sat_1_emotions_HD">SAT.1 emotions</channel>
     <channel lang="de" xmltv_id="Sat1GoldOsterreich.de" site_id="Sat_1_Gold_HD">Sat. 1 Gold Österreich</channel>
     <channel lang="de" xmltv_id="Sat1Osterreich.de" site_id="Sat_1_HD">Sat. 1 Österreich</channel>
+    <channel lang="de" xmltv_id="SchauTV.at" site_id="Schau_TV_HD">Schau TV</channel>
     <channel lang="de" xmltv_id="ServusTVOsterreich.at" site_id="Servus_TV_HD">Servus TV Österreich</channel>
     <channel lang="de" xmltv_id="SixxAustria.de" site_id="Sixx_Austria_HD">Sixx Austria</channel>
     <channel lang="de" xmltv_id="SkyAtlantic.de" site_id="Sky_Atlantic_HD">Sky Atlantic HD</channel>
@@ -153,20 +179,27 @@
     <channel lang="de" xmltv_id="Sport1.de" site_id="Sport_1_HD">Sport 1</channel>
     <channel lang="de" xmltv_id="Sport1Plus.de" site_id="Sport1__HD">Sport 1+</channel>
     <channel lang="de" xmltv_id="SportdigitalFussball.de" site_id="sportdigital_HD">SPORTDIGITAL FUSSBALL</channel>
-    <channel lang="de" xmltv_id="SRFernsehen.de" site_id="SR_HD">SR Fernsehen HD</channel>
+    <channel lang="de" xmltv_id="StingrayAllDayParty.ca" site_id="All_Day_Party">Stingray All Day Party!</channel>
+    <channel lang="de" xmltv_id="StingrayClassicRB.ca" site_id="Classic_RnB_Soul">Stingray Classic R&B</channel>
+    <channel lang="de" xmltv_id="StingrayClassicRock.ca" site_id="Classic_Rock">Stingray Classic Rock</channel>
     <channel lang="de" xmltv_id="SuperRTLAustria.de" site_id="Super_RTL_HD">Super RTL Austria</channel>
-    <channel lang="de" xmltv_id="SWRFernsehenRheinlandPfalz.de" site_id="SWR_HD">SWR Fernsehen RP</channel>
     <channel lang="de" xmltv_id="SyfyDeutschland.us" site_id="Syfy_HD">SYFY HD</channel>
-    <channel lang="de" xmltv_id="Tagesschau24.de" site_id="tagesschau24_HD">tagesschau24 HD</channel>
-    <channel lang="de" xmltv_id="Tele5.de" site_id="TELE_5">Tele 5</channel>
     <channel lang="de" xmltv_id="TLCAustria.us" site_id="TLC_HD">TLC Austria</channel>
+    <channel lang="de" xmltv_id="TRTWorld.tr" site_id="TRT_International">TRT World</channel>
     <channel lang="de" xmltv_id="TV5MondeEurope.fr" site_id="TV5Monde_Europe">TV5MONDE Europe</channel>
     <channel lang="de" xmltv_id="TVPPolonia.pl" site_id="TV_Polonia">TV Polonia</channel>
+    <channel lang="de" xmltv_id="Tagesschau24.de" site_id="tagesschau24_HD">tagesschau24 HD</channel>
+    <channel lang="de" xmltv_id="Tele5.de" site_id="TELE_5">Tele 5</channel>
+    <channel lang="de" xmltv_id="TirolTV.at" site_id="Tirol_TV_HD">Tirol TV</channel>
+    <channel lang="de" xmltv_id="ToxicTV.rs" site_id="Toxic_TV_HD">Toxic TV</channel>
     <channel lang="de" xmltv_id="UniversalTVDeutschland.us" site_id="Universal_Channel_HD">Universal TV HD</channel>
+    <channel lang="de" xmltv_id="Vesti.rs" site_id="VESTI">Vesti</channel>
+    <channel lang="de" xmltv_id="VolksmusikTV.de" site_id="Volksmusik">Volksmusik TV</channel>
     <channel lang="de" xmltv_id="VoxAustria.de" site_id="VOX_HD">Vox Austria</channel>
+    <channel lang="de" xmltv_id="W24.at" site_id="W24_HD">W24</channel>
+    <channel lang="de" xmltv_id="WDRFernsehenKoln.de" site_id="WDR_Koeln_HD">WDR Fernsehen Köln</channel>
     <channel lang="de" xmltv_id="WarnerTVComedy.de" site_id="TNT_Comedy_HD">Warner TV Comedy HD</channel>
     <channel lang="de" xmltv_id="WarnerTVSerie.de" site_id="TNT_Serie_HD">Warner TV Serie</channel>
-    <channel lang="de" xmltv_id="WDRFernsehenKoln.de" site_id="WDR_Koeln_HD">WDR Fernsehen Köln</channel>
     <channel lang="de" xmltv_id="ZDF.de" site_id="ZDF_HD">ZDF</channel>
     <channel lang="de" xmltv_id="ZDFInfo.de" site_id="ZDF_info_HD">ZDF Info</channel>
     <channel lang="de" xmltv_id="ZDFNeo.de" site_id="ZDF_neo_HD">ZDF Neo</channel>