diff --git a/channels/br.m3u b/channels/br.m3u
index 8890b7b7c8..d6ba9dbcdd 100644
--- a/channels/br.m3u
+++ b/channels/br.m3u
@@ -1,15 +1,15 @@
-#EXTM3U x-tvg-url="https://cld.pt/dl/download/7a36f027-b90a-4be0-ba89-00acb7d82fa7/RHAEPG.xml"
+#EXTM3U x-tvg-url="http://infinitytv.xyz/guide.xml"
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",All Sports TV (Opt-1)
 http://173.236.10.10:1935/dgrau/dgrau/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://3.bp.blogspot.com/-fmwFOCSFHRE/WVbriBZ6nLI/AAAAAAAAOYc/nyadJ4Lj610PGkyVW3uJNNTxkmtlt5xiQCLcBGAs/s320/ALL%2BSports.png" group-title="Sport",All Sports TV (Opt-2)
 http://173.236.10.10:1935/dgrau/dgrau/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/De6ty9h.png" group-title="",Canal Ricos
 http://video01.kshost.com.br/canalricos548/canalricos548/playlist.m3u8
-#EXTINF:-1 tvg-id="CancaoNova.br" tvg-name="Cancao Nova" tvg-logo="https://botw-pd.s3.amazonaws.com/styles/logo-thumbnail/s3/022014/untitled-1_11.png" group-title="",Canção Nova (Opt-1)
+#EXTINF:-1 tvg-id="Canção Nova" tvg-name="Canção Nova" tvg-logo="https://botw-pd.s3.amazonaws.com/styles/logo-thumbnail/s3/022014/untitled-1_11.png" group-title="",Canção Nova (Opt-1)
 https://cancaonova.secure.footprint.net/egress/bhandler/cancaonovanew/channel01/chunklist_b1155072.m3u8
-#EXTINF:-1 tvg-id="CancaoNova.br" tvg-name="Cancao Nova" tvg-logo="http://www.brstugatutoriais.tk/canais/cancaonova.gif" group-title="",Canção Nova (Opt-2)
+#EXTINF:-1 tvg-id="Canção Nova" tvg-name="Canção Nova" tvg-logo="http://www.brstugatutoriais.tk/canais/cancaonova.gif" group-title="",Canção Nova (Opt-2)
 http://tvajuhls-lh.akamaihd.net/i/tvdesk_1@147040/master.m3u8
-#EXTINF:-1 tvg-id="CancaoNova.br" tvg-name="Cancao Nova" tvg-logo="http://www.brstugatutoriais.tk/canais/cancaonova.gif" group-title="",Canção Nova (Opt-3)
+#EXTINF:-1 tvg-id="Canção Nova" tvg-name="Canção Nova" tvg-logo="http://www.brstugatutoriais.tk/canais/cancaonova.gif" group-title="",Canção Nova (Opt-3)
 http://tvajuhls-lh.akamaihd.net:80/i/tvdesk_1@147040/index_1080_av-p.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CBTV Internacional
 https://na-all7.secdn.net/cbtv-channel/play/mp4:stream/chunklist_w1097631749.m3u8
@@ -19,10 +19,6 @@ http://stmv2.srvstm.com:1935/tvjsid/tvjsid/playlist.m3u8
 http://189.86.89.116/hls-live/livecm/_definst_/liveevent/livestream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/sQ5BKun.png" group-title="",FM O Dia
 http://c2901-slbps-sambavideos.akamaized.net/livet/FMoDiaVideo_14d480346fa04ebcb4f03173f2dae707/ngrp:livestream/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Futura.br" tvg-name="Futura" tvg-logo="http://www.brstugatutoriais.tk/canais/futura.gif" group-title="",Futura (Opt-1)
-http://srv3.zoeweb.tv:1935/z01-live/stream/livestream.m3u8
-#EXTINF:-1 tvg-id="Futura.br" tvg-name="Futura" tvg-logo="http://www.brstugatutoriais.tk/canais/futura.gif" group-title="",Futura (Opt-2)
-http://srv3.zoeweb.tv:1935/z01-live/stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.g2ptv.com.br/wp-content/uploads/2017/06/g2ptv-logo.png" group-title="",G2PTV (Opt-1)
 http://srv3.zoeweb.tv:1935/z474-live/aovivo/livestream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",G2PTV (Opt-2)
@@ -33,9 +29,9 @@ https://cdn.jmvstream.com/w/inpara/_definst_/inpara/chunklist_w1305866021.m3u8?f
 http://tv02.logicahost.com.br:1935/itutv/itutv/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.jkfm.com.br/site//assets/imagem/logo/logo-jk.png" group-title="",JK FM
 http://rtmp.cdn.upx.net.br/7cdd_2/myStream.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="Tvnovotempo.br" tvg-name="TV Novo Tempo" tvg-logo="http://www.brstugatutoriais.tk/canais/tvnovotempo.gif" group-title="Religious",Novo Tempo (Opt-1)
