diff --git a/sites/meo.pt/meo.pt.channels.xml b/sites/meo.pt/meo.pt.channels.xml
index 21af77dc9..c9b3cf64f 100644
--- a/sites/meo.pt/meo.pt.channels.xml
+++ b/sites/meo.pt/meo.pt.channels.xml
@@ -15,9 +15,9 @@
   <channel site="meo.pt" site_id="ARIRANG" lang="pt" xmltv_id="ArirangTV.kr@SD">Arirang TV</channel>
   <channel site="meo.pt" site_id="ARTEHD" lang="pt" xmltv_id="arte.fr@SD">Arte</channel>
   <channel site="meo.pt" site_id="ARTV" lang="pt" xmltv_id="ARTV.pt@SD">ARTV</channel>
-  <channel site="meo.pt" site_id="AXNHD" lang="pt" xmltv_id="AXN.pt@SD">AXN HD</channel>
-  <channel site="meo.pt" site_id="AXNMHD" lang="pt" xmltv_id="AXNMovies.pt@SD">AXN Movies HD</channel>
-  <channel site="meo.pt" site_id="AXWHD" lang="pt" xmltv_id="AXNWhite.us@Portugal">AXN White HD</channel>
+  <channel site="meo.pt" site_id="AXNHD" lang="pt" xmltv_id="AXN.pt@SD">AXN</channel>
+  <channel site="meo.pt" site_id="AXNMHD" lang="pt" xmltv_id="AXNMovies.pt@SD">AXN Movies</channel>
+  <channel site="meo.pt" site_id="AXWHD" lang="pt" xmltv_id="AXNWhite.us@Portugal">AXN White</channel>
   <channel site="meo.pt" site_id="BABYT" lang="pt" xmltv_id="BabyTV.uk@UK">Baby TV</channel>
   <channel site="meo.pt" site_id="BBC W" lang="pt" xmltv_id="BBCNews.uk@Europe">BBC World News</channel>
   <channel site="meo.pt" site_id="SLBHD" lang="pt" xmltv_id="BenficaTV.pt@SD">BTV</channel>
@@ -28,11 +28,11 @@
   <channel site="meo.pt" site_id="BOMSOM" lang="pt" xmltv_id="BomSomTV.pt@SD">BomSom TV</channel>
   <channel site="meo.pt" site_id="BVN" lang="pt" xmltv_id="BVN.nl@SD">BVN</channel>
   <channel site="meo.pt" site_id="CAÇAPHD" lang="pt" xmltv_id="CacaePesca.pt@SD">Caça e Pesca</channel>
-  <channel site="meo.pt" site_id="C11" lang="pt" xmltv_id="Canal11.pt@SD">11</channel>
+  <channel site="meo.pt" site_id="C11" lang="pt" xmltv_id="Canal11.pt@SD">Canal 11</channel>
   <channel site="meo.pt" site_id="C180" lang="pt" xmltv_id="Canal180.pt@SD">CANAL 180</channel>
   <channel site="meo.pt" site_id="HOLHD" lang="pt" xmltv_id="CanalHollywood.pt@SD">Hollywood</channel>
   <channel site="meo.pt" site_id="PANDA" lang="pt" xmltv_id="CanalPanda.pt@SD">Panda</channel>
-  <channel site="meo.pt" site_id="QHD" lang="pt" xmltv_id="CanalQ.pt@SD">Q</channel>
+  <channel site="meo.pt" site_id="QHD" lang="pt" xmltv_id="CanalQ.pt@SD">Canal Q</channel>
   <channel site="meo.pt" site_id="UME" lang="pt" xmltv_id="CanalUmEuropa.pt@SD">UM Europa</channel>
   <channel site="meo.pt" site_id="CNITO" lang="pt" xmltv_id="Cartoonito.pt@SD">Cartoonito</channel>
   <channel site="meo.pt" site_id="CART" lang="pt" xmltv_id="CartoonNetworkWesternEurope.uk@Portugal">Cartoon Network</channel>
@@ -90,7 +90,7 @@
   <channel site="meo.pt" site_id="HOTGO" lang="pt" xmltv_id="HotGo.pt@SD">HOTGO</channel>
   <channel site="meo.pt" site_id="HOTMAN" lang="pt" xmltv_id="HOTMan.pt@SD">HOT Man</channel>
   <channel site="meo.pt" site_id="HOTTAB" lang="pt" xmltv_id="HOTTaboo.pt@SD">HOT Taboo</channel>
-  <channel site="meo.pt" site_id="HUSTLER" lang="pt" xmltv_id="HustlerHD.nl@SD">Hustler HD</channel>
+  <channel site="meo.pt" site_id="HUSTLER" lang="pt" xmltv_id="HustlerHD.nl@SD">Hustler</channel>
   <channel site="meo.pt" site_id="I24I" lang="pt" xmltv_id="i24NEWSEnglishWorld.il@SD">i24 News (I)</channel>
   <channel site="meo.pt" site_id="I24F" lang="pt" xmltv_id="i24NEWSFrench.il@SD">i24 News (F)</channel>
   <channel site="meo.pt" site_id="ID" lang="pt" xmltv_id="InvestigationDiscoveryEurope.us@SD">Investigation Discovery</channel>
@@ -106,7 +106,7 @@
   <channel site="meo.pt" site_id="MCMTHD" lang="pt" xmltv_id="MCMTop.fr@SD">MCM Top</channel>
   <channel site="meo.pt" site_id="DEST" lang="pt" xmltv_id="MeoDestaques.pt@SD">MEO Destaques</channel>
   <channel site="meo.pt" site_id="MEZZO" lang="pt" xmltv_id="Mezzo.fr@SD">Mezzo</channel>
-  <channel site="meo.pt" site_id="MEZHD" lang="pt" xmltv_id="MezzoLive.fr@SD">Mezzo Live HD</channel>
+  <channel site="meo.pt" site_id="MEZHD" lang="pt" xmltv_id="MezzoLive.fr@SD">Mezzo Live</channel>
   <channel site="meo.pt" site_id="NGHD" lang="pt" xmltv_id="NationalGeographic.pt@SD">National Geographic</channel>
   <channel site="meo.pt" site_id="WILDHD" lang="pt" xmltv_id="NationalGeographicWild.pt@SD">National Geographic Wild</channel>
   <channel site="meo.pt" site_id="NEWBR" lang="pt" xmltv_id="NewBrasil.br@SD">New Brasil</channel>
