diff --git a/sites/meo.pt/meo.pt_pt.channels.xml b/sites/meo.pt/meo.pt_pt.channels.xml
index 0a92872f..d5129ced 100644
--- a/sites/meo.pt/meo.pt_pt.channels.xml
+++ b/sites/meo.pt/meo.pt_pt.channels.xml
@@ -4,28 +4,40 @@
     <channel lang="pt" xmltv_id="24KitchenPortugal.us" site_id="24KITC">24 Kitchen Portugal</channel>
     <channel lang="pt" xmltv_id="3sat.de" site_id="3SAT">3sat</channel>
     <channel lang="pt" xmltv_id="ABolaTV.pt" site_id="ABOLA">A Bola TV</channel>
-    <channel lang="pt" xmltv_id="AfroMusicChannel.pt" site_id="AFRO">Afro Music Channel</channel>
-    <channel lang="pt" xmltv_id="AljazeeraEnglish.qa" site_id="ALJAZ">Aljazeera English</channel>
+    <channel lang="pt" xmltv_id="ADVNCE.pt" site_id="ADVNCE">ADVNCE</channel>
     <channel lang="pt" xmltv_id="AMCPortugal.us" site_id="AMC">AMC Portugal</channel>
-    <channel lang="pt" xmltv_id="Antena3Internacional.es" site_id="A3INTER">Antena 3 Internacional</channel>
-    <channel lang="pt" xmltv_id="ARTVCanalParlamento.pt" site_id="ARTV">AR TV Canal Parlamento</channel>
     <channel lang="pt" xmltv_id="ARTEFrancais.fr" site_id="ARTEHD">ARTE Français</channel>
-    <channel lang="pt" xmltv_id="Atrecine.es" site_id="A3CINE">Atrecine</channel>
-    <channel lang="pt" xmltv_id="Atreseries.es" site_id="A3SERIE">Atreseries</channel>
+    <channel lang="pt" xmltv_id="ARTVCanalParlamento.pt" site_id="ARTV">AR TV Canal Parlamento</channel>
     <channel lang="pt" xmltv_id="AXNMovies.us" site_id="AXNM">AXN Movies</channel>
     <channel lang="pt" xmltv_id="AXNPortugal.us" site_id="AXN">AXN Portugal</channel>
     <channel lang="pt" xmltv_id="AXNWhitePortugal.us" site_id="AXNWH">AXN White Portugal</channel>
-    <channel lang="pt" xmltv_id="BabyTVEurope.uk" site_id="BABYT">Baby TV Europe</channel>
+    <channel lang="pt" xmltv_id="AfroMusicChannel.pt" site_id="AFRO">Afro Music Channel</channel>
+    <channel lang="pt" xmltv_id="AljazeeraEnglish.qa" site_id="ALJAZ">Aljazeera English</channel>
+    <channel lang="pt" xmltv_id="AlmaLusa.pt" site_id="ALMALUS">Alma Lusa</channel>
+    <channel lang="pt" xmltv_id="Antena3Internacional.es" site_id="A3INTER">Antena 3 Internacional</channel>
+    <channel lang="pt" xmltv_id="Atrecine.es" site_id="A3CINE">Atrecine</channel>
+    <channel lang="pt" xmltv_id="Atreseries.es" site_id="A3SERIE">Atreseries</channel>
     <channel lang="pt" xmltv_id="BBCEntertainmentEurope.uk" site_id="BBC E">BBC Entertainment Europe</channel>
-    <channel lang="pt" xmltv_id="BenficaTV.pt" site_id="SLB">Benfica TV</channel>
     <channel lang="pt" xmltv_id="BFMBusiness.fr" site_id="BFMB">BFM Business</channel>
     <channel lang="pt" xmltv_id="BFMTV.fr" site_id="BFM">BFM TV</channel>