+#EXTINF:-1 tvg-id="Novo Tempo" tvg-name="Novo Tempo" tvg-logo="http://www.brstugatutoriais.tk/canais/tvnovotempo.gif" group-title="Religious",Novo Tempo (Opt-1)
 http://stream.novotempo.com:1935/tv/smil:tvnovotempo.smil/manifest.m3u8
-#EXTINF:-1 tvg-id="Tvnovotempo.br" tvg-name="TV Novo Tempo" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/0/07/Logo_2015_-_TV_Novo_Tempo.png" group-title="Religious",Novo Tempo (Opt-2)
+#EXTINF:-1 tvg-id="Novo Tempo" tvg-name="Novo Tempo" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/0/07/Logo_2015_-_TV_Novo_Tempo.png" group-title="Religious",Novo Tempo (Opt-2)
 http://stream.novotempo.com:1935/tv/tvnovotempo.smil/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://goo.gl/LcpPNw" group-title="",PUC TV Goiás
 http://flash.softhost.com.br:1935/pucgoias/aovivo/live.m3u8
@@ -43,51 +39,51 @@ http://flash.softhost.com.br:1935/pucgoias/aovivo/live.m3u8
 http://tvvitoria2.viacast.tv/livepl/tvvitoria_2_original.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://s30.postimg.org/eymtgnmjl/logo_fundotransparente2.png" group-title="",Rede Atividade
 http://173.236.10.10:1935/redeatividade/redeatividade/playlist.m3u8
-#EXTINF:-1 tvg-id="Redebrasil.br" tvg-name="Rede Brasil" tvg-logo="https://portal4.files.wordpress.com/2016/06/rede-brasil-1.jpg" group-title="",Rede Brasil
+#EXTINF:-1 tvg-id="Rede Brasil" tvg-name="Rede Brasil" tvg-logo="https://portal4.files.wordpress.com/2016/06/rede-brasil-1.jpg" group-title="",Rede Brasil
 https://59f1cbe63db89.streamlock.net:1443/rbtv/rbtv/chunklist_w1757672591.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i67.tinypic.com/2d7vy4n.png" group-title="",Rede Gospel
+#EXTINF:-1 tvg-id="Rede Gospel" tvg-name="Rede Gospel" tvg-logo="http://i67.tinypic.com/2d7vy4n.png" group-title="",Rede Gospel
 http://media01.s12.com.br:1935/live/redegospel/Rede_Gospel.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2WmdjU9.png" group-title="",Rede Metropole
 http://in.uaimacks.net.br:1935/macks/macks.sdp/chunklist_w1760176873.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Rede Seculo 21
 http://tvseculo21-lh.akamaihd.net:80/i/tvseculo_1@16110/master.m3u8
-#EXTINF:-1 tvg-id="Redetv.br" tvg-name="RedeTV!" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/thumb/1/1d/LOGO_REDETV%21.png/200px-LOGO_REDETV%21.png" group-title="",RedeTV! (Opt-1)
+#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/thumb/1/1d/LOGO_REDETV%21.png/200px-LOGO_REDETV%21.png" group-title="",RedeTV! (Opt-1)
 https://evpp.mm.uol.com.br/redetv1/redetv1/chunklist_w1209374997.m3u8
-#EXTINF:-1 tvg-id="Redetv.br" tvg-name="RedeTV!" tvg-logo="http://www.brstugatutoriais.tk/canais/redetv.gif" group-title="",RedeTV! (Opt-2)
+#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="http://www.brstugatutoriais.tk/canais/redetv.gif" group-title="",RedeTV! (Opt-2)
 http://evpp.mm.uol.com.br/redetv1/redetv1/chunklist_w674014198.m3u8
-#EXTINF:-1 tvg-id="Redetv.br" tvg-name="RedeTV!" tvg-logo="https://i.imgur.com/MEBQV6z.png" group-title="",RedeTV! (Opt-3)
+#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/MEBQV6z.png" group-title="",RedeTV! (Opt-3)
 http://evpp.mm.uol.com.br/redetv1/redetv1/chunklist_w1537397908.m3u8
-#EXTINF:-1 tvg-id="Redetv.br" tvg-name="RedeTV!" tvg-logo="https://i.imgur.com/MEBQV6z.png" group-title="",RedeTV! (Opt-4)
+#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/MEBQV6z.png" group-title="",RedeTV! (Opt-4)
 http://evpp.mm.uol.com.br/redetv1/redetv1/chunklist_w304668891.m3u8