@@ -122,7 +122,7 @@
   <channel site="meo.pt" site_id="PANDAK" lang="pt" xmltv_id="PandaKids.pt@SD">Panda Kids</channel>
   <channel site="meo.pt" site_id="PENTHG" lang="pt" xmltv_id="PenthouseGold.us@SD">Penthouse Gold</channel>
   <channel site="meo.pt" site_id="PHCNE" lang="pt" xmltv_id="PhoenixCNEChannel.hk@SD">Phoenix CNE</channel>
-  <channel site="meo.pt" site_id="PBTVHD" lang="pt" xmltv_id="PlayboyTVIberia.us@SD">Playboy TV HD</channel>
+  <channel site="meo.pt" site_id="PBTVHD" lang="pt" xmltv_id="PlayboyTVIberia.us@SD">Playboy TV</channel>
   <channel site="meo.pt" site_id="PORTO" lang="pt" xmltv_id="PortoCanal.pt@SD">Porto Canal</channel>
   <channel site="meo.pt" site_id="PROTV" lang="pt" xmltv_id="PROTVInternational.ro@SD">PRO TV Internacional</channel>
   <channel site="meo.pt" site_id="RAI1" lang="pt" xmltv_id="Rai1.it@SD">RAI 1</channel>
@@ -156,7 +156,7 @@
   <channel site="meo.pt" site_id="SETAS" lang="pt" xmltv_id="SonyEntertainmentTelevisionAsia.in@SD">SET Asia</channel>
   <channel site="meo.pt" site_id="MAX" lang="pt" xmltv_id="SonyMax.uk@SD">SET Max</channel>
   <channel site="meo.pt" site_id="SMAISHD" lang="pt" xmltv_id="SPlus.pt@SD">S+</channel>
-  <channel site="meo.pt" site_id="SCPHD" lang="pt" xmltv_id="SportingTV.pt@SD">Sporting TV HD</channel>
+  <channel site="meo.pt" site_id="SCPHD" lang="pt" xmltv_id="SportingTV.pt@SD">Sporting TV</channel>
   <channel site="meo.pt" site_id="SPT1HD" lang="pt" xmltv_id="SportTV1.pt@SD">Sport TV1</channel>
   <channel site="meo.pt" site_id="SPT2HD" lang="pt" xmltv_id="SportTV2.pt@SD">Sport TV2</channel>
   <channel site="meo.pt" site_id="SPT3HD" lang="pt" xmltv_id="SportTV3.pt@SD">Sport TV3</channel>
@@ -179,12 +179,12 @@
   <channel site="meo.pt" site_id="SYFHD" lang="pt" xmltv_id="Syfy.pt@SD">SyFy</channel>
   <channel site="meo.pt" site_id="TAGES24" lang="pt" xmltv_id="tagesschau24.de@SD">Tagesschau24</channel>
   <channel site="meo.pt" site_id="TCV" lang="pt" xmltv_id="TCVInternacional.cv@SD">TCV Internacional</channel>
-  <channel site="meo.pt" site_id="TELESUR" lang="pt" xmltv_id="Telesur.ve@SD">Telesur HD</channel>
+  <channel site="meo.pt" site_id="TELESUR" lang="pt" xmltv_id="Telesur.ve@SD">Telesur</channel>
   <channel site="meo.pt" site_id="DIZI" lang="pt" xmltv_id="TimelessDiziChannel.ro@SD">Dizi Channel</channel>
   <channel site="meo.pt" site_id="TLC" lang="pt" xmltv_id="TLC.pt@SD">TLC</channel>
   <channel site="meo.pt" site_id="TPA" lang="en" xmltv_id="TPAi.ao@SD">TPA Notícias</channel>
   <channel site="meo.pt" site_id="TRAHD" lang="pt" xmltv_id="TraceUrban.fr@SD">Trace Urban</channel>
-  <channel site="meo.pt" site_id="TRAXP" lang="pt" xmltv_id="Travelxp.in@SD">Travelxp HD</channel>
+  <channel site="meo.pt" site_id="TRAXP" lang="pt" xmltv_id="Travelxp.in@SD">Travelxp</channel>
   <channel site="meo.pt" site_id="TRTWHD" lang="en" xmltv_id="TRTWorld.tr@SD">TRT World</channel>
   <channel site="meo.pt" site_id="TV5HD" lang="pt" xmltv_id="TV5MondeEurope.fr@SD">TV5 Monde</channel>
   <channel site="meo.pt" site_id="TVA" lang="pt" xmltv_id="TVA.cv@SD">Televisão África</channel>
diff --git a/sites/nostv.pt/nostv.pt.channels.xml b/sites/nostv.pt/nostv.pt.channels.xml
index 29dcf4ff5..ddb29b818 100644
--- a/sites/nostv.pt/nostv.pt.channels.xml
+++ b/sites/nostv.pt/nostv.pt.channels.xml
@@ -1,142 +1,134 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
-  <channel site="nostv.pt" site_id="40" lang="de" xmltv_id="RTL.hr@SD">RTL</channel>
   <channel site="nostv.pt" site_id="24" lang="en" xmltv_id="1Plus1International.ua@SD">1+1</channel>