+    <channel lang="pt" xmltv_id="BNT4.bg" site_id="BNT4">BNT 4</channel>
+    <channel lang="pt" xmltv_id="BVNEuropa.nl" site_id="BVN">BVN Europa</channel>
+    <channel lang="pt" xmltv_id="BabyTVEurope.uk" site_id="BABYT">Baby TV Europe</channel>
+    <channel lang="pt" xmltv_id="BenficaTV.pt" site_id="SLB">Benfica TV</channel>
     <channel lang="pt" xmltv_id="Biggs.pt" site_id="BIGGS">Biggs</channel>
     <channel lang="pt" xmltv_id="BlazePortugal.us" site_id="BLAZE">Blaze Portugal</channel>
     <channel lang="pt" xmltv_id="BloombergTVEurope.us" site_id="BLOOM">Bloomberg TV Europe</channel>
-    <channel lang="pt" xmltv_id="BNT4.bg" site_id="BNT4">BNT 4</channel>
+    <channel lang="pt" xmltv_id="BodySexHD.pt" site_id="BODYSEX">Body Sex HD</channel>
+    <channel lang="pt" xmltv_id="BomSomTV.ao" site_id="BOMSOM">Bom Som TV</channel>
     <channel lang="pt" xmltv_id="BoomerangPortugal.us" site_id="BOOM">Boomerang Portugal</channel>
-    <channel lang="pt" xmltv_id="BVNEuropa.nl" site_id="BVN">BVN Europa</channel>
+    <channel lang="pt" xmltv_id="CBSRealityEurope.us" site_id="CBSR">CBS Reality Europe</channel>
+    <channel lang="pt" xmltv_id="CCTV4Europe.cn" site_id="CCTV4">CCTV 4 Europe</channel>
+    <channel lang="pt" xmltv_id="CGTN.cn" site_id="CGTN">CGTN</channel>
+    <channel lang="pt" xmltv_id="CGTNDocumentary.cn" site_id="CGTNDHD">CGTN Documentary</channel>
+    <channel lang="pt" xmltv_id="CMTV.pt" site_id="CMTV">CM TV</channel>
+    <channel lang="pt" xmltv_id="CNBCEurope.us" site_id="CNBC">CNBC Europe</channel>
+    <channel lang="pt" xmltv_id="CNNInternationalEurope.us" site_id="CNN">CNN International Europe</channel>
+    <channel lang="pt" xmltv_id="CNNInternationalPortugal.us" site_id="CNNPT">CNN International Portugal</channel>
     <channel lang="pt" xmltv_id="Cacavision.es" site_id="CAÇAV">Caçavision</channel>
     <channel lang="pt" xmltv_id="Canal11.pt" site_id="C11">Canal 11</channel>
     <channel lang="pt" xmltv_id="Canal24Horas.es" site_id="TVE24">Canal 24 Horas</channel>
@@ -36,16 +48,11 @@
     <channel lang="pt" xmltv_id="CanalUmEuropa.br" site_id="UME">Canal Um Europa</channel>
     <channel lang="pt" xmltv_id="CartoonNetworkPortugal.us" site_id="CART">Cartoon Network Portugal</channel>
     <channel lang="pt" xmltv_id="CazayPesca.es" site_id="CAÇAP">Caza y Pesca</channel>
-    <channel lang="pt" xmltv_id="CBSRealityEurope.us" site_id="CBSR">CBS Reality Europe</channel>
-    <channel lang="pt" xmltv_id="CCTV4Europe.cn" site_id="CCTV4">CCTV 4 Europe</channel>
-    <channel lang="pt" xmltv_id="CGTN.cn" site_id="CGTN">CGTN</channel>
-    <channel lang="pt" xmltv_id="CGTNDocumentary.cn" site_id="CGTNDHD">CGTN Documentary</channel>
     <channel lang="pt" xmltv_id="CineMundo.pt" site_id="CINE">Cine Mundo</channel>
     <channel lang="pt" xmltv_id="ClubbingTV.fr" site_id="CLUBB">Clubbing TV</channel>
