diff --git a/index.content.m3u b/index.content.m3u
index f19a078bd..f3989b38b 100644
--- a/index.content.m3u
+++ b/index.content.m3u
@@ -117,10 +117,14 @@ http://www.elahmad.com/tv/m3u8/fr_xoyky_49.m3u8?id=algerie
 http://live.creacast.com/cna/smil:cna.smil/chunklist_w1780122037_b864000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="Ennahar TV" tvg-logo="https://i.imgur.com/1x1ifx8.png" group-title="",Ennahar TV
 http://144.217.76.52:8080/ENNAHAR/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Xfrg0x4.png" group-title="",RTVA
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Xfrg0x4.png" group-title="",RTVA (Opt-1)
 https://videos.rtva.ad/live/rtva/chunklist_w1082760031.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Xfrg0x4.png" group-title="",RTVA - Canal Web
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Xfrg0x4.png" group-title="",RTVA (Opt-2)
 https://videos.rtva.ad/live/web/chunklist_w1342231881.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/65/RTVA_logotip.png" group-title="",RTVA (Opt-3)
+http://videos.rtva.ad:1935/live/rtva/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/65/RTVA_logotip.png" group-title="",RTVA (Opt-4)
+http://videos.rtva.ad:1935/live/web/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PbLE9S2.jpg" group-title="",TPA 1
 http://api.new.livestream.com/accounts/1181452/events/5141181/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.13maxtv.com/new/img/logo13.png" group-title="",13 Max
@@ -393,8 +397,6 @@ http://ott-cdn.ucom.am/s9/index.m3u8
 http://ott-cdn.ucom.am/s10/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/USGVQIv.png" group-title="",Դար 21 (Opt-2)
 http://ott-cdn.ucom.am/s10/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/33ciFCa.png" group-title="",Aruba Beach
-http://video3.earthcam.com/fecnetwork/4644.flv/hasbahca.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wjwxp3K.png" group-title="",Tele Aruba
 http://cdn.setar.aw:1935/Telearuba/smil:telearuba.smil/chunklist_w964107368_b896000_sleng.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="7HD" tvg-logo="" group-title="",7HD
@@ -507,33 +509,29 @@ http://streams2.livetv.az/azerbaijan/space_stream/playlist.m3u8
 http://streams2.livetv.az/azerbaijan/xazar_sd_stream2/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://2.bp.blogspot.com/-_tSYQldIdyI/XBQYPRsRd-I/AAAAAAAAB5U/qEhPdv-tu9AWvEztT12Kmnz5lBR5-0nygCLcBGAs/s1600/NNT.png" group-title="",Ümüd
 http://win26.yayin.com.tr/umudtv/smil:umudtv.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/OoRft1c.png" group-title="",Eyewitness News
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/OoRft1c.png" group-title="News",Eyewitness News
 https://iltv.cachefly.net/live/live_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",BAHRAIN QURAN
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Bahrain Quran
 http://185.105.4.106:1935/live/Bahrain%20Quran/chunklist.m3u8?v=1548640033
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",BAHRAIN SPORTS
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Bahrain Sports (Opt-1)
 http://185.105.4.106:1935/live/Bahrain%20Sports/chunklist.m3u8?v=1548640033
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",BAHRAININTERNATIONAL
-http://www.elahmad.com/tv/m3u8/bahraintv.m3u8?id=bahrain_55
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/9/90/CBC_TV_8.png" group-title="",CBC TV 8
-http://161.0.157.9/PLTV/88888888/224/3221226831/index.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Bahrain Sports (Opt-2)
+http://185.105.4.106:1935/live/Bahrain%20Sports/chunklist.m3u8?v=1558393494
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.whatsupcaribbean.com/images/Triddent%2010.jpg" group-title="",Trident 10 TV
 http://161.0.157.9/PLTV/88888888/224/3221226832/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://belarus24.by/local/templates/belarus24.responsive/images/logo-company.png" group-title="",Беларусь 24
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://belarus24.by/local/templates/belarus24.responsive/images/logo-company.png" group-title="News",Беларусь 24
 https://nimble01edge01.hoster.by/belarus24hd/livehd/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",БелМуз ТВ
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",БелМуз ТВ
 http://streams.tv.mts.by/belmustv/1/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",БелРос ТВ
 http://live2.mediacdn.ru/sr1/tro/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.prfm.ru/logo/novoe-belarus-logo.png" group-title="",Новое Радио HD
-http://serv25.vintera.tv:8081/novoetv/nov_tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ОНТ
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="General",ОНТ
 http://stream.ont.by:1935/ont/live576p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Скиф (Беларусь)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Скиф
 http://178.172.150.248:2051/skifvit/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",СТВ (Беларусь)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="General",СТВ
 http://212.98.171.116/HLS/ctvby/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2016/05/TNTInternational.png" group-title="",ТНТ Беларусь
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2016/05/TNTInternational.png" group-title="Entertainment",ТНТ International (Белоруссия)
 http://streams.tv.mts.by/tnt_international/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vyMGsVf.jpg" group-title="Local",21bis
 http://bhutan.thomasmore.be/elemental_hls/hls_stream_iphone_high.m3u8
@@ -603,8 +601,6 @@ https://xite2065.cloudycdn.services/tlive/_definst_/xite_xite_1_tbc_42077_defaul
 https://live-vrt.akamaized.net/groupc/live/8edf3bdf-7db3-41c3-a318-72cb7f82de66/live_aes.isml/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="https://i.imgur.com/QLFDLnf.jpg" tvg-logo="" group-title="",één (Opt-2)
 https://live-vrt.akamaized.net/groupc/live/8edf3bdf-7db3-41c3-a318-72cb7f82de66/live_aes.isml/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.comteco.com.bo/img/upload/canales/boliviatv-2.png" group-title="",Bolivia Deportes
-http://btvboliviatv.srfms.com:6568/live/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.cadenaa.tv/web/wp-content/uploads/2018/06/Logo-cabecera.png" group-title="",Cadena A (Opt-1)
 http://136.243.3.70:1935/CadenaA/CadenaA/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.foromedios.com/uploads/gallery/category_6/gallery_9461_6_34035.png" group-title="",Cadena A (Opt-2)
@@ -613,26 +609,24 @@ http://www.channel.tevemi.com:1935/CadenaA/CadenaA/playlist.m3u8
 http://www.channel.tevemi.com:1935/CatolicaTv/CatolicaTv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.catolicatelevision.com/wp-content/uploads/sites/9/2013/10/logo_ctv2.png" group-title="",Católica TV (Opt-2)
 http://136.243.3.70:1935/CatolicaTv/CatolicaTv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://images.mi.tv/channels/pe_pat_m.png" group-title="",PAT La Paz
-http://192.99.38.174:1935/patbolivia/patlapaz/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://images.mi.tv/channels/pe_pat_m.png" group-title="",PAT Santa Cruz
-http://192.99.38.174:1935/patbolivia/patsantacruz/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",RED ADVENIR
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Red ADVenir
 http://streamer1.streamhost.org:1935/salive/GMIredadvenirh/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Red Pat La Paz SD
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://images.mi.tv/channels/pe_pat_m.png" group-title="",Red PAT La Paz (Opt-1)
+http://192.99.38.174:1935/patbolivia/patlapaz/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Red PAT La Paz (Opt-2)
 http://192.99.38.174:1935/patbolivia/patlapaz/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Red Pat Santa Cruz SD
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://images.mi.tv/channels/pe_pat_m.png" group-title="",Red PAT Santa Cruz (Opt-1)
+http://192.99.38.174:1935/patbolivia/patsantacruz/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Red PAT Santa Cruz (Opt-2)
 http://192.99.38.174:1935/patbolivia/patsantacruz/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://img11.androidappsapk.co/300/d/9/0/com.trunect2.rtp.png" group-title="",RTP
 http://136.243.3.70:1935/RtpBolivia/RtpBolivia/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7jIxa3B.png" group-title="News",AL JAZEERA BALKANS [360p]
-http://aljazeera-balkans-apple-live.adaptive.level3.net/apple/aljazeera/balkans/800.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8UD164r.png" group-title="",BNTV Bosnia SD
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8UD164r.png" group-title="",BN Televizija HD
 http://tvstream.rtvbn.com:1935/live/stream/chunklist_w1957700324.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hdwjkYa.png" group-title="",TELEVIZIJA 5
-http://37.59.21.217:8809/live/tv5web.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1Btvotr.png" group-title="",TVUSK
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1Btvotr.png" group-title="",RTV USK HD
 http://ott.dobratv.net:8888/rtvusk/tracks-v1a1/mono.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hdwjkYa.png" group-title="",Televizija 5
+http://37.59.21.217:8809/live/tv5web.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",All Sports Brasil [480p]
 http://173.236.10.10:1935/dgrau/dgrau/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Brazil 1 FTA
@@ -907,9 +901,9 @@ http://220.158.149.14:9999/live/TV00000000000000000117@HHZT;LIVE
 http://203.176.130.123:8989/live/ctv9_480k.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://cache.khmerlive.tv/tvk.png" group-title="",TVK
 http://203.176.130.123:8989/live/tvk_480k.stream/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qJ4ykc8.png" group-title="",Generation Change TV
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qJ4ykc8.png" group-title="",GC TV
 https://5c4984c4d9146.streamlock.net:1937/live/ngrp:GCTV_all/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.pinimg.com/originals/cc/5d/18/cc5d1807d156c21df2b866a4bdceac89.jpg" group-title="",Vision 4 TV
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.pinimg.com/originals/cc/5d/18/cc5d1807d156c21df2b866a4bdceac89.jpg" group-title="",Vision 4
 http://cdnamd-hls-globecast.akamaized.net/live/ramdisk/vision4/hls_video/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",5AAB TV [1080p]
 http://158.69.124.9:1935/5aabtv/5aabtv/playlist.m3u8
@@ -3489,29 +3483,23 @@ http://195.29.70.67/PLTV/88888888/224/3221226195/02.m3u8
 http://195.29.70.67/PLTV/88888888/224/3221226195/03.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",RTL Hrvatska [only audio]
 http://195.29.70.67/PLTV/88888888/224/3221226195/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MARTI [540p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Radio Televisión Martí
 http://ocb-lh.akamaihd.net/i/ocb_mpls_tvmc1@383606/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jmYvx2s.jpg" group-title="",Nos Païs
 http://highvolume04.streampartner.nl:1935/nos_pais_24_7/smil:livestream.stream.smil/chunklist_w1798703532_b2000000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9D9G4co.png" group-title="",Tele Curaçao
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9D9G4co.png" group-title="",TeleCuraçao
 http://api.streann.com:8080/loadbalancer-dev/services/public/channels/56992db2e4b045bf250ba13c/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/icDfA5x.jpg" group-title="",TV Direct 13
 http://edge1.tvdirect13.com/live/smil:mystream.smil/playlist_720p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://soombo.com/assets/images/200_1459039529.png" group-title="",BRT 1 (Turkish)