-  <channel site="nostv.pt" site_id="108" lang="en" xmltv_id="AlJazeera.qa@Arabic">Al Jazeera</channel>
-  <channel site="nostv.pt" site_id="44" lang="en" xmltv_id="BloombergTV.us@Europe">Bloomberg</channel>
-  <channel site="nostv.pt" site_id="316" lang="en" xmltv_id="CCTV4Europe.cn@SD">CCTV 4</channel>
-  <channel site="nostv.pt" site_id="312" lang="en" xmltv_id="CGTN.cn@SD">CGTN</channel>
-  <channel site="nostv.pt" site_id="52" lang="en" xmltv_id="CNBCEurope.uk@SD">CNBC</channel>
-  <channel site="nostv.pt" site_id="26" lang="en" xmltv_id="CNNInternational.us@MENA">CNN</channel>
-  <channel site="nostv.pt" site_id="115" lang="en" xmltv_id="DW.de@English">DW</channel>
-  <channel site="nostv.pt" site_id="236" lang="en" xmltv_id="FightNetwork.ca@SD">Fight Network HD</channel>
-  <channel site="nostv.pt" site_id="109" lang="en" xmltv_id="France24.fr@English">France 24 (I)</channel>
-  <channel site="nostv.pt" site_id="680" lang="en" xmltv_id="HorseTV.us@SD">Horse TV</channel>
-  <channel site="nostv.pt" site_id="234" lang="en" xmltv_id="KBSWorld.kr@SD">KBS World HD</channel>
-  <channel site="nostv.pt" site_id="34" lang="en" xmltv_id="MCMTop.fr@SD">MCM Top</channel>
-  <channel site="nostv.pt" site_id="356" lang="en" xmltv_id="MezzoLive.fr@SD">Mezzo Live HD</channel>
-  <channel site="nostv.pt" site_id="167" lang="en" xmltv_id="MyZenTV.fr@SD">MyZen TV</channel>
-  <channel site="nostv.pt" site_id="83" lang="en" xmltv_id="NationalGeographicWild.pt@SD">National Geographic WILD HD</channel>
-  <channel site="nostv.pt" site_id="679" lang="en" xmltv_id="NauticalChannel.it@SD">Nautical Channel</channel>
-  <channel site="nostv.pt" site_id="46" lang="en" xmltv_id="NHKWorldJapan.jp@SD">NHK World TV</channel>
-  <channel site="nostv.pt" site_id="39" lang="en" xmltv_id="SkyNewsAustralia.au@SD">Sky News</channel>
-  <channel site="nostv.pt" site_id="144" lang="en" xmltv_id="SonyEntertainmentTelevisionAsia.in@SD">SET Asia</channel>
-  <channel site="nostv.pt" site_id="143" lang="en" xmltv_id="SonyMax.uk@SD">MAX</channel>
-  <channel site="nostv.pt" site_id="42" lang="en" xmltv_id="StingrayiConcerts.ca@SD">Stingray iConcerts HD</channel>
-  <channel site="nostv.pt" site_id="701" lang="en" xmltv_id="WSport.za@SD">W-Sport</channel>
-  <channel site="nostv.pt" site_id="48" lang="es" xmltv_id="TVEInternacionalEuropeAsia.es@SD">TVEi</channel>
-  <channel site="nostv.pt" site_id="41" lang="fr" xmltv_id="arte.fr@SD">ARTE (Français)</channel>
-  <channel site="nostv.pt" site_id="132" lang="fr" xmltv_id="France24.fr@French">France 24 (F)</channel>
-  <channel site="nostv.pt" site_id="37" lang="fr" xmltv_id="M6.fr@HD">M6</channel>
-  <channel site="nostv.pt" site_id="53" lang="fr" xmltv_id="TV5MondeEurope.fr@SD">TV5 Monde</channel>
-  <channel site="nostv.pt" site_id="28" lang="nl" xmltv_id="BVN.nl@SD">BVN</channel>
   <channel site="nostv.pt" site_id="172" lang="pt" xmltv_id="24Horas.es@SD">TVE 24h</channel>
-  <channel site="nostv.pt" site_id="243" lang="pt" xmltv_id="24Kitchen.us@Portugal">24Kitchen HD</channel>
+  <channel site="nostv.pt" site_id="243" lang="pt" xmltv_id="24Kitchen.us@Portugal">24Kitchen</channel>
   <channel site="nostv.pt" site_id="719" lang="pt" xmltv_id="ABolaTV.pt@SD">A Bola TV</channel>
   <channel site="nostv.pt" site_id="272" lang="pt" xmltv_id="AfroMusicChannel.ao@SD">Afro Music Channel</channel>
-  <channel site="nostv.pt" site_id="509" lang="pt" xmltv_id="AMCBreak.pt@SD">AMC Break HD</channel>
-  <channel site="nostv.pt" site_id="545" lang="pt" xmltv_id="AMCCrime.pt@SD">AMC Crime HD</channel>
-  <channel site="nostv.pt" site_id="415" lang="pt" xmltv_id="AMCEurope.uk@Portugal">AMC HD</channel>
+  <channel site="nostv.pt" site_id="108" lang="en" xmltv_id="AlJazeera.qa@Arabic">Al Jazeera</channel>
+  <channel site="nostv.pt" site_id="509" lang="pt" xmltv_id="AMCBreak.pt@SD">AMC Break</channel>
+  <channel site="nostv.pt" site_id="545" lang="pt" xmltv_id="AMCCrime.pt@SD">AMC Crime</channel>
+  <channel site="nostv.pt" site_id="415" lang="pt" xmltv_id="AMCEurope.uk@Portugal">AMC</channel>
   <channel site="nostv.pt" site_id="723" lang="pt" xmltv_id="arte.de@SD">ARTE (Deutsch)</channel>
+  <channel site="nostv.pt" site_id="41" lang="fr" xmltv_id="arte.fr@SD">ARTE (Français)</channel>
   <channel site="nostv.pt" site_id="49" lang="pt" xmltv_id="ARTV.pt@SD">ARTV</channel>
-  <channel site="nostv.pt" site_id="161" lang="pt" xmltv_id="AXN.pt@SD">AXN HD</channel>
-  <channel site="nostv.pt" site_id="194" lang="pt" xmltv_id="AXNMovies.pt@SD">AXN Movies HD</channel>
-  <channel site="nostv.pt" site_id="75" lang="pt" xmltv_id="AXNWhite.us@Portugal">AXN White HD</channel>
+  <channel site="nostv.pt" site_id="161" lang="pt" xmltv_id="AXN.pt@SD">AXN</channel>
+  <channel site="nostv.pt" site_id="194" lang="pt" xmltv_id="AXNMovies.pt@SD">AXN Movies</channel>
+  <channel site="nostv.pt" site_id="75" lang="pt" xmltv_id="AXNWhite.us@Portugal">AXN White</channel>
   <channel site="nostv.pt" site_id="448" lang="pt" xmltv_id="BabyTV.uk@UK">Baby TV</channel>