-#EXTINF:-1 tvg-id="Redetv.br" tvg-name="RedeTV!" tvg-logo="http://www.brstugatutoriais.tk/canais/redetv.gif" group-title="",RedeTV! (Opt-5)
+#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="http://www.brstugatutoriais.tk/canais/redetv.gif" group-title="",RedeTV! (Opt-5)
 http://evpp.mm.uol.com.br:1935/redetv1/redetv1/playlist.m3u8
-#EXTINF:-1 tvg-id="Redetv.br" tvg-name="RedeTV!" tvg-logo="https://i.imgur.com/MEBQV6z.png" group-title="",RedeTV! (Opt-6)
+#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/MEBQV6z.png" group-title="",RedeTV! (Opt-6)
 http://evpp.mm.uol.com.br:1935/redetv2/redetv2/playlist.m3u8
-#EXTINF:-1 tvg-id="Redetv.br" tvg-name="RedeTV!" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/1/1d/LOGO_REDETV%21.png" group-title="",RedeTV! (Opt-7)
+#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/1/1d/LOGO_REDETV%21.png" group-title="",RedeTV! (Opt-7)
 http://evpp.mm.uol.com.br/redetv1/redetv1/chunklist_w1483436880.m3u8
-#EXTINF:-1 tvg-id="Redetv.br" tvg-name="RedeTV!" tvg-logo="https://upload.wikimedia.org/wikipedia/en/1/1d/LOGO_REDETV%21.png" group-title="",RedeTV! (Opt-8)
+#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://upload.wikimedia.org/wikipedia/en/1/1d/LOGO_REDETV%21.png" group-title="",RedeTV! (Opt-8)
 http://evpp.mm.uol.com.br/redetv1/redetv1/chunklist_w1695741209.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/f/f2/Logotipo_da_RedeTV%21_Rondônia.png" group-title="",RedeTV! Rondônia
 http://173.236.10.10:1935/tvonline/tvonline/playlist.m3u8
-#EXTINF:-1 tvg-id="Sbt.br" tvg-name="SBT" tvg-logo="http://www.brstugatutoriais.tk/canais/sbt.gif" group-title="",SBT (Opt-1)
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="http://www.brstugatutoriais.tk/canais/sbt.gif" group-title="",SBT (Opt-1)
 http://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist_w902022027_b216000_sleng.m3u8
-#EXTINF:-1 tvg-id="Sbt.br" tvg-name="SBT" tvg-logo="https://i.imgur.com/Wajw4nv.png" group-title="",SBT (Opt-2)
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/Wajw4nv.png" group-title="",SBT (Opt-2)
 https://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist_w654628617_b216000_sleng.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Sbt.br" tvg-name="SBT" tvg-logo="http://www.brstugatutoriais.tk/canais/sbt.gif" group-title="",SBT (Opt-3)
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="http://www.brstugatutoriais.tk/canais/sbt.gif" group-title="",SBT (Opt-3)
 http://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist_w1497612515_b216000_sleng.m3u8
-#EXTINF:-1 tvg-id="Sbt.br" tvg-name="SBT" tvg-logo="http://i.imgur.com/3Y9a7ri.png" group-title="",SBT (Opt-4)
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="http://i.imgur.com/3Y9a7ri.png" group-title="",SBT (Opt-4)
 http://evpp.mm.uol.com.br/ne10/ne10.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="Sbt.br" tvg-name="SBT" tvg-logo="http://www.brstugatutoriais.tk/canais/sbt.gif" group-title="",SBT (Opt-5)
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="http://www.brstugatutoriais.tk/canais/sbt.gif" group-title="",SBT (Opt-5)
 http://evpp.mm.uol.com.br/ne10/ne10-tvjornal-caruaru-video-web.sdp/playlist.m3u8?
-#EXTINF:-1 tvg-id="Sbt.br" tvg-name="SBT" tvg-logo="https://i.imgur.com/Wajw4nv.png" group-title="",SBT (Opt-6)
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/Wajw4nv.png" group-title="",SBT (Opt-6)
 http://evpp.mm.uol.com.br/ne10/ne10-tvjornal-caruaru-video-web.sdp/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Sbt.br" tvg-name="SBT" tvg-logo="http://s32.postimg.org/5fmicyl3p/SBT1.png" group-title="",SBT (Opt-7)
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="http://s32.postimg.org/5fmicyl3p/SBT1.png" group-title="",SBT (Opt-7)
 http://192.99.46.182:1935/pioneira-tv3/pioneira-tv3/playlist.m3u8