-    <channel lang="pt" xmltv_id="CMTV.pt" site_id="CMTV">CM TV</channel>
-    <channel lang="pt" xmltv_id="CNBCEurope.us" site_id="CNBC">CNBC Europe</channel>
-    <channel lang="pt" xmltv_id="CNNInternationalEurope.us" site_id="CNN">CNN International Europe</channel>
+    <channel lang="pt" xmltv_id="CrimePlusInvestigationPortugal.us" site_id="CI">Crime + Investigation Portugal</channel>
     <channel lang="pt" xmltv_id="CubavisionInternacional.cu" site_id="CUBAV">Cubavisión Internacional</channel>
+    <channel lang="pt" xmltv_id="DasErste.de" site_id="ARD">Das Erste</channel>
     <channel lang="pt" xmltv_id="Decasa.es" site_id="DECASA">Decasa</channel>
     <channel lang="pt" xmltv_id="DiscoveryChannelEurope.us" site_id="DISCV">Discovery Channel Europe</channel>
     <channel lang="pt" xmltv_id="DisneyChannelPortugal.us" site_id="DISNY">Disney Channel Portugal</channel>
@@ -85,6 +92,8 @@
     <channel lang="pt" xmltv_id="GloboNews.br" site_id="GNEWS">Globo News</channel>
     <channel lang="pt" xmltv_id="HistoriaPortugal.us" site_id="HIST">História Portugal</channel>
     <channel lang="pt" xmltv_id="Hot.pt" site_id="HOT">Hot</channel>
+    <channel lang="pt" xmltv_id="HotMan.pt" site_id="HOTMAN">Hot Man</channel>
+    <channel lang="pt" xmltv_id="HotTaboo.pt" site_id="HOTTAB">Hot Taboo</channel>
     <channel lang="pt" xmltv_id="I24NewsEnglish.il" site_id="I24I">I24 News English</channel>
     <channel lang="pt" xmltv_id="I24NewsFrancais.il" site_id="I24F">I24 News Français</channel>
     <channel lang="pt" xmltv_id="InterPlus.ua" site_id="IHTEP">Inter +</channel>
@@ -92,36 +101,30 @@
     <channel lang="pt" xmltv_id="KBSWorld.kr" site_id="KBS">KBS World</channel>
     <channel lang="pt" xmltv_id="KIKA.de" site_id="KIKA">KIKA</channel>
     <channel lang="pt" xmltv_id="KuriakosTV.pt" site_id="KURIAKO">Kuriakos TV</channel>
+    <channel lang="pt" xmltv_id="LocalvisaoTV.pt" site_id="LVTV">LocalVisão TV</channel>
     <channel lang="pt" xmltv_id="LollyKids.uk" site_id="LOLLY">Lolly Kids</channel>
-    <channel lang="pt" xmltv_id="MasChicLatinoamerica.us" site_id="MCHIC">Más Chic Latinoamérica</channel>
     <channel lang="pt" xmltv_id="MCMPop.fr" site_id="MCM P">MCM Pop</channel>
     <channel lang="pt" xmltv_id="MCMTop.fr" site_id="MCM T">MCM Top</channel>
-    <channel lang="pt" xmltv_id="Mezzo.fr" site_id="MEZZO">Mezzo</channel>
-    <channel lang="pt" xmltv_id="MezzoLiveHD.fr" site_id="MEZHD">Mezzo Live HD</channel>
     <channel lang="pt" xmltv_id="MTV00s.us" site_id="MTV00S">MTV 00s</channel>
     <channel lang="pt" xmltv_id="MTVLiveHD.us" site_id="MTVLIVE">MTV Live HD</channel>
     <channel lang="pt" xmltv_id="MTVPortugal.us" site_id="MTV">MTV Portugal</channel>