-  <channel site="nostv.pt" site_id="245" lang="pt" xmltv_id="BenficaTV.pt@SD">BTV1 HD</channel>
+  <channel site="nostv.pt" site_id="245" lang="pt" xmltv_id="BenficaTV.pt@SD">BTV</channel>
+  <channel site="nostv.pt" site_id="44" lang="en" xmltv_id="BloombergTV.us@Europe">Bloomberg</channel>
   <channel site="nostv.pt" site_id="124" lang="pt" xmltv_id="BNTWorld.bg@SD">BNT World</channel>
+  <channel site="nostv.pt" site_id="28" lang="nl" xmltv_id="BVN.nl@SD">BVN</channel>
   <channel site="nostv.pt" site_id="129" lang="pt" xmltv_id="CacaePesca.pt@SD">Caça e Pesca</channel>
-  <channel site="nostv.pt" site_id="565" lang="pt" xmltv_id="Canal11.pt@SD">Canal 11 HD</channel>
+  <channel site="nostv.pt" site_id="565" lang="pt" xmltv_id="Canal11.pt@SD">Canal 11</channel>
   <channel site="nostv.pt" site_id="58" lang="pt" xmltv_id="Canal180.pt@SD">Canal 180</channel>
   <channel site="nostv.pt" site_id="682" lang="pt" xmltv_id="CanalConvidado.pt@SD">Canal Convidado</channel>
   <channel site="nostv.pt" site_id="588" lang="pt" xmltv_id="CanalGaleria.pt@SD">Canal Galeria</channel>
-  <channel site="nostv.pt" site_id="14" lang="pt" xmltv_id="CanalHollywood.pt@SD">Canal Hollywood HD</channel>
+  <channel site="nostv.pt" site_id="14" lang="pt" xmltv_id="CanalHollywood.pt@SD">Canal Hollywood</channel>
   <channel site="nostv.pt" site_id="714" lang="pt" xmltv_id="CanalMacau.mo@SD">TDM</channel>
-  <channel site="nostv.pt" site_id="408" lang="pt" xmltv_id="CanalNOS.pt@HD">Canal NOS HD</channel>
-  <channel site="nostv.pt" site_id="593" lang="pt" xmltv_id="CanalPanda.pt@SD">Canal Panda HD</channel>
+  <channel site="nostv.pt" site_id="408" lang="pt" xmltv_id="CanalNOS.pt@HD">Canal NOS</channel>
+  <channel site="nostv.pt" site_id="593" lang="pt" xmltv_id="CanalPanda.pt@SD">Canal Panda</channel>
   <channel site="nostv.pt" site_id="235" lang="pt" xmltv_id="CanalQ.pt@SD">Canal Q</channel>
   <channel site="nostv.pt" site_id="713" lang="pt" xmltv_id="Cartoonito.pt@SD">Cartoonito</channel>
-  <channel site="nostv.pt" site_id="252" lang="pt" xmltv_id="CartoonNetworkWesternEurope.uk@Portugal">Cartoon Network HD</channel>
-  <channel site="nostv.pt" site_id="572" lang="pt" xmltv_id="CasaeCozinha.pt@SD">Casa e Cozinha HD</channel>
-  <channel site="nostv.pt" site_id="425" lang="pt" xmltv_id="CMTV.pt@SD">CMTV HD</channel>
-  <channel site="nostv.pt" site_id="557" lang="pt" xmltv_id="CNNPortugal.pt@SD">CNN Portugal HD</channel>
+  <channel site="nostv.pt" site_id="252" lang="pt" xmltv_id="CartoonNetworkWesternEurope.uk@Portugal">Cartoon Network</channel>
+  <channel site="nostv.pt" site_id="572" lang="pt" xmltv_id="CasaeCozinha.pt@SD">Casa e Cozinha</channel>
+  <channel site="nostv.pt" site_id="316" lang="en" xmltv_id="CCTV4Europe.cn@SD">CCTV 4</channel>
+  <channel site="nostv.pt" site_id="312" lang="en" xmltv_id="CGTN.cn@SD">CGTN</channel>
+  <channel site="nostv.pt" site_id="425" lang="pt" xmltv_id="CMTV.pt@SD">CMTV</channel>
+  <channel site="nostv.pt" site_id="52" lang="en" xmltv_id="CNBCEurope.uk@SD">CNBC</channel>
+  <channel site="nostv.pt" site_id="26" lang="en" xmltv_id="CNNInternational.us@MENA">CNN</channel>
+  <channel site="nostv.pt" site_id="557" lang="pt" xmltv_id="CNNPortugal.pt@SD">CNN Portugal</channel>
   <channel site="nostv.pt" site_id="721" lang="pt" xmltv_id="ContaLa.pt@HD">Conta Lá</channel>
   <channel site="nostv.pt" site_id="121" lang="pt" xmltv_id="CubavisionInternacional.cu@SD">Cubavisión Internacional</channel>
   <channel site="nostv.pt" site_id="718" lang="pt" xmltv_id="DaystarTV.us@SD">Daystar</channel>
   <channel site="nostv.pt" site_id="717" lang="pt" xmltv_id="DaystarTVEspanol.us@SD">Daystar Español</channel>