-#EXTINF:-1 tvg-id="Sbt.br" tvg-name="SBT" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/thumb/4/41/Logotipo_do_SBT.svg/800px-Logotipo_do_SBT.png" group-title="",SBT (Opt-8)
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/thumb/4/41/Logotipo_do_SBT.svg/800px-Logotipo_do_SBT.png" group-title="",SBT (Opt-8)
 http://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist_w1279440291_b216000_sleng.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/YrBt8gZ.png" group-title="",Summer TV
 http://tv01.logicahost.com.br:1935/summertv/summertv/live.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Tvaparecida.br" tvg-name="TV Aparecida" tvg-logo="http://www.brstugatutoriais.tk/canais/tvaparecida.gif" group-title="",TV Aparecida
+#EXTINF:-1 tvg-id="TV Aparecida" tvg-name="TV Aparecida" tvg-logo="http://www.brstugatutoriais.tk/canais/tvaparecida.gif" group-title="",TV Aparecida
 http://69.46.0.170:1935/tvaparecida/tvaparecida.stream/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.bno.nl/theme_bno/static/src/img/icon/BNO.png" group-title="",TV BNO
 http://tv02.logicahost.com.br:1935/bonner/bonner/live.m3u8
@@ -99,9 +95,9 @@ http://stmv1.euroti.com.br:1935/caxiashost/caxiashost/live.m3u8
 http://stmv1.euroti.com.br:1935/caxiashost/caxiashost/live.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/IOw4QoE.png" group-title="",TV Clima
 http://stmv1.srvstm.com:1935/tvcadm/tvcadm/live.m3u8
-#EXTINF:-1 tvg-id="Tvcultura.br" tvg-name="TV Cultura" tvg-logo="http://www.brstugatutoriais.tk/canais/cultura.gif" group-title="",TV Cultura (Opt-1)
+#EXTINF:-1 tvg-id="TV Cultura" tvg-name="TV Cultura" tvg-logo="http://www.brstugatutoriais.tk/canais/cultura.gif" group-title="",TV Cultura (Opt-1)
 http://rsync.com.br:1935/rsync00026/rsync.sdp/playlist.m3u8?
-#EXTINF:-1 tvg-id="Tvcultura.br" tvg-name="TV Cultura" tvg-logo="https://i.imgur.com/Oy6Nrzb.png" group-title="",TV Cultura (Opt-2)
+#EXTINF:-1 tvg-id="TV Cultura" tvg-name="TV Cultura" tvg-logo="https://i.imgur.com/Oy6Nrzb.png" group-title="",TV Cultura (Opt-2)
 http://177.74.1.38/funtelpa/tv_funtelpa/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jpEJYfT.png" group-title="",TV Destak (Opt-1)
 http://tv02.logicahost.com.br:1935/pascoal/pascoal/live.m3u8?fluxustv.m3u8
@@ -117,7 +113,7 @@ http://selpro1348.procergs.com.br:1935/tve/stve/playlist.m3u8
 http://streaming.procergs.com.br:1935/tve/stve/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Faap
 http://midia.faap.br/faaplatamlive-live/stream_480/livestream.m3u8
-#EXTINF:-1 tvg-id="TVGazeta.br" tvg-name="TV Gazeta" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/TV_Gazeta.svg/1200px-TV_Gazeta.svg.png" group-title="",TV Gazeta
+#EXTINF:-1 tvg-id="TV Gazeta" tvg-name="TV Gazeta" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/TV_Gazeta.svg/1200px-TV_Gazeta.svg.png" group-title="",TV Gazeta
 http://api.new.livestream.com/accounts/5381476/events/2395418/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AFYij7t.png" group-title="",TV Guarany
 http://wsecast.com.br:1935/rtguarany/_definst_/rtguarany/playlist.m3u8?fluxustv.m3u8
@@ -125,7 +121,7 @@ http://wsecast.com.br:1935/rtguarany/_definst_/rtguarany/playlist.m3u8?fluxustv.
 http://stmv2.euroti.com.br:1935/tvjsid/tvjsid/live.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8qwFc7d.png" group-title="",TV Japi
 http://wse3.player.tv.br:1935/tvjapi/tvjapi/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Tvjornal.br" tvg-name="TV Jornal" tvg-logo="http://tvjornaldelimeira.com.br/novosite/front/imgs/logo.png" group-title="",TV Jornal
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tvjornaldelimeira.com.br/novosite/front/imgs/logo.png" group-title="",TV Jornal
 http://flash1.crossdigital.com.br:1935/1998/1998/live.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Sd1mRw1.png" group-title="",TV Litoral Panorama
 http://streaming03.zas.media:1935/panorama/panorama/chunklist_w425951872.m3u8?fluxustv.m3u8