-http://wms.brtk.net:1935/live/brt1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://soombo.com/assets/images/200_1459039476.png" group-title="",BRT 2 (Turkish)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://soombo.com/assets/images/200_1459039476.png" group-title="Sport",BRT Spor HD
 http://wms.brtk.net:1935/live/brt2/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://farosonair.com/iconfaros.png" group-title="",FAROS on Air
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://soombo.com/assets/images/200_1459039529.png" group-title="",BRT Yaşam
+http://wms.brtk.net:1935/live/brt1/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://farosonair.com/iconfaros.png" group-title="",Faros on Air
 http://master.cystreams.com:25461/live/faros/farostv/1866.m3u8
-#EXTINF:-1 tvg-id="RIK1.cy" tvg-name="Rik1" tvg-logo="http://www.riknews.com.cy/images/stories/icons/logo-2.png" group-title="",RIKSAT
+#EXTINF:-1 tvg-id="RIK1.cy" tvg-name="Rik1" tvg-logo="http://www.riknews.com.cy/images/stories/icons/logo-2.png" group-title="",RIK Sat
 http://l3.cloudskep.com/cybcsat/abr/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xvJw3qt.png" group-title="",Sat 7 Arabic
-https://unirtmp.tulix.tv/sat7arabic/satarabiclive-web.smil/chunklist_w1635903706_b1000000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wrOg8vL.png" group-title="",Sat 7 Pars
-https://unirtmp.tulix.tv/sat7pars/satparslive-web.smil/chunklist_w879240201_b1000000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zia9ehv.jpg" group-title="",Sat 7 Türk
-https://unirtmp.tulix.tv/sat7turk/satturklive-web.smil/chunklist_w328296882_b1000000.m3u8
-#EXTINF:-1 tvg-id="Sigma TV" tvg-name="Sigma" tvg-logo="http://www.sigmatv.com/application/themes/default/img/redesign/sigma-logo-final.png" group-title="",SIGMA
+#EXTINF:-1 tvg-id="" tvg-name="Sigma TV" tvg-logo="http://www.sigmatv.com/application/themes/default/img/redesign/sigma-logo-final.png" group-title="",Sigma TV
 http://81.21.47.74/hls/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/DiscoveryChannel.uk.png" group-title="",Discovery Česká
 http://83.167.253.110:5000/live/discovery/playlist.m3u8
@@ -3581,7 +3569,7 @@ http://213.151.233.20:8000/dna-5100-tv-pc/hls/4002v105.m3u8
 http://slagrtv-live-hls.ssl.cdn.cra.cz:80/channels/slagrtv/playlist/cze/live_hq.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.starnet.cz/tv/slagr2.png" group-title="",Šlágr 2
 http://92.62.234.233/slagr2.m3u#.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://trace.company/wp-content/uploads/2017/08/TRACE-logo-kitoko-01-1.png" group-title="",Tracekitoko
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://trace.company/wp-content/uploads/2017/08/TRACE-logo-kitoko-01-1.png" group-title="Music",Trace Kitoko
 http://d2ktlibtvvj8vp.cloudfront.net/trace_kitoko/6/prog_index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="Kanal København" tvg-logo="https://i.imgur.com/hATNB38.jpg" group-title="",Kanal København
 https://59b954022ec35.streamlock.net:443/liveTV2/_definst_/smil:liveTVstream2.transcoder.smil/playlist.m3u8
@@ -6161,11 +6149,11 @@ https://dcunilive28-lh.akamaihd.net/i/dclive_1@531020/master.m3u8
 https://dcunilive55-lh.akamaihd.net/i/dclive_1@761470/master.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ulango.tv/uploads/channels/16278/logo_rti%205.png" group-title="",RTI 1
 https://www.enovativecdn.com:4433/rticdn/smil:rti1.smil/chunklist_w2123045922_b250000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ulango.tv/uploads/channels/8150/rti_tv2_ci.png" group-title="",RTI 2
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ulango.tv/uploads/channels/8150/rti_tv2_ci.png" group-title="",RTI 2 (Opt-1)
 https://www.enovativecdn.com:4433/rticdn/smil:rti2.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ulango.tv/uploads/channels/8150/rti_tv2_ci.png" group-title="",RTI 2
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ulango.tv/uploads/channels/8150/rti_tv2_ci.png" group-title="",RTI 2 (Opt-2)
 https://www.enovativecdn.com:4433/rticdn/smil:rti2.smil/chunklist_w1505588093_b250000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/J3o9RbS.png" group-title="",RTI 2 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/J3o9RbS.png" group-title="",RTI 2 (Opt-3)
 http://185.59.221.143:1935/rticdn/smil:rti2.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://stluciatimes.com/wp-content/uploads/2016/05/CATCH-150x150.jpg" group-title="",Catch
 http://161.0.157.9/PLTV/88888888/224/3221226865/index.m3u8?fluxustv.m3u8
@@ -6303,6 +6291,8 @@ http://live-almatytv.cdnvideo.ru/almatytv/almatytv.sdp/playlist.m3u8
 http://sc.id-tv.kz/ElArna_36_37.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/tvpedia/images/0/08/%D0%9C%D0%B0%D0%B3%D0%B8%D1%8F_%D0%9A%D1%83%D1%85%D0%BD%D0%B8_%28%D0%9A%D0%B0%D0%B7%D0%B0%D1%85%D1%81%D1%82%D0%B0%D0%BD%29.png/revision/latest?cb=20171212131520&path-prefix=ru" group-title="",Магия Кухни ТВ
 http://sc.id-tv.kz/MagiyaKuhni_36_37.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Новое Телевидение
+http://serv25.vintera.tv:8081/novoetv/nov_tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://1tv.kz/wp-content/uploads/2018/02/LOG-e1518435929410.png" group-title="",Первый канал Евразия
 http://sc.id-tv.kz/1KanalEvraziya_36_37.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/3/3c/REN_TV_logo_2015.png" group-title="",Рен ТВ Казахстан
@@ -9341,18 +9331,18 @@ http://api.tv.ipnet.ua/api/v1/manifest/2118742463.m3u8
 http://api.tv.ipnet.ua/api/v1/manifest/2118742463.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://4channel.com.ua/wp-content/uploads/2018/04/4logo-main.png" group-title="",4 канал
 http://cdn.vsnw.net:8081/interradio/1080i.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",4 канал
+http://cdn.vsnw.net:8081/interradio/720i.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",4 канал [480p]
 http://cdn.vsnw.net:8081/interradio/480i.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",4 канал [576p] (Opt-1)
 http://api.tv.ipnet.ua/api/v1/manifest/2118742331.m3u8?codec=mpeg4&app=playlist
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",4 канал [576p] (Opt-2)
 http://api.tv.ipnet.ua/api/v1/manifest/2118742331.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",4 канал [720p]
-http://cdn.vsnw.net:8081/interradio/720i.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",5 канал [576p]
-http://api.tv.ipnet.ua/api/v1/manifest/1293299450.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",5 канал [576p]
 http://api.tv.ipnet.ua/api/v1/manifest/1293299450.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",5 канал [576p]
+http://api.tv.ipnet.ua/api/v1/manifest/1293299450.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",7 канал (Одесса) [720p]
 http://cdn10.live-tv.od.ua:8081/7tvod/7tvod-abr/7tvod/7tvod/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ACADEMY [504p]
@@ -9403,10 +9393,10 @@ http://idfashion-hls1.cosmonova.net.ua/hls/idfashion_ua_hi/index.m3u8
 http://idfashion-hls1.cosmonova.net.ua/hls/idfashion_ua_low/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",ID Fashion [720p]
 http://idfashion-hls1.cosmonova.net.ua/hls/idfashion_ua_mid/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Iнтер (Opt-1)
-https://edge3.iptv.macc.com.ua/img/inter_3/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://inter.ua/images/logo.png" group-title="",Iнтер (Opt-1)
 http://109.68.41.148:1935/live/inter_3/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Iнтер (Opt-1)
+https://edge3.iptv.macc.com.ua/img/inter_3/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zyiROw1.png" group-title="",JaTB
 https://webcams.ks.ua/tvhls/stream2/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.k1.ua/images/logo.png" group-title="",K1
@@ -9587,10 +9577,10 @@ http://api.tv.ipnet.ua/api/v1/manifest/1293296300.m3u8?codec=mpeg4&app=playlist
 http://api.tv.ipnet.ua/api/v1/manifest/1293296300.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Київ TV (Opt-4)
 http://hls-kyivtv.cdnvideo.ru/kyivtv/kyivtv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tvkrt.com.ua/img/tvkrtlogo.png" group-title="",КРТ
-http://api.tv.ipnet.ua/api/v1/manifest/1298864660.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Shop",КРТ
 http://api.tv.ipnet.ua/api/v1/manifest/1298864660.m3u8?codec=mpeg4&app=playlist
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tvkrt.com.ua/img/tvkrtlogo.png" group-title="",КРТ
+http://api.tv.ipnet.ua/api/v1/manifest/1298864660.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Kids",Малятко TV
 http://api.tv.ipnet.ua/api/v1/manifest/1311963260.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.mediainform.in.ua/wp-content/uploads/2016/12/cropped-MI-Logo-site-01-2-300x59.png" group-title="",Медиа Информ
@@ -9623,10 +9613,10 @@ http://hls.cdn.ua/1zahid.com_live/_definst_/livestream/playlist.m3u8
 http://api.tv.ipnet.ua/api/v1/manifest/2118742459.m3u8?codec=mpeg4&app=playlist
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://pravdatut.ua/img/logo.png" group-title="",Правда ТУТ
 http://pravdatytkievshina-hls2.cosmonova.net.ua/hls/pravdatytkievshina_ua_hi/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://prm.ua/wp-content/themes/prm-new/img/header-logo.png" group-title="",Прямий
-http://prm-hls1.cosmonova.net.ua/hls/prm_ua_hi/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Прямий
 http://api.tv.ipnet.ua/api/v1/manifest/1293294600.m3u8?codec=mpeg4&app=playlist
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://prm.ua/wp-content/themes/prm-new/img/header-logo.png" group-title="",Прямий
+http://prm-hls1.cosmonova.net.ua/hls/prm_ua_hi/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://onlines.tv/wp-content/uploads/2017/04/1514921891_telekanal-rada.png" group-title="",Рада
 http://api.tv.ipnet.ua/api/v1/manifest/1312714970.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Рада ТВ
@@ -11527,8 +11517,6 @@ http://bit.ly/2zzZfqt
 http://sdn-global-live-http-cache.3qsdn.com/live/_definst_/amlst:9528-mbr/chunklist_b1728000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/BabyTV.uk.png" group-title="",Baby TV (Opt-1)
 http://livecdnh1.tvanywhere.ae:80/hls/baby/06.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Bahrain Sports (Opt-2)