-    <channel lang="pt" xmltv_id="NationalGeographicPortugal.us" site_id="NGC">National Geographic Portugal</channel>
-    <channel lang="pt" xmltv_id="NationalGeographicWildEurope.us" site_id="WILD">National Geographic Wild Europe</channel>
+    <channel lang="pt" xmltv_id="MasChicLatinoamerica.us" site_id="MCHIC">Más Chic Latinoamérica</channel>
+    <channel lang="pt" xmltv_id="Mezzo.fr" site_id="MEZZO">Mezzo</channel>
+    <channel lang="pt" xmltv_id="MezzoLiveHD.fr" site_id="MEZHD">Mezzo Live HD</channel>
     <channel lang="pt" xmltv_id="NBATV.us" site_id="NBATVHD">NBA TV</channel>
     <channel lang="pt" xmltv_id="NHKWorldJapan.jp" site_id="NHKHD">NHK World Japan</channel>
+    <channel lang="pt" xmltv_id="NationalGeographicPortugal.us" site_id="NGC">National Geographic Portugal</channel>
+    <channel lang="pt" xmltv_id="NationalGeographicWildEurope.us" site_id="WILD">National Geographic Wild Europe</channel>
     <channel lang="pt" xmltv_id="NickelodeonEurope.us" site_id="NICKELO">Nickelodeon Europe</channel>
     <channel lang="pt" xmltv_id="Odisseia.es" site_id="ODISS">Odisseia</channel>
+    <channel lang="pt" xmltv_id="PFCInternacional.br" site_id="PFC">PFC Internacional</channel>
+    <channel lang="pt" xmltv_id="PandaKids.pt" site_id="PANDAK">Panda Kids</channel>
     <channel lang="pt" xmltv_id="PenthouseGold.us" site_id="PENTHG">Penthouse Gold</channel>
     <channel lang="pt" xmltv_id="PerviykanalEuropa.ru" site_id="1RUSS">Perviy kanal Europa</channel>
-    <channel lang="pt" xmltv_id="PFCInternacional.br" site_id="PFC">PFC Internacional</channel>
     <channel lang="pt" xmltv_id="PhoenixCNE.hk" site_id="PHCNE">Phoenix CNE</channel>
     <channel lang="pt" xmltv_id="PlayboyTVEurope.us" site_id="PLAY">Playboy TV Europe</channel>
     <channel lang="pt" xmltv_id="PortoCanal.pt" site_id="PORTO">Porto Canal</channel>
     <channel lang="pt" xmltv_id="ProTVInternational.ro" site_id="PROTV">Pro TV International</channel>
-    <channel lang="pt" xmltv_id="Rai1.it" site_id="RAI1">Rai 1</channel>
-    <channel lang="pt" xmltv_id="Rai2.it" site_id="RAI2">Rai 2</channel>
-    <channel lang="pt" xmltv_id="Rai3.it" site_id="RAI3">Rai 3</channel>
-    <channel lang="pt" xmltv_id="RaiNews24.it" site_id="RAINEWS">Rai News 24</channel>
-    <channel lang="pt" xmltv_id="RaiScuola.it" site_id="SCUOLA">Rai Scuola</channel>
-    <channel lang="pt" xmltv_id="RaiStoria.it" site_id="STORIA">Rai Storia</channel>
-    <channel lang="pt" xmltv_id="RecordNews.br" site_id="RECNEW">Record News</channel>
-    <channel lang="pt" xmltv_id="RecordTVEuropa.br" site_id="TVREC">Record TV Europa</channel>
     <channel lang="pt" xmltv_id="RTNews.ru" site_id="RUSSTHD">RT News</channel>
     <channel lang="pt" xmltv_id="RTP1.pt" site_id="RTP1">RTP 1</channel>
     <channel lang="pt" xmltv_id="RTP2.pt" site_id="RTP2">RTP 2</channel>
@@ -130,24 +133,36 @@
     <channel lang="pt" xmltv_id="RTPAfrica.pt" site_id="RTPA">RTP África</channel>
     <channel lang="pt" xmltv_id="RTPMadeira.pt" site_id="RTPMA">RTP Madeira</channel>
     <channel lang="pt" xmltv_id="RTPMemoria.pt" site_id="RTPM">RTP Memória</channel>