-  <channel site="nostv.pt" site_id="518" lang="pt" xmltv_id="DAZN1.uk@Portugal">DAZN 1</channel>
-  <channel site="nostv.pt" site_id="519" lang="pt" xmltv_id="DAZN2.uk@Portugal">DAZN 2</channel>
-  <channel site="nostv.pt" site_id="513" lang="pt" xmltv_id="DAZN3.uk@Portugal">DAZN 3</channel>
-  <channel site="nostv.pt" site_id="514" lang="pt" xmltv_id="DAZN4.uk@Portugal">DAZN 4</channel>
-  <channel site="nostv.pt" site_id="515" lang="pt" xmltv_id="DAZN5.uk@Portugal">DAZN 5</channel>
-  <channel site="nostv.pt" site_id="561" lang="pt" xmltv_id="DiscoveryChannel.pt@SD">Discovery HD</channel>
-  <channel site="nostv.pt" site_id="594" lang="pt" xmltv_id="DisneyChannel.pt@SD">Disney Channel HD</channel>
-  <channel site="nostv.pt" site_id="673" lang="pt" xmltv_id="DisneyJunior.pt@SD">Disney Junior HD</channel>
+  <channel site="nostv.pt" site_id="561" lang="pt" xmltv_id="DiscoveryChannel.pt@SD">Discovery</channel>
+  <channel site="nostv.pt" site_id="594" lang="pt" xmltv_id="DisneyChannel.pt@SD">Disney Channel</channel>
+  <channel site="nostv.pt" site_id="673" lang="pt" xmltv_id="DisneyJunior.pt@SD">Disney Junior</channel>
   <channel site="nostv.pt" site_id="371" lang="pt" xmltv_id="DogTV.us@SD">DOGTV</channel>
-  <channel site="nostv.pt" site_id="202" lang="pt" xmltv_id="E.fr@SD">E! Entertainment HD</channel>
+  <channel site="nostv.pt" site_id="115" lang="en" xmltv_id="DW.de@English">DW</channel>
+  <channel site="nostv.pt" site_id="202" lang="pt" xmltv_id="E.fr@SD">E! Entertainment</channel>
   <channel site="nostv.pt" site_id="25" lang="pt" xmltv_id="EuronewsPortuguese.fr@SD">Euronews</channel>
-  <channel site="nostv.pt" site_id="145" lang="pt" xmltv_id="Eurosport1.fr@France">Eurosport 1 HD</channel>
-  <channel site="nostv.pt" site_id="563" lang="pt" xmltv_id="Eurosport2.fr@France">Eurosport 2 HD</channel>
-  <channel site="nostv.pt" site_id="47" lang="pt" xmltv_id="FashionTVHD.fr@SD">FTV HD</channel>
-  <channel site="nostv.pt" site_id="62" lang="pt" xmltv_id="FoodNetworkEMEA.us@SD">Food Network HD</channel>
-  <channel site="nostv.pt" site_id="72" lang="pt" xmltv_id="FUELTV.pt@EMEA">Fuel TV HD</channel>
+  <channel site="nostv.pt" site_id="145" lang="pt" xmltv_id="Eurosport1.fr@France">Eurosport 1</channel>
+  <channel site="nostv.pt" site_id="563" lang="pt" xmltv_id="Eurosport2.fr@France">Eurosport 2</channel>
+  <channel site="nostv.pt" site_id="47" lang="pt" xmltv_id="FashionTVHD.fr@SD">FTV</channel>
+  <channel site="nostv.pt" site_id="236" lang="en" xmltv_id="FightNetwork.ca@SD">Fight Network</channel>
+  <channel site="nostv.pt" site_id="62" lang="pt" xmltv_id="FoodNetworkEMEA.us@SD">Food Network</channel>
+  <channel site="nostv.pt" site_id="109" lang="en" xmltv_id="France24.fr@English">France 24 (I)</channel>
+  <channel site="nostv.pt" site_id="132" lang="fr" xmltv_id="France24.fr@French">France 24 (F)</channel>
+  <channel site="nostv.pt" site_id="72" lang="pt" xmltv_id="FUELTV.pt@EMEA">Fuel TV</channel>
   <channel site="nostv.pt" site_id="54" lang="pt" xmltv_id="GaliciaTVEuropa.es@SD">TV Galicia</channel>
-  <channel site="nostv.pt" site_id="447" lang="pt" xmltv_id="Globo.pt@SD">Globo HD</channel>
+  <channel site="nostv.pt" site_id="447" lang="pt" xmltv_id="Globo.pt@SD">Globo</channel>
   <channel site="nostv.pt" site_id="710" lang="pt" xmltv_id="HGTV.us@Portugal">HGTV</channel>
-  <channel site="nostv.pt" site_id="544" lang="pt" xmltv_id="Historia.pt@SD">Canal História HD</channel>
+  <channel site="nostv.pt" site_id="544" lang="pt" xmltv_id="Historia.pt@SD">Canal História</channel>
+  <channel site="nostv.pt" site_id="680" lang="en" xmltv_id="HorseTV.us@SD">Horse TV</channel>
   <channel site="nostv.pt" site_id="530" lang="pt" xmltv_id="InvestigationDiscoveryEurope.us@SD">ID Investigation Discovery</channel>
+  <channel site="nostv.pt" site_id="234" lang="en" xmltv_id="KBSWorld.kr@SD">KBS World</channel>
   <channel site="nostv.pt" site_id="426" lang="pt" xmltv_id="KuriakosTV.pt@SD">Kuriakos TV</channel>
-  <channel site="nostv.pt" site_id="229" lang="pt" xmltv_id="LocalVisaoTV.pt@SD">Localvisão TV HD</channel>
+  <channel site="nostv.pt" site_id="229" lang="pt" xmltv_id="LocalVisaoTV.pt@SD">Localvisão TV</channel>
+  <channel site="nostv.pt" site_id="37" lang="fr" xmltv_id="M6.fr@HD">M6</channel>
   <channel site="nostv.pt" site_id="368" lang="pt" xmltv_id="MCMPop.fr@SD">MCM Pop</channel>
+  <channel site="nostv.pt" site_id="34" lang="en" xmltv_id="MCMTop.fr@SD">MCM Top</channel>
   <channel site="nostv.pt" site_id="50" lang="pt" xmltv_id="Mezzo.fr@SD">Mezzo</channel>
