diff --git a/sites/nostv.pt/nostv.pt.channels.xml b/sites/nostv.pt/nostv.pt.channels.xml
index c5a99065..49a0faf6 100644
--- a/sites/nostv.pt/nostv.pt.channels.xml
+++ b/sites/nostv.pt/nostv.pt.channels.xml
@@ -41,8 +41,7 @@
   <channel site="nostv.pt" lang="pt" xmltv_id="" site_id="408">Canal NOS HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="CanalPanda.pt" site_id="593">Canal Panda HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="CanalQ.pt" site_id="235">Canal Q</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="CartoonNetworkWesternEurope.uk@Portugal"
-    site_id="252">Cartoon Network HD</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="CartoonNetworkWesternEurope.uk@Portugal" site_id="252">Cartoon Network HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="CasaeCozinha.pt" site_id="572">Casa e Cozinha HD</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="CCTV4Europe.cn" site_id="316">CCTV 4</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="CGTN.cn" site_id="312">CGTN</channel>
@@ -50,8 +49,7 @@
   <channel site="nostv.pt" lang="en" xmltv_id="CNBCEurope.uk" site_id="52">CNBC</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="CNNInternational.us@MENA" site_id="26">CNN</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="CNNPortugal.pt" site_id="557">CNN Portugal HD</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="CubavisionInternacional.cu" site_id="121">Cubavisión
-    Internacional</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="CubavisionInternacional.cu" site_id="121">Cubavisión Internacional</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="DiscoveryChannel.pt" site_id="22">Discovery Channel</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="DiscoveryChannel.pt" site_id="561">Discovery HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="DisneyChannel.pt" site_id="594">Disney Channel HD</channel>
@@ -88,8 +86,7 @@
   <channel site="nostv.pt" lang="pt" xmltv_id="Historia.pt" site_id="19">Canal História</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="Historia.pt" site_id="544">Canal História HD</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="HorseTVHD.it" site_id="680">Horse TV</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="InvestigationDiscoveryEurope.us" site_id="530">ID
-    Investigation Discovery</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="InvestigationDiscoveryEurope.us" site_id="530">ID Investigation Discovery</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="KBSWorld.kr" site_id="234">KBS World HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="KuriakosTV.pt" site_id="426">Kuriakos TV</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="LocalVisaoTV.pt" site_id="229">Localvisão TV HD</channel>
@@ -104,10 +101,8 @@
   <channel site="nostv.pt" lang="pt" xmltv_id="MTV.pt" site_id="377">MTV Portugal HD</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="MTVLive.uk" site_id="560">MTV Live</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="MyZenTV.fr" site_id="167">MyZen TV</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="NationalGeographic.pt" site_id="134">National
-    Geographic HD</channel>
-  <channel site="nostv.pt" lang="en" xmltv_id="NationalGeographicWild.pt" site_id="83">National
-    Geographic WILD HD</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="NationalGeographic.pt" site_id="134">National Geographic HD</channel>
+  <channel site="nostv.pt" lang="en" xmltv_id="NationalGeographicWild.pt" site_id="83">National Geographic WILD HD</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="NauticalChannel.it" site_id="679">Nautical Channel</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="NHKWorldJapan.jp" site_id="46">NHK World TV</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="Nickelodeon.pt" site_id="94">Nickelodeon</channel>
@@ -117,8 +112,7 @@
   <channel site="nostv.pt" lang="pt" xmltv_id="PandaKids.pt" site_id="597">Panda KIDS</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="PFC.br" site_id="112">PFC</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="PhoenixCNEChannel.hk" site_id="119">Phoenix CNE</channel>
-  <channel site="nostv.pt" lang="en" xmltv_id="PhoenixInfoNewsChannel.hk" site_id="120">Phoenix
-    Infonews</channel>
+  <channel site="nostv.pt" lang="en" xmltv_id="PhoenixInfoNewsChannel.hk" site_id="120">Phoenix Infonews</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="PortoCanal.pt" site_id="423">Porto Canal HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="RecordNews.br" site_id="30">Record News</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="RecordTVEuropa.pt" site_id="350">Record TV HD</channel>
@@ -140,8 +134,7 @@
   <channel site="nostv.pt" lang="pt" xmltv_id="SICNoticias.pt" site_id="419">SIC Notícias HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="SICRadical.pt" site_id="422">SIC Radical HD</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="SkyNewsAustralia.au" site_id="39">Sky News</channel>
-  <channel site="nostv.pt" lang="en" xmltv_id="SonyEntertainmentTelevisionAsia.in" site_id="144">SET
-    Asia</channel>
+  <channel site="nostv.pt" lang="en" xmltv_id="SonyEntertainmentTelevisionAsia.in" site_id="144">SET Asia</channel>
   <channel site="nostv.pt" lang="en" xmltv_id="SonyMax.uk" site_id="143">MAX</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="SPlus.pt" site_id="510">S+ HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="SportingTV.pt" site_id="352">Sporting TV HD</channel>
@@ -153,8 +146,7 @@
   <channel site="nostv.pt" lang="pt" xmltv_id="SportTV6.pt" site_id="610">Sport TV 6 HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="SportTV7.pt" site_id="706">Sport TV 7 HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="SportTVPlus.pt" site_id="417">SPORT TV+ HD</channel>
-  <channel site="nostv.pt" lang="en" xmltv_id="StingrayiConcerts.ca" site_id="42">Stingray iConcerts
-    HD</channel>
+  <channel site="nostv.pt" lang="en" xmltv_id="StingrayiConcerts.ca" site_id="42">Stingray iConcerts HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="Syfy.pt" site_id="201">Syfy HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="TCVInternacional.cv" site_id="237">TCV Internacional</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="Telesur.ve" site_id="33">TeleSUR</channel>
@@ -162,8 +154,7 @@
   <channel site="nostv.pt" lang="pt" xmltv_id="TraceToca.fr" site_id="543">Trace Toca</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="TraceUrban.fr" site_id="65">Trace Urban HD</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="TravelChannelEMEA.uk" site_id="100">Travel Channel</channel>
-  <channel site="nostv.pt" lang="pt" xmltv_id="TravelChannelEMEA.uk@HD" site_id="70">Travel Channel
-    HD</channel>
+  <channel site="nostv.pt" lang="pt" xmltv_id="TravelChannelEMEA.uk@HD" site_id="70">Travel Channel HD</channel>
   <channel site="nostv.pt" lang="fr" xmltv_id="TV5MondeEurope.fr" site_id="53">TV5 Monde</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="TVCancaoNova.pt" site_id="142">Canção Nova</channel>
   <channel site="nostv.pt" lang="pt" xmltv_id="TVCineAction.pt" site_id="224">TVCine ACTION HD</channel>