+    <channel lang="pt" xmltv_id="Rai1.it" site_id="RAI1">Rai 1</channel>
+    <channel lang="pt" xmltv_id="Rai2.it" site_id="RAI2">Rai 2</channel>
+    <channel lang="pt" xmltv_id="Rai3.it" site_id="RAI3">Rai 3</channel>
+    <channel lang="pt" xmltv_id="RaiNews24.it" site_id="RAINEWS">Rai News 24</channel>
+    <channel lang="pt" xmltv_id="RaiScuola.it" site_id="SCUOLA">Rai Scuola</channel>
+    <channel lang="pt" xmltv_id="RaiStoria.it" site_id="STORIA">Rai Storia</channel>
+    <channel lang="pt" xmltv_id="RecordNews.br" site_id="RECNEW">Record News</channel>
+    <channel lang="pt" xmltv_id="RecordTVEuropa.br" site_id="TVREC">Record TV Europa</channel>
+    <channel lang="pt" xmltv_id="RedeGlobo.br" site_id="GLOB">Rede Globo</channel>
+    <channel lang="pt" xmltv_id="RybalkaTelekanal.ua" site_id="RYBALKA">Rybalka Telekanal</channel>
     <channel lang="pt" xmltv_id="SETAsia.in" site_id="SETAS">SET Asia</channel>
-    <channel lang="pt" xmltv_id="Sextreme.br" site_id="SEXTRM">Sextreme</channel>
     <channel lang="pt" xmltv_id="SIC.pt" site_id="SIC">SIC</channel>
     <channel lang="pt" xmltv_id="SICCaras.pt" site_id="SICC">SIC Caras</channel>
     <channel lang="pt" xmltv_id="SICK.pt" site_id="SICK">SIC K</channel>
     <channel lang="pt" xmltv_id="SICMulher.pt" site_id="SICM">SIC Mulher</channel>
     <channel lang="pt" xmltv_id="SICNoticias.pt" site_id="SICN">SIC Notícias</channel>
     <channel lang="pt" xmltv_id="SICRadical.pt" site_id="SICR">SIC Radical</channel>
+    <channel lang="pt" xmltv_id="SPlus.pt" site_id="SMAISHD">S+</channel>
+    <channel lang="pt" xmltv_id="Sextreme.br" site_id="SEXTRM">Sextreme</channel>
     <channel lang="pt" xmltv_id="SkyNewsInternational.uk" site_id="SKYN">Sky News International</channel>
     <channel lang="pt" xmltv_id="SolMusica.es" site_id="SOLMUSI">Sol Música</channel>
     <channel lang="pt" xmltv_id="Somos.es" site_id="SOMOS">Somos</channel>
     <channel lang="pt" xmltv_id="SonyMaxUK.in" site_id="MAX">Sony Max UK</channel>
-    <channel lang="pt" xmltv_id="SportTVPlus.pt" site_id="SPTV">Sport TV +</channel>
     <channel lang="pt" xmltv_id="SportTV1.pt" site_id="SPTV1">Sport TV 1</channel>
     <channel lang="pt" xmltv_id="SportTV2.pt" site_id="SPTV2">Sport TV 2</channel>
     <channel lang="pt" xmltv_id="SportTV3.pt" site_id="SPTV3">Sport TV 3</channel>
     <channel lang="pt" xmltv_id="SportTV4.pt" site_id="SPTV4">Sport TV 4</channel>
     <channel lang="pt" xmltv_id="SportTV5.pt" site_id="SPTV5">Sport TV 5</channel>
+    <channel lang="pt" xmltv_id="SportTV6.pt" site_id="SPTV6">Sport TV 6</channel>
+    <channel lang="pt" xmltv_id="SportTVPlus.pt" site_id="SPTV">Sport TV +</channel>
     <channel lang="pt" xmltv_id="SportingTV.pt" site_id="SCP">Sporting TV</channel>
     <channel lang="pt" xmltv_id="StarCinema.ua" site_id="STARCIN">Star Cinema</channel>
     <channel lang="pt" xmltv_id="StarFamily.ua" site_id="STARFAM">Star Family</channel>