-  <channel site="nostv.pt" site_id="354" lang="pt" xmltv_id="Motorvision.de@SD">Motorvision HD</channel>
-  <channel site="nostv.pt" site_id="377" lang="pt" xmltv_id="MTV.pt@SD">MTV Portugal HD</channel>
-  <channel site="nostv.pt" site_id="134" lang="pt" xmltv_id="NationalGeographic.pt@SD">National Geographic HD</channel>
+  <channel site="nostv.pt" site_id="356" lang="en" xmltv_id="MezzoLive.fr@SD">Mezzo Live</channel>
+  <channel site="nostv.pt" site_id="354" lang="pt" xmltv_id="Motorvision.de@SD">Motorvision</channel>
+  <channel site="nostv.pt" site_id="377" lang="pt" xmltv_id="MTV.pt@SD">MTV Portugal</channel>
+  <channel site="nostv.pt" site_id="167" lang="en" xmltv_id="MyZenTV.fr@SD">MyZen TV</channel>
+  <channel site="nostv.pt" site_id="134" lang="pt" xmltv_id="NationalGeographic.pt@SD">National Geographic</channel>
+  <channel site="nostv.pt" site_id="83" lang="en" xmltv_id="NationalGeographicWild.pt@SD">National Geographic WILD</channel>
+  <channel site="nostv.pt" site_id="679" lang="en" xmltv_id="NauticalChannel.it@SD">Nautical Channel</channel>
   <channel site="nostv.pt" site_id="697" lang="pt" xmltv_id="NewBrasil.br@SD">New Brasil</channel>
   <channel site="nostv.pt" site_id="705" lang="pt" xmltv_id="NewsNow.pt@SD">NewsNOW</channel>
+  <channel site="nostv.pt" site_id="46" lang="en" xmltv_id="NHKWorldJapan.jp@SD">NHK World TV</channel>
   <channel site="nostv.pt" site_id="94" lang="pt" xmltv_id="Nickelodeon.pt@SD">Nickelodeon</channel>
   <channel site="nostv.pt" site_id="444" lang="pt" xmltv_id="NickJr.pt@SD">Nick Jr.</channel>
-  <channel site="nostv.pt" site_id="547" lang="pt" xmltv_id="NosStudios.pt@SD">NOS Studios HD</channel>
-  <channel site="nostv.pt" site_id="441" lang="pt" xmltv_id="Odisseia.pt@SD">ODISSEIA HD</channel>
+  <channel site="nostv.pt" site_id="547" lang="pt" xmltv_id="NosStudios.pt@SD">NOS Studios</channel>
+  <channel site="nostv.pt" site_id="441" lang="pt" xmltv_id="Odisseia.pt@SD">ODISSEIA</channel>
   <channel site="nostv.pt" site_id="694" lang="pt" xmltv_id="OneToroTV.es@SD">OneToro TV</channel>
   <channel site="nostv.pt" site_id="597" lang="pt" xmltv_id="PandaKids.pt@SD">Panda KIDS</channel>
-  <channel site="nostv.pt" site_id="423" lang="pt" xmltv_id="PortoCanal.pt@SD">Porto Canal HD</channel>
+  <channel site="nostv.pt" site_id="423" lang="pt" xmltv_id="PortoCanal.pt@SD">Porto Canal</channel>
   <channel site="nostv.pt" site_id="55" lang="pt" xmltv_id="RaiItalia.it@EuropeAfrica">Rai Italia</channel>
   <channel site="nostv.pt" site_id="30" lang="pt" xmltv_id="RecordNews.br@SD">Record News</channel>
   <channel site="nostv.pt" site_id="350" lang="pt" xmltv_id="RecordTVEuropa.pt@SD">Record</channel>
   <channel site="nostv.pt" site_id="165" lang="pt" xmltv_id="RT.ru@SD">Russia Today</channel>
-  <channel site="nostv.pt" site_id="139" lang="pt" xmltv_id="RTP1.pt@HD">RTP 1 HD</channel>
-  <channel site="nostv.pt" site_id="554" lang="pt" xmltv_id="RTP2.pt@HD">RTP 2 HD</channel>
+  <channel site="nostv.pt" site_id="40" lang="de" xmltv_id="RTL.hr@SD">RTL</channel>
+  <channel site="nostv.pt" site_id="139" lang="pt" xmltv_id="RTP1.pt@HD">RTP 1</channel>
+  <channel site="nostv.pt" site_id="554" lang="pt" xmltv_id="RTP2.pt@HD">RTP 2</channel>
   <channel site="nostv.pt" site_id="106" lang="pt" xmltv_id="RTPAcores.pt@HD">RTP Açores</channel>
   <channel site="nostv.pt" site_id="27" lang="pt" xmltv_id="RTPAfrica.pt@SD">RTP África</channel>
   <channel site="nostv.pt" site_id="107" lang="pt" xmltv_id="RTPMadeira.pt@HD">RTP Madeira</channel>
   <channel site="nostv.pt" site_id="80" lang="pt" xmltv_id="RTPMemoria.pt@SD">RTP Memória</channel>
-  <channel site="nostv.pt" site_id="556" lang="pt" xmltv_id="RTPNoticias.pt@HD">RTP Notícias HD</channel>
+  <channel site="nostv.pt" site_id="556" lang="pt" xmltv_id="RTPNoticias.pt@HD">RTP Notícias</channel>
   <channel site="nostv.pt" site_id="117" lang="pt" xmltv_id="RTRPlaneta.ru@Europe">RTR Planeta</channel>
-  <channel site="nostv.pt" site_id="418" lang="pt" xmltv_id="SIC.pt@SD">SIC HD</channel>
-  <channel site="nostv.pt" site_id="421" lang="pt" xmltv_id="SICCaras.pt@SD">SIC Caras HD</channel>
-  <channel site="nostv.pt" site_id="553" lang="pt" xmltv_id="SICK.pt@SD">SIC K HD</channel>
-  <channel site="nostv.pt" site_id="420" lang="pt" xmltv_id="SICMulher.pt@SD">SIC Mulher HD</channel>
-  <channel site="nostv.pt" site_id="419" lang="pt" xmltv_id="SICNoticias.pt@SD">SIC Notícias HD</channel>
+  <channel site="nostv.pt" site_id="418" lang="pt" xmltv_id="SIC.pt@SD">SIC</channel>
+  <channel site="nostv.pt" site_id="421" lang="pt" xmltv_id="SICCaras.pt@SD">SIC Caras</channel>
+  <channel site="nostv.pt" site_id="553" lang="pt" xmltv_id="SICK.pt@SD">SIC K</channel>
+  <channel site="nostv.pt" site_id="420" lang="pt" xmltv_id="SICMulher.pt@SD">SIC Mulher</channel>
+  <channel site="nostv.pt" site_id="419" lang="pt" xmltv_id="SICNoticias.pt@SD">SIC Notícias</channel>
   <channel site="nostv.pt" site_id="709" lang="pt" xmltv_id="SICNovelas.pt@SD">SIC Novelas</channel>