-http://185.105.4.106:1935/live/Bahrain%20Sports/chunklist.m3u8?v=1558393494
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",BALI TV
 http://202.80.222.171/000001/2/ch00000090990000001729/index.m3u8?virtualDomain=000001.live_hls.zte.com
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",BANDAMAX
@@ -11673,7 +11661,7 @@ http://54.255.155.24:1935//Live/_definst_/amlst:sweetbcha1novD28L720P/chunklist_
 http://origin3-edge2.ord.yourstreamlive.com:1935/live/yourstreamlive/out_657_198vbyhi/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ca/CBCNews.ca.png" group-title="News",CBC News
 https://1674331492.rsc.cdn77.org/LS-ATL-54548-8/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/d/d6/CBC_Sport%2C_logo%2C_2015.png" group-title="",CBC Sport
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/d/d6/CBC_Sport%2C_logo%2C_2015.png" group-title="Sport",CBC Sport
 https://streams.livetv.az/azerbaijan/cbc_sport_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CBC Television
 http://161.0.157.50/PLTV/88888888/224/3221227004/index.m3u8
@@ -12483,8 +12471,6 @@ http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/04.m3u8
 http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/05.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo People (Opt-4)
 http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/NatGeoWild.us.png" group-title="",Nat Geo Wild (Opt-6)
-http://livecdnh1.tvanywhere.ae/hls/nat_geo_wild/05.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo Wild (Opt-1)
 http://189.216.247.113/Content/HLS/Live/Channel(NAT_GEO_WILD)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo Wild (Opt-2)
@@ -12495,6 +12481,8 @@ http://6dfbb588.melpakomn.ru/iptv/QZH6CQVGHR6Z99 /216/index.m3u8
 http://189.216.247.113/Content/HLS/Live/Channel(NAT_GEO_WILD)/Stream(02)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo Wild (Opt-5)
 http://livecdnh1.tvanywhere.ae/hls/nat_geo_wild/02.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/NatGeoWild.us.png" group-title="",Nat Geo Wild (Opt-6)
+http://livecdnh1.tvanywhere.ae/hls/nat_geo_wild/05.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/d/d2/NBA_TV.svg/1200px-NBA_TV.svg.png" group-title="",NBA TV
 http://185.246.209.109:8080/NBA9/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",NBC Bay Area (KNTV-TV)
@@ -12745,10 +12733,6 @@ http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes.m3u8
 http://ott-cdn.ucom.am/s63/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",RTV
 http://202.80.222.170:80/000001/2/ch00000090990000001716/index.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/65/RTVA_logotip.png" group-title="",RTVA (Opt-1)
-http://videos.rtva.ad:1935/live/rtva/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/65/RTVA_logotip.png" group-title="",RTVA (Opt-2)
-http://videos.rtva.ad:1935/live/web/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",RTVE
 http://hlsliveamdgl8-lh.akamaihd.net/i/hlsdvrlive_1@583030/index_1500_av-b.m3u8?sd=10&rebase=on
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/a/ae/RTD-TV-logo.png" group-title="",RTд (Russia Today Documentary)
@@ -12769,6 +12753,12 @@ http://212.18.231.213:1935/samarra/samarra/gmswf.m3u8?v=1559313925
 http://live.cast-control.eu:1935/samiaki/samiaki/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/IFaWQLx.png" group-title="",Santuario de Fatima (PT)
 http://213.13.26.11:1935/live/santuario.stream/livestream.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xvJw3qt.png" group-title="",Sat 7 Arabic
+https://unirtmp.tulix.tv/sat7arabic/satarabiclive-web.smil/chunklist_w1635903706_b1000000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wrOg8vL.png" group-title="",Sat 7 Pars
+https://unirtmp.tulix.tv/sat7pars/satparslive-web.smil/chunklist_w879240201_b1000000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zia9ehv.jpg" group-title="",Sat 7 Türk
+https://unirtmp.tulix.tv/sat7turk/satturklive-web.smil/chunklist_w328296882_b1000000.m3u8
 #EXTINF:-1 tvg-id="Sat7" tvg-name="Sat7" tvg-logo="http://t3.gstatic.com/images?q=tbn:ANd9GcQEph1hr_UeSi2_-EORwfhXop2ndFJ7tO20vbA-6bt7DZkicjuzXwQhjec" group-title="Family",Sat7 (Family) (EG) (Arabic)
 http://www.streamwebtown.com/player/sat7/arabic/stream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NM0QWA0.png" group-title="",SAT7kids (JO)
@@ -13005,7 +12995,7 @@ http://zu2or9hg.rocketcdn.com/konf/mob/web16009.isml/QualityLevels(1564000)/mani
 http://streamingcws20.com:1935/tmtv/videotmtv/.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TNT HD
 http://189.216.247.113/Content/HLS/Live/Channel(TNT_HD)/Stream(06)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://trace.tv/trace-mziki/wp-content/uploads/sites/21/2016/11/logo_mziki-1.png" group-title="Music",Trace Mmziki
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://trace.tv/trace-mziki/wp-content/uploads/sites/21/2016/11/logo_mziki-1.png" group-title="Music",Trace Mziki
 http://d2ktlibtvvj8vp.cloudfront.net/trace_mizki/5/prog_index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TRANS7
 http://202.80.222.174/000001/2/ch14041511545447343123/index.m3u8?virtualDomain=000001.live_hls.zte.com
diff --git a/index.country.m3u b/index.country.m3u
index d176266fb..5110d911a 100644
--- a/index.country.m3u
+++ b/index.country.m3u
@@ -117,10 +117,14 @@ http://www.elahmad.com/tv/m3u8/fr_xoyky_49.m3u8?id=algerie
 http://live.creacast.com/cna/smil:cna.smil/chunklist_w1780122037_b864000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="Ennahar TV" tvg-logo="https://i.imgur.com/1x1ifx8.png" group-title="Algeria",Ennahar TV
 http://144.217.76.52:8080/ENNAHAR/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Xfrg0x4.png" group-title="Andorra",RTVA
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Xfrg0x4.png" group-title="Andorra",RTVA (Opt-1)
 https://videos.rtva.ad/live/rtva/chunklist_w1082760031.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Xfrg0x4.png" group-title="Andorra",RTVA - Canal Web
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Xfrg0x4.png" group-title="Andorra",RTVA (Opt-2)
 https://videos.rtva.ad/live/web/chunklist_w1342231881.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/65/RTVA_logotip.png" group-title="Andorra",RTVA (Opt-3)
+http://videos.rtva.ad:1935/live/rtva/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/65/RTVA_logotip.png" group-title="Andorra",RTVA (Opt-4)
+http://videos.rtva.ad:1935/live/web/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PbLE9S2.jpg" group-title="Angola",TPA 1
 http://api.new.livestream.com/accounts/1181452/events/5141181/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.13maxtv.com/new/img/logo13.png" group-title="Argentina",13 Max
@@ -393,8 +397,6 @@ http://ott-cdn.ucom.am/s9/index.m3u8
 http://ott-cdn.ucom.am/s10/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/USGVQIv.png" group-title="Armenia",Դար 21 (Opt-2)
 http://ott-cdn.ucom.am/s10/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/33ciFCa.png" group-title="Aruba",Aruba Beach
-http://video3.earthcam.com/fecnetwork/4644.flv/hasbahca.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wjwxp3K.png" group-title="Aruba",Tele Aruba
 http://cdn.setar.aw:1935/Telearuba/smil:telearuba.smil/chunklist_w964107368_b896000_sleng.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="7HD" tvg-logo="" group-title="Australia",7HD
@@ -509,14 +511,12 @@ http://streams2.livetv.az/azerbaijan/xazar_sd_stream2/playlist.m3u8
 http://win26.yayin.com.tr/umudtv/smil:umudtv.smil/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/OoRft1c.png" group-title="Bahamas",Eyewitness News
 https://iltv.cachefly.net/live/live_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bahrain",BAHRAIN QURAN
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bahrain",Bahrain Quran
 http://185.105.4.106:1935/live/Bahrain%20Quran/chunklist.m3u8?v=1548640033
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bahrain",BAHRAIN SPORTS
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bahrain",Bahrain Sports (Opt-1)
 http://185.105.4.106:1935/live/Bahrain%20Sports/chunklist.m3u8?v=1548640033
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bahrain",BAHRAININTERNATIONAL
-http://www.elahmad.com/tv/m3u8/bahraintv.m3u8?id=bahrain_55
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/9/90/CBC_TV_8.png" group-title="Barbados",CBC TV 8
-http://161.0.157.9/PLTV/88888888/224/3221226831/index.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bahrain",Bahrain Sports (Opt-2)
+http://185.105.4.106:1935/live/Bahrain%20Sports/chunklist.m3u8?v=1558393494
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.whatsupcaribbean.com/images/Triddent%2010.jpg" group-title="Barbados",Trident 10 TV
 http://161.0.157.9/PLTV/88888888/224/3221226832/index.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://belarus24.by/local/templates/belarus24.responsive/images/logo-company.png" group-title="Belarus",Беларусь 24
@@ -525,15 +525,13 @@ https://nimble01edge01.hoster.by/belarus24hd/livehd/chunks.m3u8
 http://streams.tv.mts.by/belmustv/1/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Belarus",БелРос ТВ
 http://live2.mediacdn.ru/sr1/tro/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.prfm.ru/logo/novoe-belarus-logo.png" group-title="Belarus",Новое Радио HD
-http://serv25.vintera.tv:8081/novoetv/nov_tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Belarus",ОНТ
 http://stream.ont.by:1935/ont/live576p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Belarus",Скиф (Беларусь)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Belarus",Скиф
 http://178.172.150.248:2051/skifvit/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Belarus",СТВ (Беларусь)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Belarus",СТВ
 http://212.98.171.116/HLS/ctvby/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2016/05/TNTInternational.png" group-title="Belarus",ТНТ Беларусь
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2016/05/TNTInternational.png" group-title="Belarus",ТНТ International (Белоруссия)
 http://streams.tv.mts.by/tnt_international/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vyMGsVf.jpg" group-title="Belgium",21bis
 http://bhutan.thomasmore.be/elemental_hls/hls_stream_iphone_high.m3u8
@@ -603,8 +601,6 @@ https://xite2065.cloudycdn.services/tlive/_definst_/xite_xite_1_tbc_42077_defaul
 https://live-vrt.akamaized.net/groupc/live/8edf3bdf-7db3-41c3-a318-72cb7f82de66/live_aes.isml/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="https://i.imgur.com/QLFDLnf.jpg" tvg-logo="" group-title="Belgium",één (Opt-2)
 https://live-vrt.akamaized.net/groupc/live/8edf3bdf-7db3-41c3-a318-72cb7f82de66/live_aes.isml/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.comteco.com.bo/img/upload/canales/boliviatv-2.png" group-title="Bolivia",Bolivia Deportes