@@ -158,16 +173,12 @@
     <channel lang="pt" xmltv_id="StingrayRetro.ca" site_id="RETRO">Stingray Retro</channel>
     <channel lang="pt" xmltv_id="SyfyPortugal.us" site_id="SYFY">Syfy Portugal</channel>
     <channel lang="pt" xmltv_id="TCVInternacional.cv" site_id="TCV">TCV Internacional</channel>
-    <channel lang="pt" xmltv_id="Telesur.ve" site_id="TELESUR">Telesur</channel>
     <channel lang="pt" xmltv_id="TLCPanRegional.us" site_id="TLC">TLC Pan Regional</channel>
-    <channel lang="pt" xmltv_id="TorosTV.pt" site_id="TOROTV">Toros TV</channel>
     <channel lang="pt" xmltv_id="TPAInternacional.ao" site_id="TPA">TPA Internacional</channel>
-    <channel lang="pt" xmltv_id="TraceBrazuca.fr" site_id="TRACEBR">Trace Brazuca</channel>
-    <channel lang="pt" xmltv_id="TraceToca.fr" site_id="TRACETC">Trace Toca</channel>
-    <channel lang="pt" xmltv_id="TraceUrban.fr" site_id="TRACE">Trace Urban</channel>
     <channel lang="pt" xmltv_id="TRTWorld.tr" site_id="TRTWHD">TRT World</channel>
-    <channel lang="pt" xmltv_id="TVCancaoNovaPortugal.br" site_id="CNOVA">TV Canção Nova Portugal</channel>
+    <channel lang="pt" xmltv_id="TV2.no" site_id="NLOTV2">TV 2</channel>
     <channel lang="pt" xmltv_id="TV5MondeEurope.fr" site_id="TV5">TV5Monde Europe</channel>
+    <channel lang="pt" xmltv_id="TVCancaoNovaPortugal.br" site_id="CNOVA">TV Canção Nova Portugal</channel>
     <channel lang="pt" xmltv_id="TVCineAction.pt" site_id="TVCACTH">TVCine Action</channel>
     <channel lang="pt" xmltv_id="TVCineEdition.pt" site_id="TVCEDIH">TVCine Edition</channel>
     <channel lang="pt" xmltv_id="TVCineEmotion.pt" site_id="TVCEMOH">TVCine Emotion</channel>
@@ -177,7 +188,15 @@
     <channel lang="pt" xmltv_id="TVI24.pt" site_id="TVI24">TVI 24</channel>
     <channel lang="pt" xmltv_id="TVIFiccao.pt" site_id="TVIFIC">TVI Ficção</channel>
     <channel lang="pt" xmltv_id="TVIReality.pt" site_id="TVIR">TVI Reality</channel>
+    <channel lang="pt" xmltv_id="TVVerdade.br" site_id="TVVERHD">TV Verdade</channel>
+    <channel lang="pt" xmltv_id="Telesur.ve" site_id="TELESUR">Telesur</channel>
+    <channel lang="pt" xmltv_id="TorosTV.pt" site_id="TOROTV">Toros TV</channel>
+    <channel lang="pt" xmltv_id="TraceBrazuca.fr" site_id="TRACEBR">Trace Brazuca</channel>
+    <channel lang="pt" xmltv_id="TraceToca.fr" site_id="TRACETC">Trace Toca</channel>
+    <channel lang="pt" xmltv_id="TraceUrban.fr" site_id="TRACE">Trace Urban</channel>
     <channel lang="pt" xmltv_id="Ukraina24.ua" site_id="UKR24">Ukraïna 24</channel>
+    <channel lang="pt" xmltv_id="Ukraine1.ua" site_id="UKR1">Ukraine 1</channel>
+    <channel lang="pt" xmltv_id="Ukraine2.ua" site_id="UKR2">Ukraine 2</channel>
     <channel lang="pt" xmltv_id="Venus.ar" site_id="VENUS">Venus</channel>
     <channel lang="pt" xmltv_id="VividRed.us" site_id="VIVID">Vivid Red</channel>
     <channel lang="pt" xmltv_id="XSport.ua" site_id="XSPORT">X Sport</channel>