-  <channel site="nostv.pt" site_id="422" lang="pt" xmltv_id="SICRadical.pt@SD">SIC Radical HD</channel>
-  <channel site="nostv.pt" site_id="510" lang="pt" xmltv_id="SPlus.pt@SD">S+ HD</channel>
-  <channel site="nostv.pt" site_id="352" lang="pt" xmltv_id="SportingTV.pt@SD">Sporting TV HD</channel>
-  <channel site="nostv.pt" site_id="137" lang="pt" xmltv_id="SportTV1.pt@SD">SPORT TV1 HD</channel>
-  <channel site="nostv.pt" site_id="187" lang="pt" xmltv_id="SportTV2.pt@SD">SPORT TV2 HD</channel>
-  <channel site="nostv.pt" site_id="188" lang="pt" xmltv_id="SportTV3.pt@SD">SPORT TV3 HD</channel>
-  <channel site="nostv.pt" site_id="247" lang="pt" xmltv_id="SportTV4.pt@SD">SPORT TV4 HD</channel>
-  <channel site="nostv.pt" site_id="180" lang="pt" xmltv_id="SportTV5.pt@SD">SPORT TV5 HD</channel>
-  <channel site="nostv.pt" site_id="610" lang="pt" xmltv_id="SportTV6.pt@SD">Sport TV 6 HD</channel>
-  <channel site="nostv.pt" site_id="706" lang="pt" xmltv_id="SportTV7.pt@SD">Sport TV 7 HD</channel>
-  <channel site="nostv.pt" site_id="417" lang="pt" xmltv_id="SportTVPlus.pt@SD">SPORT TV+ HD</channel>
-  <channel site="nostv.pt" site_id="174" lang="pt" xmltv_id="StarChannel.pt@SD">Star Channel HD</channel>
-  <channel site="nostv.pt" site_id="113" lang="pt" xmltv_id="StarComedy.pt@SD">Star Comedy HD</channel>
-  <channel site="nostv.pt" site_id="244" lang="pt" xmltv_id="StarCrime.pt@SD">Star Crime HD</channel>
-  <channel site="nostv.pt" site_id="175" lang="pt" xmltv_id="StarLife.pt@SD">Star Life HD</channel>
-  <channel site="nostv.pt" site_id="242" lang="pt" xmltv_id="StarMovies.pt@SD">Star Movies HD</channel>
+  <channel site="nostv.pt" site_id="422" lang="pt" xmltv_id="SICRadical.pt@SD">SIC Radical</channel>
+  <channel site="nostv.pt" site_id="39" lang="en" xmltv_id="SkyNewsAustralia.au@SD">Sky News</channel>
+  <channel site="nostv.pt" site_id="144" lang="en" xmltv_id="SonyEntertainmentTelevisionAsia.in@SD">SET Asia</channel>
+  <channel site="nostv.pt" site_id="143" lang="en" xmltv_id="SonyMax.uk@SD">MAX</channel>
+  <channel site="nostv.pt" site_id="510" lang="pt" xmltv_id="SPlus.pt@SD">S+</channel>
+  <channel site="nostv.pt" site_id="352" lang="pt" xmltv_id="SportingTV.pt@SD">Sporting TV</channel>
+  <channel site="nostv.pt" site_id="137" lang="pt" xmltv_id="SportTV1.pt@SD">SPORT TV1</channel>
+  <channel site="nostv.pt" site_id="187" lang="pt" xmltv_id="SportTV2.pt@SD">SPORT TV2</channel>
+  <channel site="nostv.pt" site_id="188" lang="pt" xmltv_id="SportTV3.pt@SD">SPORT TV3</channel>
+  <channel site="nostv.pt" site_id="247" lang="pt" xmltv_id="SportTV4.pt@SD">SPORT TV4</channel>
+  <channel site="nostv.pt" site_id="180" lang="pt" xmltv_id="SportTV5.pt@SD">SPORT TV5</channel>
+  <channel site="nostv.pt" site_id="610" lang="pt" xmltv_id="SportTV6.pt@SD">Sport TV6</channel>
+  <channel site="nostv.pt" site_id="706" lang="pt" xmltv_id="SportTV7.pt@SD">Sport TV7</channel>
+  <channel site="nostv.pt" site_id="417" lang="pt" xmltv_id="SportTVPlus.pt@SD">SPORT TV+</channel>
+  <channel site="nostv.pt" site_id="174" lang="pt" xmltv_id="StarChannel.pt@SD">Star Channel</channel>
+  <channel site="nostv.pt" site_id="113" lang="pt" xmltv_id="StarComedy.pt@SD">Star Comedy</channel>
+  <channel site="nostv.pt" site_id="244" lang="pt" xmltv_id="StarCrime.pt@SD">Star Crime</channel>
+  <channel site="nostv.pt" site_id="175" lang="pt" xmltv_id="StarLife.pt@SD">Star Life</channel>
+  <channel site="nostv.pt" site_id="242" lang="pt" xmltv_id="StarMovies.pt@SD">Star Movies</channel>
+  <channel site="nostv.pt" site_id="42" lang="en" xmltv_id="StingrayiConcerts.ca@SD">Stingray iConcerts</channel>
   <channel site="nostv.pt" site_id="343" lang="pt" xmltv_id="STVNoticias.mz@SD">STV Notícias</channel>
-  <channel site="nostv.pt" site_id="201" lang="pt" xmltv_id="Syfy.pt@SD">Syfy HD</channel>
+  <channel site="nostv.pt" site_id="201" lang="pt" xmltv_id="Syfy.pt@SD">Syfy</channel>
   <channel site="nostv.pt" site_id="237" lang="pt" xmltv_id="TCVInternacional.cv@SD">TCV Internacional</channel>
   <channel site="nostv.pt" site_id="33" lang="pt" xmltv_id="Telesur.ve@SD">TeleSUR</channel>
   <channel site="nostv.pt" site_id="702" lang="pt" xmltv_id="TimelessDiziChannel.ro@SD">Dizi</channel>