-http://btvboliviatv.srfms.com:6568/live/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.cadenaa.tv/web/wp-content/uploads/2018/06/Logo-cabecera.png" group-title="Bolivia",Cadena A (Opt-1)
 http://136.243.3.70:1935/CadenaA/CadenaA/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.foromedios.com/uploads/gallery/category_6/gallery_9461_6_34035.png" group-title="Bolivia",Cadena A (Opt-2)
@@ -613,26 +609,24 @@ http://www.channel.tevemi.com:1935/CadenaA/CadenaA/playlist.m3u8
 http://www.channel.tevemi.com:1935/CatolicaTv/CatolicaTv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.catolicatelevision.com/wp-content/uploads/sites/9/2013/10/logo_ctv2.png" group-title="Bolivia",Católica TV (Opt-2)
 http://136.243.3.70:1935/CatolicaTv/CatolicaTv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://images.mi.tv/channels/pe_pat_m.png" group-title="Bolivia",PAT La Paz
-http://192.99.38.174:1935/patbolivia/patlapaz/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://images.mi.tv/channels/pe_pat_m.png" group-title="Bolivia",PAT Santa Cruz
-http://192.99.38.174:1935/patbolivia/patsantacruz/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bolivia",RED ADVENIR
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bolivia",Red ADVenir
 http://streamer1.streamhost.org:1935/salive/GMIredadvenirh/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bolivia",Red Pat La Paz SD
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://images.mi.tv/channels/pe_pat_m.png" group-title="Bolivia",Red PAT La Paz (Opt-1)
+http://192.99.38.174:1935/patbolivia/patlapaz/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bolivia",Red PAT La Paz (Opt-2)
 http://192.99.38.174:1935/patbolivia/patlapaz/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bolivia",Red Pat Santa Cruz SD
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://images.mi.tv/channels/pe_pat_m.png" group-title="Bolivia",Red PAT Santa Cruz (Opt-1)
+http://192.99.38.174:1935/patbolivia/patsantacruz/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bolivia",Red PAT Santa Cruz (Opt-2)
 http://192.99.38.174:1935/patbolivia/patsantacruz/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://img11.androidappsapk.co/300/d/9/0/com.trunect2.rtp.png" group-title="Bolivia",RTP
 http://136.243.3.70:1935/RtpBolivia/RtpBolivia/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7jIxa3B.png" group-title="Bosnia and Herzegovina",AL JAZEERA BALKANS [360p]
-http://aljazeera-balkans-apple-live.adaptive.level3.net/apple/aljazeera/balkans/800.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8UD164r.png" group-title="Bosnia and Herzegovina",BNTV Bosnia SD
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8UD164r.png" group-title="Bosnia and Herzegovina",BN Televizija HD
 http://tvstream.rtvbn.com:1935/live/stream/chunklist_w1957700324.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hdwjkYa.png" group-title="Bosnia and Herzegovina",TELEVIZIJA 5
-http://37.59.21.217:8809/live/tv5web.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1Btvotr.png" group-title="Bosnia and Herzegovina",TVUSK
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1Btvotr.png" group-title="Bosnia and Herzegovina",RTV USK HD
 http://ott.dobratv.net:8888/rtvusk/tracks-v1a1/mono.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hdwjkYa.png" group-title="Bosnia and Herzegovina",Televizija 5
+http://37.59.21.217:8809/live/tv5web.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Brazil",All Sports Brasil [480p]
 http://173.236.10.10:1935/dgrau/dgrau/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Brazil",Brazil 1 FTA
@@ -907,9 +901,9 @@ http://220.158.149.14:9999/live/TV00000000000000000117@HHZT;LIVE
 http://203.176.130.123:8989/live/ctv9_480k.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://cache.khmerlive.tv/tvk.png" group-title="Cambodia",TVK
 http://203.176.130.123:8989/live/tvk_480k.stream/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qJ4ykc8.png" group-title="Cameroon",Generation Change TV
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qJ4ykc8.png" group-title="Cameroon",GC TV
 https://5c4984c4d9146.streamlock.net:1937/live/ngrp:GCTV_all/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.pinimg.com/originals/cc/5d/18/cc5d1807d156c21df2b866a4bdceac89.jpg" group-title="Cameroon",Vision 4 TV
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.pinimg.com/originals/cc/5d/18/cc5d1807d156c21df2b866a4bdceac89.jpg" group-title="Cameroon",Vision 4
 http://cdnamd-hls-globecast.akamaized.net/live/ramdisk/vision4/hls_video/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Canada",5AAB TV [1080p]
 http://158.69.124.9:1935/5aabtv/5aabtv/playlist.m3u8
@@ -3489,29 +3483,23 @@ http://195.29.70.67/PLTV/88888888/224/3221226195/02.m3u8
 http://195.29.70.67/PLTV/88888888/224/3221226195/03.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Croatia",RTL Hrvatska [only audio]
 http://195.29.70.67/PLTV/88888888/224/3221226195/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Cuba",MARTI [540p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Cuba",Radio Televisión Martí
 http://ocb-lh.akamaihd.net/i/ocb_mpls_tvmc1@383606/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jmYvx2s.jpg" group-title="Curaçao",Nos Païs
 http://highvolume04.streampartner.nl:1935/nos_pais_24_7/smil:livestream.stream.smil/chunklist_w1798703532_b2000000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9D9G4co.png" group-title="Curaçao",Tele Curaçao
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9D9G4co.png" group-title="Curaçao",TeleCuraçao
 http://api.streann.com:8080/loadbalancer-dev/services/public/channels/56992db2e4b045bf250ba13c/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/icDfA5x.jpg" group-title="Curaçao",TV Direct 13
 http://edge1.tvdirect13.com/live/smil:mystream.smil/playlist_720p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://soombo.com/assets/images/200_1459039529.png" group-title="Cyprus",BRT 1 (Turkish)
-http://wms.brtk.net:1935/live/brt1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://soombo.com/assets/images/200_1459039476.png" group-title="Cyprus",BRT 2 (Turkish)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://soombo.com/assets/images/200_1459039476.png" group-title="Cyprus",BRT Spor HD
 http://wms.brtk.net:1935/live/brt2/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://farosonair.com/iconfaros.png" group-title="Cyprus",FAROS on Air
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://soombo.com/assets/images/200_1459039529.png" group-title="Cyprus",BRT Yaşam
+http://wms.brtk.net:1935/live/brt1/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://farosonair.com/iconfaros.png" group-title="Cyprus",Faros on Air
 http://master.cystreams.com:25461/live/faros/farostv/1866.m3u8
-#EXTINF:-1 tvg-id="RIK1.cy" tvg-name="Rik1" tvg-logo="http://www.riknews.com.cy/images/stories/icons/logo-2.png" group-title="Cyprus",RIKSAT
+#EXTINF:-1 tvg-id="RIK1.cy" tvg-name="Rik1" tvg-logo="http://www.riknews.com.cy/images/stories/icons/logo-2.png" group-title="Cyprus",RIK Sat
 http://l3.cloudskep.com/cybcsat/abr/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xvJw3qt.png" group-title="Cyprus",Sat 7 Arabic
-https://unirtmp.tulix.tv/sat7arabic/satarabiclive-web.smil/chunklist_w1635903706_b1000000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wrOg8vL.png" group-title="Cyprus",Sat 7 Pars
-https://unirtmp.tulix.tv/sat7pars/satparslive-web.smil/chunklist_w879240201_b1000000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zia9ehv.jpg" group-title="Cyprus",Sat 7 Türk
-https://unirtmp.tulix.tv/sat7turk/satturklive-web.smil/chunklist_w328296882_b1000000.m3u8
-#EXTINF:-1 tvg-id="Sigma TV" tvg-name="Sigma" tvg-logo="http://www.sigmatv.com/application/themes/default/img/redesign/sigma-logo-final.png" group-title="Cyprus",SIGMA
+#EXTINF:-1 tvg-id="" tvg-name="Sigma TV" tvg-logo="http://www.sigmatv.com/application/themes/default/img/redesign/sigma-logo-final.png" group-title="Cyprus",Sigma TV
 http://81.21.47.74/hls/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/DiscoveryChannel.uk.png" group-title="Czech Republic",Discovery Česká
 http://83.167.253.110:5000/live/discovery/playlist.m3u8
@@ -3581,7 +3569,7 @@ http://213.151.233.20:8000/dna-5100-tv-pc/hls/4002v105.m3u8
 http://slagrtv-live-hls.ssl.cdn.cra.cz:80/channels/slagrtv/playlist/cze/live_hq.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.starnet.cz/tv/slagr2.png" group-title="Czech Republic",Šlágr 2
 http://92.62.234.233/slagr2.m3u#.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://trace.company/wp-content/uploads/2017/08/TRACE-logo-kitoko-01-1.png" group-title="Democratic Republic of the Congo",Tracekitoko
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://trace.company/wp-content/uploads/2017/08/TRACE-logo-kitoko-01-1.png" group-title="Democratic Republic of the Congo",Trace Kitoko
 http://d2ktlibtvvj8vp.cloudfront.net/trace_kitoko/6/prog_index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="Kanal København" tvg-logo="https://i.imgur.com/hATNB38.jpg" group-title="Denmark",Kanal København
 https://59b954022ec35.streamlock.net:443/liveTV2/_definst_/smil:liveTVstream2.transcoder.smil/playlist.m3u8
@@ -6161,11 +6149,11 @@ https://dcunilive28-lh.akamaihd.net/i/dclive_1@531020/master.m3u8
 https://dcunilive55-lh.akamaihd.net/i/dclive_1@761470/master.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ulango.tv/uploads/channels/16278/logo_rti%205.png" group-title="Ivory Coast",RTI 1
 https://www.enovativecdn.com:4433/rticdn/smil:rti1.smil/chunklist_w2123045922_b250000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ulango.tv/uploads/channels/8150/rti_tv2_ci.png" group-title="Ivory Coast",RTI 2
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ulango.tv/uploads/channels/8150/rti_tv2_ci.png" group-title="Ivory Coast",RTI 2 (Opt-1)
 https://www.enovativecdn.com:4433/rticdn/smil:rti2.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ulango.tv/uploads/channels/8150/rti_tv2_ci.png" group-title="Ivory Coast",RTI 2
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ulango.tv/uploads/channels/8150/rti_tv2_ci.png" group-title="Ivory Coast",RTI 2 (Opt-2)
 https://www.enovativecdn.com:4433/rticdn/smil:rti2.smil/chunklist_w1505588093_b250000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/J3o9RbS.png" group-title="Ivory Coast",RTI 2 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/J3o9RbS.png" group-title="Ivory Coast",RTI 2 (Opt-3)
 http://185.59.221.143:1935/rticdn/smil:rti2.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://stluciatimes.com/wp-content/uploads/2016/05/CATCH-150x150.jpg" group-title="Jamaica",Catch
 http://161.0.157.9/PLTV/88888888/224/3221226865/index.m3u8?fluxustv.m3u8
