diff --git a/sites/zap.co.ao/zap.co.ao.channels.xml b/sites/zap.co.ao/zap.co.ao.channels.xml
index 5e283ea4..1a1561c0 100644
--- a/sites/zap.co.ao/zap.co.ao.channels.xml
+++ b/sites/zap.co.ao/zap.co.ao.channels.xml
@@ -1,105 +1,118 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site site="zap.co.ao">
-  <channels>
-    <channel lang="pt" xmltv_id="24KitchenPortugal.pt" site_id="78">24 Kitchen Portugal</channel>
-    <channel lang="pt" xmltv_id="ABolaTV.pt" site_id="8">A Bola TV</channel>
-    <channel lang="pt" xmltv_id="AXNMoviesPortugal.pt" site_id="70">AXN Movies</channel>
-    <channel lang="pt" xmltv_id="AXNPortugal.pt" site_id="62">AXN Portugal</channel>
-    <channel lang="pt" xmltv_id="Africanews.cg" site_id="190">Africanews</channel>
-    <channel lang="pt" xmltv_id="AfroMusicChannel.pt" site_id="86">Afro Music Channel</channel>
-    <channel lang="pt" xmltv_id="AlJazeeraChannel.qa" site_id="119">Aljazeera Channel</channel>
-    <channel lang="pt" xmltv_id="AlJazeeraEnglish.qa" site_id="107">Aljazeera English</channel>
-    <channel lang="pt" xmltv_id="BBCWorldNewsAfrica.uk" site_id="18">BBC World News Africa</channel>
-    <channel lang="pt" xmltv_id="BabyTV.uk" site_id="48">Baby TV Europe</channel>
-    <channel lang="pt" xmltv_id="BandInternacional.br" site_id="30">Band Internacional</channel>
-    <channel lang="pt" xmltv_id="BandNews.br" site_id="33">Band News</channel>
-    <channel lang="pt" xmltv_id="BeKuduro.ao" site_id="155">Be Kuduro</channel>
-    <channel lang="pt" xmltv_id="BenficaTV.pt" site_id="36">Benfica TV</channel>
-    <channel lang="pt" xmltv_id="Biggs.pt" site_id="47">Biggs</channel>
-    <channel lang="pt" xmltv_id="CanalBlast.pt" site_id="120">Blast</channel>
-    <channel lang="pt" xmltv_id="BlazePortugal.pt" site_id="99">Blaze Portugal</channel>
-    <channel lang="pt" xmltv_id="BloombergTVAfrica.us" site_id="111">Bloomberg TV Africa</channel>
-    <channel lang="pt" xmltv_id="CCTV4Europe.cn" site_id="114">CCTV 4 Europe</channel>
-    <channel lang="pt" xmltv_id="CMTV.pt" site_id="32">CM TV</channel>
-    <channel lang="pt" xmltv_id="CanalHollywoodPortugal.pt" site_id="56">Canal Hollywood Portugal</channel>
-    <channel lang="pt" xmltv_id="CanalPandaPortugal.pt" site_id="21">Canal Panda Portugal</channel>
-    <channel lang="pt" xmltv_id="CanalProgramacao.mz" site_id="115">Canal Programação</channel>
-    <channel lang="pt" xmltv_id="Colors.in" site_id="76">Colors</channel>
-    <channel lang="pt" xmltv_id="CubavisionInternacional.cu" site_id="118">Cubavisión Internacional</channel>
-    <channel lang="pt" xmltv_id="Cubayo.uk" site_id="203">Cubayo</channel>
-    <channel lang="pt" xmltv_id="DigitalCongoTV.cd" site_id="151">Digital Congo TV</channel>
-    <channel lang="pt" xmltv_id="DisneyChannelPortugal.pt" site_id="50">Disney Channel Portugal</channel>
-    <channel lang="pt" xmltv_id="DisneyJuniorPortugal.pt" site_id="51">Disney Junior Portugal</channel>
-    <channel lang="pt" xmltv_id="ESPN2Africa.za" site_id="148">ESPN 2 Africa</channel>
-    <channel lang="pt" xmltv_id="ESPNAfrica.za" site_id="38">ESPN Africa</channel>
-    <channel lang="pt" xmltv_id="EuronewsPortuguese.fr" site_id="19">EuroNews Português</channel>
-    <channel lang="pt" xmltv_id="ExtremeSportsChannelEurope.nl" site_id="178">Extreme Sports Channel</channel>
-    <channel lang="pt" xmltv_id="FightBox.nl" site_id="42">FightBox HD</channel>
-    <channel lang="pt" xmltv_id="FoodNetworkEMEA.us" site_id="79">Food Network EMEA</channel>
-    <channel lang="pt" xmltv_id="FoxComedyPortugal.pt" site_id="143">Fox Comedy Portugal</channel>
-    <channel lang="pt" xmltv_id="FoxCrimePortugal.pt" site_id="66">Fox Crime Portugal</channel>
-    <channel lang="pt" xmltv_id="FoxLifePortugal.pt" site_id="58">Fox Life Portugal</channel>
-    <channel lang="pt" xmltv_id="FoxMoviesPortugal.pt" site_id="57">Fox Movies Portugal</channel>
-    <channel lang="pt" xmltv_id="FoxPortugal.pt" site_id="59">Fox Portugal</channel>
-    <channel lang="pt" xmltv_id="France2.fr" site_id="123">France 2</channel>
-    <channel lang="pt" xmltv_id="France3.fr" site_id="124">France 3</channel>
-    <channel lang="pt" xmltv_id="France5.fr" site_id="125">France 5</channel>
-    <channel lang="pt" xmltv_id="France24French.fr" site_id="108">France 24 Français</channel>
-    <channel lang="pt" xmltv_id="Gametoon.nl" site_id="195">Gametoon</channel>
-    <channel lang="pt" xmltv_id="GloboOn.ao" site_id="134">Globo On</channel>
-    <channel lang="pt" xmltv_id="GloomChannel.mz" site_id="172">Gloom Channel</channel>
-    <channel lang="pt" xmltv_id="GulliBrasil.br" site_id="199">Gulli Brasil</channel>
-    <channel lang="pt" xmltv_id="HistoireTV.fr" site_id="128">Histoire TV</channel>
-    <channel lang="pt" xmltv_id="HistoriaPortugal.pt" site_id="100">História Portugal</channel>
-    <channel lang="pt" xmltv_id="KIX.hk" site_id="205">Kix</channel>
-    <channel lang="pt" xmltv_id="LCI.fr" site_id="127">LCI</channel>
-    <channel lang="pt" xmltv_id="LaLiganaZap.ao" site_id="141">La Liga na Zap</channel>
-    <channel lang="pt" xmltv_id="LuxeTV.lu" site_id="80">Luxe TV</channel>
-    <channel lang="pt" xmltv_id="MCMTop.fr" site_id="95">MCM Top</channel>
-    <channel lang="pt" xmltv_id="MotorvisionTV.de" site_id="40">Motorvision TV</channel>
-    <channel lang="pt" xmltv_id="MyZenTV.fr" site_id="105">MyZen Music</channel>
-    <channel lang="pt" xmltv_id="MyZenNature.fr" site_id="117">MyZen Nature</channel>
-    <channel lang="pt" xmltv_id="NBATV.us" site_id="37">NBA TV</channel>
-    <channel lang="pt" xmltv_id="NationalGeographicPortugal.pt" site_id="103">National Geographic Portugal</channel>
-    <channel lang="pt" xmltv_id="NationalGeographicWildSouthAfrica.za" site_id="102">National Geographic Wild South Africa</channel>
-    <channel lang="pt" xmltv_id="Odisseia.pt" site_id="98">Odisseia</channel>
-    <channel lang="pt" xmltv_id="PortoCanal.pt" site_id="39">Porto Canal</channel>
-    <channel lang="pt" xmltv_id="RFMTV.fr" site_id="94">RFM TV</channel>
-    <channel lang="pt" xmltv_id="RTNC.cd" site_id="144">RTNC</channel>
-    <channel lang="pt" xmltv_id="RT.ru" site_id="26">RT News</channel>
-    <channel lang="pt" xmltv_id="RTPAfrica.pt" site_id="5">RTP África</channel>
-    <channel lang="pt" xmltv_id="RTPInternacional.pt" site_id="29">RTP Internacional Europa</channel>
-    <channel lang="pt" xmltv_id="RTRPlaneta.ru" site_id="113">RTR Planeta</channel>
-    <channel lang="pt" xmltv_id="RaiItaliaAfrica.it" site_id="112">Rai Italia Africa</channel>
-    <channel lang="pt" xmltv_id="Russia24.ru" site_id="109">Rossiya 24</channel>
-    <channel lang="pt" xmltv_id="SICK.pt" site_id="20">SIC K</channel>
-    <channel lang="pt" xmltv_id="SICMulher.pt" site_id="171">SIC Mulher</channel>
-    <channel lang="pt" xmltv_id="SICRadical.pt" site_id="75">SIC Radical</channel>
-    <channel lang="pt" xmltv_id="STVNoticias.mz" site_id="27">STV Noticias</channel>
-    <channel lang="pt" xmltv_id="SportTVAfrica1.pt" site_id="9">Sport TV África 1</channel>
-    <channel lang="pt" xmltv_id="SportingTV.pt" site_id="46">Sporting TV</channel>
-    <channel lang="pt" xmltv_id="StingrayCMusic.ca" site_id="96">Stingray CMusic</channel>
-    <channel lang="pt" xmltv_id="StingrayiConcerts.ca" site_id="93">Stingray IConcerts</channel>
-    <channel lang="pt" xmltv_id="TLNNetwork.pt" site_id="71">TLN Network</channel>
-    <channel lang="pt" xmltv_id="TPA1.ao" site_id="1">TPA 1</channel>
-    <channel lang="pt" xmltv_id="TVCineAction.pt" site_id="55">TVCine Action</channel>
-    <channel lang="pt" xmltv_id="TVCineEdition.pt" site_id="53">TVCine Edition</channel>
-    <channel lang="pt" xmltv_id="TVCineEmotion.pt" site_id="54">TVCine Emotion</channel>
-    <channel lang="pt" xmltv_id="TVCineTop.pt" site_id="52">TVCine Top</channel>
-    <channel lang="pt" xmltv_id="TVEInternacionalEuropeAsia.es" site_id="23">TVE Internacional Europa</channel>
-    <channel lang="pt" xmltv_id="TVGloboInternacionalAfrica.br" site_id="135">TV Globo Internacional África</channel>
-    <channel lang="pt" xmltv_id="TVI24.pt" site_id="17">TVI 24</channel>
-    <channel lang="pt" xmltv_id="TVIFiccao.pt" site_id="72">TVI Ficção</channel>
-    <channel lang="pt" xmltv_id="TVIInternacional.pt" site_id="28">TVI Internacional</channel>
-    <channel lang="pt" xmltv_id="Tele50.cd" site_id="145">Télé 50</channel>
-    <channel lang="pt" xmltv_id="TiJi.fr" site_id="122">Tiji</channel>
-    <channel lang="pt" xmltv_id="TravelChannelEMEA.uk" site_id="101">Travel Channel Europe</channel>
-    <channel lang="pt" xmltv_id="UshuaiaTV.fr" site_id="129">Ushuaïa TV</channel>
-    <channel lang="pt" xmltv_id="ZapFilmes1.ao" site_id="131">Zap Filmes 1</channel>
-    <channel lang="pt" xmltv_id="ZapFilmes2.ao" site_id="132">Zap Filmes 2</channel>
-    <channel lang="pt" xmltv_id="ZapFilmes3.ao" site_id="133">Zap Filmes 3</channel>
-    <channel lang="pt" xmltv_id="ZapFilmesHD.ao" site_id="130">Zap Filmes HD</channel>
-    <channel lang="pt" xmltv_id="ZapNovelas.ao" site_id="10">Zap Novelas</channel>
-    <channel lang="pt" xmltv_id="ZapViva.ao" site_id="13">Zap Viva</channel>
-  </channels>
-</site>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<site site="zap.co.ao">
+  <channels>
+    <channel lang="pt" xmltv_id="24KitchenPortugal.pt" site_id="2243">24 Kitchen</channel>
+    <channel lang="pt" xmltv_id="ABolaTV.pt" site_id="2261">A Bola TV</channel>
+    <channel lang="pt" xmltv_id="Africanews.cg" site_id="2440">Africa News</channel>
+    <channel lang="pt" xmltv_id="AfroMusicAngola.pt" site_id="2272">AfroMusic</channel>
+    <channel lang="pt" xmltv_id="AlJazeeraChannel.qa" site_id="2340">Aljazeera Arabic</channel>
+    <channel lang="pt" xmltv_id="AlJazeeraEnglish.qa" site_id="2108">Al Jazeera English</channel>
+    <channel lang="pt" xmltv_id="AXNMoviesPortugal.pt" site_id="2164">AXN Movies</channel>
+    <channel lang="pt" xmltv_id="BabyTV.uk" site_id="2289">BABY TV</channel>
+    <channel lang="pt" xmltv_id="BandNews.br" site_id="2265">Band News</channel>
+    <channel lang="pt" xmltv_id="BeKuduro.ao" site_id="2432">BeKuduro</channel>
+    <channel lang="pt" xmltv_id="BenficaTV.pt" site_id="2245">BENFICATV</channel>
+    <channel lang="pt" xmltv_id="Biggs.pt" site_id="2176">Biggs</channel>
+    <channel lang="pt" xmltv_id="BlackDiamondz.uk" site_id="2460">Black Diamond</channel>
+    <channel lang="pt" xmltv_id="BomSomTV.pt" site_id="2459">BomSom TV</channel>
+    <channel lang="pt" xmltv_id="CanalHollywoodPortugal.pt" site_id="2013">Canal Hollywood</channel>
+    <channel lang="pt" xmltv_id="CanalPandaPortugal.pt" site_id="2031">Canal Panda</channel>
+    <channel lang="pt" xmltv_id="CNNPortugal.pt" site_id="2160">CNN Portugal</channel>
+    <channel lang="pt" xmltv_id="ColorsCineplex.in" site_id="2436">Colors Cineplex</channel>
+    <channel lang="pt" xmltv_id="Cubayo.uk" site_id="2461">Cubayo</channel>
+    <channel lang="pt" xmltv_id="DigitalCongoTV.cd" site_id="2427">Digital Congo</channel>
+    <channel lang="pt" xmltv_id="FashionBox.nl" site_id="2447">Fashion BOX</channel>
+    <channel lang="pt" xmltv_id="FightBox.nl" site_id="2446">FIGHTBOX</channel>
+    <channel lang="pt" xmltv_id="FightSports.us" site_id="2437">Fight Sports</channel>
+    <channel lang="pt" xmltv_id="FoxComedyPortugal.pt" site_id="2116">FOX Comedy</channel>
+    <channel lang="pt" xmltv_id="FoxCrimePortugal.pt" site_id="2114">FOX Crime</channel>
+    <channel lang="pt" xmltv_id="FoxMoviesPortugal.pt" site_id="2177">FOX Movies</channel>
+    <channel lang="pt" xmltv_id="France2.fr" site_id="2317">France 2</channel>
+    <channel lang="pt" xmltv_id="France24French.fr" site_id="2132">France 24 Fr</channel>
+    <channel lang="pt" xmltv_id="France3.fr" site_id="2318">France 3</channel>
+    <channel lang="pt" xmltv_id="France5.fr" site_id="2319">France 5</channel>
+    <channel lang="pt" xmltv_id="Gametoon.nl" site_id="2443">Gametoon</channel>
+    <channel lang="pt" xmltv_id="GloboOn.ao" site_id="2383">GLOBOON</channel>
+    <channel lang="pt" xmltv_id="GloomChannel.mz" site_id="2435">GLOOM</channel>
+    <channel lang="pt" xmltv_id="GulliAfrica.fr" site_id="2449">Gulli</channel>
+    <channel lang="pt" xmltv_id="HistoireTV.fr" site_id="2322">Histoire</channel>
+    <channel lang="pt" xmltv_id="KIX.hk" site_id="2462">KIX</channel>
+    <channel lang="pt" xmltv_id="LaLiganaZap.ao" site_id="2386">La Liga HD</channel>
+    <channel lang="pt" xmltv_id="LCI.fr" site_id="2321">LCI</channel>
+    <channel lang="pt" xmltv_id="MCMTop.fr" site_id="2034">MCM TOP</channel>
+    <channel lang="pt" xmltv_id="MotorvisionTV.de" site_id="2357">Motorvision</channel>
+    <channel lang="pt" xmltv_id="MyMusicChannel.ao" site_id="2442">My Music Channel HD</channel>
+    <channel lang="pt" xmltv_id="Odisseia.pt" site_id="2020">Odisseia</channel>
+    <channel lang="pt" xmltv_id="PandaKids.pt" site_id="2456">PandaKids</channel>
+    <channel lang="pt" xmltv_id="PlusHitsAfrica.ao" site_id="2273">+HITS AFRICA</channel>
+    <channel lang="pt" xmltv_id="PortoCanal.pt" site_id="2105">Porto Canal</channel>
+    <channel lang="pt" xmltv_id="RTP3.pt" site_id="2064">RTP 3</channel>
+    <channel lang="pt" xmltv_id="RTPAfrica.pt" site_id="2027">RTP África</channel>
+    <channel lang="pt" xmltv_id="RTPInternacional.pt" site_id="2262">RTP Internacional</channel>
+    <channel lang="pt" xmltv_id="SICK.pt" site_id="2264">SIC K</channel>
+    <channel lang="pt" xmltv_id="SICMulher.pt" site_id="2071">SIC Mulher</channel>
+    <channel lang="pt" xmltv_id="SICRadical.pt" site_id="2061">SIC Radical</channel>
+    <channel lang="pt" xmltv_id="SportingTV.pt" site_id="2351">Sporting TV</channel>
+    <channel lang="pt" xmltv_id="SportTVAfrica1.pt" site_id="2267">SportTV África HD</channel>
+    <channel lang="pt" xmltv_id="StingrayiConcerts.ca" site_id="2042">Stingray iConcerts HD</channel>
+    <channel lang="pt" xmltv_id="STVNoticias.mz" site_id="2445">STV Noticias HD</channel>
+    <channel lang="pt" xmltv_id="Tele50.cd" site_id="2391">TELE 50</channel>
+    <channel lang="pt" xmltv_id="TiJi.fr" site_id="2297">Tiji</channel>
+    <channel lang="pt" xmltv_id="TPA1.ao" site_id="2275">TPA 1</channel>
+    <channel lang="pt" xmltv_id="TPA2.ao" site_id="2276">TPA 2</channel>
+    <channel lang="pt" xmltv_id="TraceBrazuca.fr" site_id="2441">Trace Brazuca</channel>
+    <channel lang="pt" xmltv_id="TVCineAction.pt" site_id="2084">TVCine ACTION HD</channel>
+    <channel lang="pt" xmltv_id="TVCineEdition.pt" site_id="2018">TVCine EDITION HD</channel>
+    <channel lang="pt" xmltv_id="TVCineEmotion.pt" site_id="2076">TVCine EMOTION HD</channel>
+    <channel lang="pt" xmltv_id="TVCineTop.pt" site_id="2141">TVCine TOP HD</channel>
+    <channel lang="pt" xmltv_id="TVZimbo.ao" site_id="2280">TV Zimbo HD</channel>
+    <channel lang="pt" xmltv_id="UshuaiaTV.fr" site_id="2323">Ushuaia TV</channel>
+    <channel lang="pt" xmltv_id="WSport.za" site_id="2467">W-Sport</channel>
+    <channel lang="pt" xmltv_id="ZapNovelas.ao" site_id="2439">ZAP Novelas HD</channel>
+    <channel lang="pt" xmltv_id="ZapViva.ao" site_id="2455">ZAP Viva</channel>
+    <!-- <channel lang="pt" xmltv_id="" site_id="2019">Canal de História</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2025">Euronews</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2044">ZAP- Bloomberg</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2045">BBC World News</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2048">TVEi</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2059">National Geographic</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2062">Food Network</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2066">Disney Channel</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2081">AMC Break</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2082">NG Wild HD</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2100">Travel Channel</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2117">RTR Planeta</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2121">CUBA</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2161">AXN HD</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2167">MyZen.tv nature</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2168">MyZen.tv music</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2174">FOX HD</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2175">FOX Life HD</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2226">Disney Junior</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2271">Luxe TV HD</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2282">Canal de Programação</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2290">C-MUSIC</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2295">RAI ITALIA 3</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2296">ESPN</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2303">Tele Novelas</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2306">Colors</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2316">CCTV 4</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2325">ZAP - AfroBeats</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2355">CMTV África</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2366">BLAST</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2379">Globo HD</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2381">AXN d</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2390">RTNC 1</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2412">RTP 3 – Duplicado</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2424">ZAP - TVI Internacional</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2425">ESPN2</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2430">NBA TV HD</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2448">SBT HD</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2451">Fast and Fun</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2465">ZAP Ligue 1 HD</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2466">Nickelodeon</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2469">TPA Noticias HD</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2470">Cartoon TV</channel> -->
+    <!-- <channel lang="pt" xmltv_id="" site_id="2472">Canal 11 Internacional</channel> -->
+  </channels>
+</site>