@@ -144,20 +136,22 @@
   <channel site="nostv.pt" site_id="138" lang="pt" xmltv_id="TPAi.ao@SD">TPA Notícias</channel>
   <channel site="nostv.pt" site_id="704" lang="pt" xmltv_id="TraceBrazuca.fr@SD">Trace Brasil</channel>
   <channel site="nostv.pt" site_id="543" lang="pt" xmltv_id="TraceToca.fr@SD">Trace Toca</channel>
-  <channel site="nostv.pt" site_id="65" lang="pt" xmltv_id="TraceUrban.fr@SD">Trace Urban HD</channel>
-  <channel site="nostv.pt" site_id="70" lang="pt" xmltv_id="TravelChannelEMEA.uk@SD">Travel Channel HD</channel>
+  <channel site="nostv.pt" site_id="65" lang="pt" xmltv_id="TraceUrban.fr@SD">Trace Urban</channel>
+  <channel site="nostv.pt" site_id="70" lang="pt" xmltv_id="TravelChannelEMEA.uk@SD">Travel Channel</channel>
   <channel site="nostv.pt" site_id="142" lang="pt" xmltv_id="TVCancaoNova.pt@SD">Canção Nova</channel>
-  <channel site="nostv.pt" site_id="224" lang="pt" xmltv_id="TVCineAction.pt@SD">TVCine ACTION HD</channel>
-  <channel site="nostv.pt" site_id="74" lang="pt" xmltv_id="TVCineEdition.pt@SD">TVCine EDITION HD</channel>
-  <channel site="nostv.pt" site_id="223" lang="pt" xmltv_id="TVCineEmotion.pt@SD">TVCine EMOTION HD</channel>
-  <channel site="nostv.pt" site_id="141" lang="pt" xmltv_id="TVCineTop.pt@SD">TVCine TOP HD</channel>
-  <channel site="nostv.pt" site_id="555" lang="pt" xmltv_id="TVI.pt@SD">TVI HD</channel>
-  <channel site="nostv.pt" site_id="567" lang="pt" xmltv_id="TVIReality.pt@SD">TVI Reality HD</channel>
+  <channel site="nostv.pt" site_id="224" lang="pt" xmltv_id="TVCineAction.pt@SD">TVCine ACTION</channel>
+  <channel site="nostv.pt" site_id="74" lang="pt" xmltv_id="TVCineEdition.pt@SD">TVCine EDITION</channel>
+  <channel site="nostv.pt" site_id="223" lang="pt" xmltv_id="TVCineEmotion.pt@SD">TVCine EMOTION</channel>
+  <channel site="nostv.pt" site_id="141" lang="pt" xmltv_id="TVCineTop.pt@SD">TVCine TOP</channel>
+  <channel site="nostv.pt" site_id="48" lang="es" xmltv_id="TVEInternacionalEuropeAsia.es@SD">TVEi</channel>
+  <channel site="nostv.pt" site_id="555" lang="pt" xmltv_id="TVI.pt@SD">TVI</channel>
+  <channel site="nostv.pt" site_id="567" lang="pt" xmltv_id="TVIReality.pt@SD">TVI Reality</channel>
   <channel site="nostv.pt" site_id="123" lang="pt" xmltv_id="TVRInternational.ro@SD">TVR Internacional</channel>
   <channel site="nostv.pt" site_id="708" lang="pt" xmltv_id="TVZimboInternacional.ao@HD">TV Zimbo</channel>
   <channel site="nostv.pt" site_id="689" lang="pt" xmltv_id="UnifeTV.pt@SD">Unifé TV</channel>
   <channel site="nostv.pt" site_id="176" lang="pt" xmltv_id="VinTV.pt@SD">VinTV</channel>
   <channel site="nostv.pt" site_id="571" lang="pt" xmltv_id="VITECAzoresTV.pt@SD">Azores TV</channel>
   <channel site="nostv.pt" site_id="574" lang="pt" xmltv_id="VPlusTVI.pt@SD">V+TVI</channel>
-  <channel site="nostv.pt" site_id="538" lang="pt" xmltv_id="ZapViva.ao@SD">ZAP Viva HD</channel>
-</channels>
+  <channel site="nostv.pt" site_id="701" lang="en" xmltv_id="WSport.za@SD">W-Sport</channel>
+  <channel site="nostv.pt" site_id="538" lang="pt" xmltv_id="ZapViva.ao@SD">ZAP Viva</channel>
+</channels>
\ No newline at end of file
diff --git a/sites/vodafone.pt/vodafone.pt.channels.xml b/sites/vodafone.pt/vodafone.pt.channels.xml
index 51b63f634..5b75708cb 100644
--- a/sites/vodafone.pt/vodafone.pt.channels.xml
+++ b/sites/vodafone.pt/vodafone.pt.channels.xml
@@ -8,7 +8,7 @@
   <channel site="vodafone.pt" site_id="3017" lang="pt" xmltv_id="AMCBREAK.pt@HD">AMC BREAK</channel>
   <channel site="vodafone.pt" site_id="8426" lang="pt" xmltv_id="AMCCrime.pt@HD">AMC Crime</channel>
   <channel site="vodafone.pt" site_id="3019" lang="pt" xmltv_id="ArirangTV.kr@HD">Arirang TV</channel>
-  <channel site="vodafone.pt" site_id="2736" lang="pt" xmltv_id="ARTV.pt@SD">AR TV</channel>
+  <channel site="vodafone.pt" site_id="2736" lang="pt" xmltv_id="ARTV.pt@SD">ARTV</channel>
   <channel site="vodafone.pt" site_id="2713" lang="pt" xmltv_id="AXN.pt@HD">AXN</channel>
   <channel site="vodafone.pt" site_id="2700" lang="pt" xmltv_id="AXNMovies.pt@HD">AXN Movies</channel>
   <channel site="vodafone.pt" site_id="2833" lang="pt" xmltv_id="AXNWhite.pt@HD">AXN White</channel>