@@ -6303,6 +6291,8 @@ http://live-almatytv.cdnvideo.ru/almatytv/almatytv.sdp/playlist.m3u8
 http://sc.id-tv.kz/ElArna_36_37.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/tvpedia/images/0/08/%D0%9C%D0%B0%D0%B3%D0%B8%D1%8F_%D0%9A%D1%83%D1%85%D0%BD%D0%B8_%28%D0%9A%D0%B0%D0%B7%D0%B0%D1%85%D1%81%D1%82%D0%B0%D0%BD%29.png/revision/latest?cb=20171212131520&path-prefix=ru" group-title="Kazakhstan",Магия Кухни ТВ
 http://sc.id-tv.kz/MagiyaKuhni_36_37.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Kazakhstan",Новое Телевидение
+http://serv25.vintera.tv:8081/novoetv/nov_tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://1tv.kz/wp-content/uploads/2018/02/LOG-e1518435929410.png" group-title="Kazakhstan",Первый канал Евразия
 http://sc.id-tv.kz/1KanalEvraziya_36_37.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/3/3c/REN_TV_logo_2015.png" group-title="Kazakhstan",Рен ТВ Казахстан
@@ -9341,18 +9331,18 @@ http://api.tv.ipnet.ua/api/v1/manifest/2118742463.m3u8
 http://api.tv.ipnet.ua/api/v1/manifest/2118742463.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://4channel.com.ua/wp-content/uploads/2018/04/4logo-main.png" group-title="Ukraine",4 канал
 http://cdn.vsnw.net:8081/interradio/1080i.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",4 канал
+http://cdn.vsnw.net:8081/interradio/720i.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",4 канал [480p]
 http://cdn.vsnw.net:8081/interradio/480i.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",4 канал [576p] (Opt-1)
 http://api.tv.ipnet.ua/api/v1/manifest/2118742331.m3u8?codec=mpeg4&app=playlist
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",4 канал [576p] (Opt-2)
 http://api.tv.ipnet.ua/api/v1/manifest/2118742331.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",4 канал [720p]
-http://cdn.vsnw.net:8081/interradio/720i.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",5 канал [576p]
-http://api.tv.ipnet.ua/api/v1/manifest/1293299450.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",5 канал [576p]
 http://api.tv.ipnet.ua/api/v1/manifest/1293299450.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",5 канал [576p]
+http://api.tv.ipnet.ua/api/v1/manifest/1293299450.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",7 канал (Одесса) [720p]
 http://cdn10.live-tv.od.ua:8081/7tvod/7tvod-abr/7tvod/7tvod/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",ACADEMY [504p]
@@ -9403,10 +9393,10 @@ http://idfashion-hls1.cosmonova.net.ua/hls/idfashion_ua_hi/index.m3u8
 http://idfashion-hls1.cosmonova.net.ua/hls/idfashion_ua_low/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",ID Fashion [720p]
 http://idfashion-hls1.cosmonova.net.ua/hls/idfashion_ua_mid/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",Iнтер (Opt-1)
-https://edge3.iptv.macc.com.ua/img/inter_3/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://inter.ua/images/logo.png" group-title="Ukraine",Iнтер (Opt-1)
 http://109.68.41.148:1935/live/inter_3/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",Iнтер (Opt-1)
+https://edge3.iptv.macc.com.ua/img/inter_3/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zyiROw1.png" group-title="Ukraine",JaTB
 https://webcams.ks.ua/tvhls/stream2/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.k1.ua/images/logo.png" group-title="Ukraine",K1
@@ -9587,10 +9577,10 @@ http://api.tv.ipnet.ua/api/v1/manifest/1293296300.m3u8?codec=mpeg4&app=playlist
 http://api.tv.ipnet.ua/api/v1/manifest/1293296300.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",Київ TV (Opt-4)
 http://hls-kyivtv.cdnvideo.ru/kyivtv/kyivtv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tvkrt.com.ua/img/tvkrtlogo.png" group-title="Ukraine",КРТ
-http://api.tv.ipnet.ua/api/v1/manifest/1298864660.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",КРТ
 http://api.tv.ipnet.ua/api/v1/manifest/1298864660.m3u8?codec=mpeg4&app=playlist
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tvkrt.com.ua/img/tvkrtlogo.png" group-title="Ukraine",КРТ
+http://api.tv.ipnet.ua/api/v1/manifest/1298864660.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",Малятко TV
 http://api.tv.ipnet.ua/api/v1/manifest/1311963260.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.mediainform.in.ua/wp-content/uploads/2016/12/cropped-MI-Logo-site-01-2-300x59.png" group-title="Ukraine",Медиа Информ
@@ -9623,10 +9613,10 @@ http://hls.cdn.ua/1zahid.com_live/_definst_/livestream/playlist.m3u8
 http://api.tv.ipnet.ua/api/v1/manifest/2118742459.m3u8?codec=mpeg4&app=playlist
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://pravdatut.ua/img/logo.png" group-title="Ukraine",Правда ТУТ
 http://pravdatytkievshina-hls2.cosmonova.net.ua/hls/pravdatytkievshina_ua_hi/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://prm.ua/wp-content/themes/prm-new/img/header-logo.png" group-title="Ukraine",Прямий
-http://prm-hls1.cosmonova.net.ua/hls/prm_ua_hi/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",Прямий
 http://api.tv.ipnet.ua/api/v1/manifest/1293294600.m3u8?codec=mpeg4&app=playlist
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://prm.ua/wp-content/themes/prm-new/img/header-logo.png" group-title="Ukraine",Прямий
+http://prm-hls1.cosmonova.net.ua/hls/prm_ua_hi/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://onlines.tv/wp-content/uploads/2017/04/1514921891_telekanal-rada.png" group-title="Ukraine",Рада
 http://api.tv.ipnet.ua/api/v1/manifest/1312714970.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",Рада ТВ
@@ -11527,8 +11517,6 @@ http://bit.ly/2zzZfqt
 http://sdn-global-live-http-cache.3qsdn.com/live/_definst_/amlst:9528-mbr/chunklist_b1728000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/BabyTV.uk.png" group-title="Unsorted",Baby TV (Opt-1)
 http://livecdnh1.tvanywhere.ae:80/hls/baby/06.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",Bahrain Sports (Opt-2)
-http://185.105.4.106:1935/live/Bahrain%20Sports/chunklist.m3u8?v=1558393494
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",BALI TV
 http://202.80.222.171/000001/2/ch00000090990000001729/index.m3u8?virtualDomain=000001.live_hls.zte.com
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",BANDAMAX
@@ -12483,8 +12471,6 @@ http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/04.m3u8
 http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/05.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",Nat Geo People (Opt-4)
 http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/NatGeoWild.us.png" group-title="Unsorted",Nat Geo Wild (Opt-6)
-http://livecdnh1.tvanywhere.ae/hls/nat_geo_wild/05.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",Nat Geo Wild (Opt-1)
 http://189.216.247.113/Content/HLS/Live/Channel(NAT_GEO_WILD)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",Nat Geo Wild (Opt-2)
@@ -12495,6 +12481,8 @@ http://6dfbb588.melpakomn.ru/iptv/QZH6CQVGHR6Z99 /216/index.m3u8
 http://189.216.247.113/Content/HLS/Live/Channel(NAT_GEO_WILD)/Stream(02)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",Nat Geo Wild (Opt-5)
 http://livecdnh1.tvanywhere.ae/hls/nat_geo_wild/02.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/NatGeoWild.us.png" group-title="Unsorted",Nat Geo Wild (Opt-6)
+http://livecdnh1.tvanywhere.ae/hls/nat_geo_wild/05.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/d/d2/NBA_TV.svg/1200px-NBA_TV.svg.png" group-title="Unsorted",NBA TV
 http://185.246.209.109:8080/NBA9/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",NBC Bay Area (KNTV-TV)
@@ -12745,10 +12733,6 @@ http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes.m3u8
 http://ott-cdn.ucom.am/s63/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",RTV
 http://202.80.222.170:80/000001/2/ch00000090990000001716/index.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/65/RTVA_logotip.png" group-title="Unsorted",RTVA (Opt-1)
-http://videos.rtva.ad:1935/live/rtva/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/65/RTVA_logotip.png" group-title="Unsorted",RTVA (Opt-2)
-http://videos.rtva.ad:1935/live/web/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",RTVE
 http://hlsliveamdgl8-lh.akamaihd.net/i/hlsdvrlive_1@583030/index_1500_av-b.m3u8?sd=10&rebase=on
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/a/ae/RTD-TV-logo.png" group-title="Unsorted",RTд (Russia Today Documentary)
@@ -12769,6 +12753,12 @@ http://212.18.231.213:1935/samarra/samarra/gmswf.m3u8?v=1559313925
 http://live.cast-control.eu:1935/samiaki/samiaki/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/IFaWQLx.png" group-title="Unsorted",Santuario de Fatima (PT)
 http://213.13.26.11:1935/live/santuario.stream/livestream.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xvJw3qt.png" group-title="Unsorted",Sat 7 Arabic
+https://unirtmp.tulix.tv/sat7arabic/satarabiclive-web.smil/chunklist_w1635903706_b1000000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wrOg8vL.png" group-title="Unsorted",Sat 7 Pars
+https://unirtmp.tulix.tv/sat7pars/satparslive-web.smil/chunklist_w879240201_b1000000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zia9ehv.jpg" group-title="Unsorted",Sat 7 Türk
+https://unirtmp.tulix.tv/sat7turk/satturklive-web.smil/chunklist_w328296882_b1000000.m3u8
 #EXTINF:-1 tvg-id="Sat7" tvg-name="Sat7" tvg-logo="http://t3.gstatic.com/images?q=tbn:ANd9GcQEph1hr_UeSi2_-EORwfhXop2ndFJ7tO20vbA-6bt7DZkicjuzXwQhjec" group-title="Unsorted",Sat7 (Family) (EG) (Arabic)
 http://www.streamwebtown.com/player/sat7/arabic/stream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NM0QWA0.png" group-title="Unsorted",SAT7kids (JO)
@@ -13005,7 +12995,7 @@ http://zu2or9hg.rocketcdn.com/konf/mob/web16009.isml/QualityLevels(1564000)/mani
 http://streamingcws20.com:1935/tmtv/videotmtv/.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",TNT HD
 http://189.216.247.113/Content/HLS/Live/Channel(TNT_HD)/Stream(06)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://trace.tv/trace-mziki/wp-content/uploads/sites/21/2016/11/logo_mziki-1.png" group-title="Unsorted",Trace Mmziki
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://trace.tv/trace-mziki/wp-content/uploads/sites/21/2016/11/logo_mziki-1.png" group-title="Unsorted",Trace Mziki
 http://d2ktlibtvvj8vp.cloudfront.net/trace_mizki/5/prog_index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",TRANS7
 http://202.80.222.174/000001/2/ch14041511545447343123/index.m3u8?virtualDomain=000001.live_hls.zte.com
diff --git a/index.full.m3u b/index.full.m3u
index 6a93f59e0..90bd6d6fc 100644
--- a/index.full.m3u
+++ b/index.full.m3u
@@ -117,10 +117,14 @@ http://www.elahmad.com/tv/m3u8/fr_xoyky_49.m3u8?id=algerie
 http://live.creacast.com/cna/smil:cna.smil/chunklist_w1780122037_b864000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="Ennahar TV" tvg-logo="https://i.imgur.com/1x1ifx8.png" group-title="Algeria",Ennahar TV
 http://144.217.76.52:8080/ENNAHAR/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Xfrg0x4.png" group-title="Andorra",RTVA
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Xfrg0x4.png" group-title="Andorra",RTVA (Opt-1)
 https://videos.rtva.ad/live/rtva/chunklist_w1082760031.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Xfrg0x4.png" group-title="Andorra",RTVA - Canal Web
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Xfrg0x4.png" group-title="Andorra",RTVA (Opt-2)
 https://videos.rtva.ad/live/web/chunklist_w1342231881.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/65/RTVA_logotip.png" group-title="Andorra",RTVA (Opt-3)
+http://videos.rtva.ad:1935/live/rtva/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/65/RTVA_logotip.png" group-title="Andorra",RTVA (Opt-4)
+http://videos.rtva.ad:1935/live/web/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PbLE9S2.jpg" group-title="Angola",TPA 1
 http://api.new.livestream.com/accounts/1181452/events/5141181/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.13maxtv.com/new/img/logo13.png" group-title="Argentina",13 Max
@@ -393,8 +397,6 @@ http://ott-cdn.ucom.am/s9/index.m3u8
 http://ott-cdn.ucom.am/s10/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/USGVQIv.png" group-title="Armenia",Դար 21 (Opt-2)
 http://ott-cdn.ucom.am/s10/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/33ciFCa.png" group-title="Aruba",Aruba Beach
-http://video3.earthcam.com/fecnetwork/4644.flv/hasbahca.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wjwxp3K.png" group-title="Aruba",Tele Aruba
 http://cdn.setar.aw:1935/Telearuba/smil:telearuba.smil/chunklist_w964107368_b896000_sleng.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="7HD" tvg-logo="" group-title="Australia",7HD
@@ -507,33 +509,29 @@ http://streams2.livetv.az/azerbaijan/space_stream/playlist.m3u8
 http://streams2.livetv.az/azerbaijan/xazar_sd_stream2/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://2.bp.blogspot.com/-_tSYQldIdyI/XBQYPRsRd-I/AAAAAAAAB5U/qEhPdv-tu9AWvEztT12Kmnz5lBR5-0nygCLcBGAs/s1600/NNT.png" group-title="Azerbaijan",Ümüd
 http://win26.yayin.com.tr/umudtv/smil:umudtv.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/OoRft1c.png" group-title="Bahamas",Eyewitness News
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/OoRft1c.png" group-title="Bahamas;News",Eyewitness News
 https://iltv.cachefly.net/live/live_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bahrain",BAHRAIN QURAN
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bahrain",Bahrain Quran
 http://185.105.4.106:1935/live/Bahrain%20Quran/chunklist.m3u8?v=1548640033
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bahrain;Sport",BAHRAIN SPORTS
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bahrain;Sport",Bahrain Sports (Opt-1)
 http://185.105.4.106:1935/live/Bahrain%20Sports/chunklist.m3u8?v=1548640033
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bahrain",BAHRAININTERNATIONAL
-http://www.elahmad.com/tv/m3u8/bahraintv.m3u8?id=bahrain_55
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/9/90/CBC_TV_8.png" group-title="Barbados",CBC TV 8
-http://161.0.157.9/PLTV/88888888/224/3221226831/index.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bahrain;Sport",Bahrain Sports (Opt-2)
+http://185.105.4.106:1935/live/Bahrain%20Sports/chunklist.m3u8?v=1558393494
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.whatsupcaribbean.com/images/Triddent%2010.jpg" group-title="Barbados",Trident 10 TV
 http://161.0.157.9/PLTV/88888888/224/3221226832/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://belarus24.by/local/templates/belarus24.responsive/images/logo-company.png" group-title="Belarus",Беларусь 24
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://belarus24.by/local/templates/belarus24.responsive/images/logo-company.png" group-title="Belarus;News",Беларусь 24
 https://nimble01edge01.hoster.by/belarus24hd/livehd/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Belarus",БелМуз ТВ
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Belarus;Entertainment",БелМуз ТВ
 http://streams.tv.mts.by/belmustv/1/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Belarus",БелРос ТВ
 http://live2.mediacdn.ru/sr1/tro/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.prfm.ru/logo/novoe-belarus-logo.png" group-title="Belarus",Новое Радио HD
-http://serv25.vintera.tv:8081/novoetv/nov_tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Belarus",ОНТ
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Belarus;General",ОНТ
 http://stream.ont.by:1935/ont/live576p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Belarus",Скиф (Беларусь)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Belarus",Скиф
 http://178.172.150.248:2051/skifvit/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Belarus",СТВ (Беларусь)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Belarus;General",СТВ
 http://212.98.171.116/HLS/ctvby/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2016/05/TNTInternational.png" group-title="Belarus",ТНТ Беларусь
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2016/05/TNTInternational.png" group-title="Belarus;Entertainment",ТНТ International (Белоруссия)
 http://streams.tv.mts.by/tnt_international/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vyMGsVf.jpg" group-title="Belgium;Local",21bis
 http://bhutan.thomasmore.be/elemental_hls/hls_stream_iphone_high.m3u8
@@ -603,8 +601,6 @@ https://xite2065.cloudycdn.services/tlive/_definst_/xite_xite_1_tbc_42077_defaul
 https://live-vrt.akamaized.net/groupc/live/8edf3bdf-7db3-41c3-a318-72cb7f82de66/live_aes.isml/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="https://i.imgur.com/QLFDLnf.jpg" tvg-logo="" group-title="Belgium",één (Opt-2)
 https://live-vrt.akamaized.net/groupc/live/8edf3bdf-7db3-41c3-a318-72cb7f82de66/live_aes.isml/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.comteco.com.bo/img/upload/canales/boliviatv-2.png" group-title="Bolivia",Bolivia Deportes
-http://btvboliviatv.srfms.com:6568/live/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.cadenaa.tv/web/wp-content/uploads/2018/06/Logo-cabecera.png" group-title="Bolivia",Cadena A (Opt-1)
 http://136.243.3.70:1935/CadenaA/CadenaA/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.foromedios.com/uploads/gallery/category_6/gallery_9461_6_34035.png" group-title="Bolivia",Cadena A (Opt-2)
@@ -613,26 +609,24 @@ http://www.channel.tevemi.com:1935/CadenaA/CadenaA/playlist.m3u8
 http://www.channel.tevemi.com:1935/CatolicaTv/CatolicaTv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.catolicatelevision.com/wp-content/uploads/sites/9/2013/10/logo_ctv2.png" group-title="Bolivia",Católica TV (Opt-2)
 http://136.243.3.70:1935/CatolicaTv/CatolicaTv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://images.mi.tv/channels/pe_pat_m.png" group-title="Bolivia",PAT La Paz
-http://192.99.38.174:1935/patbolivia/patlapaz/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://images.mi.tv/channels/pe_pat_m.png" group-title="Bolivia",PAT Santa Cruz
-http://192.99.38.174:1935/patbolivia/patsantacruz/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bolivia",RED ADVENIR
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bolivia;Religious",Red ADVenir
 http://streamer1.streamhost.org:1935/salive/GMIredadvenirh/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bolivia",Red Pat La Paz SD
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://images.mi.tv/channels/pe_pat_m.png" group-title="Bolivia",Red PAT La Paz (Opt-1)
+http://192.99.38.174:1935/patbolivia/patlapaz/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bolivia",Red PAT La Paz (Opt-2)
 http://192.99.38.174:1935/patbolivia/patlapaz/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bolivia",Red Pat Santa Cruz SD
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://images.mi.tv/channels/pe_pat_m.png" group-title="Bolivia",Red PAT Santa Cruz (Opt-1)
+http://192.99.38.174:1935/patbolivia/patsantacruz/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Bolivia",Red PAT Santa Cruz (Opt-2)
 http://192.99.38.174:1935/patbolivia/patsantacruz/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://img11.androidappsapk.co/300/d/9/0/com.trunect2.rtp.png" group-title="Bolivia",RTP
 http://136.243.3.70:1935/RtpBolivia/RtpBolivia/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7jIxa3B.png" group-title="Bosnia and Herzegovina;News",AL JAZEERA BALKANS [360p]
-http://aljazeera-balkans-apple-live.adaptive.level3.net/apple/aljazeera/balkans/800.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8UD164r.png" group-title="Bosnia and Herzegovina",BNTV Bosnia SD
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8UD164r.png" group-title="Bosnia and Herzegovina",BN Televizija HD
 http://tvstream.rtvbn.com:1935/live/stream/chunklist_w1957700324.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hdwjkYa.png" group-title="Bosnia and Herzegovina",TELEVIZIJA 5
-http://37.59.21.217:8809/live/tv5web.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1Btvotr.png" group-title="Bosnia and Herzegovina",TVUSK
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1Btvotr.png" group-title="Bosnia and Herzegovina",RTV USK HD
 http://ott.dobratv.net:8888/rtvusk/tracks-v1a1/mono.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hdwjkYa.png" group-title="Bosnia and Herzegovina",Televizija 5
+http://37.59.21.217:8809/live/tv5web.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Brazil;Sport",All Sports Brasil [480p]
 http://173.236.10.10:1935/dgrau/dgrau/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Brazil",Brazil 1 FTA
@@ -907,9 +901,9 @@ http://220.158.149.14:9999/live/TV00000000000000000117@HHZT;LIVE
 http://203.176.130.123:8989/live/ctv9_480k.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://cache.khmerlive.tv/tvk.png" group-title="Cambodia",TVK
 http://203.176.130.123:8989/live/tvk_480k.stream/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qJ4ykc8.png" group-title="Cameroon",Generation Change TV
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qJ4ykc8.png" group-title="Cameroon",GC TV
 https://5c4984c4d9146.streamlock.net:1937/live/ngrp:GCTV_all/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.pinimg.com/originals/cc/5d/18/cc5d1807d156c21df2b866a4bdceac89.jpg" group-title="Cameroon",Vision 4 TV
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.pinimg.com/originals/cc/5d/18/cc5d1807d156c21df2b866a4bdceac89.jpg" group-title="Cameroon",Vision 4
 http://cdnamd-hls-globecast.akamaized.net/live/ramdisk/vision4/hls_video/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Canada",5AAB TV [1080p]
 http://158.69.124.9:1935/5aabtv/5aabtv/playlist.m3u8
@@ -3489,29 +3483,23 @@ http://195.29.70.67/PLTV/88888888/224/3221226195/02.m3u8
 http://195.29.70.67/PLTV/88888888/224/3221226195/03.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Croatia",RTL Hrvatska [only audio]
 http://195.29.70.67/PLTV/88888888/224/3221226195/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Cuba",MARTI [540p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Cuba",Radio Televisión Martí
 http://ocb-lh.akamaihd.net/i/ocb_mpls_tvmc1@383606/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jmYvx2s.jpg" group-title="Curaçao",Nos Païs
 http://highvolume04.streampartner.nl:1935/nos_pais_24_7/smil:livestream.stream.smil/chunklist_w1798703532_b2000000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9D9G4co.png" group-title="Curaçao",Tele Curaçao
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9D9G4co.png" group-title="Curaçao",TeleCuraçao
 http://api.streann.com:8080/loadbalancer-dev/services/public/channels/56992db2e4b045bf250ba13c/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/icDfA5x.jpg" group-title="Curaçao",TV Direct 13
 http://edge1.tvdirect13.com/live/smil:mystream.smil/playlist_720p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://soombo.com/assets/images/200_1459039529.png" group-title="Cyprus",BRT 1 (Turkish)
-http://wms.brtk.net:1935/live/brt1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://soombo.com/assets/images/200_1459039476.png" group-title="Cyprus",BRT 2 (Turkish)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://soombo.com/assets/images/200_1459039476.png" group-title="Cyprus;Sport",BRT Spor HD
 http://wms.brtk.net:1935/live/brt2/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://farosonair.com/iconfaros.png" group-title="Cyprus",FAROS on Air
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://soombo.com/assets/images/200_1459039529.png" group-title="Cyprus",BRT Yaşam
+http://wms.brtk.net:1935/live/brt1/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://farosonair.com/iconfaros.png" group-title="Cyprus",Faros on Air
 http://master.cystreams.com:25461/live/faros/farostv/1866.m3u8
-#EXTINF:-1 tvg-id="RIK1.cy" tvg-name="Rik1" tvg-logo="http://www.riknews.com.cy/images/stories/icons/logo-2.png" group-title="Cyprus",RIKSAT
+#EXTINF:-1 tvg-id="RIK1.cy" tvg-name="Rik1" tvg-logo="http://www.riknews.com.cy/images/stories/icons/logo-2.png" group-title="Cyprus",RIK Sat
 http://l3.cloudskep.com/cybcsat/abr/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xvJw3qt.png" group-title="Cyprus",Sat 7 Arabic
-https://unirtmp.tulix.tv/sat7arabic/satarabiclive-web.smil/chunklist_w1635903706_b1000000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wrOg8vL.png" group-title="Cyprus",Sat 7 Pars
-https://unirtmp.tulix.tv/sat7pars/satparslive-web.smil/chunklist_w879240201_b1000000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zia9ehv.jpg" group-title="Cyprus",Sat 7 Türk
-https://unirtmp.tulix.tv/sat7turk/satturklive-web.smil/chunklist_w328296882_b1000000.m3u8
-#EXTINF:-1 tvg-id="Sigma TV" tvg-name="Sigma" tvg-logo="http://www.sigmatv.com/application/themes/default/img/redesign/sigma-logo-final.png" group-title="Cyprus",SIGMA
+#EXTINF:-1 tvg-id="" tvg-name="Sigma TV" tvg-logo="http://www.sigmatv.com/application/themes/default/img/redesign/sigma-logo-final.png" group-title="Cyprus",Sigma TV
 http://81.21.47.74/hls/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/DiscoveryChannel.uk.png" group-title="Czech Republic",Discovery Česká
 http://83.167.253.110:5000/live/discovery/playlist.m3u8
@@ -3581,7 +3569,7 @@ http://213.151.233.20:8000/dna-5100-tv-pc/hls/4002v105.m3u8
 http://slagrtv-live-hls.ssl.cdn.cra.cz:80/channels/slagrtv/playlist/cze/live_hq.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.starnet.cz/tv/slagr2.png" group-title="Czech Republic",Šlágr 2
 http://92.62.234.233/slagr2.m3u#.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://trace.company/wp-content/uploads/2017/08/TRACE-logo-kitoko-01-1.png" group-title="Democratic Republic of the Congo",Tracekitoko
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://trace.company/wp-content/uploads/2017/08/TRACE-logo-kitoko-01-1.png" group-title="Democratic Republic of the Congo;Music",Trace Kitoko
 http://d2ktlibtvvj8vp.cloudfront.net/trace_kitoko/6/prog_index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="Kanal København" tvg-logo="https://i.imgur.com/hATNB38.jpg" group-title="Denmark",Kanal København
 https://59b954022ec35.streamlock.net:443/liveTV2/_definst_/smil:liveTVstream2.transcoder.smil/playlist.m3u8
@@ -6161,11 +6149,11 @@ https://dcunilive28-lh.akamaihd.net/i/dclive_1@531020/master.m3u8
 https://dcunilive55-lh.akamaihd.net/i/dclive_1@761470/master.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ulango.tv/uploads/channels/16278/logo_rti%205.png" group-title="Ivory Coast",RTI 1
 https://www.enovativecdn.com:4433/rticdn/smil:rti1.smil/chunklist_w2123045922_b250000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ulango.tv/uploads/channels/8150/rti_tv2_ci.png" group-title="Ivory Coast",RTI 2
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ulango.tv/uploads/channels/8150/rti_tv2_ci.png" group-title="Ivory Coast",RTI 2 (Opt-1)
 https://www.enovativecdn.com:4433/rticdn/smil:rti2.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ulango.tv/uploads/channels/8150/rti_tv2_ci.png" group-title="Ivory Coast",RTI 2
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ulango.tv/uploads/channels/8150/rti_tv2_ci.png" group-title="Ivory Coast",RTI 2 (Opt-2)
 https://www.enovativecdn.com:4433/rticdn/smil:rti2.smil/chunklist_w1505588093_b250000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/J3o9RbS.png" group-title="Ivory Coast",RTI 2 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/J3o9RbS.png" group-title="Ivory Coast",RTI 2 (Opt-3)
 http://185.59.221.143:1935/rticdn/smil:rti2.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://stluciatimes.com/wp-content/uploads/2016/05/CATCH-150x150.jpg" group-title="Jamaica",Catch
 http://161.0.157.9/PLTV/88888888/224/3221226865/index.m3u8?fluxustv.m3u8
@@ -6303,6 +6291,8 @@ http://live-almatytv.cdnvideo.ru/almatytv/almatytv.sdp/playlist.m3u8
 http://sc.id-tv.kz/ElArna_36_37.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/tvpedia/images/0/08/%D0%9C%D0%B0%D0%B3%D0%B8%D1%8F_%D0%9A%D1%83%D1%85%D0%BD%D0%B8_%28%D0%9A%D0%B0%D0%B7%D0%B0%D1%85%D1%81%D1%82%D0%B0%D0%BD%29.png/revision/latest?cb=20171212131520&path-prefix=ru" group-title="Kazakhstan",Магия Кухни ТВ
 http://sc.id-tv.kz/MagiyaKuhni_36_37.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Kazakhstan",Новое Телевидение
+http://serv25.vintera.tv:8081/novoetv/nov_tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://1tv.kz/wp-content/uploads/2018/02/LOG-e1518435929410.png" group-title="Kazakhstan",Первый канал Евразия
 http://sc.id-tv.kz/1KanalEvraziya_36_37.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/3/3c/REN_TV_logo_2015.png" group-title="Kazakhstan",Рен ТВ Казахстан
@@ -9341,18 +9331,18 @@ http://api.tv.ipnet.ua/api/v1/manifest/2118742463.m3u8
 http://api.tv.ipnet.ua/api/v1/manifest/2118742463.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://4channel.com.ua/wp-content/uploads/2018/04/4logo-main.png" group-title="Ukraine",4 канал
 http://cdn.vsnw.net:8081/interradio/1080i.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine;News",4 канал
+http://cdn.vsnw.net:8081/interradio/720i.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",4 канал [480p]
 http://cdn.vsnw.net:8081/interradio/480i.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",4 канал [576p] (Opt-1)
 http://api.tv.ipnet.ua/api/v1/manifest/2118742331.m3u8?codec=mpeg4&app=playlist
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",4 канал [576p] (Opt-2)
 http://api.tv.ipnet.ua/api/v1/manifest/2118742331.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",4 канал [720p]
-http://cdn.vsnw.net:8081/interradio/720i.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine;News",5 канал [576p]
-http://api.tv.ipnet.ua/api/v1/manifest/1293299450.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine;News",5 канал [576p]
 http://api.tv.ipnet.ua/api/v1/manifest/1293299450.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine;News",5 канал [576p]
+http://api.tv.ipnet.ua/api/v1/manifest/1293299450.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",7 канал (Одесса) [720p]
 http://cdn10.live-tv.od.ua:8081/7tvod/7tvod-abr/7tvod/7tvod/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",ACADEMY [504p]
@@ -9403,10 +9393,10 @@ http://idfashion-hls1.cosmonova.net.ua/hls/idfashion_ua_hi/index.m3u8
 http://idfashion-hls1.cosmonova.net.ua/hls/idfashion_ua_low/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine;Fashion",ID Fashion [720p]
 http://idfashion-hls1.cosmonova.net.ua/hls/idfashion_ua_mid/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",Iнтер (Opt-1)
-https://edge3.iptv.macc.com.ua/img/inter_3/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://inter.ua/images/logo.png" group-title="Ukraine",Iнтер (Opt-1)
 http://109.68.41.148:1935/live/inter_3/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",Iнтер (Opt-1)
+https://edge3.iptv.macc.com.ua/img/inter_3/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zyiROw1.png" group-title="Ukraine",JaTB
 https://webcams.ks.ua/tvhls/stream2/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.k1.ua/images/logo.png" group-title="Ukraine",K1
@@ -9587,10 +9577,10 @@ http://api.tv.ipnet.ua/api/v1/manifest/1293296300.m3u8?codec=mpeg4&app=playlist
 http://api.tv.ipnet.ua/api/v1/manifest/1293296300.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",Київ TV (Opt-4)
 http://hls-kyivtv.cdnvideo.ru/kyivtv/kyivtv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tvkrt.com.ua/img/tvkrtlogo.png" group-title="Ukraine",КРТ
-http://api.tv.ipnet.ua/api/v1/manifest/1298864660.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine;Shop",КРТ
 http://api.tv.ipnet.ua/api/v1/manifest/1298864660.m3u8?codec=mpeg4&app=playlist
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tvkrt.com.ua/img/tvkrtlogo.png" group-title="Ukraine",КРТ
+http://api.tv.ipnet.ua/api/v1/manifest/1298864660.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine;Kids",Малятко TV
 http://api.tv.ipnet.ua/api/v1/manifest/1311963260.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.mediainform.in.ua/wp-content/uploads/2016/12/cropped-MI-Logo-site-01-2-300x59.png" group-title="Ukraine",Медиа Информ
@@ -9623,10 +9613,10 @@ http://hls.cdn.ua/1zahid.com_live/_definst_/livestream/playlist.m3u8
 http://api.tv.ipnet.ua/api/v1/manifest/2118742459.m3u8?codec=mpeg4&app=playlist
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://pravdatut.ua/img/logo.png" group-title="Ukraine",Правда ТУТ
 http://pravdatytkievshina-hls2.cosmonova.net.ua/hls/pravdatytkievshina_ua_hi/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://prm.ua/wp-content/themes/prm-new/img/header-logo.png" group-title="Ukraine",Прямий
-http://prm-hls1.cosmonova.net.ua/hls/prm_ua_hi/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",Прямий
 http://api.tv.ipnet.ua/api/v1/manifest/1293294600.m3u8?codec=mpeg4&app=playlist
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://prm.ua/wp-content/themes/prm-new/img/header-logo.png" group-title="Ukraine",Прямий
+http://prm-hls1.cosmonova.net.ua/hls/prm_ua_hi/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://onlines.tv/wp-content/uploads/2017/04/1514921891_telekanal-rada.png" group-title="Ukraine",Рада
 http://api.tv.ipnet.ua/api/v1/manifest/1312714970.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Ukraine",Рада ТВ
@@ -11527,8 +11517,6 @@ http://bit.ly/2zzZfqt
 http://sdn-global-live-http-cache.3qsdn.com/live/_definst_/amlst:9528-mbr/chunklist_b1728000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/BabyTV.uk.png" group-title="Unsorted",Baby TV (Opt-1)
 http://livecdnh1.tvanywhere.ae:80/hls/baby/06.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted;Sport",Bahrain Sports (Opt-2)
-http://185.105.4.106:1935/live/Bahrain%20Sports/chunklist.m3u8?v=1558393494
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",BALI TV
 http://202.80.222.171/000001/2/ch00000090990000001729/index.m3u8?virtualDomain=000001.live_hls.zte.com
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",BANDAMAX
@@ -11673,7 +11661,7 @@ http://54.255.155.24:1935//Live/_definst_/amlst:sweetbcha1novD28L720P/chunklist_
 http://origin3-edge2.ord.yourstreamlive.com:1935/live/yourstreamlive/out_657_198vbyhi/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ca/CBCNews.ca.png" group-title="Unsorted;News",CBC News
 https://1674331492.rsc.cdn77.org/LS-ATL-54548-8/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/d/d6/CBC_Sport%2C_logo%2C_2015.png" group-title="Unsorted",CBC Sport
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/d/d6/CBC_Sport%2C_logo%2C_2015.png" group-title="Unsorted;Sport",CBC Sport
 https://streams.livetv.az/azerbaijan/cbc_sport_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",CBC Television
 http://161.0.157.50/PLTV/88888888/224/3221227004/index.m3u8
@@ -12483,8 +12471,6 @@ http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/04.m3u8
 http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/05.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",Nat Geo People (Opt-4)
 http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/NatGeoWild.us.png" group-title="Unsorted",Nat Geo Wild (Opt-6)
-http://livecdnh1.tvanywhere.ae/hls/nat_geo_wild/05.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",Nat Geo Wild (Opt-1)
 http://189.216.247.113/Content/HLS/Live/Channel(NAT_GEO_WILD)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",Nat Geo Wild (Opt-2)
@@ -12495,6 +12481,8 @@ http://6dfbb588.melpakomn.ru/iptv/QZH6CQVGHR6Z99 /216/index.m3u8
 http://189.216.247.113/Content/HLS/Live/Channel(NAT_GEO_WILD)/Stream(02)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",Nat Geo Wild (Opt-5)
 http://livecdnh1.tvanywhere.ae/hls/nat_geo_wild/02.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/NatGeoWild.us.png" group-title="Unsorted",Nat Geo Wild (Opt-6)
+http://livecdnh1.tvanywhere.ae/hls/nat_geo_wild/05.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/d/d2/NBA_TV.svg/1200px-NBA_TV.svg.png" group-title="Unsorted",NBA TV
 http://185.246.209.109:8080/NBA9/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",NBC Bay Area (KNTV-TV)
@@ -12745,10 +12733,6 @@ http://playertest.longtailvideo.com/adaptive/oceans_aes/oceans_aes.m3u8
 http://ott-cdn.ucom.am/s63/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",RTV
 http://202.80.222.170:80/000001/2/ch00000090990000001716/index.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/65/RTVA_logotip.png" group-title="Unsorted",RTVA (Opt-1)
-http://videos.rtva.ad:1935/live/rtva/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/65/RTVA_logotip.png" group-title="Unsorted",RTVA (Opt-2)
-http://videos.rtva.ad:1935/live/web/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",RTVE
 http://hlsliveamdgl8-lh.akamaihd.net/i/hlsdvrlive_1@583030/index_1500_av-b.m3u8?sd=10&rebase=on
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/a/ae/RTD-TV-logo.png" group-title="Unsorted",RTд (Russia Today Documentary)
@@ -12769,6 +12753,12 @@ http://212.18.231.213:1935/samarra/samarra/gmswf.m3u8?v=1559313925
 http://live.cast-control.eu:1935/samiaki/samiaki/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/IFaWQLx.png" group-title="Unsorted",Santuario de Fatima (PT)
 http://213.13.26.11:1935/live/santuario.stream/livestream.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xvJw3qt.png" group-title="Unsorted",Sat 7 Arabic
+https://unirtmp.tulix.tv/sat7arabic/satarabiclive-web.smil/chunklist_w1635903706_b1000000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wrOg8vL.png" group-title="Unsorted",Sat 7 Pars
+https://unirtmp.tulix.tv/sat7pars/satparslive-web.smil/chunklist_w879240201_b1000000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zia9ehv.jpg" group-title="Unsorted",Sat 7 Türk
+https://unirtmp.tulix.tv/sat7turk/satturklive-web.smil/chunklist_w328296882_b1000000.m3u8
 #EXTINF:-1 tvg-id="Sat7" tvg-name="Sat7" tvg-logo="http://t3.gstatic.com/images?q=tbn:ANd9GcQEph1hr_UeSi2_-EORwfhXop2ndFJ7tO20vbA-6bt7DZkicjuzXwQhjec" group-title="Unsorted;Family",Sat7 (Family) (EG) (Arabic)
 http://www.streamwebtown.com/player/sat7/arabic/stream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NM0QWA0.png" group-title="Unsorted",SAT7kids (JO)
@@ -13005,7 +12995,7 @@ http://zu2or9hg.rocketcdn.com/konf/mob/web16009.isml/QualityLevels(1564000)/mani
 http://streamingcws20.com:1935/tmtv/videotmtv/.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",TNT HD
 http://189.216.247.113/Content/HLS/Live/Channel(TNT_HD)/Stream(06)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://trace.tv/trace-mziki/wp-content/uploads/sites/21/2016/11/logo_mziki-1.png" group-title="Unsorted;Music",Trace Mmziki
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://trace.tv/trace-mziki/wp-content/uploads/sites/21/2016/11/logo_mziki-1.png" group-title="Unsorted;Music",Trace Mziki
 http://d2ktlibtvvj8vp.cloudfront.net/trace_mizki/5/prog_index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Unsorted",TRANS7
 http://202.80.222.174/000001/2/ch14041511545447343123/index.m3u8?virtualDomain=000001.live_hls.zte.com
diff --git a/index.sport.m3u b/index.sport.m3u
index dff5a20a4..515a2ee70 100644
--- a/index.sport.m3u
+++ b/index.sport.m3u
@@ -9,14 +9,18 @@ https://racingvic-i.akamaized.net/hls/live/598695/racingvic/628.m3u8?fluxustv.m3
 http://i.mjh.nz/au/Canberra/tv.redbull.tv.m3u8
 #EXTINF:-1 tvg-id="tv.redbull.tv" tvg-name="Red Bull TV" tvg-logo="http://i.mjh.nz/au/images/tv.redbull.tv.png" group-title="Sport",Red Bull TV (Melbourne)
 https://i.mjh.nz/au/Melbourne/tv.redbull.tv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",BAHRAIN SPORTS
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Bahrain Sports (Opt-1)
 http://185.105.4.106:1935/live/Bahrain%20Sports/chunklist.m3u8?v=1548640033
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Bahrain Sports (Opt-2)
+http://185.105.4.106:1935/live/Bahrain%20Sports/chunklist.m3u8?v=1558393494
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",All Sports Brasil [480p]
 http://173.236.10.10:1935/dgrau/dgrau/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://chileiptv.cl/img/logos/file_1521497894.png" group-title="Sport",Real Madrid TV
 http://rmtvlive-lh.akamaihd.net/i/rmtv_1@154306/index_1000_av-p.m3u8?sd=10&rebase=on?iptvgratis?chile.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://chileiptv.cl/img/logos/file_1522637574.png" group-title="Sport",RedBull TV
 https://rbmn-live.akamaized.net/hls/live/590964/BoRB-AT/master_928.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://soombo.com/assets/images/200_1459039476.png" group-title="Sport",BRT Spor HD
+http://wms.brtk.net:1935/live/brt2/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",ASTRO ARENA [270p]
 http://playbackn5.aotg-video.astro.com.my/CH1/master_ARENA_8_02.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",ASTRO ARENA [360p]
@@ -229,8 +233,8 @@ http://173.236.10.10:1935/dgrau/dgrau/live.m3u8?iptvgratis?chile.m3u8
 http://www.elahmad.com/tv/m3u8/maroc.m3u8?id=arriadia
 #EXTINF:-1 tvg-id="" tvg-name="ATGV 1 SPORT" tvg-logo="" group-title="Sport",ATGV 1 SPORT
 https://httpcache0-00688-cacheliveedge0.dna.qbrick.com/00688-cacheliveedge0/out/u/atg_sdi_1_free_3.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Bahrain Sports (Opt-2)
-http://185.105.4.106:1935/live/Bahrain%20Sports/chunklist.m3u8?v=1558393494
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/d/d6/CBC_Sport%2C_logo%2C_2015.png" group-title="Sport",CBC Sport
+https://streams.livetv.az/azerbaijan/cbc_sport_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",CBS Sport HD
 http://0s.ha2s4mjtgixdkmzogu3a.cmle.ru/azerbaijan/cbc_sport_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://channelv6.com/images/Header/V6-logo.png" group-title="Sport",Channel V6