diff --git a/channels/ad.m3u b/channels/ad.m3u
index 5fc56b321..e5febf40c 100644
--- a/channels/ad.m3u
+++ b/channels/ad.m3u
@@ -1,9 +1,9 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/kJCjeQ4.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/kJCjeQ4.png" group-title="",RTVA (Opt-2)
-https://videos.rtva.ad/live/web/chunklist_w1342231881.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/kJCjeQ4.png" group-title="",RTVA (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/kJCjeQ4.png" group-title="",RTVA
 http://videos.rtva.ad:1935/live/rtva/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/kJCjeQ4.png" group-title="",RTVA (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/kJCjeQ4.png" group-title="",RTVA
 http://videos.rtva.ad:1935/live/web/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/kJCjeQ4.png" group-title="",RTVA
+https://videos.rtva.ad/live/rtva/chunklist_w1082760031.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/kJCjeQ4.png" group-title="",RTVA
+https://videos.rtva.ad/live/web/chunklist_w1342231881.m3u8
diff --git a/channels/ae.m3u b/channels/ae.m3u
index 2c6576128..d7fb2ca7f 100644
--- a/channels/ae.m3u
+++ b/channels/ae.m3u
@@ -1,60 +1,60 @@
 #EXTM3U x-tvg-url="http://195.154.221.171/epg/guidearab.xml.gz"
-#EXTINF:-1 tvg-id="Abu Dhabi Drama ARB" tvg-name="Abu Dhabi Drama ARB" tvg-logo="https://i.imgur.com/7Bx66K7.jpg" group-title="",Abu Dhabi Drama (Opt-1)
-http://adtv.ercdn.net/addrama/addrama_480p.m3u8
-#EXTINF:-1 tvg-id="Abu Dhabi Drama ARB" tvg-name="Abu Dhabi Drama ARB" tvg-logo="https://i.imgur.com/7Bx66K7.jpg" group-title="",Abu Dhabi Drama (Opt-2)
-http://adtv.ercdn.net/addrama/addrama_480p.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Abu Dhabi Drama ARB" tvg-name="Abu Dhabi Drama ARB" tvg-logo="https://i.imgur.com/7Bx66K7.jpg" group-title="",Abu Dhabi Drama (Opt-3)
-http://adtv.ercdn.net/addrama/addrama_720p.m3u8
-#EXTINF:-1 tvg-id="Abu Dhabi Drama ARB" tvg-name="Abu Dhabi Drama ARB" tvg-logo="https://i.imgur.com/7Bx66K7.jpg" group-title="",Abu Dhabi Drama (Opt-4)
-http://www.elahmad.com/tv/m3u8/adtv.m3u8?id=abudhabi_drama
-#EXTINF:-1 tvg-id="Abu Dhabi Drama ARB" tvg-name="Abu Dhabi Drama ARB" tvg-logo="https://i.imgur.com/7Bx66K7.jpg" group-title="",Abu Dhabi Drama (Opt-5)
+#EXTINF:-1 tvg-id="Abu Dhabi Drama ARB" tvg-name="Abu Dhabi Drama ARB" tvg-logo="https://i.imgur.com/7Bx66K7.jpg" group-title="",Abu Dhabi Drama
 http://adtv.ercdn.net/addrama/addrama.m3u8
-#EXTINF:-1 tvg-id="Abu Dhabi Sports ARB" tvg-name="Abu Dhabi Sports ARB" tvg-logo="https://i.imgur.com/lKl2wZH.png" group-title="Sport",Abu Dhabi Sports (Opt-1)
-https://adtv.ercdn.net/adsport1/adsport1_720p.m3u8?st=P9H1mUdptRfQ99toISpmTg&e=1495397980
-#EXTINF:-1 tvg-id="Abu Dhabi Sports ARB" tvg-name="Abu Dhabi Sports ARB" tvg-logo="https://i.imgur.com/lKl2wZH.png" group-title="Sport",Abu Dhabi Sports (Opt-2)
-http://adtv.ercdn.net/adsport1/adsport1_360p.m3u8?v=3157566659
-#EXTINF:-1 tvg-id="Abu Dhabi Sports ARB" tvg-name="Abu Dhabi Sports ARB" tvg-logo="https://i.imgur.com/lKl2wZH.png" group-title="Sport",Abu Dhabi Sports (Opt-3)
-http://adtv.ercdn.net/adsport1/adsport1_480p.m3u8
-#EXTINF:-1 tvg-id="Abu Dhabi Sports ARB" tvg-name="Abu Dhabi Sports ARB" tvg-logo="https://i.imgur.com/lKl2wZH.png" group-title="Sport",Abu Dhabi Sports (Opt-4)
-http://adtv.ercdn.net/adsport1/adsport1_720p.m3u8?Compartilhandolink
-#EXTINF:-1 tvg-id="Abu Dhabi Sports ARB" tvg-name="Abu Dhabi Sports ARB" tvg-logo="https://i.imgur.com/lKl2wZH.png" group-title="Sport",Abu Dhabi Sports (Opt-5)
+#EXTINF:-1 tvg-id="Abu Dhabi Drama ARB" tvg-name="Abu Dhabi Drama ARB" tvg-logo="https://i.imgur.com/7Bx66K7.jpg" group-title="",Abu Dhabi Drama
+http://adtv.ercdn.net/addrama/addrama_480p.m3u8
+#EXTINF:-1 tvg-id="Abu Dhabi Drama ARB" tvg-name="Abu Dhabi Drama ARB" tvg-logo="https://i.imgur.com/7Bx66K7.jpg" group-title="",Abu Dhabi Drama
+http://adtv.ercdn.net/addrama/addrama_480p.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="Abu Dhabi Drama ARB" tvg-name="Abu Dhabi Drama ARB" tvg-logo="https://i.imgur.com/7Bx66K7.jpg" group-title="",Abu Dhabi Drama
+http://adtv.ercdn.net/addrama/addrama_720p.m3u8
+#EXTINF:-1 tvg-id="Abu Dhabi Drama ARB" tvg-name="Abu Dhabi Drama ARB" tvg-logo="https://i.imgur.com/7Bx66K7.jpg" group-title="",Abu Dhabi Drama
+http://www.elahmad.com/tv/m3u8/adtv.m3u8?id=abudhabi_drama
+#EXTINF:-1 tvg-id="Abu Dhabi Sports ARB" tvg-name="Abu Dhabi Sports ARB" tvg-logo="https://i.imgur.com/lKl2wZH.png" group-title="Sport",Abu Dhabi Sports
 http://adtv.ercdn.net/adsport1/adsport1_360p.m3u8
-#EXTINF:-1 tvg-id="Abu Dhabi Sports ARB" tvg-name="Abu Dhabi Sports ARB" tvg-logo="https://i.imgur.com/lKl2wZH.png" group-title="Sport",Abu Dhabi Sports (Opt-6)
-http://www.elahmad.com/tv/m3u8/adtv.m3u8?id=abudhabi_Sports1
-#EXTINF:-1 tvg-id="Abu Dhabi Sports ARB" tvg-name="Abu Dhabi Sports ARB" tvg-logo="https://i.imgur.com/lKl2wZH.png" group-title="Sport",Abu Dhabi Sports (Opt-7)
+#EXTINF:-1 tvg-id="Abu Dhabi Sports ARB" tvg-name="Abu Dhabi Sports ARB" tvg-logo="https://i.imgur.com/lKl2wZH.png" group-title="Sport",Abu Dhabi Sports
+http://adtv.ercdn.net/adsport1/adsport1_360p.m3u8?v=3157566659
+#EXTINF:-1 tvg-id="Abu Dhabi Sports ARB" tvg-name="Abu Dhabi Sports ARB" tvg-logo="https://i.imgur.com/lKl2wZH.png" group-title="Sport",Abu Dhabi Sports
+http://adtv.ercdn.net/adsport1/adsport1_480p.m3u8
+#EXTINF:-1 tvg-id="Abu Dhabi Sports ARB" tvg-name="Abu Dhabi Sports ARB" tvg-logo="https://i.imgur.com/lKl2wZH.png" group-title="Sport",Abu Dhabi Sports
 http://adtv.ercdn.net/adsport1/adsport1_720p.m3u8
-#EXTINF:-1 tvg-id="Abu Dhabi Sports ARB" tvg-name="Abu Dhabi Sports ARB" tvg-logo="https://i.imgur.com/lKl2wZH.png" group-title="Sport",Abu Dhabi Sports (Opt-8)
+#EXTINF:-1 tvg-id="Abu Dhabi Sports ARB" tvg-name="Abu Dhabi Sports ARB" tvg-logo="https://i.imgur.com/lKl2wZH.png" group-title="Sport",Abu Dhabi Sports
+http://adtv.ercdn.net/adsport1/adsport1_720p.m3u8?Compartilhandolink
+#EXTINF:-1 tvg-id="Abu Dhabi Sports ARB" tvg-name="Abu Dhabi Sports ARB" tvg-logo="https://i.imgur.com/lKl2wZH.png" group-title="Sport",Abu Dhabi Sports
 http://adtv.ercdn.net/adsport1/adsport1_720p.m3u8?VIPIPTV
-#EXTINF:-1 tvg-id="Abu Dhabi Sports 2 ARB" tvg-name="Abu Dhabi Sports 2 ARB" tvg-logo="https://i.imgur.com/9q8gFsq.png" group-title="Sport",Abu Dhabi Sports 2 (Opt-1)
-http://adtv.ercdn.net/adsport2/adsport2_360p.m3u8?v=3157566659
-#EXTINF:-1 tvg-id="Abu Dhabi Sports 2 ARB" tvg-name="Abu Dhabi Sports 2 ARB" tvg-logo="https://i.imgur.com/9q8gFsq.png" group-title="Sport",Abu Dhabi Sports 2 (Opt-2)
-http://www.elahmad.com/tv/m3u8/adtv.m3u8?id=abudhabi_sports2
-#EXTINF:-1 tvg-id="Abu Dhabi Sports 2 ARB" tvg-name="Abu Dhabi Sports 2 ARB" tvg-logo="https://i.imgur.com/9q8gFsq.png" group-title="Sport",Abu Dhabi Sports 2 (Opt-3)
-http://adtv.ercdn.net/adsport2/adsport2_720p.m3u8?VIPIPTV
-#EXTINF:-1 tvg-id="Abu Dhabi Sports 2 ARB" tvg-name="Abu Dhabi Sports 2 ARB" tvg-logo="https://i.imgur.com/9q8gFsq.png" group-title="Sport",Abu Dhabi Sports 2 (Opt-4)
-http://adtv.ercdn.net/adsport2/adsport2_480p.m3u8
-#EXTINF:-1 tvg-id="Abu Dhabi Sports 2 ARB" tvg-name="Abu Dhabi Sports 2 ARB" tvg-logo="https://i.imgur.com/9q8gFsq.png" group-title="Sport",Abu Dhabi Sports 2 (Opt-5)
+#EXTINF:-1 tvg-id="Abu Dhabi Sports ARB" tvg-name="Abu Dhabi Sports ARB" tvg-logo="https://i.imgur.com/lKl2wZH.png" group-title="Sport",Abu Dhabi Sports
+http://www.elahmad.com/tv/m3u8/adtv.m3u8?id=abudhabi_Sports1
+#EXTINF:-1 tvg-id="Abu Dhabi Sports ARB" tvg-name="Abu Dhabi Sports ARB" tvg-logo="https://i.imgur.com/lKl2wZH.png" group-title="Sport",Abu Dhabi Sports
+https://adtv.ercdn.net/adsport1/adsport1_720p.m3u8?st=P9H1mUdptRfQ99toISpmTg&e=1495397980
+#EXTINF:-1 tvg-id="Abu Dhabi Sports 2 ARB" tvg-name="Abu Dhabi Sports 2 ARB" tvg-logo="https://i.imgur.com/9q8gFsq.png" group-title="Sport",Abu Dhabi Sports 2
 http://adtv.ercdn.net/adsport2/adsport2.m3u8
-#EXTINF:-1 tvg-id="Abu Dhabi Sports 2 ARB" tvg-name="Abu Dhabi Sports 2 ARB" tvg-logo="https://i.imgur.com/9q8gFsq.png" group-title="Sport",Abu Dhabi Sports 2 (Opt-6)
-http://adtv.ercdn.net/adsport2/adsport2_720p.m3u8?Compartilhandolink
-#EXTINF:-1 tvg-id="Abu Dhabi Sports 2 ARB" tvg-name="Abu Dhabi Sports 2 ARB" tvg-logo="https://i.imgur.com/9q8gFsq.png" group-title="Sport",Abu Dhabi Sports 2 (Opt-8)
+#EXTINF:-1 tvg-id="Abu Dhabi Sports 2 ARB" tvg-name="Abu Dhabi Sports 2 ARB" tvg-logo="https://i.imgur.com/9q8gFsq.png" group-title="Sport",Abu Dhabi Sports 2
 http://adtv.ercdn.net/adsport2/adsport2_360p.m3u8
-#EXTINF:-1 tvg-id="Abu Dhabi Sports 3 ARB" tvg-name="Abu Dhabi Sports 3 ARB" tvg-logo="https://i.imgur.com/U6XDpXY.png" group-title="Sport",Abu Dhabi Sports 3 (Opt-1)
+#EXTINF:-1 tvg-id="Abu Dhabi Sports 2 ARB" tvg-name="Abu Dhabi Sports 2 ARB" tvg-logo="https://i.imgur.com/9q8gFsq.png" group-title="Sport",Abu Dhabi Sports 2
+http://adtv.ercdn.net/adsport2/adsport2_360p.m3u8?v=3157566659
+#EXTINF:-1 tvg-id="Abu Dhabi Sports 2 ARB" tvg-name="Abu Dhabi Sports 2 ARB" tvg-logo="https://i.imgur.com/9q8gFsq.png" group-title="Sport",Abu Dhabi Sports 2
+http://adtv.ercdn.net/adsport2/adsport2_480p.m3u8
+#EXTINF:-1 tvg-id="Abu Dhabi Sports 2 ARB" tvg-name="Abu Dhabi Sports 2 ARB" tvg-logo="https://i.imgur.com/9q8gFsq.png" group-title="Sport",Abu Dhabi Sports 2
+http://adtv.ercdn.net/adsport2/adsport2_720p.m3u8?Compartilhandolink
+#EXTINF:-1 tvg-id="Abu Dhabi Sports 2 ARB" tvg-name="Abu Dhabi Sports 2 ARB" tvg-logo="https://i.imgur.com/9q8gFsq.png" group-title="Sport",Abu Dhabi Sports 2
+http://adtv.ercdn.net/adsport2/adsport2_720p.m3u8?VIPIPTV
+#EXTINF:-1 tvg-id="Abu Dhabi Sports 2 ARB" tvg-name="Abu Dhabi Sports 2 ARB" tvg-logo="https://i.imgur.com/9q8gFsq.png" group-title="Sport",Abu Dhabi Sports 2
+http://www.elahmad.com/tv/m3u8/adtv.m3u8?id=abudhabi_sports2
+#EXTINF:-1 tvg-id="Abu Dhabi Sports 3 ARB" tvg-name="Abu Dhabi Sports 3 ARB" tvg-logo="https://i.imgur.com/U6XDpXY.png" group-title="Sport",Abu Dhabi Sports 3
 http://www.elahmad.com/tv/m3u8/adtv.m3u8?id=abudhabi_sports3
-#EXTINF:-1 tvg-id="Abu Dhabi Sports 4 ARB" tvg-name="Abu Dhabi Sports 4 ARB" tvg-logo="https://i.imgur.com/8VqomZ5.png" group-title="Sport",Abu Dhabi Sports 4 (Opt-1)
+#EXTINF:-1 tvg-id="Abu Dhabi Sports 4 ARB" tvg-name="Abu Dhabi Sports 4 ARB" tvg-logo="https://i.imgur.com/8VqomZ5.png" group-title="Sport",Abu Dhabi Sports 4
 http://www.elahmad.com/tv/m3u8/adtv.m3u8?id=abudhabi_sports4
-#EXTINF:-1 tvg-id="Abu Dhabi Sports 5 ARB" tvg-name="Abu Dhabi Sports 5 ARB" tvg-logo="https://i.imgur.com/7snS5Ki.png" group-title="Sport",Abu Dhabi Sports 5 (Opt-1)
+#EXTINF:-1 tvg-id="Abu Dhabi Sports 5 ARB" tvg-name="Abu Dhabi Sports 5 ARB" tvg-logo="https://i.imgur.com/7snS5Ki.png" group-title="Sport",Abu Dhabi Sports 5
 http://www.elahmad.com/tv/m3u8/adtv.m3u8?id=abudhabi_sports5
-#EXTINF:-1 tvg-id="Abu Dhabi Sports 6 ARB" tvg-name="Abu Dhabi Sports 6 ARB" tvg-logo="https://i.imgur.com/icskFzD.png" group-title="Sport",Abu Dhabi Sports 6 (Opt-1)
+#EXTINF:-1 tvg-id="Abu Dhabi Sports 6 ARB" tvg-name="Abu Dhabi Sports 6 ARB" tvg-logo="https://i.imgur.com/icskFzD.png" group-title="Sport",Abu Dhabi Sports 6
 http://www.elahmad.com/tv/m3u8/adtv.m3u8?id=abudhabi_Sports6
-#EXTINF:-1 tvg-id="Abu Dhabi TV ARB" tvg-name="Abu Dhabi TV ARB" tvg-logo="https://i.imgur.com/oExmYqk.jpg" group-title="",Abu Dhabi TV (Opt-1)
-http://adtv.ercdn.net/adaloula/adaloula_480p.m3u8
-#EXTINF:-1 tvg-id="Abu Dhabi TV ARB" tvg-name="Abu Dhabi TV ARB" tvg-logo="https://i.imgur.com/oExmYqk.jpg" group-title="",Abu Dhabi TV (Opt-2)
-http://www.elahmad.com/tv/m3u8/adtv.m3u8?id=abudhabi_aloula
-#EXTINF:-1 tvg-id="Abu Dhabi TV ARB" tvg-name="Abu Dhabi TV ARB" tvg-logo="https://i.imgur.com/oExmYqk.jpg" group-title="",Abu Dhabi TV (Opt-3)
-http://adtv.ercdn.net/adaloula/adaloula_720p.m3u8
-#EXTINF:-1 tvg-id="Abu Dhabi TV ARB" tvg-name="Abu Dhabi TV ARB" tvg-logo="https://i.imgur.com/oExmYqk.jpg" group-title="",Abu Dhabi TV (Opt-4)
+#EXTINF:-1 tvg-id="Abu Dhabi TV ARB" tvg-name="Abu Dhabi TV ARB" tvg-logo="https://i.imgur.com/oExmYqk.jpg" group-title="",Abu Dhabi TV
 http://adtv.ercdn.net/adaloula/adaloula.m3u8
+#EXTINF:-1 tvg-id="Abu Dhabi TV ARB" tvg-name="Abu Dhabi TV ARB" tvg-logo="https://i.imgur.com/oExmYqk.jpg" group-title="",Abu Dhabi TV
+http://adtv.ercdn.net/adaloula/adaloula_480p.m3u8
+#EXTINF:-1 tvg-id="Abu Dhabi TV ARB" tvg-name="Abu Dhabi TV ARB" tvg-logo="https://i.imgur.com/oExmYqk.jpg" group-title="",Abu Dhabi TV
+http://adtv.ercdn.net/adaloula/adaloula_720p.m3u8
+#EXTINF:-1 tvg-id="Abu Dhabi TV ARB" tvg-name="Abu Dhabi TV ARB" tvg-logo="https://i.imgur.com/oExmYqk.jpg" group-title="",Abu Dhabi TV
+http://www.elahmad.com/tv/m3u8/adtv.m3u8?id=abudhabi_aloula
 #EXTINF:-1 tvg-id="Ajman TV ARB" tvg-name="Ajman TV ARB" tvg-logo="https://i.imgur.com/l6FT7yx.jpg" group-title="",Ajman TV
 http://livecdnh2.tvanywhere.ae/hls/ajman/04.m3u8
 #EXTINF:-1 tvg-id="Al Arabiya ARB" tvg-name="Al Arabiya ARB" tvg-logo="https://i.imgur.com/Jcr3plu.jpg" group-title="",Al Arabiya
@@ -69,110 +69,110 @@ http://livecdnh3.tvanywhere.ae/hls/b4uaflam/04.m3u8
 http://livecdnh3.tvanywhere.ae/hls/b4uplus/04.m3u8
 #EXTINF:-1 tvg-id="Cartoon Network Arabic ARB" tvg-name="Cartoon Network Arabic ARB" tvg-logo="https://i.imgur.com/mT3mCCK.png" group-title="",Cartoon Network كرتون
 http://95.170.215.109:80/hls/m3u8/CNArabica-Backup.m3u8
-#EXTINF:-1 tvg-id="Cinema 1 ARB" tvg-name="Cinema 1 ARB" tvg-logo="https://i.imgur.com/lNhSZ9N.png" group-title="Movies",Cinema 1 (Opt-1)
-http://livecdnh1.tvanywhere.ae/hls/cin1/04.m3u8
-#EXTINF:-1 tvg-id="Cinema 1 ARB" tvg-name="Cinema 1 ARB" tvg-logo="https://i.imgur.com/lNhSZ9N.png" group-title="Movies",Cinema 1 (Opt-2)
-http://livecdnh1.tvanywhere.ae/hls/cin1/index.m3u8
-#EXTINF:-1 tvg-id="Cinema 1 ARB" tvg-name="Cinema 1 ARB" tvg-logo="https://i.imgur.com/lNhSZ9N.png" group-title="Movies",Cinema 1 (Opt-3)
+#EXTINF:-1 tvg-id="Cinema 1 ARB" tvg-name="Cinema 1 ARB" tvg-logo="https://i.imgur.com/lNhSZ9N.png" group-title="Movies",Cinema 1
 http://livecdnh1.tvanywhere.ae/hls/cin1/01.m3u8
-#EXTINF:-1 tvg-id="Cinema 1 ARB" tvg-name="Cinema 1 ARB" tvg-logo="https://i.imgur.com/lNhSZ9N.png" group-title="Movies",Cinema 1 (Opt-4)
+#EXTINF:-1 tvg-id="Cinema 1 ARB" tvg-name="Cinema 1 ARB" tvg-logo="https://i.imgur.com/lNhSZ9N.png" group-title="Movies",Cinema 1
 http://livecdnh1.tvanywhere.ae/hls/cin1/03.m3u8
+#EXTINF:-1 tvg-id="Cinema 1 ARB" tvg-name="Cinema 1 ARB" tvg-logo="https://i.imgur.com/lNhSZ9N.png" group-title="Movies",Cinema 1
+http://livecdnh1.tvanywhere.ae/hls/cin1/04.m3u8
+#EXTINF:-1 tvg-id="Cinema 1 ARB" tvg-name="Cinema 1 ARB" tvg-logo="https://i.imgur.com/lNhSZ9N.png" group-title="Movies",Cinema 1
+http://livecdnh1.tvanywhere.ae/hls/cin1/index.m3u8
 #EXTINF:-1 tvg-id="Citruss TV ARB" tvg-name="Citruss TV ARB" tvg-logo="https://i.imgur.com/6lTEvrU.jpg" group-title="",Citruss TV
 https://citrusstv.akamaized.net/hls/live/687285/CTV/01.m3u8
 #EXTINF:-1 tvg-id="Dubai One ARB" tvg-name="Dubai One ARB" tvg-logo="https://i.imgur.com/WjJ8MHC.png" group-title="",Dubai One
 http://www.elahmad.com/tv/m3u8/dubaitv.m3u8?id=dubaione
-#EXTINF:-1 tvg-id="Dubai Racing ARB" tvg-name="Dubai Racing ARB" tvg-logo="https://i.imgur.com/eytrf0Y.png" group-title="Sport",Dubai Racing  (Opt-4)
-http://dmithrvll.cdn.mangomolo.com/dubairacing/smil:dubairacing.smil/chunklist_b1600000.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Dubai Racing ARB" tvg-name="Dubai Racing ARB" tvg-logo="https://i.imgur.com/eytrf0Y.png" group-title="Sport",Dubai Racing (Opt-1)
+#EXTINF:-1 tvg-id="Dubai Racing ARB" tvg-name="Dubai Racing ARB" tvg-logo="https://i.imgur.com/eytrf0Y.png" group-title="Sport",Dubai Racing
 http://162.210.195.121:8080/dubiracing2/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="Dubai Racing ARB" tvg-name="Dubai Racing ARB" tvg-logo="https://i.imgur.com/eytrf0Y.png" group-title="Sport",Dubai Racing (Opt-2)
-http://dmisvthvll.cdn.mangomolo.com/events/smil:events.smil/chunklist_b1600000.m3u8
-#EXTINF:-1 tvg-id="Dubai Racing ARB" tvg-name="Dubai Racing ARB" tvg-logo="https://i.imgur.com/eytrf0Y.png" group-title="Sport",Dubai Racing (Opt-3)
+#EXTINF:-1 tvg-id="Dubai Racing ARB" tvg-name="Dubai Racing ARB" tvg-logo="https://i.imgur.com/eytrf0Y.png" group-title="Sport",Dubai Racing
 http://dmisvthvll.cdn.mangomolo.com/events/smil:events.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="Dubai Racing ARB" tvg-name="Dubai Racing ARB" tvg-logo="https://i.imgur.com/eytrf0Y.png" group-title="",Dubai Racing (Opt-5)
+#EXTINF:-1 tvg-id="Dubai Racing ARB" tvg-name="Dubai Racing ARB" tvg-logo="https://i.imgur.com/eytrf0Y.png" group-title="Sport",Dubai Racing
+http://dmisvthvll.cdn.mangomolo.com/events/smil:events.smil/chunklist_b1600000.m3u8
+#EXTINF:-1 tvg-id="Dubai Racing ARB" tvg-name="Dubai Racing ARB" tvg-logo="https://i.imgur.com/eytrf0Y.png" group-title="",Dubai Racing
 http://dmisvthvll.cdn.mangomolo.com/events/smil:events.smil/chunklist_b1600000.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="Dubai Racing ARB" tvg-name="Dubai Racing ARB" tvg-logo="https://i.imgur.com/eytrf0Y.png" group-title="Sport",Dubai Racing
+http://dmithrvll.cdn.mangomolo.com/dubairacing/smil:dubairacing.smil/chunklist_b1600000.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="Dubai Sports 1 ARB" tvg-name="Dubai Sports 1 ARB" tvg-logo="https://i.imgur.com/iYgHR5D.png" group-title="Sport",Dubai Sports
 http://www.elahmad.com/tv/m3u8/dubaitv.m3u8?id=dubaisports
-#EXTINF:-1 tvg-id="Dubai Sports 2 ARB" tvg-name="Dubai Sports 2 ARB" tvg-logo="https://i.imgur.com/qBdOZ1x.png" group-title="Sport",Dubai Sports 2 (Opt-1)
+#EXTINF:-1 tvg-id="Dubai Sports 2 ARB" tvg-name="Dubai Sports 2 ARB" tvg-logo="https://i.imgur.com/qBdOZ1x.png" group-title="Sport",Dubai Sports 2
 http://dmiftvll.mangomolo.com/dubaisportshd/smil:dubaisportshd.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="Dubai Sports 2 ARB" tvg-name="Dubai Sports 2 ARB" tvg-logo="https://i.imgur.com/qBdOZ1x.png" group-title="Sport",Dubai Sports 2 (Opt-2)
+#EXTINF:-1 tvg-id="Dubai Sports 2 ARB" tvg-name="Dubai Sports 2 ARB" tvg-logo="https://i.imgur.com/qBdOZ1x.png" group-title="Sport",Dubai Sports 2
 http://dmivll.mangomolo.com/dubaisportshd/smil:dubaisportshd.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hxxjMPJ.jpg" group-title="Sport",Dubai Sports 3
 http://dmiftvll.mangomolo.com/dubaisportshd5/smil:dubaisportshd5.smil/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/QKXDeMQ.png" group-title="",Dubai TV
 http://www.elahmad.com/tv/m3u8/dubaitv.m3u8?id=dubaitv
-#EXTINF:-1 tvg-id="Etisalat Dubai Zaman TV ARB" tvg-name="Etisalat Dubai Zaman TV ARB" tvg-logo="https://i.imgur.com/F5U9qpf.png" group-title="",Dubai Zaman (Opt-1)
-http://www.elahmad.com/tv/m3u8/dubaitv.m3u8?id=dubaizaman
-#EXTINF:-1 tvg-id="Etisalat Dubai Zaman TV ARB" tvg-name="Etisalat Dubai Zaman TV ARB" tvg-logo="https://i.imgur.com/F5U9qpf.png" group-title="",Dubai Zaman (Opt-2)
+#EXTINF:-1 tvg-id="Etisalat Dubai Zaman TV ARB" tvg-name="Etisalat Dubai Zaman TV ARB" tvg-logo="https://i.imgur.com/F5U9qpf.png" group-title="",Dubai Zaman
 http://dmiffthvll.cdn.mangomolo.com/dubaizaman/smil:dubaizaman.smil/chunklist_b1500000.m3u8
-#EXTINF:-1 tvg-id="Al Emarat TV ARB" tvg-name="Al Emarat TV ARB" tvg-logo="https://i.imgur.com/5S2ci8p.png" group-title="",Emarat TV (Opt-1)
-http://adtv.ercdn.net/adalemarat/adalemarat_720p.m3u8
-#EXTINF:-1 tvg-id="Al Emarat TV ARB" tvg-name="Al Emarat TV ARB" tvg-logo="https://i.imgur.com/5S2ci8p.png" group-title="",Emarat TV (Opt-2)
-http://adtv.ercdn.net/adalemarat/adalemarat_480p.m3u8
-#EXTINF:-1 tvg-id="Al Emarat TV ARB" tvg-name="Al Emarat TV ARB" tvg-logo="https://i.imgur.com/5S2ci8p.png" group-title="",Emarat TV (Opt-3)
-http://www.elahmad.com/tv/m3u8/adtv.m3u8?id=abudhabi_alemarat
-#EXTINF:-1 tvg-id="Al Emarat TV ARB" tvg-name="Al Emarat TV ARB" tvg-logo="https://i.imgur.com/5S2ci8p.png" group-title="",Emarat TV (Opt-4)
+#EXTINF:-1 tvg-id="Etisalat Dubai Zaman TV ARB" tvg-name="Etisalat Dubai Zaman TV ARB" tvg-logo="https://i.imgur.com/F5U9qpf.png" group-title="",Dubai Zaman
+http://www.elahmad.com/tv/m3u8/dubaitv.m3u8?id=dubaizaman
+#EXTINF:-1 tvg-id="Al Emarat TV ARB" tvg-name="Al Emarat TV ARB" tvg-logo="https://i.imgur.com/5S2ci8p.png" group-title="",Emarat TV
 http://adtv.ercdn.net/adalemarat/adalemarat.m3u8
-#EXTINF:-1 tvg-id="Music Now ARB" tvg-name="Music Now ARB" tvg-logo="https://i.imgur.com/KABKzdl.png" group-title="",Music Now (Opt-1)
-http://livecdnh1.tvanywhere.ae/hls/music_now/index.m3u8
-#EXTINF:-1 tvg-id="Music Now ARB" tvg-name="Music Now ARB" tvg-logo="https://i.imgur.com/KABKzdl.png" group-title="",Music Now (Opt-2)
-http://livecdnh1.tvanywhere.ae/hls/music_now/04.m3u8
-#EXTINF:-1 tvg-id="Music Now ARB" tvg-name="Music Now ARB" tvg-logo="https://i.imgur.com/KABKzdl.png" group-title="Music",Music Now (Opt-3)
+#EXTINF:-1 tvg-id="Al Emarat TV ARB" tvg-name="Al Emarat TV ARB" tvg-logo="https://i.imgur.com/5S2ci8p.png" group-title="",Emarat TV
+http://adtv.ercdn.net/adalemarat/adalemarat_480p.m3u8
+#EXTINF:-1 tvg-id="Al Emarat TV ARB" tvg-name="Al Emarat TV ARB" tvg-logo="https://i.imgur.com/5S2ci8p.png" group-title="",Emarat TV
+http://adtv.ercdn.net/adalemarat/adalemarat_720p.m3u8
+#EXTINF:-1 tvg-id="Al Emarat TV ARB" tvg-name="Al Emarat TV ARB" tvg-logo="https://i.imgur.com/5S2ci8p.png" group-title="",Emarat TV
+http://www.elahmad.com/tv/m3u8/adtv.m3u8?id=abudhabi_alemarat
+#EXTINF:-1 tvg-id="Music Now ARB" tvg-name="Music Now ARB" tvg-logo="https://i.imgur.com/KABKzdl.png" group-title="Music",Music Now
 http://livecdnh1.tvanywhere.ae/hls/music_now/02.m3u8
-#EXTINF:-1 tvg-id="Music Now ARB" tvg-name="Music Now ARB" tvg-logo="https://i.imgur.com/KABKzdl.png" group-title="Music",Music Now (Opt-4)
-http://livecdnh1.tvanywhere.ae/hls/music_now/05.m3u8
-#EXTINF:-1 tvg-id="Music Now ARB" tvg-name="Music Now ARB" tvg-logo="https://i.imgur.com/KABKzdl.png" group-title="Music",Music Now (Opt-5)
+#EXTINF:-1 tvg-id="Music Now ARB" tvg-name="Music Now ARB" tvg-logo="https://i.imgur.com/KABKzdl.png" group-title="Music",Music Now
 http://livecdnh1.tvanywhere.ae/hls/music_now/03.m3u8
+#EXTINF:-1 tvg-id="Music Now ARB" tvg-name="Music Now ARB" tvg-logo="https://i.imgur.com/KABKzdl.png" group-title="",Music Now
+http://livecdnh1.tvanywhere.ae/hls/music_now/04.m3u8
+#EXTINF:-1 tvg-id="Music Now ARB" tvg-name="Music Now ARB" tvg-logo="https://i.imgur.com/KABKzdl.png" group-title="Music",Music Now
+http://livecdnh1.tvanywhere.ae/hls/music_now/05.m3u8
+#EXTINF:-1 tvg-id="Music Now ARB" tvg-name="Music Now ARB" tvg-logo="https://i.imgur.com/KABKzdl.png" group-title="",Music Now
+http://livecdnh1.tvanywhere.ae/hls/music_now/index.m3u8
 #EXTINF:-1 tvg-id="National Geographic Abu Dhabi AR ARB" tvg-name="National Geographic Abu Dhabi AR ARB" tvg-logo="https://i.imgur.com/baXbWro.jpg" group-title="",National Geographic Abu Dhabi
 http://162.210.195.121:8080/NationalGeoAD/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="Noor Dubai ARB" tvg-name="Noor Dubai ARB" tvg-logo="https://i.imgur.com/FP2yHkl.png" group-title="",Noor Dubai (Opt-1)
-http://www.elahmad.com/tv/m3u8/dubaitv.m3u8?id=noordubaitv
-#EXTINF:-1 tvg-id="Noor Dubai ARB" tvg-name="Noor Dubai ARB" tvg-logo="https://i.imgur.com/FP2yHkl.png" group-title="",Noor Dubai (Opt-2)
+#EXTINF:-1 tvg-id="Noor Dubai ARB" tvg-name="Noor Dubai ARB" tvg-logo="https://i.imgur.com/FP2yHkl.png" group-title="",Noor Dubai
 http://dmiffthvll.cdn.mangomolo.com/noordubaitv/smil:noordubaitv.smil/chunklist_b725000.m3u8
+#EXTINF:-1 tvg-id="Noor Dubai ARB" tvg-name="Noor Dubai ARB" tvg-logo="https://i.imgur.com/FP2yHkl.png" group-title="",Noor Dubai
+http://www.elahmad.com/tv/m3u8/dubaitv.m3u8?id=noordubaitv
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/aNM8KfS.png" group-title="News",Orient News
 https://svs.itworkscdn.net/orienttvlive/orienttv.smil/chunklist_b1825000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ibUfEGr.png" group-title="",Peace TV
 http://peacetv.api.visionip.tv/live/ASHTTP/peacetv-peacetv-peacetv-english-hsslive-25f-16x9-MB/playlist.m3u8
-#EXTINF:-1 tvg-id="Sama Dubai ARB" tvg-name="Sama Dubai ARB" tvg-logo="https://i.imgur.com/bF6I3N1.jpg" group-title="",Sama Dubai (Opt-1)
-http://www.elahmad.com/tv/m3u8/dubaitv.m3u8?id=samadubai
-#EXTINF:-1 tvg-id="Sama Dubai ARB" tvg-name="Sama Dubai ARB" tvg-logo="https://i.imgur.com/bF6I3N1.jpg" group-title="",Sama Dubai (Opt-2)
+#EXTINF:-1 tvg-id="Sama Dubai ARB" tvg-name="Sama Dubai ARB" tvg-logo="https://i.imgur.com/bF6I3N1.jpg" group-title="",Sama Dubai
 http://dmieigthvll.cdn.mangomolo.com/samadubai/smil:samadubai.stream.smil/chunklist_b1600000.m3u8
+#EXTINF:-1 tvg-id="Sama Dubai ARB" tvg-name="Sama Dubai ARB" tvg-logo="https://i.imgur.com/bF6I3N1.jpg" group-title="",Sama Dubai
+http://www.elahmad.com/tv/m3u8/dubaitv.m3u8?id=samadubai
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ob1GhbC.jpg" group-title="",Sharjah 2
 https://svs.itworkscdn.net/smc2live/smc2tv.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="Sharjah Sports HD ARB" tvg-name="Sharjah Sports HD ARB" tvg-logo="https://i.imgur.com/IaRaabJ.jpg" group-title="Sport",Sharjah Sport (Opt-3)
+#EXTINF:-1 tvg-id="Sharjah Sports HD ARB" tvg-name="Sharjah Sports HD ARB" tvg-logo="https://i.imgur.com/IaRaabJ.jpg" group-title="Sport",Sharjah Sport
 https://svs.itworkscdn.net/smc4sportslive/smc4.smil/chunklist_b585000.m3u8
-#EXTINF:-1 tvg-id="Sharjah Sports HD ARB" tvg-name="Sharjah Sports HD ARB" tvg-logo="https://i.imgur.com/IaRaabJ.jpg" group-title="Sport",Sharjah Sports (Opt-1)
+#EXTINF:-1 tvg-id="Sharjah Sports HD ARB" tvg-name="Sharjah Sports HD ARB" tvg-logo="https://i.imgur.com/IaRaabJ.jpg" group-title="Sport",Sharjah Sports
 https://svs.itworkscdn.net/smc4sportslive/smc4.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="Sharjah Sports HD ARB" tvg-name="Sharjah Sports HD ARB" tvg-logo="https://i.imgur.com/IaRaabJ.jpg" group-title="Sport",Sharjah Sports (Opt-2)
+#EXTINF:-1 tvg-id="Sharjah Sports HD ARB" tvg-name="Sharjah Sports HD ARB" tvg-logo="https://i.imgur.com/IaRaabJ.jpg" group-title="Sport",Sharjah Sports
 https://svs.itworkscdn.net/smc4sportslive/smc4.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="Sharjah TV ARB" tvg-name="Sharjah TV ARB" tvg-logo="https://i.imgur.com/FAp0RtO.png" group-title="",Sharjah TV (Opt-1)
+#EXTINF:-1 tvg-id="Sharjah TV ARB" tvg-name="Sharjah TV ARB" tvg-logo="https://i.imgur.com/FAp0RtO.png" group-title="",Sharjah TV
 https://svs.itworkscdn.net/smc1live/smc1.smil/chunklist_b2000000.m3u8
-#EXTINF:-1 tvg-id="Sharjah TV ARB" tvg-name="Sharjah TV ARB" tvg-logo="https://i.imgur.com/FAp0RtO.png" group-title="",Sharjah TV (Opt-2)
+#EXTINF:-1 tvg-id="Sharjah TV ARB" tvg-name="Sharjah TV ARB" tvg-logo="https://i.imgur.com/FAp0RtO.png" group-title="",Sharjah TV
 https://svs.itworkscdn.net/smc1live/smc1.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Sharqiya from Kalba ARB" tvg-name="Sharqiya from Kalba ARB" tvg-logo="https://i.imgur.com/6Er1lh6.png" group-title="",Sharqiya from Kalba TV
 http://svs.itworkscdn.net/kablatvlive/kabtv1.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="Space Toon Arabic ARB" tvg-name="Space Toon Arabic ARB" tvg-logo="https://i.imgur.com/L42Ouau.png" group-title="Kids",Spacetoon (Opt-1)
-http://livecdnh2.tvanywhere.ae/hls/spacetoon/index.m3u8
-#EXTINF:-1 tvg-id="Space Toon Arabic ARB" tvg-name="Space Toon Arabic ARB" tvg-logo="https://i.imgur.com/L42Ouau.png" group-title="Kids",Spacetoon (Opt-2)
+#EXTINF:-1 tvg-id="Space Toon Arabic ARB" tvg-name="Space Toon Arabic ARB" tvg-logo="https://i.imgur.com/L42Ouau.png" group-title="Kids",Spacetoon
 http://livecdnh2.tvanywhere.ae/hls/spacetoon/04.m3u8
-#EXTINF:-1 tvg-id="Star Movies ARB" tvg-name="Star Movies ARB" tvg-logo="https://i.imgur.com/DQ1RfUa.png" group-title="",Star Movies (Opt-1)
-http://livecdnh1.tvanywhere.ae/hls/star_movies/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Star Movies ARB" tvg-name="Star Movies ARB" tvg-logo="https://i.imgur.com/DQ1RfUa.png" group-title="",Star Movies (Opt-2)
-http://livecdnh1.tvanywhere.ae/hls/star_movies/05.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Star Movies ARB" tvg-name="Star Movies ARB" tvg-logo="https://i.imgur.com/DQ1RfUa.png" group-title="",Star Movies (Opt-3)
-http://livecdnh1.tvanywhere.ae/hls/star_movies/05.m3u8
-#EXTINF:-1 tvg-id="Star Movies ARB" tvg-name="Star Movies ARB" tvg-logo="https://i.imgur.com/DQ1RfUa.png" group-title="",Star Movies (Opt-4)
+#EXTINF:-1 tvg-id="Space Toon Arabic ARB" tvg-name="Space Toon Arabic ARB" tvg-logo="https://i.imgur.com/L42Ouau.png" group-title="Kids",Spacetoon
+http://livecdnh2.tvanywhere.ae/hls/spacetoon/index.m3u8
+#EXTINF:-1 tvg-id="Star Movies ARB" tvg-name="Star Movies ARB" tvg-logo="https://i.imgur.com/DQ1RfUa.png" group-title="",Star Movies
 http://livecdnh1.tvanywhere.ae/hls/star_movies/02.m3u8
-#EXTINF:-1 tvg-id="Star World ARB" tvg-name="Star World ARB" tvg-logo="https://i.imgur.com/9c316dr.png" group-title="",Star World (Opt-1)
-http://livecdnh1.tvanywhere.ae/hls/star_world/05.m3u8
-#EXTINF:-1 tvg-id="Star World ARB" tvg-name="Star World ARB" tvg-logo="https://i.imgur.com/9c316dr.png" group-title="",Star World (Opt-2)
-http://livecdnh1.tvanywhere.ae/hls/star_world/05.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Star World ARB" tvg-name="Star World ARB" tvg-logo="https://i.imgur.com/9c316dr.png" group-title="",Star World (Opt-3)
-http://livecdnh1.tvanywhere.ae/hls/star_world/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Star World ARB" tvg-name="Star World ARB" tvg-logo="https://i.imgur.com/9c316dr.png" group-title="",Star World (Opt-4)
-http://livecdnh1.tvanywhere.ae:80/hls/star_world/05.m3u8
-#EXTINF:-1 tvg-id="Star World ARB" tvg-name="Star World ARB" tvg-logo="https://i.imgur.com/9c316dr.png" group-title="",Star World (Opt-5)
+#EXTINF:-1 tvg-id="Star Movies ARB" tvg-name="Star Movies ARB" tvg-logo="https://i.imgur.com/DQ1RfUa.png" group-title="",Star Movies
+http://livecdnh1.tvanywhere.ae/hls/star_movies/05.m3u8
+#EXTINF:-1 tvg-id="Star Movies ARB" tvg-name="Star Movies ARB" tvg-logo="https://i.imgur.com/DQ1RfUa.png" group-title="",Star Movies
+http://livecdnh1.tvanywhere.ae/hls/star_movies/05.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="Star Movies ARB" tvg-name="Star Movies ARB" tvg-logo="https://i.imgur.com/DQ1RfUa.png" group-title="",Star Movies
+http://livecdnh1.tvanywhere.ae/hls/star_movies/index.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="Star World ARB" tvg-name="Star World ARB" tvg-logo="https://i.imgur.com/9c316dr.png" group-title="",Star World
 http://livecdnh1.tvanywhere.ae/hls/star_world/02.m3u8
+#EXTINF:-1 tvg-id="Star World ARB" tvg-name="Star World ARB" tvg-logo="https://i.imgur.com/9c316dr.png" group-title="",Star World
+http://livecdnh1.tvanywhere.ae/hls/star_world/05.m3u8
+#EXTINF:-1 tvg-id="Star World ARB" tvg-name="Star World ARB" tvg-logo="https://i.imgur.com/9c316dr.png" group-title="",Star World
+http://livecdnh1.tvanywhere.ae/hls/star_world/05.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="Star World ARB" tvg-name="Star World ARB" tvg-logo="https://i.imgur.com/9c316dr.png" group-title="",Star World
+http://livecdnh1.tvanywhere.ae/hls/star_world/index.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="Star World ARB" tvg-name="Star World ARB" tvg-logo="https://i.imgur.com/9c316dr.png" group-title="",Star World
+http://livecdnh1.tvanywhere.ae:80/hls/star_world/05.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/nsxrqta.jpg" group-title="",Toheed TV
 http://51.158.73.206/hls/stream.m3u8
 #EXTINF:-1 tvg-id="Wanasah ARB" tvg-name="Wanasah ARB" tvg-logo="https://i.imgur.com/GmgibYW.jpg" group-title="",Wanasah
diff --git a/channels/af.m3u b/channels/af.m3u
index c45c4e933..ac2acdbdc 100644
--- a/channels/af.m3u
+++ b/channels/af.m3u
@@ -5,14 +5,14 @@ http://173.208.166.179/1tv-live-ca7a6c579c-der-da-spy-zoy-ye-bastard-dala-dawusa
 https://cdn4.mjunoon.tv:8087/channels/AfghanTV-140/live/140L/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PmX9Ca3.png" group-title="",Aghani Aghani
 https://svs.itworkscdn.net/aghanilive/aghanilive/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/S1DfLSr.png" group-title="",Arezo TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/S1DfLSr.png" group-title="",Arezo TV
 http://173.208.166.179/afg_ar_tv_789-456-dont_copy_my_links-mother-fucker/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/x8mlbJM.jpg" group-title="",Ariana News
 https://d10rltuy0iweup.cloudfront.net/ATNNEWS/myStream/chunklist_w796472816.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8VbuI9n.png" group-title="",Ariana TV (Opt-1)
-https://d10rltuy0iweup.cloudfront.net/ATNNAT/myStream/chunklist_w2121902183.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8VbuI9n.png" group-title="",Ariana TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8VbuI9n.png" group-title="",Ariana TV
 http://d2g7v53450s2i2.cloudfront.net/ATNUS/streamdelay/chunklist_w1314452267.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8VbuI9n.png" group-title="",Ariana TV
+https://d10rltuy0iweup.cloudfront.net/ATNNAT/myStream/chunklist_w2121902183.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5SLlUEo.png" group-title="",Bahar TV
 http://iptv.bahartv-af.com/bahartv/playlist1/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jqdNiKi.jpg" group-title="",Hewad TV
@@ -39,9 +39,9 @@ http://173.208.166.179/tolo_news_live-1c104a79_dawus-khairatkhor_bastard-off_a3b
 https://rrsatrtmp.tulix.tv/livecdn827/myStream.sdp/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jcjlypA.jpg" group-title="",Watan HD
 http://51.15.236.137/hls/stream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SZWyE76.jpg" group-title="",Wesalhaq TV (Opt-1)
-rtmp://live.noorlive.com:1935/wesal/wesal1
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SZWyE76.jpg" group-title="",Wesalhaq TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SZWyE76.jpg" group-title="",Wesalhaq TV
 http://live.wesalhaq.tv/live/whaq_360p/gmswf.m3u8?v=
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SZWyE76.jpg" group-title="",Wesalhaq TV
+rtmp://live.noorlive.com:1935/wesal/wesal1
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dl13q0r.jpg" group-title="",Zhwandoon TV
 http://173.208.166.179/zhwandoon_tv_live-ca76ca2c8763_bastard-you664be7-dozd-lanati-kona-warkawa-c2df49a4/tracks-v1a1/mono.m3u8
diff --git a/channels/al.m3u b/channels/al.m3u
index 6dd27c374..a99edf16e 100644
--- a/channels/al.m3u
+++ b/channels/al.m3u
@@ -25,9 +25,9 @@ http://82.114.67.178:8081/hls/PeaceTV.m3u8
 http://66.55.93.204/hls-live/livepkgr/_definst_/report/stream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/EAsSKAv.png" group-title="",Rrokum TV
 http://82.114.65.202:1935/live/rrokumtv/playlist.m3u8
-#EXTINF:-1 tvg-id="RTSH 1 HD AL" tvg-name="RTSH 1 HD AL" tvg-logo="https://i.imgur.com/j6fL4vc.png" group-title="",RTSH 1 HD (Opt-1)
+#EXTINF:-1 tvg-id="RTSH 1 HD AL" tvg-name="RTSH 1 HD AL" tvg-logo="https://i.imgur.com/j6fL4vc.png" group-title="",RTSH 1 HD
 http://79.106.48.2/live/rtsh_1ott/playlist.m3u8
-#EXTINF:-1 tvg-id="RTSH 1 HD AL" tvg-name="RTSH 1 HD AL" tvg-logo="https://i.imgur.com/j6fL4vc.png" group-title="",RTSH 1 HD (Opt-2)
+#EXTINF:-1 tvg-id="RTSH 1 HD AL" tvg-name="RTSH 1 HD AL" tvg-logo="https://i.imgur.com/j6fL4vc.png" group-title="",RTSH 1 HD
 http://79.106.48.2/live/rtsh_1ott_p3/playlist.m3u8
 #EXTINF:-1 tvg-id="RTSH 2 HD AL" tvg-name="RTSH 2 HD AL" tvg-logo="https://i.imgur.com/xWigxIX.png" group-title="",RTSH 2 HD
 http://79.106.48.2/live/rtsh_2ott_p3/playlist.m3u8
@@ -43,10 +43,10 @@ http://79.106.48.2/live/rtsh_film_ott_p3/playlist.m3u8
 http://79.106.48.2/live/rtsh_muzike_ott_p3/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/IN5rJ2J.png" group-title="",RTSH Plus
 http://79.106.48.2/live/rtsh_plus_ott_p3/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/UHG6Rve.png" group-title="",RTSH Shqip (Opt-1)
-http://79.106.48.2/live/rtsh_shqip_ott_p3/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/UHG6Rve.png" group-title="",RTSH Shqip (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/UHG6Rve.png" group-title="",RTSH Shqip
 http://79.106.48.2/live/rtsh_shqip_ott_p2/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/UHG6Rve.png" group-title="",RTSH Shqip
+http://79.106.48.2/live/rtsh_shqip_ott_p3/playlist.m3u8
 #EXTINF:-1 tvg-id="RTSH Sport AL" tvg-name="RTSH Sport AL" tvg-logo="https://i.imgur.com/yQCzUi4.png" group-title="Sport",RTSH Sport
 http://79.106.48.2/live/rtsh_sport_ott_p3/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/CW26UK9.png" group-title="",RTV 1
diff --git a/channels/am.m3u b/channels/am.m3u
index a67285906..c00f19fff 100644
--- a/channels/am.m3u
+++ b/channels/am.m3u
@@ -1,27 +1,27 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/uUqKc0l.jpg" group-title="",1TV [1080p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/uUqKc0l.jpg" group-title="",1TV
 http://amtv1.livestreamingcdn.com/am2abr/tracks-v1a1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/uUqKc0l.jpg" group-title="",1TV [720p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/uUqKc0l.jpg" group-title="",1TV
 http://amtv1.livestreamingcdn.com/am2abr/tracks-v2a1/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/uTpdxvo.png" group-title="",5-րդ ալիք
 http://ott-cdn.ucom.am/s6/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3vQVwUV.jpg" group-title="",Amga
 https://streamer1.connectto.com/AMGA_WEB_1202/amga/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5RquBOS.jpg" group-title="",Arm News TV (Opt-1)
-http://ott-cdn.ucom.am/s11/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5RquBOS.jpg" group-title="",Arm News TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5RquBOS.jpg" group-title="",Arm News TV
 http://ott-cdn.ucom.am/s11/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5RquBOS.jpg" group-title="",Arm News TV
+http://ott-cdn.ucom.am/s11/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/CR9UQIA.png" group-title="Movies",Armenia Comedy
 http://ott-cdn.ucom.am/s32/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/BGXnX2B.png" group-title="",Armenia Music
 http://v3.myowntv.org/content/35978/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PHyikQJ.png" group-title="",Armenia TV (Opt-1)
-http://ott-cdn.ucom.am/s4/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PHyikQJ.png" group-title="",Armenia TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PHyikQJ.png" group-title="",Armenia TV
 http://ott-cdn.ucom.am/s4/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/kbCyJhp.jpg" group-title="",Armenia TV Premium 1 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PHyikQJ.png" group-title="",Armenia TV
+http://ott-cdn.ucom.am/s4/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/kbCyJhp.jpg" group-title="",Armenia TV Premium 1
 http://ott-cdn.ucom.am/s83/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/kbCyJhp.jpg" group-title="",Armenia TV Premium 1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/kbCyJhp.jpg" group-title="",Armenia TV Premium 1
 http://ott-cdn.ucom.am/s83/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/o2rwtC8.png" group-title="",Armenia TV Premium 2
 http://ott-cdn.ucom.am/s22/04.m3u8
@@ -33,30 +33,30 @@ http://livestream.usatv.com/hls/m3u8/ARTN-NET.m3u8
 http://ott-cdn.ucom.am/s8/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/MLEj30l.png" group-title="Movies",ATV Filmzone
 http://ott-cdn.ucom.am/s48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8DToc8n.png" group-title="",ATV ԹԱՎԱ (Opt-1)
-http://ott-cdn.ucom.am/s53/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8DToc8n.png" group-title="",ATV ԹԱՎԱ (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8DToc8n.png" group-title="",ATV ԹԱՎԱ
 http://ott-cdn.ucom.am/s53/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8DToc8n.png" group-title="",ATV ԹԱՎԱ
+http://ott-cdn.ucom.am/s53/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ItM7u0A.png" group-title="",ATV ԽԱՂԱԼԻՔ
 http://ott-cdn.ucom.am/s74/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/bfj8O2N.png" group-title="",ATV ԿԻՆՈՄԱՆ
 http://ott-cdn.ucom.am/s94/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/OXaJoQI.png" group-title="",ATV Հայ TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/OXaJoQI.png" group-title="",ATV Հայ TV
 http://ott-cdn.ucom.am/s73/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/OXaJoQI.png" group-title="",ATV Հայ TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/OXaJoQI.png" group-title="",ATV Հայ TV
 http://ott-cdn.ucom.am/s73/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/MLEj30l.png" group-title="",ATV ՖԻԼՄԶՈՆ
 http://ott-cdn.ucom.am/s48/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/b1gT2mR.png" group-title="",Bazmoc [AM][480p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/b1gT2mR.png" group-title="",Bazmoc
 http://ott-cdn.ucom.am/s74/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/IJOPtzM.png" group-title="",H2
 http://ott-cdn.ucom.am/s2/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/N0epdVk.png" group-title="Movies",Hay kino
 http://ott-cdn.ucom.am/s22/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/71OQvXB.jpg" group-title="",Kentron (Opt-1)
-http://ott-cdn.ucom.am/s5/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/71OQvXB.jpg" group-title="",Kentron (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/71OQvXB.jpg" group-title="",Kentron
 http://ott-cdn.ucom.am/s5/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/71OQvXB.jpg" group-title="",Kentron
+http://ott-cdn.ucom.am/s5/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AhCxEDh.png" group-title="Movies",Kinoman ATV
 http://ott-cdn.ucom.am/s66/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AhCxEDh.png" group-title="Movies",Kinoman ATV
@@ -67,24 +67,24 @@ http://ott-cdn.ucom.am/s12/04.m3u8
 http://37.221.175.40:8082/Panarm/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zYO4KjA.jpg" group-title="",Radio Van 103.0 FM Yerevan
 http://stream.radiovan.fm/stream/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zdJeT34.jpg" group-title="",TBN Armenia (Opt-1)
-http://bogtvhdlive-f.akamaihd.net/i/tbn_armenia@198331/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zdJeT34.jpg" group-title="",TBN Armenia (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zdJeT34.jpg" group-title="",TBN Armenia
 http://bogtvhdlive-f.akamaihd.net/i/tbn_armenia@198331/index_500_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/cJHjnm7.png" group-title="",TBN Armenia (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/cJHjnm7.png" group-title="",TBN Armenia
 http://bogtvhdlive-f.akamaihd.net/i/tbn_armenia@198331/index_500_av-p.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zdJeT34.jpg" group-title="",TBN Armenia
+http://bogtvhdlive-f.akamaihd.net/i/tbn_armenia@198331/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/bLTwA84.png" group-title="Kids",Tuntunik
 http://ott-cdn.ucom.am/s46/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NopzOwA.jpg" group-title="",US Armenia TV
 http://livestream.usatv.com/hls/m3u8/USARMENIA720.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/llEDEfK.png" group-title="",Yerkir Media (Opt-1)
-http://ott-cdn.ucom.am/s7/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/llEDEfK.png" group-title="",Yerkir Media (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/llEDEfK.png" group-title="",Yerkir Media
 http://fr.cdn.edem.tv/iptv/AILIO9MOXEEJOHBAHPAI3OHSH/608/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/lYIJ2PN.png" group-title="",Аrmenia TV Premium 3 (Opt-1)
-http://ott-cdn.ucom.am/s42/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/lYIJ2PN.png" group-title="",Аrmenia TV Premium 3 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/llEDEfK.png" group-title="",Yerkir Media
+http://ott-cdn.ucom.am/s7/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/lYIJ2PN.png" group-title="",Аrmenia TV Premium 3
 http://ott-cdn.ucom.am/s42/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/lYIJ2PN.png" group-title="",Аrmenia TV Premium 3
+http://ott-cdn.ucom.am/s42/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/yJBfIax.png" group-title="",Аrmenia TV Premium 5
 http://ott-cdn.ucom.am/s46/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LUsP2re.png" group-title="",Аrmenia TV Premium 6
@@ -97,7 +97,7 @@ http://ott-cdn.ucom.am/s3/index.m3u8
 http://ott-cdn.ucom.am/s9/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/I1TxFUq.jpg" group-title="",ԱՐ
 http://ott-cdn.ucom.am/s9/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/USGVQIv.png" group-title="",Դար 21 (Opt-1)
-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)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/USGVQIv.png" group-title="",Դար 21
 http://ott-cdn.ucom.am/s10/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/USGVQIv.png" group-title="",Դար 21
+http://ott-cdn.ucom.am/s10/index.m3u8
diff --git a/channels/ar.m3u b/channels/ar.m3u
index c2f8312f6..134344eb4 100644
--- a/channels/ar.m3u
+++ b/channels/ar.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/VuvGm3s.png" group-title="",13 Max (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/VuvGm3s.png" group-title="",13 Max
 http://coninfo.net:1935/13maxhd/live_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/VuvGm3s.png" group-title="",13 Max (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/VuvGm3s.png" group-title="",13 Max
 http://coninfo.net:1935/13maxhd/live_720p/chunklist_w352743074.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/6miysb8.png" group-title="",24/7 Canal de Noticias
 http://59c5c86e10038.streamlock.net:1935/6605140/6605140/playlist.m3u8
@@ -19,7 +19,7 @@ http://184.154.28.210:1935/airevideo/airevideo/playlist.m3u8
 http://186.0.233.76:1935/Argentinisima/smil:argentinisima.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",BA Buenos Aires
 http://www.radiosargentina.com.ar/php/tvm3u.php?id=DIAR0089
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/lKaVoN9.png" group-title="",Canal 10 Cordoba (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/lKaVoN9.png" group-title="",Canal 10 Cordoba
 https://wowzaprod169-i.akamaihd.net/hls/live/630337/59e4c1ec/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PE2Gi3N.png" group-title="",Canal 10 General Roca
 https://59c5c86e10038.streamlock.net/8204/8204/chunklist_w47008160.m3u8
@@ -27,27 +27,27 @@ https://59c5c86e10038.streamlock.net/8204/8204/chunklist_w47008160.m3u8
 http://panel.dattalive.com:1935/8204/8204/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/QX4vqEG.png" group-title="",Canal 17 Milenium Salta
 https://59c5c86e10038.streamlock.net/6605140/6605140/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Canal 26 (Opt-1)
-http://200.115.193.177/live/26hd-720/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://imagenes.cablevisionfibertel.com.ar:7007/servlet/cv/3.png" group-title="",Canal 26 (Opt-10)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://imagenes.cablevisionfibertel.com.ar:7007/servlet/cv/3.png" group-title="",Canal 26
 http://200.115.193.177/live/26hd-180/playlist.m3u8?GrupoTopIptv
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Canal 26 (Opt-2)
-http://live-edge01.telecentro.net.ar/live/smil:c26.smil/chunklist_w1700708876_b1264000_sleng.m3u8?iptvgratis?chile.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Canal 26 (Opt-3)
-http://live-edge01.telecentro.net.ar/live/26hd-360/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Canal 26 (Opt-4)
-http://200.115.193.177/live/26hd-720/.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Canal 26 (Opt-5)
-http://live-edge01.telecentro.net.ar/live/26hd-720/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/1520.png" group-title="",Canal 26 (Opt-6)
-http://live-edge01.telecentro.net.ar/live/smil:c26.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://1.bp.blogspot.com/-oaM5k7pbu3A/ULKcb6odA1I/AAAAAAAAXko/nmQ_WMr0c4k/s1600/canal26hd.png" group-title="",Canal 26 (Opt-7)
-http://live-edge01.telecentro.net.ar:1935/live/26hd-720/livestream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canal 26 (Opt-8)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canal 26
 http://200.115.193.177/live/26hd-480/.m3u8?iptvgratis?chile.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canal 26 (Opt-9)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Canal 26
+http://200.115.193.177/live/26hd-720/.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Canal 26
+http://200.115.193.177/live/26hd-720/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Canal 26
+http://live-edge01.telecentro.net.ar/live/26hd-360/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Canal 26
+http://live-edge01.telecentro.net.ar/live/26hd-720/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Canal 26
+http://live-edge01.telecentro.net.ar/live/smil:c26.smil/chunklist_w1700708876_b1264000_sleng.m3u8?iptvgratis?chile.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canal 26
 http://live-edge01.telecentro.net.ar/live/smil:c26.smil/chunklist_w188793591_b1864000_sleng.m3u8?iptvgratis?chile.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CANAL 3 PINAMAR DIGITAL [360p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/1520.png" group-title="",Canal 26
+http://live-edge01.telecentro.net.ar/live/smil:c26.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://1.bp.blogspot.com/-oaM5k7pbu3A/ULKcb6odA1I/AAAAAAAAXko/nmQ_WMr0c4k/s1600/canal26hd.png" group-title="",Canal 26
+http://live-edge01.telecentro.net.ar:1935/live/26hd-720/livestream.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CANAL 3 PINAMAR DIGITAL
 http://wowza.telpin.com.ar:1935/canal3/canal3.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hyOtap9.png" group-title="",Canal 4 Jujuy
 https://5cd577a3dd8ec.streamlock.net/CAMARAS/live3/chunklist_w621402693.m3u8
@@ -61,15 +61,15 @@ https://5b7f3c45ab7c2.streamlock.net/8096/8096/playlist.m3u8
 http://live.canalnueve.tv:8082/hls/canal.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CANAL 9 LITORAL
 http://panel.dattalive.com:1935/8250/8250/chunklist_w1259692347.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canal 9 Salta (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canal 9 Salta
 http://panel.dattalive.com:1935/8250/8250/chunklist_w325606071.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canal 9 Salta (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canal 9 Salta
 http://panel.dattalive.com:1935/8250/8250/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://3.bp.blogspot.com/-aKHK8Ajrcc0/TpOoS0KRJLI/AAAAAAAAQT4/edRRDvx0kkQ/s1600/canal9salta.png" group-title="",Canal 9 Salta (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://3.bp.blogspot.com/-aKHK8Ajrcc0/TpOoS0KRJLI/AAAAAAAAQT4/edRRDvx0kkQ/s1600/canal9salta.png" group-title="",Canal 9 Salta
 http://panel.dattalive.com:1935/8250/8250/playlist.m3u8?GrupoTopIptv
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/OTyIxNK.jpg" group-title="",Canal Acequia
 http://api.new.livestream.com/accounts/6450028/events/5813077/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CANAL PROVINCIAL SAN MIGUEL [360p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CANAL PROVINCIAL SAN MIGUEL
 http://www.trimi.com.ar/provincial/streaming/mystream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/mZlUGBf.jpg" group-title="",Chacra TV
 http://s8.stweb.tv:1935/chacra/live/chunks.m3u8
@@ -103,26 +103,26 @@ http://streaming02.arcast.com.ar:1935/la90fm/la90fm/chunklist_w379053794.m3u8
 https://5b3050bb1b2d8.streamlock.net/tvcanal11/tvcanal11/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/kF29z8z.jpg" group-title="",Locomotion TV
 http://locomotiontv.com/envivo/loco_channel/stream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LHtd9oT.png" group-title="",Multivision Argentina (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LHtd9oT.png" group-title="",Multivision Argentina
 http://panel.dattalive.com:1935/8250/8250/.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LHtd9oT.png" group-title="",Multivision Argentina (Opt-2)
-http://panel.dattalive.com:1935/8250/8250/chunklist_w689217833.m3u8?GrupoTopIptv
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LHtd9oT.png" group-title="",Multivision Argentina (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LHtd9oT.png" group-title="",Multivision Argentina
 http://panel.dattalive.com:1935/8250/8250/chunklist_w689217833.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music Top (Opt-1)
-http://live-edge01.telecentro.net.ar/live/smil:musictop.smil/chunklist_w538311571_b364000_sleng.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music Top (Opt-2)
-http://live-edge01.telecentro.net.ar/live/smil:musictop.smil/chunklist_w767435128_b2028000_sleng.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music TOP (Opt-3)
-http://live-edge01.telecentro.net.ar/live/smil:musictop.smil/chunklist_w1582140541_b364000_sleng.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music Top (Opt-4)
-http://live-edge01.telecentro.net.ar/live/musictop.smil/.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music Top [720p] (Opt-5)
-http://live-edge01.telecentro.net.ar/live/smil:musictop.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music Top [720p] (Opt-6)
-http://live-edge01.telecentro.net.ar:1935/live/msctphd-720/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music Top [720p] (Opt-7)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LHtd9oT.png" group-title="",Multivision Argentina
+http://panel.dattalive.com:1935/8250/8250/chunklist_w689217833.m3u8?GrupoTopIptv
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music Top
 http://live-edge01.telecentro.net.ar/live/msctphd-720/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music Top
+http://live-edge01.telecentro.net.ar/live/musictop.smil/.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music TOP
+http://live-edge01.telecentro.net.ar/live/smil:musictop.smil/chunklist_w1582140541_b364000_sleng.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music Top
+http://live-edge01.telecentro.net.ar/live/smil:musictop.smil/chunklist_w538311571_b364000_sleng.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music Top
+http://live-edge01.telecentro.net.ar/live/smil:musictop.smil/chunklist_w767435128_b2028000_sleng.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music Top
+http://live-edge01.telecentro.net.ar/live/smil:musictop.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music Top
+http://live-edge01.telecentro.net.ar:1935/live/msctphd-720/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/J7stpmb.png" group-title="",Net TV
 http://unlimited2-us.dps.live/nettv/nettv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/KpyKEHa.png" group-title="",Pinamar - Telpin Webcam (New!)
@@ -133,10 +133,10 @@ http://wowza.telpin.com.ar:1935/live-powerTV/power.stream/playlist.m3u8
 http://streamyes.alsolnet.com/radiodelairetv/live/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8JpXh85.png" group-title="",Radio Sur 105.1 FM Berisso
 http://video1.veemesoft.com.ar:1935/8436/8436/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/daMqavf.jpg" group-title="",RTN TV (Opt-1)
-http://media.neuquen.gov.ar/rtn/television/chunklist_w2042779766.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/daMqavf.jpg" group-title="",RTN TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/daMqavf.jpg" group-title="",RTN TV
 http://media.neuquen.gov.ar/rtn/television/chunklist_w1330236482.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/daMqavf.jpg" group-title="",RTN TV
+http://media.neuquen.gov.ar/rtn/television/chunklist_w2042779766.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Eu7rHtj.jpg" group-title="",T5 Satelital
 http://api.new.livestream.com/accounts/20819504/events/8664197/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Telemax
@@ -145,26 +145,26 @@ http://live-edge01.telecentro.net.ar/live/tlxhd-720/playlist.m3u8
 http://www.coninfo.net:1935/previsoratv/live/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/anhdazU.jpg" group-title="",TELERED (Costa Rica)
 http://k4.usastreams.com/Telesistemas/Telesistemas/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/rL8KWrL.jpg" group-title="",TelpinTV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/rL8KWrL.jpg" group-title="",TelpinTV
 http://201.219.100.30:1935/telpintv/ttv.stream_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/rL8KWrL.jpg" group-title="",TelpinTV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/rL8KWrL.jpg" group-title="",TelpinTV
 http://wowza.telpin.com.ar:1935/telpintv/ttv.stream_720p/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FscV0as.png" group-title="",Tierramia TV
 https://live-edge01.telecentro.net.ar/live/smil:trm.smil/chunklist_w68879463_b1864000_sleng.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1XgRcmd.png" group-title="",TLX (Opt-1)
-http://live-edge01.telecentro.net.ar/live/smil:tlx.smil/chunklist_w1527043435_b1828000_sleng.m3u8?iptvgratis?chile.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1XgRcmd.png" group-title="",TLX (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1XgRcmd.png" group-title="",TLX
 http://live-edge01.telecentro.net.ar/live/smil:tlx.smil/chunklist_w1527043435_b1828000_sleng.m3u8?eamogratis?Entretenimiento.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1XgRcmd.png" group-title="",TLX (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1XgRcmd.png" group-title="",TLX
+http://live-edge01.telecentro.net.ar/live/smil:tlx.smil/chunklist_w1527043435_b1828000_sleng.m3u8?iptvgratis?chile.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1XgRcmd.png" group-title="",TLX
 http://live-edge01.telecentro.net.ar/live/smil:tlx.smil/chunklist_w1527043435_b1828000_sleng.m3u8?iptvgratis?chile.m3u8?GrupoTopIptv
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1XgRcmd.png" group-title="",TLX (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1XgRcmd.png" group-title="",TLX
 http://live-edge01.telecentro.net.ar/live/smil:tlx.smil/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1XgRcmd.png" group-title="",TLX (Opt-5)
-http://live-edge01.telecentro.net.ar/live/tlxhd-720/playlist.m3u8?tecnotv.info?iptv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1XgRcmd.png" group-title="",TLX (Opt-6)
-http://live-edge01.telecentro.net.ar/live/tlxhd-720/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1XgRcmd.png" group-title="",TLX (Opt-7)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1XgRcmd.png" group-title="",TLX
 http://live-edge01.telecentro.net.ar/live/smil:tlx.smil/master.m3u8?
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1XgRcmd.png" group-title="",TLX
+http://live-edge01.telecentro.net.ar/live/tlxhd-720/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1XgRcmd.png" group-title="",TLX
+http://live-edge01.telecentro.net.ar/live/tlxhd-720/playlist.m3u8?tecnotv.info?iptv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvmana1.com/img/logo_tv_mana_1.png" group-title="",TV Maná
 http://streamspub.manasat.com:1935/tvar/tvmanaar2/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/1550.png" group-title="",TV Maná 1
diff --git a/channels/at.m3u b/channels/at.m3u
index 25c34e5ce..705582fb7 100644
--- a/channels/at.m3u
+++ b/channels/at.m3u
@@ -11,10 +11,10 @@ http://nstream17.gotv.at:1938/live/gotvlive_576p/playlist.m3u8
 http://185.85.28.19/oe3sd/orf.sdp/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/OyOPRtq.png" group-title="",K-TV
 http://d1pz8zear993v8.cloudfront.net/hlsme/kathtv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/tLwBOtU.jpg" group-title="Music",KroneHit TV (Opt-1)
-http://bitcdn-kronehit.bitmovin.com/v2/hls/chunklist_b3128000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/tLwBOtU.jpg" group-title="Music",KroneHit TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/tLwBOtU.jpg" group-title="Music",KroneHit TV
 http://bitcdn-kronehit.bitmovin.com/v2/hls/chunklist_b1628000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/tLwBOtU.jpg" group-title="Music",KroneHit TV
+http://bitcdn-kronehit.bitmovin.com/v2/hls/chunklist_b3128000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/g2Hdysr.jpg" group-title="",Ländle TV
 https://58b42f6c8c9bf.streamlock.net:8080/live/LaendleTV/chunklist_w364023246.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xmfgBrg.png" group-title="",M4
@@ -29,9 +29,9 @@ https://d38d1dtxhym0zi.cloudfront.net/LiveHTTPOrigin/okto/chunklist.m3u8
 http://p3-6.mov.at:1935/live/weekstream/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Wu6SMvb.png" group-title="",R9
 https://ms01.w24.at/R9/smil:liveeventR9.smil/chunklist_w870289389_b2112000_slger.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SSDLpPU.png" group-title="",RTS-Salzburg (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SSDLpPU.png" group-title="",RTS-Salzburg
 http://lb.hd-livestream.de:1935/live/RTS2015/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SSDLpPU.png" group-title="",RTS-Salzburg (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SSDLpPU.png" group-title="",RTS-Salzburg
 https://58b42f6c8c9bf.streamlock.net:8080/live/RTS2015/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/KJie1k5.png" group-title="",Teins TV
 http://live1.markenfunk.com/t1/live/chunklist.m3u8
diff --git a/channels/au.m3u b/channels/au.m3u
index 71b8439d9..a9487ca71 100644
--- a/channels/au.m3u
+++ b/channels/au.m3u
@@ -1,26 +1,26 @@
 #EXTM3U x-tvg-url="http://i.mjh.nz/nzau/epg.xml.gz"
 #EXTINF:-1 tvg-id="tv.101002210220" tvg-name="ABC News" tvg-logo="https://i.mjh.nz/au/images/tv.101002210220.png" group-title="News",ABC News
 https://abc-iview-mediapackagestreams-1.akamaized.net/out/v1/50345bf35f664739912f0b255c172ae9/index_1.m3u8
-#EXTINF:-1 tvg-id="tv.acctv" tvg-name="ACCTV" tvg-logo="http://i.mjh.nz/au/images/tv.acctv.png" group-title="Religious",ACCTV (Opt-1)
+#EXTINF:-1 tvg-id="tv.acctv" tvg-name="ACCTV" tvg-logo="http://i.mjh.nz/au/images/tv.acctv.png" group-title="Religious",ACCTV
 http://i.mjh.nz/au/Melbourne/tv.acctv.m3u8
-#EXTINF:-1 tvg-id="tv.acctv" tvg-name="ACCTV" tvg-logo="http://www.acc.tv/wp-content/uploads/2016/06/cropped-acctv_logo.png" group-title="Religious",ACCTV (Opt-2)
+#EXTINF:-1 tvg-id="tv.acctv" tvg-name="ACCTV" tvg-logo="http://www.acc.tv/wp-content/uploads/2016/06/cropped-acctv_logo.png" group-title="Religious",ACCTV
 http://live-mobile.cdn01.net/hls-live/202E1F/default/mobile/stream_14949_1.m3u8?source=othersites&attempt=1
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://australiachannel.com.au/images/Logo.png" group-title="News",Australia Channel
 https://austchannel-live.akamaized.net/hls/live/2002729/austchannel-news/master1280x720.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/BloombergTV.us.png" group-title="Business",Bloomberg TV Australia (Opt-1)
-https://liveprodapnortheast.global.ssl.fastly.net/oz1/Channel-OZTVqvs-AWS-tokyo-1/Source-OZTVqvs-1000-1_live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Business",Bloomberg TV Australia (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Business",Bloomberg TV Australia
 https://liveprodapnortheast.global.ssl.fastly.net/btv/desktop/aus_live.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/BloombergTV.us.png" group-title="Business",Bloomberg TV Australia
+https://liveprodapnortheast.global.ssl.fastly.net/oz1/Channel-OZTVqvs-AWS-tokyo-1/Source-OZTVqvs-1000-1_live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Shop",Expo Channel
 http://tvsn-i.akamaihd.net/hls/live/261837/expo/expo_750.m3u8
 #EXTINF:-1 tvg-id="tv.fox.sports.news" tvg-name="Fox Sports News" tvg-logo="https://www.mediaweek.com.au/wp-content/uploads/2017/01/fox-sports-news-logo.jpg" group-title="Sport",Fox Sports News
 https://austchannel-live.akamaized.net/hls/live/2002736/austchannel-sport/master1280x720.m3u8
-#EXTINF:-1 tvg-id="tv.101305020528" tvg-name="RACING.COM" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/3/3e/RACING.COM_logo_2016.svg/1200px-RACING.COM_logo_2016.svg.png" group-title="Sport",Racing.com (Opt-1)
-https://racingvic-i.akamaized.net/hls/live/598695/racingvic/628.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="tv.101305020528" tvg-name="RACING.COM" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/3/3e/RACING.COM_logo_2016.svg/1200px-RACING.COM_logo_2016.svg.png" group-title="Sport",Racing.com (Opt-2)
+#EXTINF:-1 tvg-id="tv.101305020528" tvg-name="RACING.COM" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/3/3e/RACING.COM_logo_2016.svg/1200px-RACING.COM_logo_2016.svg.png" group-title="Sport",Racing.com
 https://racingvic-i.akamaized.net/hls/live/598695/racingvic/1500.m3u8
-#EXTINF:-1 tvg-id="tv.101305020528" tvg-name="RACING.COM" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/3/3e/RACING.COM_logo_2016.svg/1200px-RACING.COM_logo_2016.svg.png" group-title="Sport",Racing.com (Opt-3)
+#EXTINF:-1 tvg-id="tv.101305020528" tvg-name="RACING.COM" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/3/3e/RACING.COM_logo_2016.svg/1200px-RACING.COM_logo_2016.svg.png" group-title="Sport",Racing.com
 https://racingvic-i.akamaized.net/hls/live/598695/racingvic/628.m3u8
+#EXTINF:-1 tvg-id="tv.101305020528" tvg-name="RACING.COM" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/3/3e/RACING.COM_logo_2016.svg/1200px-RACING.COM_logo_2016.svg.png" group-title="Sport",Racing.com
+https://racingvic-i.akamaized.net/hls/live/598695/racingvic/628.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.foxtel.com.au/content/dam/foxtel/watch/news/sky-news-extra-colour.PNG" group-title="News",Sky News Extra 1
 https://skynewsau-live.akamaized.net/hls/live/2002689/skynewsau-extra1/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.foxtel.com.au/content/dam/foxtel/watch/news/sky-news-extra-colour.PNG" group-title="News",Sky News Extra 2
diff --git a/channels/az.m3u b/channels/az.m3u
index c3aa1934b..39d273606 100644
--- a/channels/az.m3u
+++ b/channels/az.m3u
@@ -3,9 +3,9 @@
 http://85.132.81.184:8080/arb/live/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wiIJMek.jpg" group-title="",ARB 24
 http://85.132.81.184:8080/arb24/live1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/rDYSoRL.png" group-title="",ATV 1 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/rDYSoRL.png" group-title="",ATV 1
 http://85.132.81.184:8080/atv/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/rDYSoRL.png" group-title="",ATV 1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/rDYSoRL.png" group-title="",ATV 1
 http://85.132.81.184:8080/atvlive/atv-e1/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/rDYSoRL.png" group-title="",ATV 2
 http://85.132.81.184:8080/atv-2/index.m3u8
@@ -13,28 +13,28 @@ http://85.132.81.184:8080/atv-2/index.m3u8
 http://85.132.81.184:8080/atv-4/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3DpMGEX.png" group-title="",AzTV
 https://streams.livetv.az/azerbaijan/aztv_stream2/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/4VAiAnb.jpg" group-title="",CBC (Opt-1)
-https://streams.livetv.az/azerbaijan/cbc_stream2/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/4VAiAnb.jpg" group-title="",CBC (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/4VAiAnb.jpg" group-title="",CBC
 http://cbctvlive.flashmediacast.com:1935/CBCTVLive/livestream/chunklist_w1352949174.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/r9st75H.jpg" group-title="Sport",CBC Sport (Opt-1)
-https://streams.livetv.az/azerbaijan/cbc_sport_hd/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/r9st75H.jpg" group-title="Sport",CBC Sport (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/4VAiAnb.jpg" group-title="",CBC
+https://streams.livetv.az/azerbaijan/cbc_stream2/chunks.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/r9st75H.jpg" group-title="Sport",CBC Sport
 http://0s.ha2s4mjtgixdkmzogu3a.cmle.ru/azerbaijan/cbc_sport_hd/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/r9st75H.jpg" group-title="Sport",CBC Sport (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/r9st75H.jpg" group-title="Sport",CBC Sport
+https://streams.livetv.az/azerbaijan/cbc_sport_hd/chunks.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/r9st75H.jpg" group-title="Sport",CBC Sport
 https://streams.livetv.az/azerbaijan/cbc_sport_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/glJmSlO.png" group-title="",Dalğa
 http://streams2.livetv.az/azerbaijan/dalga/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SLy1nla.png" group-title="",Dunya TV
 https://streams.livetv.az/azerbaijan/dunya/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/geyLqiw.jpg" group-title="",İctimai TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/geyLqiw.jpg" group-title="",İctimai TV
 http://streams2.livetv.az/azerbaijan/ictimai_stream2/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/geyLqiw.jpg" group-title="",İctimai TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/geyLqiw.jpg" group-title="",İctimai TV
 https://streams.livetv.az/azerbaijan/ictimaihd/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/rBW77UA.png" group-title="",İdman Azərbaycan (Opt-1)
-http://streams2.livetv.az/azerbaijan/idmanhd/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/rBW77UA.png" group-title="",İdman Azərbaycan (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/rBW77UA.png" group-title="",İdman Azərbaycan
 http://streams.livetv.az/azerbaijan/idman2_stream/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/rBW77UA.png" group-title="",İdman Azərbaycan
+http://streams2.livetv.az/azerbaijan/idmanhd/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/DeKXpAu.jpg" group-title="",İnterAz TV
 http://streams2.livetv.az/azerbaijan/interaz/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/b6i8byT.png" group-title="",Kəpəz TV
diff --git a/channels/be.m3u b/channels/be.m3u
index ef370bf7e..71db4f7c4 100644
--- a/channels/be.m3u
+++ b/channels/be.m3u
@@ -9,38 +9,38 @@ http://api.new.livestream.com/accounts/27755193/events/8452381/live.m3u8
 http://bel-lh.akamaihd.net/i/BEL_1@321282/master.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/rcfUiWV.jpg" group-title="Local",Bruzz
 http://hls-origin01-bruzz.cdn02.rambla.be/adliveorigin-bruzz/_definst_/AZwy8w.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/YjKqWru.png" group-title="",BX1 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/YjKqWru.png" group-title="",BX1
 http://149.202.81.107:1935/stream/live/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/YjKqWru.png" group-title="",BX1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/YjKqWru.png" group-title="",BX1
 https://59959724487e3.streamlock.net/stream/live/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JJcnXUF.png" group-title="",Canal C (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JJcnXUF.png" group-title="",Canal C
 http://streamer.canalc.be:1935/canalc/smil:SMIL-canalc-multi/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JJcnXUF.png" group-title="",Canal C (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JJcnXUF.png" group-title="",Canal C
 https://594a365b4a1b2.streamlock.net/canalc/_definst_/live/chunklist_w1917584225.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/uoSMNnr.png" group-title="Local",Canal Zoom
 http://streamer.canalc.be:1935/canalzoom/smil:SMIL-canalzoom-multi/chunklist.m3u8
-#EXTINF:-1 tvg-id="Canvas BE" tvg-name="Canvas BE" tvg-logo="https://i.imgur.com/xVgqbbT.jpg" group-title="",Canvas (Opt-1)
+#EXTINF:-1 tvg-id="Canvas BE" tvg-name="Canvas BE" tvg-logo="https://i.imgur.com/xVgqbbT.jpg" group-title="",Canvas
 https://live-vrt.akamaized.net/groupc/live/14a2c0f6-3043-4850-88a5-7fb062fe7f05/live_aes.isml/playlist.m3u8
-#EXTINF:-1 tvg-id="Canvas BE" tvg-name="Canvas BE" tvg-logo="https://i.imgur.com/xVgqbbT.jpg" group-title="",Canvas (Opt-2)
+#EXTINF:-1 tvg-id="Canvas BE" tvg-name="Canvas BE" tvg-logo="https://i.imgur.com/xVgqbbT.jpg" group-title="",Canvas
 https://live-vrt.akamaized.net/groupc/live/14a2c0f6-3043-4850-88a5-7fb062fe7f05/live_aes.isml/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LJ4Hpdc.png" group-title="Music",City Music TV
 http://5592f056abba8.streamlock.net/citytv/citytv/playlist.m3u8
-#EXTINF:-1 tvg-id="een BE" tvg-name="een BE" tvg-logo="https://i.imgur.com/hWfo6az.png" group-title="",Eén (Opt-1)
+#EXTINF:-1 tvg-id="een BE" tvg-name="een BE" tvg-logo="https://i.imgur.com/hWfo6az.png" group-title="",Eén
 https://live-vrt.akamaized.net/groupc/live/8edf3bdf-7db3-41c3-a318-72cb7f82de66/live_aes.isml/playlist.m3u8
-#EXTINF:-1 tvg-id="een BE" tvg-name="een BE" tvg-logo="https://i.imgur.com/hWfo6az.png" group-title="",Eén (Opt-2)
+#EXTINF:-1 tvg-id="een BE" tvg-name="een BE" tvg-logo="https://i.imgur.com/hWfo6az.png" group-title="",Eén
 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://i.imgur.com/aGORIN8.png" group-title="Local",Focus
 https://hls-origin01-focus-wtv.cdn01.rambla.be/adliveorigin-focus-wtv/_definst_/AK4e8O.smil/chunklist_b3000000.m3u8
-#EXTINF:-1 tvg-id="Ketnet BE" tvg-name="Ketnet BE" tvg-logo="https://i.imgur.com/Du0YAJS.png" group-title="",Ketnet (Opt-1)
+#EXTINF:-1 tvg-id="Ketnet BE" tvg-name="Ketnet BE" tvg-logo="https://i.imgur.com/Du0YAJS.png" group-title="",Ketnet
 https://live-vrt.akamaized.net/groupc/live/f132f1b8-d04d-404e-90e0-6da1abb4f4fc/live_aes.isml/playlist.m3u8
-#EXTINF:-1 tvg-id="Ketnet BE" tvg-name="Ketnet BE" tvg-logo="https://i.imgur.com/Du0YAJS.png" group-title="",Ketnet (Opt-2)
+#EXTINF:-1 tvg-id="Ketnet BE" tvg-name="Ketnet BE" tvg-logo="https://i.imgur.com/Du0YAJS.png" group-title="",Ketnet
 https://live-vrt.akamaized.net/groupc/live/f132f1b8-d04d-404e-90e0-6da1abb4f4fc/live_aes.isml/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/eDYaphB.png" group-title="",Ketnet Junior
 http://content.uplynk.com/channel/e11a05356cc44198977436418ad71832.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8CWBmcN.png" group-title="",Notele (Opt-1)
-https://streaming01.divercom.be/notele_live/_definst_/direct.stream/chunklist_w798871553.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8CWBmcN.png" group-title="",Notele (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8CWBmcN.png" group-title="",Notele
 https://streaming01.divercom.be/notele_live/_definst_/direct.stream/chunklist_w1424854023.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8CWBmcN.png" group-title="",Notele
+https://streaming01.divercom.be/notele_live/_definst_/direct.stream/chunklist_w798871553.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/d2wbX6e.jpg" group-title="Music",NRJ Hits TV
 https://5be019f0d8c6e.streamlock.net/ngroup/ngrp:NRJHitsTV_all/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.ibb.co/4jfSTKz/contact.jpg" group-title="Music",Radio Contact Vision
diff --git a/channels/bf.m3u b/channels/bf.m3u
index 1f4d29409..7bd7487a1 100644
--- a/channels/bf.m3u
+++ b/channels/bf.m3u
@@ -2,8 +2,8 @@
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RDokpwD.png" group-title="",Impac TV
 https://edge10.vedge.infomaniak.com/livecast/impacttele/chunklist_w973675047.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8m316CG.png" group-title="",RTB
-https://edge8.vedge.infomaniak.com/livecast/rtbtvlive1/manifest.m3u8?spark=b1ace9a8-e638-435c-af06-98fd6e1d4bd7
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8m316CG.png" group-title="",RTB (Opt-2)
 https://edge10.vedge.infomaniak.com/livecast/rtbtvlive1/chunklist_w636226389.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jlX6u8M.jpg" group-title="",Savane TV
 https://edge2.vedge.infomaniak.com/livecast/savanetv/chunklist_w1817300714.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8m316CG.png" group-title="",RTB
+https://edge8.vedge.infomaniak.com/livecast/rtbtvlive1/manifest.m3u8?spark=b1ace9a8-e638-435c-af06-98fd6e1d4bd7
diff --git a/channels/bg.m3u b/channels/bg.m3u
index 69252ce2c..ed6fc07b1 100644
--- a/channels/bg.m3u
+++ b/channels/bg.m3u
@@ -1,47 +1,47 @@
 #EXTM3U x-tvg-url="http://195.154.221.171/epg/guidebulgaria.xml.gz"
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PjBm4Ic.jpg" group-title="Auto",100% Auto Moto TV
 http://100automoto.tv:1935/bgtv1/autotv/playlist.m3u8
-#EXTINF:-1 tvg-id="Alfa TV BG" tvg-name="Alfa TV BG" tvg-logo="https://i.imgur.com/fg8UFAa.jpg" group-title="News",Alfa TV (Opt-1)
+#EXTINF:-1 tvg-id="Alfa TV BG" tvg-name="Alfa TV BG" tvg-logo="https://i.imgur.com/fg8UFAa.jpg" group-title="News",Alfa TV
 http://alfa.bg:1935/live/live/playlist.m3u8
-#EXTINF:-1 tvg-id="Alfa TV BG" tvg-name="Alfa TV BG" tvg-logo="https://i.imgur.com/UaXwtnI.png" group-title="News",Alfa TV (Opt-2)
+#EXTINF:-1 tvg-id="Alfa TV BG" tvg-name="Alfa TV BG" tvg-logo="https://i.imgur.com/UaXwtnI.png" group-title="News",Alfa TV
 http://alfa.bg:1935/live/live/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/MosYmyy.jpg" group-title="",BTK (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/MosYmyy.jpg" group-title="",BTK
 http://46.249.95.180/vtk/high.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5Sl6bKi.png" group-title="",BTK (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5Sl6bKi.png" group-title="",BTK
 http://hls.cdn.bg:2007/fls/vtv/chunklist_w689766971.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Bulgaria On Air BG" tvg-name="Bulgaria On Air BG" tvg-logo="https://i.imgur.com/fawQSJN.jpg" group-title="News",Bulgaria On Air (Opt-1)
-http://ios.cdn.bg:2006/fls/bonair.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="Bulgaria On Air BG" tvg-name="Bulgaria On Air BG" tvg-logo="https://i.imgur.com/fawQSJN.jpg" group-title="News",Bulgaria On Air (Opt-2)
-http://hls.cdn.bg:2006/fls/bonair.stream/chunklist.m3u8
-#EXTINF:-1 tvg-id="Bulgaria On Air BG" tvg-name="Bulgaria On Air BG" tvg-logo="https://i.imgur.com/fawQSJN.jpg" group-title="News",Bulgaria On Air (Opt-3)
+#EXTINF:-1 tvg-id="Bulgaria On Air BG" tvg-name="Bulgaria On Air BG" tvg-logo="https://i.imgur.com/fawQSJN.jpg" group-title="News",Bulgaria On Air
 http://edge1.cdn.bg:2006/fls/bonair.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="Bulgaria On Air BG" tvg-name="Bulgaria On Air BG" tvg-logo="https://i.imgur.com/fawQSJN.jpg" group-title="News",Bulgaria On Air
+http://hls.cdn.bg:2006/fls/bonair.stream/chunklist.m3u8
+#EXTINF:-1 tvg-id="Bulgaria On Air BG" tvg-name="Bulgaria On Air BG" tvg-logo="https://i.imgur.com/fawQSJN.jpg" group-title="News",Bulgaria On Air
+http://ios.cdn.bg:2006/fls/bonair.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qskVMhF.png" group-title="",Light Channel
 http://streamer1.streamhost.org:1935/salive/GMIlcbgM/playlist.m3u8
 #EXTINF:-1 tvg-id="mm.bg" tvg-name="MM" tvg-logo="https://i.imgur.com/fX6Jprk.png" group-title="Music",MM
 http://pri.cdn.bg:2113/fls/mmtv.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/m7utsIa.jpg" group-title="",MU-VI TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/m7utsIa.jpg" group-title="",MU-VI TV
 http://ios.cdn.bg:2013/fls/livetv.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/m7utsIa.jpg" group-title="",MU-Vi TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/m7utsIa.jpg" group-title="",MU-Vi TV
 http://ios.cdn.bg:2013/fls/livetv.stream/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="Nova TV BG" tvg-name="Nova TV BG" tvg-logo="https://i.imgur.com/gU4gSR0.jpg" group-title="",Nova TV
 https://e100-nlds107.cdn.bg/nlds/novaplay2/novaent/as/live/novaent_hd_1600_pc.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PCmDrlv.jpg" group-title="Religious",Plovdivska Mitropolia TV
 http://78.130.205.67:1935/live/mpegts.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FxLjPLh.jpg" group-title="",This is Bulgaria (Opt-1)
-http://bit.ly/2CvoeKz
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FxLjPLh.jpg" group-title="",This is Bulgaria (Opt-2)
-http://31.13.223.104:1935/travel/community.stream/chunklist_w1878567751.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FxLjPLh.jpg" group-title="",This is Bulgaria (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FxLjPLh.jpg" group-title="",This is Bulgaria
 http://31.13.223.103/travel/community.stream/playlist.m3u8?hash=943212345
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FxLjPLh.jpg" group-title="",This is Bulgaria (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FxLjPLh.jpg" group-title="",This is Bulgaria
+http://31.13.223.104:1935/travel/community.stream/chunklist_w1878567751.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FxLjPLh.jpg" group-title="",This is Bulgaria
 http://31.13.223.104:1935/travel/community.stream/chunklist_w511463959.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FxLjPLh.jpg" group-title="",This is Bulgaria (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FxLjPLh.jpg" group-title="",This is Bulgaria
 http://31.13.223.104:1935/travel/community.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FxLjPLh.jpg" group-title="",This is Bulgaria
+http://bit.ly/2CvoeKz
 #EXTINF:-1 tvg-id="Travel TV BG" tvg-name="Travel TV BG" tvg-logo="https://i.imgur.com/7E4Kia6.jpg" group-title="",Travel TV
 http://31.13.223.104:1935/travel/travel.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="TV+ BG" tvg-name="TV+ BG" tvg-logo="https://i.imgur.com/W074hkS.jpg" group-title="",TV+ (Opt-1)
+#EXTINF:-1 tvg-id="TV+ BG" tvg-name="TV+ BG" tvg-logo="https://i.imgur.com/W074hkS.jpg" group-title="",TV+
 http://141.136.14.18/kanal1/kanal1.m3u8
-#EXTINF:-1 tvg-id="TV+ BG" tvg-name="TV+ BG" tvg-logo="https://i.imgur.com/W074hkS.jpg" group-title="",TV+ (Opt-2)
+#EXTINF:-1 tvg-id="TV+ BG" tvg-name="TV+ BG" tvg-logo="https://i.imgur.com/W074hkS.jpg" group-title="",TV+
 http://141.136.14.18/kanal1/kanal1_1500/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dvrRMvh.jpg" group-title="News",България 24
 http://46.249.82.226:82/streams/bulgaria24/stream.m3u8
diff --git a/channels/bh.m3u b/channels/bh.m3u
index 4fe7b49ab..e964c5842 100644
--- a/channels/bh.m3u
+++ b/channels/bh.m3u
@@ -1,9 +1,9 @@
 #EXTM3U x-tvg-url="http://195.154.221.171/epg/guidearab.xml.gz"
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/EiiO5nm.png" group-title="",Bahrain Quran
 http://185.105.4.106:1935/live/Bahrain%20Quran/chunklist.m3u8?v=1548640033
-#EXTINF:-1 tvg-id="Bahrain Sport 1 ARB" tvg-name="Bahrain Sport 1 ARB" tvg-logo="https://i.imgur.com/G9BMhDS.png" group-title="Sport",Bahrain Sport 1 (Opt-1)
+#EXTINF:-1 tvg-id="Bahrain Sport 1 ARB" tvg-name="Bahrain Sport 1 ARB" tvg-logo="https://i.imgur.com/G9BMhDS.png" group-title="Sport",Bahrain Sport 1
 http://185.105.4.106:1935/live/Bahrain%20Sports/chunklist.m3u8?v=1548640033
-#EXTINF:-1 tvg-id="Bahrain Sport 1 ARB" tvg-name="Bahrain Sport 1 ARB" tvg-logo="https://i.imgur.com/G9BMhDS.png" group-title="Sport",Bahrain Sport 1 (Opt-2)
+#EXTINF:-1 tvg-id="Bahrain Sport 1 ARB" tvg-name="Bahrain Sport 1 ARB" tvg-logo="https://i.imgur.com/G9BMhDS.png" group-title="Sport",Bahrain Sport 1
 http://185.105.4.106:1935/live/Bahrain%20Sports/chunklist.m3u8?v=1558393494
 #EXTINF:-1 tvg-id="Al Bahrain TV ARB" tvg-name="Al Bahrain TV ARB" tvg-logo="https://i.imgur.com/XZcLqWk.jpg" group-title="",Bahrain TV
 http://185.105.4.106:1935/live/Bahrain%20TV/chunklist_w721264201.m3u8
diff --git a/channels/bn.m3u b/channels/bn.m3u
index e8488f05f..e0b220cb8 100644
--- a/channels/bn.m3u
+++ b/channels/bn.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",RTB (Opt-1)
-mms://202.160.15.88/stream-02-300
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",RTB (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",RTB
 mms://202.160.15.88/stream-01-128
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",RTB
+mms://202.160.15.88/stream-02-300
diff --git a/channels/bo.m3u b/channels/bo.m3u
index 797b6ccb3..d7bb68910 100644
--- a/channels/bo.m3u
+++ b/channels/bo.m3u
@@ -1,18 +1,18 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/pawDMnQ.jpg" group-title="",Bolivision
 http://136.243.3.70:1935/Bolivision/Bolivision/chunklist_w1258803449.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/APwaLsO.jpg" group-title="Religious",Católica TV (Opt-1)
-http://www.channel.tevemi.com:1935/CatolicaTv/CatolicaTv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/APwaLsO.jpg" group-title="Religious",Católica TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/APwaLsO.jpg" group-title="Religious",Católica TV
 http://136.243.3.70:1935/CatolicaTv/CatolicaTv/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/APwaLsO.jpg" group-title="Religious",Católica TV
+http://www.channel.tevemi.com:1935/CatolicaTv/CatolicaTv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Mega TV
 http://hdp2.imd.la:1935/megatv/megatv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gXHwjSg.jpg" group-title="Religious",Red ADVenir
 http://streamer1.streamhost.org:1935/salive/GMIredadvenirh/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/P4OY0fr.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="https://i.imgur.com/P4OY0fr.png" group-title="",Red PAT La Paz (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/P4OY0fr.png" group-title="",Red PAT La Paz
 http://192.99.38.174:1935/patbolivia/patlapaz/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/P4OY0fr.png" group-title="",Red PAT La Paz
+http://192.99.38.174:1935/patbolivia/patlapaz/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XAgQE1z.png" group-title="",Red Uno
 http://136.243.3.70:1935/RedUno/RedUno/chunklist_w372299009.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/eTDc0wd.jpg" group-title="",RTP
diff --git a/channels/br.m3u b/channels/br.m3u
index c078d35f8..0275b6994 100644
--- a/channels/br.m3u
+++ b/channels/br.m3u
@@ -3,10 +3,10 @@
 http://api.new.livestream.com/accounts/15107153/events/4338771/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/De6ty9h.png" group-title="",Canal Ricos
 http://video01.kshost.com.br/canalricos548/canalricos548/playlist.m3u8
-#EXTINF:-1 tvg-id="Canção Nova" tvg-name="Canção Nova" tvg-logo="https://i.imgur.com/zJSUbTM.png" group-title="",Canção Nova (Opt-1)
-https://cancaonova.secure.footprint.net/egress/bhandler/cancaonovanew/channel01/chunklist_b1155072.m3u8
-#EXTINF:-1 tvg-id="Canção Nova" tvg-name="Canção Nova" tvg-logo="https://i.imgur.com/zJSUbTM.png" group-title="",Canção Nova (Opt-2)
+#EXTINF:-1 tvg-id="Canção Nova" tvg-name="Canção Nova" tvg-logo="https://i.imgur.com/zJSUbTM.png" group-title="",Canção Nova
 http://tvajuhls-lh.akamaihd.net/i/tvdesk_1@147040/master.m3u8
+#EXTINF:-1 tvg-id="Canção Nova" tvg-name="Canção Nova" tvg-logo="https://i.imgur.com/zJSUbTM.png" group-title="",Canção Nova
+https://cancaonova.secure.footprint.net/egress/bhandler/cancaonovanew/channel01/chunklist_b1155072.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/S2tZaxs.jpg" group-title="",CBTV
 https://sa-all13.secdn.net/cbtv-channel/play/mp4:stream/chunklist_w1662090379.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/S2tZaxs.jpg" group-title="",CBTV Internacional
@@ -15,9 +15,9 @@ https://na-all7.secdn.net/cbtv-channel/play/mp4:stream/chunklist_w1097631749.m3u
 http://189.86.89.116/hls-live/livecm/_definst_/liveevent/livestream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/sQ5BKun.png" group-title="",FM O Dia
 http://c2901-slbps-sambavideos.akamaized.net/livet/FMoDiaVideo_14d480346fa04ebcb4f03173f2dae707/ngrp:livestream/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ov6GsFs.png" group-title="",G2PTV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ov6GsFs.png" group-title="",G2PTV
 http://srv3.zoeweb.tv:1935/z474-live/aovivo/livestream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ov6GsFs.png" group-title="",G2PTV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ov6GsFs.png" group-title="",G2PTV
 http://srv3.zoeweb.tv:1935/z474-live/aovivo/playlist.m3u8?
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/D15qpCm.png" group-title="",IMPD TV
 https://58a4464faef53.streamlock.net/impd/ngrp:impd_all/playlist.m3u8?PEDROJUNIORTUTORIAIS
@@ -27,12 +27,12 @@ https://cdn.jmvstream.com/w/inpara/_definst_/inpara/chunklist_w1305866021.m3u8?f
 http://tv02.logicahost.com.br:1935/itutv/itutv/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/f08u4UV.png" group-title="",JK FM
 http://rtmp.cdn.upx.net.br/7cdd_2/myStream.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="Novo Tempo" tvg-name="Novo Tempo" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="Religious",Novo Tempo (Opt-1)
-http://stream.novotempo.com:1935/tv/smil:tvnovotempo.smil/manifest.m3u8
-#EXTINF:-1 tvg-id="Novo Tempo" tvg-name="Novo Tempo" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="Religious",Novo Tempo (Opt-2)
-http://stream.novotempo.com:1935/tv/tvnovotempo.smil/live.m3u8
-#EXTINF:-1 tvg-id="Novo Tempo" tvg-name="Novo Tempo" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="Religious",Novo Tempo (Opt-3)
+#EXTINF:-1 tvg-id="Novo Tempo" tvg-name="Novo Tempo" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="Religious",Novo Tempo
 http://stream.live.novotempo.com/tv/smil:tvnovotempo.smil/chunklist_b2128000_slpor.m3u8
+#EXTINF:-1 tvg-id="Novo Tempo" tvg-name="Novo Tempo" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="Religious",Novo Tempo
+http://stream.novotempo.com:1935/tv/smil:tvnovotempo.smil/manifest.m3u8
+#EXTINF:-1 tvg-id="Novo Tempo" tvg-name="Novo Tempo" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="Religious",Novo Tempo
+http://stream.novotempo.com:1935/tv/tvnovotempo.smil/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ppy20ev.jpg" group-title="",PUC TV Goiás
 http://flash.softhost.com.br:1935/pucgoias/aovivo/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5REiGPt.png" group-title="",RecordTV
@@ -41,101 +41,101 @@ http://tvvitoria2.viacast.tv/livepl/tvvitoria_2_original.m3u8
 http://173.236.10.10:1935/redeatividade/redeatividade/playlist.m3u8
 #EXTINF:-1 tvg-id="Rede Brasil" tvg-name="Rede Brasil" tvg-logo="https://i.imgur.com/JuPgB1h.jpg" group-title="",Rede Brasil
 https://59f1cbe63db89.streamlock.net:1443/rbtv/rbtv/chunklist_w1757672591.m3u8
-#EXTINF:-1 tvg-id="Rede Gospel" tvg-name="Rede Gospel" tvg-logo="https://i.imgur.com/RCWyETb.png" group-title="",Rede Gospel (Opt-1)
-http://media01.s12.com.br:1935/live/redegospel/Rede_Gospel.m3u8
-#EXTINF:-1 tvg-id="Rede Gospel" tvg-name="Rede Gospel" tvg-logo="https://i.imgur.com/RCWyETb.png" group-title="",Rede Gospel (Opt-2)
+#EXTINF:-1 tvg-id="Rede Gospel" tvg-name="Rede Gospel" tvg-logo="https://i.imgur.com/RCWyETb.png" group-title="",Rede Gospel
 http://media.igospel.com.br:1935/live/redegospel/waldo_paes.m3u8
+#EXTINF:-1 tvg-id="Rede Gospel" tvg-name="Rede Gospel" tvg-logo="https://i.imgur.com/RCWyETb.png" group-title="",Rede Gospel
+http://media01.s12.com.br:1935/live/redegospel/Rede_Gospel.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2WmdjU9.png" group-title="",Rede Metropole
 http://in.uaimacks.net.br:1935/macks/macks.sdp/chunklist_w1760176873.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ZuJ5X0q.jpg" group-title="",Rede Minas
 https://5c64355d4b57c.streamlock.net:1936/8304/8304/chunklist_w393028282.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ODbxcM.png" group-title="",Rede Super (Opt-1)
-http://api.new.livestream.com/accounts/10205943/events/3429501/live.m3u8?IPTVPLENITUDE
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ODbxcM.png" group-title="",Rede Super (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ODbxcM.png" group-title="",Rede Super
 http://api.new.livestream.com/accounts/10205943/events/3429501/live.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ODbxcM.png" group-title="",Rede Super
+http://api.new.livestream.com/accounts/10205943/events/3429501/live.m3u8?IPTVPLENITUDE
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vvrCWVo.jpg" group-title="",Rede Século 21
 http://tvseculo21-lh.akamaihd.net:80/i/tvseculo_1@16110/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/h4WaIw5.jpg" group-title="",Rede Vida
 https://cvd1.cds.ebtcvd.net/live-redevida/smil:redevida.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/cJC3PPk.png" group-title="",RedeTV! (Opt-1)
-https://evpp.mm.uol.com.br/redetv1/redetv1/chunklist_w1209374997.m3u8
-#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/cJC3PPk.png" group-title="",RedeTV! (Opt-2)
-http://evpp.mm.uol.com.br/redetv1/redetv1/chunklist_w674014198.m3u8
-#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/cJC3PPk.png" group-title="",RedeTV! (Opt-3)
-http://evpp.mm.uol.com.br/redetv1/redetv1/chunklist_w1537397908.m3u8
-#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/cJC3PPk.png" group-title="",RedeTV! (Opt-4)
-http://evpp.mm.uol.com.br/redetv1/redetv1/chunklist_w304668891.m3u8
-#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/cJC3PPk.png" group-title="",RedeTV! (Opt-5)
-http://evpp.mm.uol.com.br:1935/redetv1/redetv1/playlist.m3u8
-#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/cJC3PPk.png" group-title="",RedeTV! (Opt-6)
-http://evpp.mm.uol.com.br:1935/redetv2/redetv2/playlist.m3u8
-#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/cJC3PPk.png" group-title="",RedeTV! (Opt-7)
+#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/cJC3PPk.png" group-title="",RedeTV!
 http://evpp.mm.uol.com.br/redetv1/redetv1/chunklist_w1483436880.m3u8
-#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/cJC3PPk.png" group-title="",RedeTV! (Opt-8)
+#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/cJC3PPk.png" group-title="",RedeTV!
+http://evpp.mm.uol.com.br/redetv1/redetv1/chunklist_w1537397908.m3u8
+#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/cJC3PPk.png" group-title="",RedeTV!
 http://evpp.mm.uol.com.br/redetv1/redetv1/chunklist_w1695741209.m3u8
-#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT (Opt-1)
-http://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist_w902022027_b216000_sleng.m3u8
-#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT (Opt-10)
-https://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT (Opt-11)
+#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/cJC3PPk.png" group-title="",RedeTV!
+http://evpp.mm.uol.com.br/redetv1/redetv1/chunklist_w304668891.m3u8
+#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/cJC3PPk.png" group-title="",RedeTV!
+http://evpp.mm.uol.com.br/redetv1/redetv1/chunklist_w674014198.m3u8
+#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/cJC3PPk.png" group-title="",RedeTV!
+http://evpp.mm.uol.com.br:1935/redetv1/redetv1/playlist.m3u8
+#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/cJC3PPk.png" group-title="",RedeTV!
+http://evpp.mm.uol.com.br:1935/redetv2/redetv2/playlist.m3u8
+#EXTINF:-1 tvg-id="Rede TV" tvg-name="Rede TV" tvg-logo="https://i.imgur.com/cJC3PPk.png" group-title="",RedeTV!
+https://evpp.mm.uol.com.br/redetv1/redetv1/chunklist_w1209374997.m3u8
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT
+http://192.99.46.182:1935/pioneira-tv3/pioneira-tv3/playlist.m3u8
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT
+http://evpp.mm.uol.com.br/ne10/ne10-tvjornal-caruaru-video-web.sdp/playlist.m3u8?
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT
+http://evpp.mm.uol.com.br/ne10/ne10-tvjornal-caruaru-video-web.sdp/playlist.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT
+http://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist_w1279440291_b216000_sleng.m3u8
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT
 http://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist_w130916676_b216000_sleng.m3u8
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT
+http://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist_w1497612515_b216000_sleng.m3u8
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT
+http://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist_w199492672_b216000_sleng.m3u8
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT
+http://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist_w902022027_b216000_sleng.m3u8
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT
+http://evpp.mm.uol.com.br/ne10/ne10.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT
+https://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist.m3u8
+#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT
+https://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist_w654628617_b216000_sleng.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT (Opt-12)
 https://5a1c76baf08c0.streamlock.net/z343-live/stream/playlist.m3u8
-#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT (Opt-2)
-https://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist_w654628617_b216000_sleng.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT (Opt-3)
-http://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist_w1497612515_b216000_sleng.m3u8
-#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT (Opt-4)
-http://evpp.mm.uol.com.br/ne10/ne10.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT (Opt-5)
-http://evpp.mm.uol.com.br/ne10/ne10-tvjornal-caruaru-video-web.sdp/playlist.m3u8?
-#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT (Opt-6)
-http://evpp.mm.uol.com.br/ne10/ne10-tvjornal-caruaru-video-web.sdp/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT (Opt-7)
-http://192.99.46.182:1935/pioneira-tv3/pioneira-tv3/playlist.m3u8
-#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT (Opt-8)
-http://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist_w1279440291_b216000_sleng.m3u8
-#EXTINF:-1 tvg-id="SBT" tvg-name="SBT" tvg-logo="https://i.imgur.com/p1Q6udv.png" group-title="",SBT (Opt-9)
-http://evpp.mm.uol.com.br/ne10/ne10.smil/chunklist_w199492672_b216000_sleng.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/YrBt8gZ.png" group-title="",Summer TV
 http://tv01.logicahost.com.br:1935/summertv/summertv/live.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="TV Aparecida" tvg-name="TV Aparecida" tvg-logo="https://i.imgur.com/xyYIdif.png" group-title="",TV Aparecida (Opt-1)
+#EXTINF:-1 tvg-id="TV Aparecida" tvg-name="TV Aparecida" tvg-logo="https://i.imgur.com/xyYIdif.png" group-title="",TV Aparecida
 http://69.46.0.170:1935/tvaparecida/tvaparecida.stream/chunklist_w404485210.m3u8
-#EXTINF:-1 tvg-id="TV Aparecida" tvg-name="TV Aparecida" tvg-logo="https://i.imgur.com/xyYIdif.png" group-title="",TV Aparecida (Opt-2)
+#EXTINF:-1 tvg-id="TV Aparecida" tvg-name="TV Aparecida" tvg-logo="https://i.imgur.com/xyYIdif.png" group-title="",TV Aparecida
 http://69.46.0.170:1935/tvaparecida/tvaparecida.stream/live.m3u8
-#EXTINF:-1 tvg-id="TV Aparecida" tvg-name="TV Aparecida" tvg-logo="https://i.imgur.com/xyYIdif.png" group-title="",TV Aparecida (Opt-3)
+#EXTINF:-1 tvg-id="TV Aparecida" tvg-name="TV Aparecida" tvg-logo="https://i.imgur.com/xyYIdif.png" group-title="",TV Aparecida
 http://69.46.0.170:1935/tvaparecida/tvaparecida.stream/live.m3u8?FORMIGATV
-#EXTINF:-1 tvg-id="TV Aparecida" tvg-name="TV Aparecida" tvg-logo="https://i.imgur.com/xyYIdif.png" group-title="",TV Aparecida (Opt-4)
-http://caikron.com.br:1935/tvaparecida/tvaparecida.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="TV Aparecida" tvg-name="TV Aparecida" tvg-logo="https://i.imgur.com/xyYIdif.png" group-title="",TV Aparecida (Opt-5)
+#EXTINF:-1 tvg-id="TV Aparecida" tvg-name="TV Aparecida" tvg-logo="https://i.imgur.com/xyYIdif.png" group-title="",TV Aparecida
 http://69.46.0.170:1935/tvaparecida/tvaparecida.stream/live.m3u8?TvFogoHD
+#EXTINF:-1 tvg-id="TV Aparecida" tvg-name="TV Aparecida" tvg-logo="https://i.imgur.com/xyYIdif.png" group-title="",TV Aparecida
+http://caikron.com.br:1935/tvaparecida/tvaparecida.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ejp65zr.png" group-title="",TV BNO
 http://tv02.logicahost.com.br:1935/bonner/bonner/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JYzvqeF.png" group-title="",TV Carioca
 https://593d7fe3c9b0d.streamlock.net/tvcarioca/tvcarioca/chunklist_w1904480155.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="TV Cultura" tvg-name="TV Cultura" tvg-logo="https://i.imgur.com/Oy6Nrzb.png" group-title="",TV Cultura (Opt-1)
-http://rsync.com.br:1935/rsync00026/rsync.sdp/playlist.m3u8?
-#EXTINF:-1 tvg-id="TV Cultura" tvg-name="TV Cultura" tvg-logo="https://i.imgur.com/Oy6Nrzb.png" group-title="",TV Cultura (Opt-2)
+#EXTINF:-1 tvg-id="TV Cultura" tvg-name="TV Cultura" tvg-logo="https://i.imgur.com/Oy6Nrzb.png" group-title="",TV Cultura
 http://177.74.1.38/funtelpa/tv_funtelpa/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jpEJYfT.png" group-title="",TV Destak (Opt-1)
-http://tv02.logicahost.com.br:1935/pascoal/pascoal/live.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jpEJYfT.png" group-title="",TV Destak (Opt-2)
+#EXTINF:-1 tvg-id="TV Cultura" tvg-name="TV Cultura" tvg-logo="https://i.imgur.com/Oy6Nrzb.png" group-title="",TV Cultura
+http://rsync.com.br:1935/rsync00026/rsync.sdp/playlist.m3u8?
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jpEJYfT.png" group-title="",TV Destak
 http://tv02.logicahost.com.br:1935/pascoal/pascoal/live.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jpEJYfT.png" group-title="",TV Destak
+http://tv02.logicahost.com.br:1935/pascoal/pascoal/live.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/VqIzaFz.png" group-title="",TV Digital Birigui
 http://tv02.logicahost.com.br:1935/tvdigitalbirigui/tvdigitalbirigui/live.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NifNfjn.png" group-title="",TV Educativa da Bahia
 http://200.187.60.190:80/hls-live/livepkgr/_definst_/irdeb/pgm-2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XLD3GbZ.png" group-title="",TV Educativa de Porto Alegre (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XLD3GbZ.png" group-title="",TV Educativa de Porto Alegre
 http://selpro1348.procergs.com.br:1935/tve/stve/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XLD3GbZ.png" group-title="",TV Educativa de Porto Alegre (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XLD3GbZ.png" group-title="",TV Educativa de Porto Alegre
 http://streaming.procergs.com.br:1935/tve/stve/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/b9q8rtn.jpg" group-title="",TV Faap (Opt-1)
-http://midia.faap.br/faaplatamlive-live/stream_480/livestream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/b9q8rtn.jpg" group-title="",TV Faap (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/b9q8rtn.jpg" group-title="",TV Faap
 http://bit.ly/2CyHmr0
-#EXTINF:-1 tvg-id="TV Gazeta" tvg-name="TV Gazeta" tvg-logo="https://i.imgur.com/ZKDc2V2.png" group-title="",TV Gazeta (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/b9q8rtn.jpg" group-title="",TV Faap
+http://midia.faap.br/faaplatamlive-live/stream_480/livestream.m3u8
+#EXTINF:-1 tvg-id="TV Gazeta" tvg-name="TV Gazeta" tvg-logo="https://i.imgur.com/ZKDc2V2.png" group-title="",TV Gazeta
 http://api.new.livestream.com/accounts/5381476/events/2395418/live.m3u8
-#EXTINF:-1 tvg-id="TV Gazeta" tvg-name="TV Gazeta" tvg-logo="https://i.imgur.com/ZKDc2V2.png" group-title="",TV Gazeta (Opt-2)
+#EXTINF:-1 tvg-id="TV Gazeta" tvg-name="TV Gazeta" tvg-logo="https://i.imgur.com/ZKDc2V2.png" group-title="",TV Gazeta
 http://api.new.livestream.com:80/accounts/5381476/events/2395418/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/z5HMLv9.png" group-title="",TV Gidoes
 http://streaming02.zas.media:1935/gideoes/_definst_/mp4:programacao_360p/chunklist_w93290010.m3u8
diff --git a/channels/by.m3u b/channels/by.m3u
index e98233449..455eedee4 100644
--- a/channels/by.m3u
+++ b/channels/by.m3u
@@ -3,9 +3,9 @@
 https://nimble01edge01.hoster.by/belarus24hd/livehd/chunks.m3u8
 #EXTINF:-1 tvg-id="belmuztv" tvg-name="МузТВ Беларусь" tvg-logo="https://iptvx.one/icn/muztv.png" group-title="Entertainment",БелМуз ТВ
 http://streams.tv.mts.by/belmustv/1/index.m3u8
-#EXTINF:-1 tvg-id="tro" tvg-name="ТРО" tvg-logo="https://iptvx.one/icn/belros.png" group-title="",БелРос ТВ (Opt-1)
+#EXTINF:-1 tvg-id="tro" tvg-name="ТРО" tvg-logo="https://iptvx.one/icn/belros.png" group-title="",БелРос ТВ
 http://live2.mediacdn.ru/sr1/tro/playlist.m3u8
-#EXTINF:-1 tvg-id="tro" tvg-name="ТРО" tvg-logo="https://iptvx.one/icn/belros.png" group-title="",БелРос ТВ (Opt-2)
+#EXTINF:-1 tvg-id="tro" tvg-name="ТРО" tvg-logo="https://iptvx.one/icn/belros.png" group-title="",БелРос ТВ
 https://str-3.mediabay.tv/BelRos/playlist.m3u8?token=3cf292c37b71d118c72c5c9d0261de59821ccf34-6e8b70fd9eca8148004e3fa9cd1b9759-1566590194-1566579394
 #EXTINF:-1 tvg-id="ont-by" tvg-name="ОНТ" tvg-logo="https://iptvx.one/icn/ont-by.png" group-title="General",ОНТ
 http://stream.ont.by:1935/ont/live576p/playlist.m3u8
diff --git a/channels/ca.m3u b/channels/ca.m3u
index 6161d6bdf..862799b82 100644
--- a/channels/ca.m3u
+++ b/channels/ca.m3u
@@ -1,10 +1,10 @@
 #EXTM3U x-tvg-url="http://epg.streamstv.me/epg/guide-canada.xml.gz"
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Jxjg4Nx.png" group-title="",5AAB Music Channel
 http://195.181.169.151:8080/5aabtv_music_pun/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/k9M5ydW.png" group-title="",5AAB TV (Opt-1)
-http://158.69.124.9:1935/5aabtv/5aabtv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/k9M5ydW.png" group-title="",5AAB TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/k9M5ydW.png" group-title="",5AAB TV
 http://158.69.124.9:1935/5aabtv/5aabtv/chunklist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/k9M5ydW.png" group-title="",5AAB TV
+http://158.69.124.9:1935/5aabtv/5aabtv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XgejLKw.png" group-title="",Amazing Discoveries TV
 https://uni01rtmp.tulix.tv/amazingdtv/amazingdtv/chunklist_w133198316.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/uSX4YXL.png" group-title="",BBC Toronto Gaunda Punjab
@@ -49,10 +49,10 @@ http://70.52.161.69:1935/ICNET/ngrp:my.stream_all/chunklist_w2017851544_b3478286
 https://uni10rtmp.tulix.tv/iipctv/iipctv.smil/chunklist_w1550531622_b864000.m3u8
 #EXTINF:-1 tvg-id="Knowledge Kids-CA" tvg-name="Knowledge Kids-CA" tvg-logo="https://i.imgur.com/kdgMVOI.png" group-title="",Knowledge Kids
 http://knstream1.azureedge.net/knlive/knlive_high.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0jeKzdO.png" group-title="Religious",Miracle Channel (Opt-1)
-https://d9ruw6nhj5a52.cloudfront.net/live/smil:VODmultibitrate.smil/chunklist_wF1TV_b3000000_sleng.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0jeKzdO.png" group-title="Religious",Miracle Channel (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0jeKzdO.png" group-title="Religious",Miracle Channel
 https://d9ruw6nhj5a52.cloudfront.net/live/live/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0jeKzdO.png" group-title="Religious",Miracle Channel
+https://d9ruw6nhj5a52.cloudfront.net/live/smil:VODmultibitrate.smil/chunklist_wF1TV_b3000000_sleng.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/eNu3N0f.png" group-title="",Montreal Greek TV
 http://94.130.180.175:8081/live/greektv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2pCmTWZ.png" group-title="",NTV (CJON-DT)
@@ -77,9 +77,9 @@ http://pe-ak-lp01a-9c9media.akamaized.net/live/Space/p/hls/00000201/689924a518f2
 http://185.246.209.109:8080/SPORTSNET_ONTARIO/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5aL6P7a.png" group-title="",Sur Sagar TV
 http://sursagar24.dyndns.tv:8080/sstv/720p/tracks-v1a1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jSWRXdg.png" group-title="",Tamil Vision TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jSWRXdg.png" group-title="",Tamil Vision TV
 http://live.tamilvision.tv:8081/TVI/HD/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jSWRXdg.png" group-title="",Tamil Vision TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jSWRXdg.png" group-title="",Tamil Vision TV
 http://live.tamilvision.tv:8081/TVI/SD/chunks.m3u8
 #EXTINF:-1 tvg-id="Shopping Channel-CA" tvg-name="Shopping Channel-CA" tvg-logo="https://i.imgur.com/FlJVD8a.png" group-title="Shop",The Shopping Channel
 http://tscstreaming-lh.akamaihd.net/i/TSCLiveStreaming_1@91031/master.m3u8
@@ -91,7 +91,7 @@ http://capcobroadcaststream.in:1935/capco/tv29/playlist.m3u8
 https://teleqmmd.mmdlive.lldns.net/teleqmmd/f386e3b206814e1f8c8c1c71c0f8e748/chunklist_b2592000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7768lwn.jpg" group-title="",Urdu TV Toronto
 http://cdn4.live247stream.com/urdu/tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/IWpevBp.jpg" group-title="",VBS (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/IWpevBp.jpg" group-title="",VBS
 http://uni6rtmp.tulix.tv:1935/vbstv/vbsabr.smil/chunklist_w1847269952_b204800.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/IWpevBp.jpg" group-title="",VBS (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/IWpevBp.jpg" group-title="",VBS
 http://uni6rtmp.tulix.tv:1935/vbstv/vbsabr.smil/chunklist_w530158239_b1228800.m3u8
diff --git a/channels/cd.m3u b/channels/cd.m3u
index aea26abd8..9bbc003d9 100644
--- a/channels/cd.m3u
+++ b/channels/cd.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#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 (Opt-1)
+#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="" tvg-logo="https://trace.company/wp-content/uploads/2017/08/TRACE-logo-kitoko-01-1.png" group-title="Music",Trace Kitoko (Opt-2)
+#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
 https://d2ktlibtvvj8vp.cloudfront.net/trace_kitoko/6/prog_index.m3u8?fluxustv.m3u8
diff --git a/channels/ch.m3u b/channels/ch.m3u
index 960a2def1..4be388b01 100644
--- a/channels/ch.m3u
+++ b/channels/ch.m3u
@@ -9,12 +9,12 @@ https://www.onairport.live/die-neue-zeit-tv-live/livestream_high/chunklist_w2039
 http://46.101.244.86:8081/folx-abr/live-abr/fle/fle1/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/nQVDOVb.png" group-title="",Kanal 9
 https://livesd2.vedge.infomaniak.com/livecast/livesd2/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JiAnDPu.png" group-title="",La Tele (Opt-1)
-https://latele.vedge.infomaniak.com/livecast/latele/chunklist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JiAnDPu.png" group-title="",La Tele (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JiAnDPu.png" group-title="",La Tele
 http://livevideo.infomaniak.com/streaming/livecast/latele/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JiAnDPu.png" group-title="",La Tele (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JiAnDPu.png" group-title="",La Tele
 https://latele.vedge.infomaniak.com/livecast/latele/chunklist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JiAnDPu.png" group-title="",La Tele
+https://latele.vedge.infomaniak.com/livecast/latele/chunklist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/UE1E3uH.png" group-title="",LFM TV
 https://lfmmd.vedge.infomaniak.com/livecast/smil:lfmmd.smil/chunklist_w638707571_b3000000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/A21WS1A.png" group-title="Music",Musig24
@@ -29,10 +29,10 @@ http://klive-a.akamaihd.net/dc-1/live/hls/p/1719221/e/1_uv9hs4ww/sd/6000/t/wrKSS
 https://livevideo.infomaniak.com/streaming/livecast/rp_tv_1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/TMpdP04.jpg" group-title="",Radio Südostschweiz
 http://swisstxt2-lh.akamaihd.net/i/grischa_1@144003/index_1100_av-p.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/G030MZb.png" group-title="",Rouge TV (Opt-1)
-https://rougetv.vedge.infomaniak.com/livecast/rougetv/chunklist_w847296835.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/G030MZb.png" group-title="",Rouge TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/G030MZb.png" group-title="",Rouge TV
 http://rougetv.vedge.infomaniak.com/livecast/rougetv/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/G030MZb.png" group-title="",Rouge TV
+https://rougetv.vedge.infomaniak.com/livecast/rougetv/chunklist_w847296835.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/oyxClat.png" group-title="",RTS 1
 https://s1.tntendirect.com/rts1/live/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1sdALZc.png" group-title="",RTS 2
@@ -43,12 +43,12 @@ http://api.new.livestream.com/accounts/3888956/events/4187384/live.m3u8
 https://cdn02.upstream-cloud.ch/sstvlinear/ngrp:sstvlinear_all/chunklist_w2102582891_b6628000.m3u8
 #EXTINF:-1 tvg-id="Tele M1 HD CH" tvg-name="Tele M1 HD CH" tvg-logo="https://i.imgur.com/RqKjRTP.png" group-title="",Tele M1 HD
 http://klive-a.akamaihd.net/dc-1/live/hls/p/1719221/e/1_ljzy3evp/sd/10000/t/nwOKUovT2mwnA8x_KnC4zg/index-s32.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XZ5i8HF.jpg" group-title="",TeleBarn (Opt-1)
-http://klive-a.akamaihd.net/dc-1/live/hls/p/1719221/e/1_0mc3z57p/t/gaudIWTPWrpJe6yJmHI9vA/index-s32.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XZ5i8HF.jpg" group-title="",TeleBarn (Opt-2)
-http://klive-a.akamaihd.net/dc-1/live/hls/p/1719221/e/1_0mc3z57p/sd/10000/t/XTGwenpKUhx_fbVnsiu9MQ/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XZ5i8HF.jpg" group-title="",TeleBarn (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XZ5i8HF.jpg" group-title="",TeleBarn
 http://cdnapi.kaltura.com/p/1719221/sp/171922100/playManifest/entryId/1_0mc3z57p/format/applehttp/protocol/http/uiConfId/26605911/a.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XZ5i8HF.jpg" group-title="",TeleBarn
+http://klive-a.akamaihd.net/dc-1/live/hls/p/1719221/e/1_0mc3z57p/sd/10000/t/XTGwenpKUhx_fbVnsiu9MQ/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XZ5i8HF.jpg" group-title="",TeleBarn
+http://klive-a.akamaihd.net/dc-1/live/hls/p/1719221/e/1_0mc3z57p/t/gaudIWTPWrpJe6yJmHI9vA/index-s32.m3u8
 #EXTINF:-1 tvg-id="Telebasel HD CH" tvg-name="Telebasel HD CH" tvg-logo="https://i.imgur.com/mMXYqtm.png" group-title="",Telebasel HD
 http://xapp510394368c1000199.f.l.z.lb.core-cdn.net/10096xtelebase/ios_500/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/bPpWJj2.png" group-title="",TeleBielingue
diff --git a/channels/ci.m3u b/channels/ci.m3u
index cd5680f09..de8d8147c 100644
--- a/channels/ci.m3u
+++ b/channels/ci.m3u
@@ -1,9 +1,9 @@
 #EXTM3U
 #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 (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 (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-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/J3o9RbS.png" group-title="",RTI 2
 http://185.59.221.143:1935/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
+https://www.enovativecdn.com:4433/rticdn/smil:rti2.smil/chunklist_w1505588093_b250000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ulango.tv/uploads/channels/8150/rti_tv2_ci.png" group-title="",RTI 2
+https://www.enovativecdn.com:4433/rticdn/smil:rti2.smil/playlist.m3u8
diff --git a/channels/cl.m3u b/channels/cl.m3u
index c55284289..8cd077026 100644
--- a/channels/cl.m3u
+++ b/channels/cl.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Y0jMZpT.jpg" group-title="",AE Radio Concepcion (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Y0jMZpT.jpg" group-title="",AE Radio Concepcion
 http://edge1.cl.grupoz.cl/aeradio/live/chunklist_w678069134.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Y0jMZpT.jpg" group-title="",AE Radio Concepcion (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Y0jMZpT.jpg" group-title="",AE Radio Concepcion
 https://tls.cdnz.cl/aeradio/live/chunklist_w1654406934.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/71zvDbw.jpg" group-title="",AM Canal
 https://v2.tustreaming.cl/amtv/live1/tracks-v1a1/mono.m3u8
@@ -9,12 +9,12 @@ https://v2.tustreaming.cl/amtv/live1/tracks-v1a1/mono.m3u8
 https://unlimited1-us.dps.live/atv/atv.smil/atv/livestream2/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HqfzqsO.png" group-title="",Atacama TV
 https://v3.tustreaming.cl/atacamatv/live1/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/S0OCpjV.png" group-title="Kids",Cachipum (Opt-1)
-http://edge1.cl.grupoz.cl/cachipuntv/live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/S0OCpjV.png" group-title="Kids",Cachipum (Opt-2)
-http://edge1.cl.grupoz.cl/cachipuntv/live/chunklist_w2057048261.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/S0OCpjV.png" group-title="Kids",Cachipum (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/S0OCpjV.png" group-title="Kids",Cachipum
 http://edge1.cl.grupoz.cl/cachipuntv/live/chunklist_w1056888968.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/S0OCpjV.png" group-title="Kids",Cachipum
+http://edge1.cl.grupoz.cl/cachipuntv/live/chunklist_w2057048261.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/S0OCpjV.png" group-title="Kids",Cachipum
+http://edge1.cl.grupoz.cl/cachipuntv/live/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zypeHFL.jpg" group-title="",Campus TV
 https://unlimited1-us.dps.live/campustv/campustv.smil/campustv/livestream1/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1BsMD7G.png" group-title="",Canal 11 Aysen
@@ -25,15 +25,15 @@ http://play.streaminghd.cl:80/claudio441/claudio441/playlist.m3u8
 http://unlimited5-cl.dps.live/canal2/canal2.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/650TwbF.jpg" group-title="",Canal 5 LRC Puerto Montt
 https://590c5dc5c3271.streamlock.net/luis251/luis251/chunklist_w549236658.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CDO
+http://edge1.cl.grupoz.cl/cdofree/live/chunklist_w102518198.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Ols6oB6.png" group-title="",CDO
+http://edge1.cl.grupoz.cl/cdofree/live/chunklist_w72729836.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i2.wp.com/directostv.teleame.com/wp-content/uploads/2018/06/cdo.png?fit=800%2C500" group-title="Sport",CDO
 http://edge1.cl.grupoz.cl/cdofree/live/chunklist_w822432298.m3u8?GrupoTopIptv
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Ols6oB6.png" group-title="",CDO (Opt-1)
-http://edge1.cl.grupoz.cl/cdofree/live/chunklist_w72729836.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Ols6oB6.png" group-title="",CDO (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Ols6oB6.png" group-title="",CDO
 http://edge1.cl.grupoz.cl/cdofree/live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CDO (Opt-3)
-http://edge1.cl.grupoz.cl/cdofree/live/chunklist_w102518198.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SVplx7K.jpg" group-title="",Chile 5 FTA [360p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SVplx7K.jpg" group-title="",Chile 5 FTA
 http://streaming.elpinguino.com:1935/live/pinguinotv_360p/sat.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/LHn9ofg.png" group-title="",Contivision Constitucion
 https://unlimited4-cl.dps.live/contivision/contivision.smil/playlist.m3u8
@@ -41,24 +41,24 @@ https://unlimited4-cl.dps.live/contivision/contivision.smil/playlist.m3u8
 http://unlimited6-cl.dps.live/desiertotv/desiertotv.smil/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",El Pinguino TV
 http://streaming.elpinguino.com:1935/live/pinguinotv_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV (Opt-1)
-http://streaming.elpinguino.com:1935/live/pinguinotv_720p/hasbahca.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV (Opt-2)
-http://streaming.elpinguino.com:1935/live/pinguinotv_720p/livestream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV (Opt-3)
-http://streaming.elpinguino.com:1935/live/pinguinotv_360p/livestream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV (Opt-4)
-http://streaming.elpinguino.com:1935/live/pinguinotv_source/livestream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV (Opt-5)
-http://streaming.elpinguino.com:1935/live/pinguinotv_720p/hasbahca.m3u8?GrupoTopIptv
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV (Opt-6)
-http://streaming.elpinguino.com:1935/live/pinguinotv_360p/chunklist_w194650448.m3u8?MegaIPTVArgentina
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV (Opt-7)
-http://streaming.elpinguino.com:1935/live/pinguinotv_360p/BratuMarian.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV (Opt-8)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV
 http://streaming.elpinguino.com:1935/live/pinguinotv_240p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV (Opt-9)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV
+http://streaming.elpinguino.com:1935/live/pinguinotv_360p/BratuMarian.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV
+http://streaming.elpinguino.com:1935/live/pinguinotv_360p/chunklist_w194650448.m3u8?MegaIPTVArgentina
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV
+http://streaming.elpinguino.com:1935/live/pinguinotv_360p/livestream.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV
 http://streaming.elpinguino.com:1935/live/pinguinotv_360p/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV
+http://streaming.elpinguino.com:1935/live/pinguinotv_720p/hasbahca.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV
+http://streaming.elpinguino.com:1935/live/pinguinotv_720p/hasbahca.m3u8?GrupoTopIptv
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV
+http://streaming.elpinguino.com:1935/live/pinguinotv_720p/livestream.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3ob9ss3.jpg" group-title="",El Pingüino TV
+http://streaming.elpinguino.com:1935/live/pinguinotv_source/livestream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/6N5OjYv.jpg" group-title="",EmolTv
 https://streaming.ecn.cl/hls/vivohd_hi/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qJCUQpY.png" group-title="",Genial TV
@@ -67,37 +67,37 @@ http://v3.tustreaming.cl/genialtv/live1/tracks-v1a1/rewind-999999.m3u8
 https://video.mediostream.cl/graciatv/live1/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LLcPfcO.png" group-title="",Gracia TV Nacional
 https://v2.tustreaming.cl/graciatv/live1/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/DZTIv7w.png" group-title="",Holvoet TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/DZTIv7w.png" group-title="",Holvoet TV
 http://unlimited6-cl.dps.live/holvoettv/holvoettv.smil/holvoettv/livestream1/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/DZTIv7w.png" group-title="",Holvoet TV (Opt-2)
-http://unlimited6-cl.dps.live/holvoettv/holvoettv.smil/holvoettv/livestream3/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Holvoet TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Holvoet TV
 http://unlimited6-cl.dps.live/holvoettv/holvoettv.smil/holvoettv/livestream1/chunks.m3u8?
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/DZTIv7w.png" group-title="",Holvoet TV
+http://unlimited6-cl.dps.live/holvoettv/holvoettv.smil/holvoettv/livestream3/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/V11xJJv.png" group-title="",Infinita (100.1 FM)
 http://unlimited1-us.dps.live/infinita/go/audio/now/livestream1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9sKGsmt.png" group-title="",ITV Patagonia
 https://unlimited1-us.dps.live/itv/itv.smil/itv/livestream1/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Hq8ri30.jpg" group-title="",Nuevo Tiempo (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Hq8ri30.jpg" group-title="",Nuevo Tiempo
 http://stream.live.novotempo.com/tv/smil:tvnuevotiempo.smil/chunklist_b4128000_slpor.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="",Nuevo Tiempo (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="",Nuevo Tiempo
 http://stream.novotempo.com:1935/tv/tvnuevotiempo.stream/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/CJsdLMO.jpg" group-title="",Paula FM (100.5 FM)
 http://unlimited1-us.dps.live/radiopaula/go/audio/now/livestream1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/CFbHdqZ.jpg" group-title="",PAUTA
 http://video-ply.pauta.cl/playlist/stream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H3jMiCj.png" group-title="",Pintana TV (Opt-1)
-https://tls.cdnz.cl/lapintana/live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H3jMiCj.png" group-title="",Pintana TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H3jMiCj.png" group-title="",Pintana TV
 http://cdn.vms.grupoz.cl/lapintanatv/content/5a7c8e25e19d3e641aca9fb2/hls/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/umdJ2mP.jpg" group-title="Music",Portalfoxmix (Opt-1)
-http://tv.portalfoxmix.club:1935/portalfoxmix/portalfoxmix/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/umdJ2mP.jpg" group-title="Music",Portalfoxmix (Opt-2)
-http://149.56.17.92:1935/portalfoxmix/_definst_/portalfoxmix/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/umdJ2mP.jpg" group-title="Music",Portalfoxmix (Opt-3)
-http://tv.portalfoxmix.club:1935/portalfoxmix/portalfoxmix/chunklist_w707723531.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Portalfoxmix (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H3jMiCj.png" group-title="",Pintana TV
+https://tls.cdnz.cl/lapintana/live/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Portalfoxmix
 http://149.56.17.92:1935/portalfoxmix/_definst_/portalfoxmix/chunklist_w1915378513.m3u8?iptvgratis?chile.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Portalfoxmix (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/umdJ2mP.jpg" group-title="Music",Portalfoxmix
+http://149.56.17.92:1935/portalfoxmix/_definst_/portalfoxmix/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/umdJ2mP.jpg" group-title="Music",Portalfoxmix
+http://tv.portalfoxmix.club:1935/portalfoxmix/portalfoxmix/chunklist_w707723531.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/umdJ2mP.jpg" group-title="Music",Portalfoxmix
+http://tv.portalfoxmix.club:1935/portalfoxmix/portalfoxmix/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Portalfoxmix
 http://tv.portalfoxmix.club:1935/portalfoxmix/portalfoxmix/playlist.m3u8?JoCaRoIPTV.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/a7iI5NO.jpg" group-title="",Quinta TV
 https://593b04c4c5670.streamlock.net/8042/8042/chunklist_w19663722.m3u8?fluxustv.m3u8
@@ -127,17 +127,17 @@ http://janus-tv-ply.senado.cl/playlist/stream.m3u8?s=tvsenado-sd
 http://unlimited1-us.dps.live/tv5/tv5.smil/tv5/livestream1/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GsElUQr.jpg" group-title="",TV8 Concepcion
 https://593b04c4c5670.streamlock.net/8134/8134/chunklist_w1803894255.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7gVuLSu.png" group-title="",TVR (Opt-1)
-https://unlimited2-cl.dps.live/tvr/tvr.smil/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7gVuLSu.png" group-title="",TVR (Opt-2)
-https://unlimited4-cl.dps.live/tvr/tvr.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7gVuLSu.png" group-title="",TVR (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7gVuLSu.png" group-title="",TVR
 https://unlimited2-cl.dps.live/tvr/tvr.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2dVTcSF.png" group-title="",UESTV (Opt-1)
-http://cl.origin.grupoz.cl/uestv/live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2dVTcSF.png" group-title="",UESTV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7gVuLSu.png" group-title="",TVR
+https://unlimited2-cl.dps.live/tvr/tvr.smil/playlist.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7gVuLSu.png" group-title="",TVR
+https://unlimited4-cl.dps.live/tvr/tvr.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2dVTcSF.png" group-title="",UESTV
 http://cl.origin.grupoz.cl/uestv/live/playlist.m3u
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2dVTcSF.png" group-title="",UESTV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2dVTcSF.png" group-title="",UESTV
+http://cl.origin.grupoz.cl/uestv/live/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2dVTcSF.png" group-title="",UESTV
 http://cl.origin.grupoz.cl:1935/uestv/live/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/v5pAeq8.jpg" group-title="",UMAG TV
 http://cl.origin.grupoz.cl:1935/tser5/live/chunklist_w853101429.m3u8
diff --git a/channels/cn.m3u b/channels/cn.m3u
index 169bb3127..525fc6941 100644
--- a/channels/cn.m3u
+++ b/channels/cn.m3u
@@ -61,17 +61,17 @@ https://aldirect.hls.huya.com/huyalive/28466698-2689654432-11551977822981455872-
 https://aldirect.hls.huya.com/huyalive/29359996-2689475864-11551210879261343744-2847699104-10057-A-1525430092-1_1200.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AYSAR MOVIE 2
 https://aldirect.hls.huya.com/huyalive/29106097-2689453724-11551115788685410304-2847687506-10057-A-1525422901-1_1200.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AYSAR MOVIE 4 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AYSAR MOVIE 4
 http://js.hls.huya.com/huyalive/29106097-2689446042-11551082794746642432-2789253870-10057-A-0-1_1200.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AYSAR MOVIE 4 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AYSAR MOVIE 4
 https://aldirect.hls.huya.com/huyalive/29169025-2686221566-11537233775779905536-2789253842-10057-A-1523933708-1_1200.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AYSAR MOVIE 6
 http://aldirect.hls.huya.com/huyalive/30765679-2554414705-10971127618396487680-3048991636-10057-A-0-1_1200.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AYSAR MOVIE 7
 http://aldirect.hls.huya.com/huyalive/94525224-2460686034-10568566041753944064-2789274542-10057-A-0-1_1200.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AYSAR Movie 9 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AYSAR Movie 9
 http://aldirect.hls.huya.com/huyalive/29169025-2686220598-11537229618251563008-2847687556-10057-A-1524043048-1_1200.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AYSAR Movie 9 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AYSAR Movie 9
 http://aldirect.hls.huya.com/huyalive/94525224-2579683592-11079656661667807232-2847687574-10057-A-0-1_1200.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",BABY亲子台
 http://ms003.happytv.com.tw/live/F9YMztT5DcwWEr1f/index.m3u8
@@ -85,17 +85,17 @@ http://39.134.52.162/wh7f454c46tw3730304110_1867932700/hwottcdn.ln.chinamobile.c
 http://120.198.235.70/112.50.243.12/PLTV/88888888/224/3221226646/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Bestv超级体育5+
 http://120.198.235.70/112.50.243.12/PLTV/88888888/224/3221226642/1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ogFbu15.png" group-title="",Bright Smart Channel (Opt-1) (New!)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ogFbu15.png" group-title="",Bright Smart Channel (New!)
 http://fc_video.bsgroup.com.hk:443/webcast/bshdlive-pc/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0eGv67Q.png" group-title="",Canal Macau (Opt-1) (New!)
-http://live4.tdm.com.mo:80/ch2/_definst_/ch2.live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0eGv67Q.png" group-title="",Canal Macau (Opt-2) (New!)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0eGv67Q.png" group-title="",Canal Macau (New!)
 http://61.244.22.4/ch2/ch2.live/playelist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0eGv67Q.png" group-title="",Canal Macau (New!)
+http://live4.tdm.com.mo:80/ch2/_definst_/ch2.live/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CBN幸福剧场
 http://42.48.60.248:8082/live/gqys-800k.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CBN每日影院
 http://42.48.60.248:8082/live/gqts-800k.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1D941LM.png" group-title="",CCTV 1 (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1D941LM.png" group-title="",CCTV 1
 http://cctv1-lh.akamaihd.net/i/cctv1_1@619500/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctvgefwq.jpg" group-title="",CCTV 高尔夫·网球频道
 http://huaweicdn.hb.chinamobile.com/PLTV/88888888/224/3221225903/1.m3u8
@@ -121,25 +121,25 @@ http://112.50.243.7/PLTV/88888888/224/3221226489/index.m3u8
 http://183.207.249.9/PLTV/3/224/3221225530/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-1
 http://223.110.245.159/ott.js.chinamobile.com/PLTV/3/224/3221225852/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1D941LM.png" group-title="",CCTV-1
+http://36476.hlsplay.aodianyun.com/guangdianyun_36476/tv_channel_416.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-1
 http://hbpx.chinashadt.com:2036/live/px2.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1D941LM.png" group-title="",CCTV-1
+http://hhab.chinashadt.com:2136/live/di1.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1D941LM.png" group-title="",CCTV-1
+http://hljjms.chinashadt.com:2036/live/1002.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-1
 http://hnqf.chinashadt.com:2036/live/8.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-1
 http://hnyz.chinashadt.com:2036/live/stream:tv3.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1D941LM.png" group-title="",CCTV-1
 http://www.szmgiptv.com:14437/hls/1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1D941LM.png" group-title="",CCTV-1 (Opt-1)
-http://hhab.chinashadt.com:2136/live/di1.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1D941LM.png" group-title="",CCTV-1 (Opt-2)
-http://36476.hlsplay.aodianyun.com/guangdianyun_36476/tv_channel_416.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1D941LM.png" group-title="",CCTV-1 (Opt-3)
-http://hljjms.chinashadt.com:2036/live/1002.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv1.jpg" group-title="",CCTV-1 综合 (Opt-1)
-http://39.135.16.142:6060/PLTV/88888888/224/3221225777/1/index.m3u8?fmt=ts2hls
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv1.jpg" group-title="",CCTV-1 综合 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv1.jpg" group-title="",CCTV-1 综合
 http://223.110.242.130:6610/gitv/live1/G_CCTV-1-HQ/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-1 综合 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv1.jpg" group-title="",CCTV-1 综合
+http://39.135.16.142:6060/PLTV/88888888/224/3221225777/1/index.m3u8?fmt=ts2hls
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-1 综合
 http://cctv.v.kcdnvip.com/live/cctv1_1/index.m3u8?adapt=0&BR=audio
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-10
 http://111.40.205.87/PLTV/88888888/224/3221225730/index.m3u8
@@ -155,10 +155,10 @@ http://121.31.30.90:8085/ysten-business/live/cctv-10/1.m3u8
 http://223.110.245.163/ott.js.chinamobile.com/PLTV/3/224/3221227317/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-10
 http://hnmc.chinashadt.com:3036/live/1004.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-10 科教 (Opt-1)
-http://cctv.v.live.qingcdn.com/live/cctv10_1/index.m3u8?adapt=0&BR=audio
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv10.jpg" group-title="",CCTV-10 科教 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv10.jpg" group-title="",CCTV-10 科教
 http://223.110.242.130:6610/gitv/live1/G_CCTV-10-HQ/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-10 科教
+http://cctv.v.live.qingcdn.com/live/cctv10_1/index.m3u8?adapt=0&BR=audio
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-10FHD
 http://120.198.235.68/112.50.243.7/PLTV/88888888/224/3221226488/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-10FHD
@@ -195,12 +195,12 @@ http://121.31.30.90:8085/ysten-business/live/cctv-11/1.m3u8
 http://223.110.245.153/ott.js.chinamobile.com/PLTV/3/224/3221227384/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-11
 http://223.82.250.72/live/cctv-11/1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-11 戏曲 (Opt-1)
-http://cctv.v.kcdnvip.com/live/cctv11_1/index.m3u8?adapt=0&BR=audio
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-11 戏曲 (Opt-2)
-http://cctv.v.myalicdn.com/live/cctv11_1audio.m3u8?adapt=0&BR=audio
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv11.jpg" group-title="",CCTV-11 戏曲 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv11.jpg" group-title="",CCTV-11 戏曲
 http://223.110.242.130:6610/gitv/live1/G_CCTV-11-HQ/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-11 戏曲
+http://cctv.v.kcdnvip.com/live/cctv11_1/index.m3u8?adapt=0&BR=audio
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-11 戏曲
+http://cctv.v.myalicdn.com/live/cctv11_1audio.m3u8?adapt=0&BR=audio
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-11戏曲
 http://121.31.30.90:8085/ysten-business/live/cctv-11/yst.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-11标清
@@ -225,12 +225,12 @@ http://202.107.188.232:5002/cctv12_hdcq-1.m3u8?token=bP9FFW3XRRVuX0UV_yoongoo&am
 http://223.110.245.157/ott.js.chinamobile.com/PLTV/3/224/3221226019/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-12
 http://223.82.250.72/live/cctv-12/1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv12.jpg" group-title="",CCTV-12 社会与法 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv12.jpg" group-title="",CCTV-12 社会与法
 http://111.40.205.76/PLTV/88888888/224/3221225731/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-12 社会与法 (Opt-2)
-http://cctv.v.myalicdn.com/live/cctv12_1audio.m3u8?adapt=0&BR=audio
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-12 社会与法 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-12 社会与法
 http://cctv.v.kcdnvip.com/live/cctv12_1/index.m3u8?adapt=0&BR=audio
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-12 社会与法
+http://cctv.v.myalicdn.com/live/cctv12_1audio.m3u8?adapt=0&BR=audio
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-12FHD
 http://120.198.235.68/112.50.243.7/PLTV/88888888/224/3221225816/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-12FHD
@@ -271,9 +271,9 @@ http://hhab.chinashadt.com:2136/live/di3.stream/playlist.m3u8
 http://klmyyun.chinavas.com/hls/qishi2.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-13
 http://sxty.chinashadt.com:2036/zhibo/6.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-13 新闻 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-13 新闻
 http://cctv.v.kcdnvip.com/live/cctv13_1/index.m3u8?adapt=0&BR=audio
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv13.jpg" group-title="",CCTV-13 新闻频道 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv13.jpg" group-title="",CCTV-13 新闻频道
 http://39.135.16.142:6060/PLTV/88888888/224/3221225748/1/index.m3u8?fmt=ts2hls
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-13新闻
 http://121.31.30.90:8085/ysten-business/live/cctv-13/yst.m3u8
@@ -299,11 +299,11 @@ http://112.50.243.7/PLTV/88888888/224/3221226497/index.m3u8
 http://121.31.30.90:8085/ysten-business/live/cctv-14/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-14
 http://202.107.188.232:5002/cctv14_hdcq-1.m3u8?token=bNLXGW3SXhlu0v4Z_yoongoo&ct=wifi&gid=cctv14_hdcq&sid=cctv14_hd
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-14 少儿 (Opt-1)
-http://cctv.v.myalicdn.com/live/cctvchild_1audio.m3u8?adapt=0&BR=audio
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-14 少儿 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-14 少儿
 http://cctv.v.kcdnvip.com/live/cctvchild_1/index.m3u8?adapt=0&BR=audio
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/a0/CCTV-14少儿.png" group-title="",CCTV-14 少儿频道 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-14 少儿
+http://cctv.v.myalicdn.com/live/cctvchild_1audio.m3u8?adapt=0&BR=audio
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/a0/CCTV-14少儿.png" group-title="",CCTV-14 少儿频道
 http://111.40.205.76/PLTV/88888888/224/3221225732/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-14FHD
 http://120.198.235.68/112.50.243.7/PLTV/88888888/224/3221225933/1.m3u8
@@ -401,12 +401,12 @@ http://223.110.242.130:6610/cntv/live1/cctv-2/cctv-2?&virtualDomain=001.live_hls
 http://hbpx.chinashadt.com:2036/live/px3.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-2
 http://hljjms.chinashadt.com:2036/live/1004.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv2.jpg" group-title="",CCTV-2 财经 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv2.jpg" group-title="",CCTV-2 财经
 http://223.110.242.130:6610/gitv/live1/G_CCTV-2-CQ/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-2 财经 (Opt-2)
-http://cctv.v.myalicdn.com/live/cctv2_1audio.m3u8?adapt=0&BR=audio
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-2 财经 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-2 财经
 http://cctv.v.kcdnvip.com/live/cctv2_1/index.m3u8?adapt=0&BR=audio
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-2 财经
+http://cctv.v.myalicdn.com/live/cctv2_1audio.m3u8?adapt=0&BR=audio
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-2FHD
 http://120.198.235.68/112.50.243.7/PLTV/88888888/224/3221225800/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-2FHD
@@ -445,9 +445,9 @@ http://hnmc.chinashadt.com:3036/live/1003.stream/playlist.m3u8
 http://live.hn0746.com/zyst/sd/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-3
 http://sdlqx.chinashadt.com:2036/live/CCTV3.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv3.jpg" group-title="",CCTV-3 综艺 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv3.jpg" group-title="",CCTV-3 综艺
 http://223.110.242.130:6610/gitv/live1/G_CCTV-3-HQ/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-3 综艺 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-3 综艺
 http://cctv.v.kcdnvip.com/live/cctv3_1/index.m3u8?adapt=0&BR=audio
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-3FHD
 http://223.110.245.149/ott.js.chinamobile.com/PLTV/3/224/3221227032/index.m3u8
@@ -489,17 +489,17 @@ http://223.110.245.159/ott.js.chinamobile.com/PLTV/3/224/3221225781/index.m3u8
 http://223.110.245.170/ott.js.chinamobile.com/PLTV/3/224/3221225534/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-4
 http://223.82.250.72/live/cctv-4/1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-4 中文国际 (Opt-1)
-http://223.110.243.173/PLTV/3/224/3221225534/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv4.jpg" group-title="",CCTV-4 中文国际 (Opt-3)
-http://39.135.16.142:6060/PLTV/88888888/224/3221225779/1/index.m3u8?fmt=ts2hls
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv4.jpg" group-title="",CCTV-4 中文国际 (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv4.jpg" group-title="",CCTV-4 中文国际
 http://223.110.242.130:6610/gitv/live1/G_CCTV-4-HQ/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-4 中文国际 欧洲 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-4 中文国际
+http://223.110.243.173/PLTV/3/224/3221225534/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv4.jpg" group-title="",CCTV-4 中文国际
+http://39.135.16.142:6060/PLTV/88888888/224/3221225779/1/index.m3u8?fmt=ts2hls
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-4 中文国际 欧洲
 http://cctv.v.kcdnvip.com/live/cctveurope_1/index.m3u8?adapt=0&BR=audio
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-4 中文国际 美洲 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-4 中文国际 美洲
 http://cctv.v.kcdnvip.com/live/cctvamerica_1/index.m3u8?adapt=0&BR=audio
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-4 中文国际 美洲 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-4 中文国际 美洲
 http://cctv.v.myalicdn.com/live/cctvamerica_1audio.m3u8?adapt=0&BR=audio
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-4中文国际
 http://121.31.30.90:8085/ysten-business/live/cctv-4/yst.m3u8
@@ -575,11 +575,11 @@ http://223.110.243.138/PLTV/3/224/3221227209/index.m3u8
 http://sdlqx.chinashadt.com:2036/live/CCTV6.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-6
 http://sxws.chinashadt.com:1936/live/tv6.stream_360p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv6.jpg" group-title="",CCTV-6 电影 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv6.jpg" group-title="",CCTV-6 电影
 http://223.110.242.130:6610/gitv/live1/G_CCTV-6-HQ/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-6 电影 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-6 电影
 http://cctv.v.kcdnvip.com/live/cctv6_1/index.m3u8?adapt=0&BR=audio
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-6 电影 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-6 电影
 http://cctv.v.myalicdn.com/live/cctv6_1audio.m3u8?adapt=0&BR=audio
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="samplelogo.png" group-title="",CCTV-6-1080p-1
 http://117.169.79.106:8080/PLTV/88888888/224/3221225634/index.m3u8
@@ -619,9 +619,9 @@ http://183.207.249.9/PLTV/3/224/3221225546/1.m3u8
 http://223.110.242.130:6610/cntv/live1/cctv-7/cctv-7?&virtualDomain=001.live_hls.zte.com
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-7
 http://hljjms.chinashadt.com:2036/live/1008.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv7.jpg" group-title="",CCTV-7 军事·农业 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv7.jpg" group-title="",CCTV-7 军事·农业
 http://223.110.242.130:6610/gitv/live1/G_CCTV-7-HQ/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-7 军事农业 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-7 军事农业
 http://cctv.v.myalicdn.com/live/cctv7_1audio.m3u8?adapt=0&BR=audio
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-7FHD
 http://120.198.235.68/112.50.243.7/PLTV/88888888/224/3221225805/1.m3u8
@@ -655,12 +655,12 @@ http://223.110.245.167/ott.js.chinamobile.com/PLTV/3/224/3221227204/index.m3u8
 http://hbry.chinashadt.com:1938/live/1002.stream_360p/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-8
 http://sxws.chinashadt.com:1936/live/tv7.stream_360p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-8 电视剧 (Opt-1)
-http://cctv.v.myalicdn.com/live/cctv8_1audio.m3u8?adapt=0&BR=audio
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv8.jpg" group-title="",CCTV-8 电视剧 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv8.jpg" group-title="",CCTV-8 电视剧
 http://223.110.242.130:6610/gitv/live1/G_CCTV-8-HQ/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-8 电视剧 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-8 电视剧
 http://cctv.v.kcdnvip.com/live/cctv8_1/index.m3u8?adapt=0&BR=audio
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-8 电视剧
+http://cctv.v.myalicdn.com/live/cctv8_1audio.m3u8?adapt=0&BR=audio
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-8FHD
 http://223.110.245.139:80/PLTV/4/224/3221227304/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-8FHD
@@ -697,11 +697,11 @@ http://121.31.30.90:8085/ysten-business/live/cctv-news/1.m3u8
 http://183.207.248.11/PLTV/4/224/3221225868/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-9
 http://183.207.249.6/PLTV/3/224/3221225532/1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-9 纪录 (Opt-1)
-http://cctv.v.kcdnvip.com/live/cctvjilu_1/index.m3u8?adapt=0&BR=audio
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv9.jpg" group-title="",CCTV-9 纪录 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/cctv9.jpg" group-title="",CCTV-9 纪录
 http://111.40.205.76/PLTV/88888888/224/3221225734/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-9 纪录 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-9 纪录
+http://cctv.v.kcdnvip.com/live/cctvjilu_1/index.m3u8?adapt=0&BR=audio
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-9 纪录
 http://cctv.v.myalicdn.com/live/cctvjilu_1audio.m3u8?adapt=0&BR=audio
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-9FHD
 http://120.198.235.68/112.50.243.7/PLTV/88888888/224/3221225820/1.m3u8
@@ -1093,7 +1093,7 @@ http://ivi.bupt.edu.cn/hls/chchd.m3u8
 http://slave.jscnwx.com:13164/playurl?protocol=hls&playtype=live&auth=no&accesstoken=R5AFFA7BBU308EE0ABK7735A70CI146FE473PBM3143450WDE2A287F8B2&&playtoken=ABCDEFGH&programid=4200000077
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CHC高清电影
 rtmp://ivi.bupt.edu.cn:1935/livetv/chchd
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/fWVXqKc.png" group-title="",China Business Network (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/fWVXqKc.png" group-title="",China Business Network
 https://w1live.livecdn.yicai.com/live/cbn.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CIBN军  事
 http://player.pplive.cn/live/2.12.29/player4live2.swf?pl=pptv://0a2fmamapKeSy7O&pid=493601
@@ -1147,110 +1147,110 @@ http://117.169.79.103:8080/PLTV/88888888/224/3221225735/index.m3u8
 http://61.58.60.230:9000/live/257.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNN
 http://218.202.220.2:5000/nn_live.ts?id=CNN
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中华之声 (Opt-1)
-http://ngcdn005.cnr.cn/live/zhzs/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中华之声 (Opt-2)
-http://ngcdn005.cnr.cn/live/zhzs48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中华之声 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中华之声
 http://ls.qingting.fm/live/390.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国之声 (Opt-1)
-http://ngcdn001.cnr.cn/live/zgzs48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国之声 (Opt-2)
-http://ngcdn001.cnr.cn/live/zgzs/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国之声 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中华之声
+http://ngcdn005.cnr.cn/live/zhzs/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中华之声
+http://ngcdn005.cnr.cn/live/zhzs48/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国之声
 http://ls.qingting.fm/live/386.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国乡村之声 (Opt-1)
-http://ngcdn017.cnr.cn/live/xczs48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国乡村之声 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国之声
+http://ngcdn001.cnr.cn/live/zgzs/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国之声
+http://ngcdn001.cnr.cn/live/zgzs48/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国乡村之声
 http://ls.qingting.fm/live/5039.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国乡村之声 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国乡村之声
 http://ngcdn017.cnr.cn/live/xczs/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国交通广播 (Opt-1)
-http://ngcdn016.cnr.cn/live/gsgljtgb/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国交通广播 (Opt-2)
-http://ngcdn016.cnr.cn/live/gsgljtgb48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国交通广播 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国乡村之声
+http://ngcdn017.cnr.cn/live/xczs48/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国交通广播
 http://ls.qingting.fm/live/4985.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 华夏之声 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国交通广播
+http://ngcdn016.cnr.cn/live/gsgljtgb/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 中国交通广播
+http://ngcdn016.cnr.cn/live/gsgljtgb48/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 华夏之声
 http://ls.qingting.fm/live/392.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 华夏之声 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 华夏之声
 http://ngcdn007.cnr.cn/live/hxzs/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 华夏之声 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 华夏之声
 http://ngcdn007.cnr.cn/live/hxzs48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 古典音乐 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 古典音乐
 http://ls.qingting.fm/live/4993.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 古典音乐 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 古典音乐
 http://ngcdn022.cnr.cn/live/gdyy/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 哈语广播 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 哈语广播
 http://ngcdn025.cnr.cn/live/hygb/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 哈语广播 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 哈语广播
 http://ngcdn025.cnr.cn/live/hygb48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 娱乐广播 (Opt-1)
-http://ngcdn014.cnr.cn/live/ylgb/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 娱乐广播 (Opt-2)
-http://ngcdn014.cnr.cn/live/ylgb48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 娱乐广播 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 娱乐广播
 http://ls.qingting.fm/live/398.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 文艺之声 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 娱乐广播
+http://ngcdn014.cnr.cn/live/ylgb/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 娱乐广播
+http://ngcdn014.cnr.cn/live/ylgb48/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 文艺之声
 http://ls.qingting.fm/live/395.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 文艺之声 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 文艺之声
 http://ngcdn010.cnr.cn/live/wyzs/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 文艺之声 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 文艺之声
 http://ngcdn010.cnr.cn/live/wyzs48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 民族之声 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 民族之声
 http://ls.qingting.fm/live/394.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 民族之声 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 民族之声
 http://ngcdn009.cnr.cn/live/mzzs/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 民族之声 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 民族之声
 http://ngcdn009.cnr.cn/live/mzzs48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 神州之声 (Opt-1)
-http://ngcdn006.cnr.cn/live/szzs/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 神州之声 (Opt-2)
-http://ngcdn006.cnr.cn/live/szzs48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 神州之声 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 神州之声
 http://ls.qingting.fm/live/391.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 经典音乐广播 101.8 (Opt-1)
-http://ngcdn004.cnr.cn/live/dszs48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 经典音乐广播 101.8 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 神州之声
+http://ngcdn006.cnr.cn/live/szzs/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 神州之声
+http://ngcdn006.cnr.cn/live/szzs48/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 经典音乐广播 101.8
 http://ls.qingting.fm/live/389.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 经典音乐广播 101.8 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 经典音乐广播 101.8
 http://ngcdn004.cnr.cn/live/dszs/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 经济之声 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 经典音乐广播 101.8
+http://ngcdn004.cnr.cn/live/dszs48/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 经济之声
 http://ls.qingting.fm/live/387.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 经济之声 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 经济之声
 http://ngcdn002.cnr.cn/live/jjzs/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 经济之声 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 经济之声
 http://ngcdn002.cnr.cn/live/jjzs48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 维语广播 (Opt-1)
-http://ngcdn013.cnr.cn/live/wygb48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 维语广播 (Opt-2)
-http://ngcdn013.cnr.cn/live/wygb/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 维语广播 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 维语广播
 http://ls.qingting.fm/live/4988.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 老年之声 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 维语广播
+http://ngcdn013.cnr.cn/live/wygb/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 维语广播
+http://ngcdn013.cnr.cn/live/wygb48/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 老年之声
 http://ls.qingting.fm/live/396.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 老年之声 (Opt-2)
-http://ngcdn011.cnr.cn/live/lnzs48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 老年之声 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 老年之声
 http://ngcdn011.cnr.cn/live/lnzs/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 藏语广播 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 老年之声
+http://ngcdn011.cnr.cn/live/lnzs48/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 藏语广播
 http://ngcdn012.cnr.cn/live/zygb/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 藏语广播 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 藏语广播
 http://ngcdn012.cnr.cn/live/zygb48/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 长篇联播
 http://ls.qingting.fm/live/4992.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 音乐之声 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 音乐之声
 http://ls.qingting.fm/live/388.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 音乐之声 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 音乐之声
 http://ngcdn003.cnr.cn/live/yyzs/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 音乐之声 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 音乐之声
 http://ngcdn003.cnr.cn/live/yyzs48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 香港之声 (Opt-1)
-http://ngcdn008.cnr.cn/live/xgzs48/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 香港之声 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 香港之声
 http://ls.qingting.fm/live/4986.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 香港之声 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 香港之声
 http://ngcdn008.cnr.cn/live/xgzs/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNR 香港之声
+http://ngcdn008.cnr.cn/live/xgzs48/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNTV军旅剧场
 http://183.207.249.7/PLTV/3/224/3221225531/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNTV农业致富
@@ -1271,37 +1271,37 @@ http://183.207.249.7/PLTV/3/224/3221225543/index.m3u8
 http://183.207.249.7/PLTV/3/224/3221225559/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI Easy FM – FM91.5
 http://sk.cri.cn/915.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI Hit FM FM88.7 (Opt-1)
-http://sk.cri.cn/887.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI Hit FM FM88.7 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI Hit FM FM88.7
 http://ls.qingting.fm/live/1007.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI NEWS Plus AM1008 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI Hit FM FM88.7
+http://sk.cri.cn/887.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI NEWS Plus AM1008
 http://ls.qingting.fm/live/4584.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI NEWS Plus AM1008 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI NEWS Plus AM1008
 http://sk.cri.cn/am1008.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI NEWS Plus AM846
 http://sk.cri.cn/am846.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 中文环球广播 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 中文环球广播
 http://ls.qingting.fm/live/4995.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 中文环球广播 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 中文环球广播
 http://sk.cri.cn/hyhq.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 南海之声 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 南海之声
 http://ls.qingting.fm/live/62624.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 南海之声 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 南海之声
 http://sk.cri.cn/nhzs.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 客家之声
 http://sk.cri.cn/hakka.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 海峡飞虹
 http://ls.qingting.fm/live/1734855.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 环球资讯广播 FM90.5 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 环球资讯广播 FM90.5
 http://ls.qingting.fm/live/24035.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 环球资讯广播 FM90.5 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 环球资讯广播 FM90.5
 http://sk.cri.cn/905.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 轻松调频 FM91.5
 http://ls.qingting.fm/live/1006.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 闽南之音 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 闽南之音
 http://ls.qingting.fm/live/1002.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 闽南之音 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CRI 闽南之音
 http://sk.cri.cn/minnan.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CTV-3
 http://223.99.186.132:6610/shandong_cabletv.live.zte.com/223.99.253.7:8081/00/SNM/CHANNEL00000502/index.m3u8
@@ -1431,7 +1431,7 @@ http://87.246.0.155:5286/tv_HBO_3
 http://161.0.157.5/PLTV/88888888/224/3221227026/03.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",hollywood-movies-2
 http://aldirect.hls.huya.com/huyalive/28466698-2689659358-11551998979990355968-2789274580-10057-A-0-1_1200.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/oIRxwu9.png" group-title="",Hong Kong Open TV (HK) (Opt-1) (New!)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/oIRxwu9.png" group-title="",Hong Kong Open TV (HK) (New!)
 http://media.fantv.hk/m3u8/archive/channel2.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="",Hope Channel
 http://bcliveuniv-lh.akamaihd.net:80/i/Live_1@384161/index_500_av-p.m3u8
@@ -1499,10 +1499,10 @@ http://117.156.28.119/270000001111/1110000110/index.m3u8
 http://121.31.30.90:8085/ysten-business/live/saishijx/yst.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",i综艺
 http://dlhls.live.cnlive.com:1935/cdn/izongyi/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Jusmin TV (Opt-1)
-http://109.71.162.112:1935/live/hd.jasminchannel.stream/chunklist_w934179313.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Jusmin TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Jusmin TV
 http://109.71.162.112:1935/live/hd.jasminchannel.stream/chunklist_w1190948669.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Jusmin TV
+http://109.71.162.112:1935/live/hd.jasminchannel.stream/chunklist_w934179313.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KAKU少儿
 http://117.169.79.103:8080/PLTV/88888888/224/3221225682/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KAKU少儿
@@ -1559,7 +1559,7 @@ https://dwstream4-lh.akamaihd.net/i/dwstream4_live@131329/index_1_av-p.m3u8
 http://183.207.249.16/PLTV/3/224/3221225543/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ZpSb5PD.png" group-title="",NewTV Blockbusters (New!)
 http://183.207.249.14/PLTV/3/224/3221225535/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ZpSb5PD.png" group-title="",NewTV Movies (Opt-1) (New!)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ZpSb5PD.png" group-title="",NewTV Movies (New!)
 http://183.251.61.198/PLTV/88888888/224/3221225804/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ZpSb5PD.png" group-title="",NewTV Sports (New!)
 http://183.251.61.198/PLTV/88888888/224/3221225803/index.m3u8
@@ -1807,15 +1807,15 @@ http://223.99.186.132:6610/shandong_cabletv.live.zte.com/223.99.253.7:8081/00/SN
 http://223.99.186.132:6610/shandong_cabletv.live.zte.com/223.99.253.7:8081/00/SNM/CHANNEL00000505/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/78/RTHK_TV_32.svg/220px-RTHK_TV_32.svg.png" group-title="",RTHK 32 (Hong Kong)
 http://rthklive2-lh.akamaihd.net/i/rthk32_1@168450/index_810_av-b.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H36G8wZ.png" group-title="",RTHK TV 31 (HK) (Opt-1) (New!)
-http://rthklive1-lh.akamaihd.net/i/rthk31_1@167495/index_810_av-b.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H36G8wZ.png" group-title="",RTHK TV 31 (HK) (Opt-2) (New!)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H36G8wZ.png" group-title="",RTHK TV 31 (HK) (New!)
 http://rthklive1-lh.akamaihd.net/i/rthk31_1@167495/index_1296_av-b.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H36G8wZ.png" group-title="",RTHK TV 31 (HK) (Opt-3) (New!)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H36G8wZ.png" group-title="",RTHK TV 31 (HK) (New!)
 http://rthklive1-lh.akamaihd.net/i/rthk31_1@167495/index_2052_av-b.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/fmzC0MN.png" group-title="",RTHK TV 32 (HK) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H36G8wZ.png" group-title="",RTHK TV 31 (HK) (New!)
+http://rthklive1-lh.akamaihd.net/i/rthk31_1@167495/index_810_av-b.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/fmzC0MN.png" group-title="",RTHK TV 32 (HK)
 http://rthklive2-lh.akamaihd.net/i/rthk32_1@168450/index_1296_av-b.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/fmzC0MN.png" group-title="",RTHK TV 32 (HK) (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/fmzC0MN.png" group-title="",RTHK TV 32 (HK)
 http://rthklive2-lh.akamaihd.net/i/rthk32_1@168450/index_2052_av-b.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",SDETV
 http://120.198.235.68/112.50.243.7/PLTV/88888888/224/3221225873/1.m3u8
@@ -1835,19 +1835,19 @@ http://61.216.177.73/sta/ch91865016.m3u8
 rtmp://ivi.bupt.edu.cn:1935/livetv/starsports
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Style
 http://61.216.177.73/sta/ch91865007.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5FTCFRj.png" group-title="",TDM HD Macau (Opt-1) (New!)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5FTCFRj.png" group-title="",TDM HD Macau (New!)
 http://live4.tdm.com.mo:80/ch6/_definst_/hd_ch6.live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5FTCFRj.png" group-title="",TDM Info. Macau (Opt-1) (New!)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5FTCFRj.png" group-title="",TDM Info. Macau (New!)
 http://live4.tdm.com.mo:80/ch5/_definst_/info_ch5.live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5FTCFRj.png" group-title="",TDM Macau (Opt-1) (New!)
-http://live4.tdm.com.mo:80/ch1/_definst_/ch1.live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5FTCFRj.png" group-title="",TDM Macau (Opt-2) (New!)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5FTCFRj.png" group-title="",TDM Macau (New!)
 http://61.244.22.4/ch1/ch1.live/playelist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/59lAsao.png" group-title="",TDM Macau Satelite (Opt-1) (New!)
-http://live4.tdm.com.mo:80/ch3/_definst_/ch3.live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/59lAsao.png" group-title="",TDM Macau Satelite (Opt-2) (New!)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5FTCFRj.png" group-title="",TDM Macau (New!)
+http://live4.tdm.com.mo:80/ch1/_definst_/ch1.live/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/59lAsao.png" group-title="",TDM Macau Satelite (New!)
 http://61.244.22.4/ch3/ch3.live/playelist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5FTCFRj.png" group-title="",TDM Sports Macau (Opt-1) (New!)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/59lAsao.png" group-title="",TDM Macau Satelite (New!)
+http://live4.tdm.com.mo:80/ch3/_definst_/ch3.live/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5FTCFRj.png" group-title="",TDM Sports Macau (New!)
 http://live4.tdm.com.mo:80/ch4/_definst_/sport_ch4.live/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",The-Country-Network
 https://dcunilive2-lh.akamaihd.net/i/dclive_1@390829/master.m3u8
@@ -1885,7 +1885,7 @@ http://223.99.186.132:6610/shandong_cabletv.live.zte.com/223.99.253.7:8081/00/SN
 http://223.99.186.132:6610/shandong_cabletv.live.zte.com/223.99.253.7:8081/00/SNM/CHANNEL00000216/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",XSTV-1HD
 http://117.169.79.103:8080/PLTV/88888888/224/3221225816/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LcJZVV5.png" group-title="",Xuzhou TV 1 Shanghai (Opt-2) (New!)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LcJZVV5.png" group-title="",Xuzhou TV 1 Shanghai (New!)
 http://223.110.245.165/ott.js.chinamobile.com/PLTV/3/224/3221225945/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LcJZVV5.png" group-title="",Xuzhou TV 2 Shanghai (New!)
 http://223.110.245.167/ott.js.chinamobile.com/PLTV/3/224/3221225947/index.m3u8
@@ -1923,23 +1923,23 @@ http://huaweicdn.hb.chinamobile.com/PLTV/88888888/224/3221225934/1.m3u8
 https://ifeng.com-l-ifeng.com/20190103/26081_6443bc56/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州三峡移民
 http://123.146.162.24:8013/tslslive/PU2vzMI/hls/live_sd.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州三峡移民 (Opt-1)
-http://wanzhoulive.cbg.cn:8017/c2F0hmi/1000/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州三峡移民 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州三峡移民
 http://123.146.162.24:8017/c2F0hmi/1000/live.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州三峡移民
+http://wanzhoulive.cbg.cn:8017/c2F0hmi/1000/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州影视
 http://123.146.162.24:8013/tslslive/vWlnEzU/hls/live_sd.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州影视文艺 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州影视文艺
 http://123.146.162.24:8017/d4ceB1a/1000/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州影视文艺 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州影视文艺
 http://wanzhoulive.cbg.cn:8017/d4ceB1a/1000/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州科教频道 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州科教频道
 http://123.146.162.24:8017/Cz7WPb8/800/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州科教频道 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州科教频道
 http://wanzhoulive.cbg.cn:8017/Cz7WPb8/800/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州综合频道 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州综合频道
 http://123.146.162.24:8017/iTXwrGs/800/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州综合频道 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万州综合频道
 http://wanzhoulive.cbg.cn:8017/iTXwrGs/800/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",万盛
 http://qxlmlive.cbg.cn:1935/app_2/ls_40.stream/chunklist.m3u8
@@ -2119,11 +2119,11 @@ http://121.31.30.90:8085/ysten-business/live/dongfangstv/1.m3u8
 http://121.31.30.90:8085/ysten-business/live/dongfangstv/yst.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",东方卫视
 http://183.207.249.9/PLTV/3/224/3221225558/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/dongfang.jpg" group-title="",东方卫视
+http://223.110.241.204:6610/gitv/live1/G_DONGFANG-CQ/G_DONGFANG-CQ/.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",东方卫视
 http://223.99.186.132:6410/shandong_cabletv.live.zte.com/223.99.253.7:8081/00/SNM/CHANNEL00000022/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/dongfang.jpg" group-title="",东方卫视 (Opt-1)
-http://223.110.241.204:6610/gitv/live1/G_DONGFANG-CQ/G_DONGFANG-CQ/.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/dongfang.jpg" group-title="",东方卫视 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/dongfang.jpg" group-title="",东方卫视
 http://39.135.16.142:6060/PLTV/88888888/224/3221225752/1/index.m3u8?fmt=ts2hls
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",东方卫视FHD
 http://117.148.187.37/PLTV/88888888/224/3221226142/index.m3u8
@@ -2385,6 +2385,8 @@ http://bsyll.qingk.cn/live/rstv2/index.m3u8
 http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225628/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",云南交通广播 FM91.8
 http://ls.qingting.fm/live/1928.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/e/e0/Yunnan_TV_logo.png" group-title="",云南卫视
+http://111.40.205.76/PLTV/88888888/224/3221225636/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",云南卫视
 http://111.40.205.87/PLTV/88888888/224/3221225636/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",云南卫视
@@ -2421,10 +2423,8 @@ http://edge1.yntv.cn/channels/yntv/ynws/flv:sd/live
 http://hwottcdn.ln.chinamobile.com/PLTV/88888890/224/3221226029/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",云南卫视
 http://ivi.bupt.edu.cn/hls/yntv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",云南卫视 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",云南卫视
 http://m-tvlmedia.public.bcs.ysten.com/ysten-business/live/yunnanstv/1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/e/e0/Yunnan_TV_logo.png" group-title="",云南卫视 (Opt-2)
-http://111.40.205.76/PLTV/88888888/224/3221225636/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",云南卫视(电)
 http://118.123.60.10:8114/syhjcms_hls/10000100201705020000001000000008?FvSeid=5bf2539394e75947&Fsv_filetype=0&Fsv_ctype=LIVES&Fsv_cid=6641&Fsv_TBt=614400&Fsv_ShiftEnable=1&Fsv_ShiftTsp=120&Fsv_SV_PARAM1=0&Fsv_otype=0&Provider_id=syhjcms_hls&Pcontent_id=10000100201705020000001000000008&Fsv_CMSID=syhjcms&Fsv_chan_hls_se_idx=12
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",云南卫视-3
@@ -2675,10 +2675,10 @@ http://219.153.252.50/PLTV/88888888/224/3221225626/chunklist.m3u8
 http://live.china-latv.com/channel2/sd/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.china-latv.com/t/icon/201901/20190107160038YJK.png" group-title="",六安新闻综合
 http://live.china-latv.com/channel1/sd/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/liupanshui.jpg" group-title="",六盘水新闻综合 (Opt-1)
-http://39.135.16.142:6060/PLTV/88888888/224/3221225773/1/index.m3u8?fmt=ts2hls
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/liupanshui.jpg" group-title="",六盘水新闻综合 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/liupanshui.jpg" group-title="",六盘水新闻综合
 http://39.135.16.142:6060/PLTV/88888888/224/3221225772/1/index.m3u8?fmt=ts2hls
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/liupanshui.jpg" group-title="",六盘水新闻综合
+http://39.135.16.142:6060/PLTV/88888888/224/3221225773/1/index.m3u8?fmt=ts2hls
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",兰州交通音乐广播 FM99.5
 http://ls.qingting.fm/live/1711.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",兰州新闻综合广播 FM97.3
@@ -2707,6 +2707,8 @@ http://59.48.244.99:8098/hls/xx/playlist.m3u8
 http://11189.liveplay.myqcloud.com/live/11189_b05abef6b47511e792905cb9018cf0d4.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",兵团
 http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225627/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/bingtuantv.jpg" group-title="",兵团卫视
+http://112.17.40.140/PLTV/88888888/224/3221226186/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",兵团卫视
 http://125.210.152.20:9090/live/BTWS.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",兵团卫视
@@ -2717,10 +2719,8 @@ http://ivi.bupt.edu.cn/hls/bttv.m3u8
 http://klmyyun.chinavas.com/hls/qishi3.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",兵团卫视
 http://v.btzx.com.cn:1935/live/weishi.stream/chunklist_w846804169.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",兵团卫视 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",兵团卫视
 http://v.btzx.com.cn:1935/live/weishi.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/bingtuantv.jpg" group-title="",兵团卫视 (Opt-2)
-http://112.17.40.140/PLTV/88888888/224/3221226186/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",兵团建设
 http://v.btzx.com.cn:1935/live/news.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",兵团建设
@@ -2787,9 +2787,9 @@ http://117.169.79.103:8080/PLTV/88888888/224/3221225688/index.m3u8
 http://202.107.188.151:5002/nonglinweishi_hdcq-1.m3u8?token=9rLKYPeyymD4sspg_yoongoo&ct=wifi&gid=nonglinweishi_hdcq&sid=nonglinweishi_hd
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",农林卫视
 http://202.107.188.9:5000/nn_live.ts?id=nonglintvh
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/c/ca/CNNL_logo.png" group-title="",农林卫视 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/c/ca/CNNL_logo.png" group-title="",农林卫视
 http://39.135.16.142:6060/PLTV/88888888/224/3221225696/1/index.m3u8?fmt=ts2hls
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",农林卫视 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",农林卫视
 http://stream.snrtv.com/sxtvs-nl.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",凉山彝语频道
 http://vod.lsiptv.cn:1935/live/smil:LSTV3_copy.smil/playlist.m3u8
@@ -2889,9 +2889,9 @@ http://117.169.79.103:8080/PLTV/88888888/224/3221225627/index.m3u8
 http://113.5.255.186:5002/local_dmxc_cq.m3u8?token=guoziyun
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",动漫秀场
 http://39.134.52.180/PLTV/88888888/224/3221225820/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/sitvdmxc.jpg" group-title="",动漫秀场 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/sitvdmxc.jpg" group-title="",动漫秀场
 http://huaweicdn.hb.chinamobile.com/PLTV/88888888/224/3221225977/1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/sitvdmxc.jpg" group-title="",动漫秀场 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/sitvdmxc.jpg" group-title="",动漫秀场
 http://huaweicdn.hb.chinamobile.com/PLTV/88888888/224/3221225977/3.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",动漫秀场FHD
 http://120.198.235.68/112.50.243.7/PLTV/88888888/224/3221226141/1.m3u8
@@ -2929,15 +2929,15 @@ http://ivi.bupt.edu.cn/hls/btv10.m3u8
 http://116.199.5.51:8114/00000000/hls/index.m3u8?Fsv_chan_hls_se_idx=158&FvSeid=1&Fsv_ctype=LIVES&Fsv_otype=1&Provider_id=&Pcontent_id=.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京HD
 http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225662/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京交通广播 FM103.9 (Opt-1)
-http://ls.qingting.fm/live/336.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京交通广播 FM103.9 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京交通广播 FM103.9
 http://audiolive.rbc.cn:1935/live/fm1039/96K/tzwj_video.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京交通广播 FM103.9
+http://ls.qingting.fm/live/336.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京体育
 rtmp://ivi.bupt.edu.cn:1935/livetv/btv6hd
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京体育广播 FM102.5 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京体育广播 FM102.5
 http://audiolive.rbc.cn:1935/live/fm1025/96K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京体育广播 FM102.5 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京体育广播 FM102.5
 http://ls.qingting.fm/live/335.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://media.bjnews.com.cn/image/2019/05/03/4788479376108891447.jpg" group-title="",北京冬奥纪实
 http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221225729/index.m3u8
@@ -3013,21 +3013,21 @@ http://223.110.242.130:6610/cntv/live1/HD-2500k-1080P-beijingstv/index.m3u8
 http://39.135.32.29:6610/000000001000/1000000001000021288/index.m3u8?i
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京卫视高清
 http://live.gansuyunshi.com:9090/live/BJWS-SD_800.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京古典音乐 FM98.6 (Opt-1)
-http://ls.qingting.fm/live/344.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京古典音乐 FM98.6 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京古典音乐 FM98.6
 http://audiolive.rbc.cn:1935/live/fm986/96K/tzwj_video.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京古典音乐 FM98.6
+http://ls.qingting.fm/live/344.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京国际
 http://61.58.60.230:9000/live/226.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5daMiaZ.jpg" group-title="",北京国际频道
 http://61.58.60.230:9319/live/226.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京城市广播 FM107.3 (Opt-1)
-http://ls.qingting.fm/live/345.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京城市广播 FM107.3 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京城市广播 FM107.3
 http://audiolive.rbc.cn:1935/live/fm1073/96K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京外语广播 AM774 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京城市广播 FM107.3
+http://ls.qingting.fm/live/345.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京外语广播 AM774
 http://audiolive.rbc.cn:1935/live/am774/96K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京外语广播 AM774 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京外语广播 AM774
 http://ls.qingting.fm/live/334.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京好音乐 FM95.9
 http://ls.qingting.fm/live/2131011.m3u8
@@ -3035,44 +3035,44 @@ http://ls.qingting.fm/live/2131011.m3u8
 http://ivi.bupt.edu.cn/hls/btv4.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京影视
 rtmp://ivi.bupt.edu.cn:1935/livetv/btv4hd
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京怀旧金曲 FM107.5 (Opt-1)
-http://ls.qingting.fm/live/340.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京怀旧金曲 FM107.5 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京怀旧金曲 FM107.5
 http://123.56.16.201:1935/live/fm1075/96K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京戏曲曲艺 FM105.1 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京怀旧金曲 FM107.5
+http://ls.qingting.fm/live/340.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京戏曲曲艺 FM105.1
 http://123.56.16.201:1935/live/fm1051/96K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京戏曲曲艺 FM105.1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京戏曲曲艺 FM105.1
 http://ls.qingting.fm/live/343.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京房山经典音乐 FM96.9
 http://ls.qingting.fm/live/68746.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京故事广播 AM603 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京故事广播 AM603
 http://123.56.16.201:1935/live/am603/96K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京故事广播 AM603 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京故事广播 AM603
 http://ls.qingting.fm/live/337.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京教学广播 FM99.4 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京教学广播 FM99.4
 http://123.56.16.201:1935/live/fm994/96K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京教学广播 FM99.4 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京教学广播 FM99.4
 http://ls.qingting.fm/live/338.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京文艺
 http://ivi.bupt.edu.cn/hls/btv2.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京文艺HD
 http://ivi.bupt.edu.cn/hls/btv2hd.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京文艺广播 FM87.6 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京文艺广播 FM87.6
 http://123.56.16.201:1935/live/fm876/96K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京文艺广播 FM87.6 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京文艺广播 FM87.6
 http://ls.qingting.fm/live/333.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/btv9.jpg" group-title="",北京新闻
 http://cctvtxyh5c.liveplay.myqcloud.com/wstv/btv9_2_hd.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京新闻
 http://ivi.bupt.edu.cn/hls/btv9.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京新闻广播 FM100.6 (Opt-1)
-http://ls.qingting.fm/live/339.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京新闻广播 FM100.6 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京新闻广播 FM100.6
 http://123.56.16.201:1935/live/fm1006/96K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京欢乐时光 FM106.5 (Opt-1)
-http://ls.qingting.fm/live/341.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京欢乐时光 FM106.5 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京新闻广播 FM100.6
+http://ls.qingting.fm/live/339.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京欢乐时光 FM106.5
 http://123.56.16.201:1935/live/fm1065/96K/tzwj_video.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京欢乐时光 FM106.5
+http://ls.qingting.fm/live/341.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/btv7.jpg" group-title="",北京生活
 http://cctvtxyh5c.liveplay.myqcloud.com/wstv/btv7_2/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京生活
@@ -3099,29 +3099,29 @@ http://117.169.79.103:8080/PLTV/88888888/224/3221225807/index.m3u8
 http://cctvtxyh5c.liveplay.myqcloud.com/wstv/btv5_2/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京财经
 http://ivi.bupt.edu.cn/hls/btv5.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京长书广播 FM104.3 (Opt-1)
-http://ls.qingting.fm/live/342.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京长书广播 FM104.3 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京长书广播 FM104.3
 http://audiolive.rbc.cn:1935/live/fm1043/96K/tzwj_video.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京长书广播 FM104.3
+http://ls.qingting.fm/live/342.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/btv8.jpg" group-title="",北京青年
 http://cctvtxyh5c.liveplay.myqcloud.com/wstv/btv8_2/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京青年
 http://ivi.bupt.edu.cn/hls/btv8.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京青年
 rtmp://ivi.bupt.edu.cn:1935/livetv/btv8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京青年广播 FM98.2 (Opt-1)
-http://ls.qingting.fm/live/347.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京青年广播 FM98.2 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京青年广播 FM98.2
 http://audiolive.rbc.cn:1935/live/am927/96K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京音乐广播 FM97.4 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京青年广播 FM98.2
+http://ls.qingting.fm/live/347.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京音乐广播 FM97.4
 http://123.56.16.201:1935/live/fm974/96K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京音乐广播 FM97.4 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京音乐广播 FM97.4
 http://ls.qingting.fm/live/332.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北京體育
 http://222.207.48.30/hls/btv6.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/beihai.jpg" group-title="",北海新闻综合 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/beihai.jpg" group-title="",北海新闻综合
 http://111.12.83.2:6610/000000001000/BeiHai/1.m3u8?livemode=1&IASHttpSessionId=SLB19992019031013130037521848
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北海新闻综合 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北海新闻综合
 http://live.bhtv.cc/channel1/sd/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",北海经济科教
 http://live.bhtv.cc/channel2/sd/live.m3u8
@@ -3225,9 +3225,9 @@ http://pili-live-hls.148.i2863.com/i2863-148/live_148_811389.m3u8
 http://30539.hlsplay.aodianyun.com/lms_30539/tv_channel_295.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",南阳图文信息
 http://30539.hlsplay.aodianyun.com/lms_30539/tv_channel_300.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",南阳新闻频道 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",南阳新闻频道
 http://30539.hlsplay.aodianyun.com/lms_30539/tv_channel_142.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",南阳新闻频道 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",南阳新闻频道
 http://hnnz.chinashadt.com:1935/live/1003.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",南阳科教频道
 http://30539.hlsplay.aodianyun.com/lms_30539/tv_channel_296.m3u8
@@ -3279,6 +3279,8 @@ http://112.5.223.62/wh7f454c46tw3126726062_345210462/ott.fj.chinamobile.com/PLTV
 http://112.5.223.53/wh7f454c46tw2968571561_1046297840/ott.fj.chinamobile.com/PLTV/88888888/224/3221226764/index.m3u8?icpid=88888888&RTS=1543546243&from=1&hms_devid=423
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",厦门卫视
 http://112.5.223.36/wh7f454c46tw1733532305_1126203219/ott.fj.chinamobile.com/PLTV/88888888/224/3221226781/index.m3u8?icpid=88888888&RTS=1543546243&from=1&hms_devid=263
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/thumb/a/a2/Xiamen_Star_Logo.png/330px-Xiamen_Star_Logo.png" group-title="",厦门卫视
+http://112.50.243.8/PLTV/88888888/224/3221226781/3.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",厦门卫视
 http://223.110.245.145/ott.js.chinamobile.com/PLTV/3/224/3221226093/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",厦门卫视
@@ -3289,8 +3291,6 @@ http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225623/index.m3u8
 http://ivi.bupt.edu.cn/hls/xmtv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",厦门卫视
 http://ott.js.chinamobile.com/PLTV/3/224/3221226093/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/thumb/a/a2/Xiamen_Star_Logo.png/330px-Xiamen_Star_Logo.png" group-title="",厦门卫视 (Opt-1)
-http://112.50.243.8/PLTV/88888888/224/3221226781/3.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",厦门卫视高清
 http://183.207.249.11/PLTV/2/224/3221226093/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",厦门广播闽南之声
@@ -3938,13 +3938,13 @@ http://119.39.242.52:1935/live/gonggong/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",娄底公共频道
 http://mms.ldntv.cn:1935/live/gonggong/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",娄底综合频道
+http://119.39.242.52:1935/live/zonghe/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",娄底综合频道
 http://218.77.102.118:1935/live/zonghe/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",娄底综合频道
-http://mms.ldntv.cn:1935/live/zonghe/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",娄底综合频道 (Opt-1)
 http://218.77.102.118:1935/live/zonghe_iphone/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",娄底综合频道 (Opt-2)
-http://119.39.242.52:1935/live/zonghe/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",娄底综合频道
+http://mms.ldntv.cn:1935/live/zonghe/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",娱乐
 http://223.99.186.132:6610/shandong_cabletv.live.zte.com/223.99.253.7:8081/00/SNM/CHANNEL00000274/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",娱乐频道
@@ -4385,12 +4385,12 @@ http://183.207.248.11/PLTV/3/224/3221225614/index.m3u8
 http://202.107.188.152:5002/shandongjiaoyu_hdcq-1.m3u8?token=7LOHXe2zh13us4dd_yoongoo&ct=wifi&gid=shandongjiaoyu_hdcq&sid=shandongjiaoyu_hd
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山东教育
 http://223.82.250.72/live/shandongjy/1.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/sdetv.jpg" group-title="",山东教育
+http://live.sdetv.com.cn/live/sdetv/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山东教育
+http://m-tvlmedia.public.bcs.ysten.com/ysten-business/live/shandongjy/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山东教育
 rtmp://ivi.bupt.edu.cn:1935/livetv/sdetv
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山东教育 (Opt-1)
-http://m-tvlmedia.public.bcs.ysten.com/ysten-business/live/shandongjy/1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/sdetv.jpg" group-title="",山东教育 (Opt-2)
-http://live.sdetv.com.cn/live/sdetv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山东教育卫视
 http://117.169.79.103:8080/PLTV/88888888/224/3221225690/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山东生活
@@ -4403,6 +4403,8 @@ http://223.99.186.132:6410/shandong_cabletv.live.zte.com/223.99.253.7:8081/00/SN
 http://32553.hlsplay.aodianyun.com/guangdianyun_32553/tv_channel_180.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山西
 http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225624/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/b/b5/Shanxi_Television.png" group-title="",山西卫视
+http://111.40.205.76/PLTV/88888888/224/3221225624/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山西卫视
 http://111.40.205.87/PLTV/88888888/224/3221225624/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山西卫视
@@ -4432,6 +4434,8 @@ http://202.107.188.249:5002/shanxi_hdcq-1.m3u8?token=hwKWTIgClkyJApZM_yoongoo&am
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山西卫视
 http://223.110.242.130:6610/cntv/live1/shanxistv/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山西卫视
+http://223.110.245.147/ott.js.chinamobile.com/PLTV/3/224/3221226091/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山西卫视
 http://223.82.250.72/live/shanxistv/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山西卫视
 http://223.99.186.132:6410/shandong_cabletv.live.zte.com/223.99.253.7:8081/00/SNM/CHANNEL00000032/index.m3u8
@@ -4439,10 +4443,6 @@ http://223.99.186.132:6410/shandong_cabletv.live.zte.com/223.99.253.7:8081/00/SN
 http://hwottcdn.ln.chinamobile.com/PLTV/88888890/224/3221226032/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山西卫视
 http://sxty.chinashadt.com:2036/zhibo/4.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/b/b5/Shanxi_Television.png" group-title="",山西卫视 (Opt-1)
-http://111.40.205.76/PLTV/88888888/224/3221225624/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山西卫视 (Opt-2)
-http://223.110.245.147/ott.js.chinamobile.com/PLTV/3/224/3221226091/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山西卫视(电)
 http://118.123.60.12:8114/syhjcms_hls/?FvSeid=&Fsv_filetype=0&Fsv_ctype=LIVES&Fsv_cid=6449&Fsv_TBt=3072000&Fsv_ShiftEnable=1&Fsv_ShiftTsp=120&Fsv_SV_PARAM1=0&Fsv_otype=0&Provider_id=syhjcms_hls&Pcontent_id=&Fsv_CMSID=syhjcms&Fsv_chan_hls_se_idx=10
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",山西黄河
@@ -4577,6 +4577,8 @@ http://111.40.205.87/PLTV/88888888/224/3221225641/index.m3u8
 http://111.40.205.87/PLTV/88888888/224/3221225699/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",广东卫视
 http://111.40.205.87/PLTV/88888888/224/3221225736/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/thumb/d/d8/GRT_Satellite_Channel_2016_logo.jpg/400px-GRT_Satellite_Channel_2016_logo.jpg" group-title="",广东卫视
+http://112.50.243.8/PLTV/88888888/224/3221225942/3.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",广东卫视
 http://116.199.5.51:8114/00000000/hls/index.m3u8?Fsv_chan_hls_se_idx=18&FvSeid=1&Fsv_ctype=LIVES&Fsv_otype=1&Provider_id=&Pcontent_id=.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",广东卫视
@@ -4592,6 +4594,8 @@ http://121.31.30.90:8085/ysten-business/live/guangdongstv/yst.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",广东卫视
 http://125.210.152.20:9090/live/GDWSHD_H265.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",广东卫视
+http://183.207.248.11/PLTV/4/224/3221225864/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",广东卫视
 http://183.207.249.9/PLTV/3/224/3221225592/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",广东卫视
 http://223.110.245.141/ott.js.chinamobile.com/PLTV/3/224/3221225578/index.m3u8
@@ -4601,10 +4605,6 @@ http://223.99.186.132:6410/shandong_cabletv.live.zte.com/223.99.253.7:8081/00/SN
 http://m-tvlmedia.public.bcs.ysten.com/ysten-business/live/hdguangdongstv/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",广东卫视
 http://nclive.grtn.cn/gdws/sd/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/thumb/d/d8/GRT_Satellite_Channel_2016_logo.jpg/400px-GRT_Satellite_Channel_2016_logo.jpg" group-title="",广东卫视 (Opt-1)
-http://112.50.243.8/PLTV/88888888/224/3221225942/3.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",广东卫视 (Opt-2)
-http://183.207.248.11/PLTV/4/224/3221225864/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",广东卫视FHD
 http://120.198.235.68/112.50.243.7/PLTV/88888888/224/3221225824/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",广东卫视FHD
@@ -4860,9 +4860,9 @@ http://live.ybtvyun.com/video/s10016-ybtv1-sd/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",延边新闻综合
 http://stream2.jlntv.cn/jlyb/sd/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",延边汉语综合
-http://live.ybtvyun.com/video/s10016-ybtv2-sd/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",延边汉语综合 (Opt-2)
 http://live.ybtvyun.com/video/s10006-ybtv2-sd/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",延边汉语综合
+http://live.ybtvyun.com/video/s10016-ybtv2-sd/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",开封公共频道
 http://117.158.206.60:9080/kaifeng/kftv3.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",开封新闻综合
@@ -5295,9 +5295,9 @@ http://livehyw2.sobeycache.com/xjtvs/zb08.m3u8
 http://202.107.188.246:5002/xj9_hdcq-1.m3u8?token=tL8dALWXHQC2vx0A_yoongoo&ct=wifi&gid=xj9_hdcq&sid=xj9_hd
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆-9
 http://livehyw2.sobeycache.com/xjtvs/zb09.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆交通广播 FM94.9 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆交通广播 FM94.9
 http://aod.xjbs.com.cn:1935/live/949/32K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆交通广播 FM94.9 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆交通广播 FM94.9
 http://ls.qingting.fm/live/1910.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆卫视
 http://111.40.205.87/PLTV/88888888/224/3221225635/index.m3u8
@@ -5333,40 +5333,40 @@ http://hwottcdn.ln.chinamobile.com/PLTV/88888890/224/3221226026/index.m3u8
 http://ivi.bupt.edu.cn/hls/xjtv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆卫视
 http://livehyw2.sobeycache.com/xjtvs/zb01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆哈萨克语广播 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆哈萨克语广播
 http://aod.xjbs.com.cn:1935/live/hay/32K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆哈萨克语广播 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆哈萨克语广播
 http://ls.qingting.fm/live/1908.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆故事广播 FM102.8 (Opt-1)
-http://ls.qingting.fm/live/1911.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆故事广播 FM102.8 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆故事广播 FM102.8
 http://aod.xjbs.com.cn:1935/live/1028/32K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆新闻广播 FM96.1 (Opt-1)
-http://ls.qingting.fm/live/1902.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆新闻广播 FM96.1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆故事广播 FM102.8
+http://ls.qingting.fm/live/1911.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆新闻广播 FM96.1
 http://aod.xjbs.com.cn:1935/live/961/32K/tzwj_video.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆新闻广播 FM96.1
+http://ls.qingting.fm/live/1902.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆柯尔克孜语广播
 http://aod.xjbs.com.cn:1935/live/ky/32K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆民生广播 FM92.4 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆民生广播 FM92.4
 http://aod.xjbs.com.cn:1935/live/924/32K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆民生广播 FM92.4 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆民生广播 FM92.4
 http://ls.qingting.fm/live/76186.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆私家车广播 FM92.9 (Opt-1)
-http://ls.qingting.fm/live/1909.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆私家车广播 FM92.9 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆私家车广播 FM92.9
 http://aod.xjbs.com.cn:1935/live/929/32K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆维吾尔语交通文艺广播 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆私家车广播 FM92.9
+http://ls.qingting.fm/live/1909.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆维吾尔语交通文艺广播
 http://aod.xjbs.com.cn:1935/live/wywy/32K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆维吾尔语交通文艺广播 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆维吾尔语交通文艺广播
 http://ls.qingting.fm/live/78923.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆维吾尔语综合广播
 http://aod.xjbs.com.cn:1935/live/wy/32K/tzwj_video.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆维语综合
 http://livehyw.sobeycache.com/xjtvs/zb2.m3u8?auth_key=1807150105-0-0-c3a098295a22448c89a29cf5df542211
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆蒙古语广播 (Opt-1)
-http://ls.qingting.fm/live/1903.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆蒙古语广播 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆蒙古语广播
 http://aod.xjbs.com.cn:1935/live/my/32K/tzwj_video.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆蒙古语广播
+http://ls.qingting.fm/live/1903.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆阳光895 FM89.5
 http://aod.xjbs.com.cn:1935/live/738/32K/tzwj_video.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",新疆音乐广播 MyFM FM103.9
@@ -5673,9 +5673,9 @@ rtmp://www.scbtv.cn/live/news
 http://111.12.83.7:6410/000000001000/lzkj/1.m3u8?livemode=1
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",栖霞新闻频道
 http://pili-live-hls.140.i2863.com/i2863-140/live_140_236499.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",株洲新闻综合 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",株洲新闻综合
 http://live.zzbtv.com/live/live122/800K/tzwj_video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",株洲新闻综合 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",株洲新闻综合
 http://vod.zzlknews.cn:40731/live/_definst_/zzzh/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",株洲法制频道
 http://live.zzbtv.com/live/live124/800K/tzwj_video.m3u8
@@ -5725,10 +5725,10 @@ http://hnnz.chinashadt.com:1935/live/1004.stream/playlist.m3u8
 http://59.46.18.134:8114/Fsv_otype=1?FvSeid=5bf181c25f226bb2&Fsv_filetype=1&Fsv_ctype=LIVES&Fsv_cid=0&Fsv_chan_hls_se_idx=80&Fsv_rate_id=0&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Provider_id=&Pcontent_id=&Fsv_CMSID=&Fsv_otype=1
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",楚天交通广播 FM92.7
 http://ls.qingting.fm/live/1291.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",楚天音乐广播 FM105.8 (Opt-1)
-http://ls.qingting.fm/live/1289.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",楚天音乐广播 FM105.8 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",楚天音乐广播 FM105.8
 http://live7.hbtv.com.cn/masvod/ctyygb_q1/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",楚天音乐广播 FM105.8
+http://ls.qingting.fm/live/1289.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",榆林综合
 http://61.150.114.78:8089/hls-live/livepkgr/_definst_/liveevent/ylwltv1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",榆树综合频道
@@ -5841,13 +5841,13 @@ rtmp://vod.scjygd.com:1935/live/xwzh
 http://222.179.155.21:1935/ch2.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",江津文化旅游
 http://jiangjinlive.cbg.cn:1935/ch2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",江津新闻综合 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",江津新闻综合
 http://222.179.155.21:1935/ch1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",江津新闻综合 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",江津新闻综合
 http://jiangjinlive.cbg.cn:1935/ch1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",江津经济生活 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",江津经济生活
 http://222.179.155.21:1935/ch0.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",江津经济生活 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",江津经济生活
 http://jiangjinlive.cbg.cn:1935/ch0.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="samplelogo.png" group-title="",江湖儿女
 https://zkgn.wb699.com/2018/10/05/mUBSonSef5dZYnYR/playlist.m3u8
@@ -5955,10 +5955,10 @@ http://lzlive.vojs.cn/pL6NkZo/92/live.m3u8
 http://lzlive.vojs.cn/5Fo8mMX/92/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",江苏新闻广播 FM93.7
 http://ls.qingting.fm/live/4944.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",江苏新闻综合广播 AM702 (Opt-1)
-http://lzlive.vojs.cn/rTyLc36/92/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",江苏新闻综合广播 AM702 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",江苏新闻综合广播 AM702
 http://ls.qingting.fm/live/5055.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",江苏新闻综合广播 AM702
+http://lzlive.vojs.cn/rTyLc36/92/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="samplelogo.png" group-title="",江苏移动-CCTV14
 http://223.110.245.155/ott.js.chinamobile.com/PLTV/3/224/3221225813/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="samplelogo.png" group-title="",江苏移动-CCTV5+FHD1
@@ -6145,10 +6145,10 @@ http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225632/index.m3u8
 http://ls.qingting.fm/live/2508757.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北交通广播 FM99.2
 http://ls.qingting.fm/live/1646.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北公共 (Opt-1)
-http://weblive.hebtv.com/live/hbgg_lc/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北公共 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北公共
 http://weblive.hebtv.com/live/hbgg_bq/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北公共
+http://weblive.hebtv.com/live/hbgg_lc/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北农民
 http://hblc.chinashadt.com:1935/live/stream:lczy.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北农民
@@ -6156,13 +6156,15 @@ http://hbzx.chinashadt.com:2036/zhibo/stream:hbnm.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北农民
 http://hbzx.chinashadt.com:2036/zhibo/stream:hbnm.stream_360p/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北农民
-http://wuqiao.chinashadt.com:2035/live/di1.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北农民 (Opt-1)
 http://weblive.hebtv.com/live/nmpd_bq/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北农民 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北农民
 http://weblive.hebtv.com/live/nmpd_lc/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北农民
+http://wuqiao.chinashadt.com:2035/live/di1.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北农民广播 AM558
 http://ls.qingting.fm/live/1650.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/4/4d/HebeiTV.png/200px-HebeiTV.png" group-title="",河北卫视
+http://111.40.205.76/PLTV/88888888/224/3221225623/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北卫视
 http://111.40.205.87/PLTV/88888888/224/3221225623/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北卫视
@@ -6183,20 +6185,18 @@ http://223.110.245.149/ott.js.chinamobile.com/PLTV/3/224/3221225840/index.m3u8
 http://223.110.245.165/ott.js.chinamobile.com/PLTV/3/224/3221225602/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北卫视
 http://223.82.250.72/live/hebeistv/1.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/4/4d/HebeiTV.png/200px-HebeiTV.png" group-title="",河北卫视
+http://39.135.16.142:6060/PLTV/88888888/224/3221225753/1/index.m3u8?fmt=ts2hls
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北卫视
 http://hbpx.chinashadt.com:2036/live/px4.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北卫视
 http://live01.hebtv.com/channels/hebtv/video_channel_04/flv:2000k/live
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北卫视
 http://live01.hebtv.com/channels/hebtv/video_channel_04/flv:800k/live?1234567890
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北卫视 (Opt-1)
-http://weblive.hebtv.com/live/hbwsbq_lc/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/4/4d/HebeiTV.png/200px-HebeiTV.png" group-title="",河北卫视 (Opt-2)
-http://111.40.205.76/PLTV/88888888/224/3221225623/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北卫视 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北卫视
 http://weblive.hebtv.com/live/hbwsbq_bq/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/4/4d/HebeiTV.png/200px-HebeiTV.png" group-title="",河北卫视 (Opt-4)
-http://39.135.16.142:6060/PLTV/88888888/224/3221225753/1/index.m3u8?fmt=ts2hls
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北卫视
+http://weblive.hebtv.com/live/hbwsbq_lc/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北卫视HD
 http://125.210.152.20:9090/live/HBWSHD_H265.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北卫视HD
@@ -6213,20 +6213,20 @@ http://223.110.242.131:6610/cntv/live1/hebeistv/index.m3u8
 http://hwottcdn.ln.chinamobile.com/PLTV/88888890/224/3221226013/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北卫视高清
 http://weblive.hebtv.com/live/hbws_bq/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北少儿 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北少儿
 http://weblive.hebtv.com/live/hbse_bq/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北少儿 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北少儿
 http://weblive.hebtv.com/live/hbse_lc/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北影视
 http://hbzq.chinashadt.com:1936/live/zaoqiang4.stream_360p/palylist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北影视
 http://live01.hebtv.com/channels/hebtv/video_channel_06/flv:2000k/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北影视
-http://wuqiao.chinashadt.com:2035/live/di7.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北影视 (Opt-1)
 http://weblive.hebtv.com/live/hbys_bq/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北影视 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北影视
 http://weblive.hebtv.com/live/hbys_lc/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北影视
+http://wuqiao.chinashadt.com:2035/live/di7.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北戏曲
 http://117.158.206.60:9080/live/live31_tzwj_500k.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北故事广播 FM107.9
@@ -6246,17 +6246,17 @@ http://ls.qingting.fm/live/4867.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北私家车广播 FM90.7
 http://ls.qingting.fm/live/4868.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北经济
+http://hbfc.chinashadt.com:2036/live/6.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北经济
 http://weblive.hebtv.com/live/hbjj_bq/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北经济
-http://wuqiao.chinashadt.com:2035/live/di3.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北经济 (Opt-1)
-http://hbfc.chinashadt.com:2036/live/6.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北经济 (Opt-2)
 http://weblive.hebtv.com/live/hbjj_lc/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北购物 (Opt-1)
-http://weblive.hebtv.com/live/sjgw_lc/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北购物 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北经济
+http://wuqiao.chinashadt.com:2035/live/di3.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北购物
 http://weblive.hebtv.com/live/sjgw_bq/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北购物
+http://weblive.hebtv.com/live/sjgw_lc/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北邯郸科教
 http://mms.hdbs.cn:1936/live/public_sd/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河北都市
@@ -6271,6 +6271,8 @@ http://ls.qingting.fm/live/59896.m3u8
 http://ls.qingting.fm/live/1209.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河南公共
 http://123.163.119.21:9601/live/live8/500K/tzwj_video.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/1/15/%E6%B2%B3%E5%8D%97%E5%8D%AB%E8%A7%86.png" group-title="",河南卫视
+http://112.17.40.140/PLTV/88888888/224/3221226130/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河南卫视
 http://112.50.243.8/PLTV/88888888/224/3221225842/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河南卫视
@@ -6286,15 +6288,13 @@ http://121.31.30.90:8085/ysten-business/live/henanstv/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河南卫视
 http://121.31.30.90:8085/ysten-business/live/henanstv/yst.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河南卫视
+http://183.207.249.7/PLTV/2/224/3221226065/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河南卫视
 http://223.110.242.130:6610/cntv/live1/henanstv/henanstv?&virtualDomain=001.live_hls.zte.com
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/1/15/%E6%B2%B3%E5%8D%97%E5%8D%AB%E8%A7%86.png" group-title="",河南卫视
+http://39.135.16.142:6060/PLTV/88888888/224/3221225709/1/index.m3u8?fmt=ts2hls
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河南卫视
 http://m-tvlmedia.public.bcs.ysten.com/ysten-business/live/henanstv/1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/1/15/%E6%B2%B3%E5%8D%97%E5%8D%AB%E8%A7%86.png" group-title="",河南卫视 (Opt-1)
-http://39.135.16.142:6060/PLTV/88888888/224/3221225709/1/index.m3u8?fmt=ts2hls
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河南卫视 (Opt-2)
-http://183.207.249.7/PLTV/2/224/3221226065/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/1/15/%E6%B2%B3%E5%8D%97%E5%8D%AB%E8%A7%86.png" group-title="",河南卫视 (Opt-3)
-http://112.17.40.140/PLTV/88888888/224/3221226130/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河南卫视(电)
 http://118.123.60.8:8114/syhjcms_hls/?FvSeid=&Fsv_filetype=0&Fsv_ctype=LIVES&Fsv_TBt=614400&Fsv_ShiftEnable=1&Fsv_ShiftTsp=120&Fsv_SV_PARAM1=0&Fsv_otype=0&Provider_id=syhjcms_hls&Pcontent_id=&Fsv_CMSID=syhjcms&Fsv_cid=6653&Fsv_chan_hls_se_idx=19
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",河南卫视(电)
@@ -6431,7 +6431,7 @@ http://hhab.chinashadt.com:2136/live/di7.stream/playlist.m3u8
 http://tx.hls.huya.com/huyalive/29106097-2689406282-11550912026846953472-2789274558-10057-A-0-1_1200.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="samplelogo.png" group-title="",洪金宝电影
 http://tx.hls.huya.com/huyalive/29106097-2689406282-11550912026846953472-2789274558-10057-A-0-1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",洪雅新闻综合[卡]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",洪雅新闻综合
 http://117.172.215.250:8083/videos/live/35/39/GQVbrgob5CGJM/GQVbrgob5CGJM.M3U8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",济南交通
 http://ts1.ijntv.cn/jnjtpl/sd/live.m3u8
@@ -6507,13 +6507,13 @@ http://117.169.72.6:8080/ysten-businessmobile/live//zhejiangstv/1.m3u8
 http://l.cztvcloud.com/channels/lantian/channel12/360p.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江6频道
 http://117.148.187.37/PLTV/88888888/224/3221226237/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江之声 FM88 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江之声 FM88
 http://ls.qingting.fm/live/4518.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江之声 FM88 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江之声 FM88
 http://yf.m.l.cztv.com/channels/lantian/audio02/128k.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江交通之声 FM93 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江交通之声 FM93
 http://ls.qingting.fm/live/4522.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江交通之声 FM93 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江交通之声 FM93
 http://yf.m.l.cztv.com/channels/lantian/audio04/128k.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://img01.cztv.com/201805/23/8b5c0215b0652a42a1070c7e4dcb8935.png" group-title="",浙江公共新闻
 http://112.17.40.140/PLTV/88888888/224/3221226324/index.m3u8
@@ -6521,10 +6521,10 @@ http://112.17.40.140/PLTV/88888888/224/3221226324/index.m3u8
 http://125.210.152.20:9090/live/ZJGG.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江公共新闻
 http://l.cztvcloud.com/channels/lantian/channel07/360p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江动听(音乐调频) FM96.8 (Opt-1)
-http://yf.m.l.cztv.com/channels/lantian/audio01/128k.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江动听(音乐调频) FM96.8 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江动听(音乐调频) FM96.8
 http://ls.qingting.fm/live/4866.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江动听(音乐调频) FM96.8
+http://yf.m.l.cztv.com/channels/lantian/audio01/128k.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江卫视
 http://111.40.205.87/PLTV/88888888/224/3221225612/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江卫视
@@ -6585,14 +6585,14 @@ http://61.58.60.230:9000/live/233.m3u8
 http://61.58.60.230:9319/live/233.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江国际
 http://l.cztvcloud.com/channels/lantian/channel10/360p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江城市之声 (私家车107) FM107 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江城市之声 (私家车107) FM107
 http://ls.qingting.fm/live/4523.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江城市之声 (私家车107) FM107 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江城市之声 (私家车107) FM107
 http://yf.m.l.cztv.com/channels/lantian/audio06/128k.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江女主播电台 FM104.5 (Opt-1)
-http://yf.m.l.cztv.com/channels/lantian/audio07/128k.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江女主播电台 FM104.5 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江女主播电台 FM104.5
 http://ls.qingting.fm/live/4524.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江女主播电台 FM104.5
+http://yf.m.l.cztv.com/channels/lantian/audio07/128k.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://img01.cztv.com/201606/09/6a0bca347e8ebf1537adb7d8753b6677.jpg" group-title="",浙江少儿
 http://112.17.40.140/PLTV/88888888/224/3221226251/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江少儿
@@ -6615,9 +6615,9 @@ http://125.210.152.20:9090/live/ZJJYKJ.m3u8
 http://l.cztvcloud.com/channels/lantian/channel04/360p.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://img01.cztv.com/201606/09/26ae79a65e60561898b8a5d3c4936c51.jpg" group-title="",浙江数码时代
 http://112.17.40.140/PLTV/88888888/224/3221226638/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江新闻广播新锐 FM98.8 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江新闻广播新锐 FM98.8
 http://ls.qingting.fm/live/2686006.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江新闻广播新锐 FM98.8 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江新闻广播新锐 FM98.8
 http://yf.m.l.cztv.com/channels/lantian/audio08/128k.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://img01.cztv.com/201606/09/87c6b60ea10f882574570ef2e9d22288.jpg" group-title="",浙江民生
 http://112.17.40.140/PLTV/88888888/224/3221226237/index.m3u8
@@ -6635,9 +6635,9 @@ http://117.148.187.37/PLTV/88888888/224/3221226423/index.m3u8
 http://125.210.152.20:9090/live/ZJJS.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江经视
 http://l.cztvcloud.com/channels/lantian/channel03/360p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江财富广播 FM95 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江财富广播 FM95
 http://ls.qingting.fm/live/4519.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江财富广播 FM95 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江财富广播 FM95
 http://yf.m.l.cztv.com/channels/lantian/audio05/128k.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",浙江钱江都市
 http://l.cztvcloud.com/channels/lantian/channel02/360p.m3u8
@@ -6785,10 +6785,10 @@ http://223.110.242.130:6610/cntv/live1/HD-2500k-1080P-shenzhenstv/index.m3u8
 http://39.135.32.28:6610/000000001000/1000000001000009227/index.m3u8?i
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",深圳国际
 http://61.58.60.230:9000/live/235.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",深圳国际 (Opt-1)
-http://www.szmgiptv.com:14436/hls/9.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/szgjpd.jpg" group-title="",深圳国际 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/szgjpd.jpg" group-title="",深圳国际
 http://61.58.60.230:9319/live/235.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",深圳国际
+http://www.szmgiptv.com:14436/hls/9.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",深圳娱乐
 http://www.szmgiptv.com:14436/hls/24.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",深圳少儿
@@ -6971,10 +6971,10 @@ http://223.110.243.173/PLTV/3/224/3221227220/index.m3u8
 http://223.110.245.165/ott.js.chinamobile.com/PLTV/3/224/3221225854/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",湖南卫视
 http://36514.hlsplay.aodianyun.com/guangdianyun_36514/tv_channel_452.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://pmcdeadline2.files.wordpress.com/2015/01/hunan-tv-logo.jpg" group-title="",湖南卫视
+http://39.135.16.142:6060/PLTV/88888888/224/3221225778/1/index.m3u8?fmt=ts2hls
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",湖南卫视
 http://hbpx.chinashadt.com:2036/live/px5.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://pmcdeadline2.files.wordpress.com/2015/01/hunan-tv-logo.jpg" group-title="",湖南卫视 (Opt-1)
-http://39.135.16.142:6060/PLTV/88888888/224/3221225778/1/index.m3u8?fmt=ts2hls
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",湖南卫视FHD
 http://117.148.187.37/PLTV/88888888/224/3221226162/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",湖南卫视FHD
@@ -7053,7 +7053,7 @@ http://124.232.231.246:6610/000000001001/201500000235/12000.m3u8?zte_auth=fbca2e
 http://124.232.231.246:6610/000000001001/201600020003/index.m3u8?A
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",湖南都市
 http://124.232.231.247:6610/000000001001/201600020003/1400.m3u8?
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",湖南都市 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",湖南都市
 http://hnsd.chinashadt.com:2036/live/stream:hunandushi.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",湖南金鹰卡通
 http://183.252.176.36/PLTV/88888888/224/3221225870/index.m3u8
@@ -7557,7 +7557,7 @@ http://jssn.chinashadt.com:2036/live/1004.stream/playlist.m3u8
 http://jssn.chinashadt.com:2036/live/1003.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://static2.tvzhe.com/channel/logo/SUININGXW.jpg" group-title="",睢宁综合
 http://tv.jrsncn.com:9001/hls/live/live1/stream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",睢宁综合频道 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",睢宁综合频道
 http://jssn.chinashadt.com:2036/live/1002.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",睢宁资讯频道
 http://jssn.chinashadt.com:2036/live/1005.stream/playlist.m3u8
@@ -7595,13 +7595,13 @@ http://live1.fzntv.cn/live/zohi_fztv4/playlist.m3u8
 http://live.zohi.tv/video/s10001-yspd-2/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",福州影视
 http://live1.fzntv.cn/live/zohi_fztv2/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",福州生活 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",福州生活
 http://live.zohi.tv/video/s10001-shpd-3/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",福州生活 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",福州生活
 http://live1.fzntv.cn/live/zohi_fztv3/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",福州综合 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",福州综合
 http://live.zohi.tv/video/s10001-FZTV-1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",福州综合 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",福州综合
 http://live1.fzntv.cn/live/zohi_fztv1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",福建公共
 http://stream5.fjtv.net/ggpd/sd/live.m3u8
@@ -7687,9 +7687,9 @@ https://vip888.kuyun99.com/20180824/dsejI0LI/index.m3u8
 https://vip888.kuyun99.com/20180824/MMrikhSZ/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="samplelogo.png" group-title="",系列惊悚片Friday-the-13th(黑色星期五)8
 http://vip.yingshidaqian.com/20180803/YBVdk7Zx/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",綦江综合频道 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",綦江综合频道
 http://113.207.29.195:1935/app_2/_definst_/ls_25.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",綦江综合频道 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",綦江综合频道
 http://qxlmlive.cbg.cn:1935/app_2/_definst_/ls_25.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",红安综合
 http://hongan.live.cjyun.org/video/s10063-HAZH.m3u8
@@ -7817,9 +7817,9 @@ http://live.zgbctv.com:8011/m11.m3u8
 https://aldirect.hls.huya.com/huyalive/30765679-2523417472-10837995516394995712-2847699158-10057-A-1521181527-1_1200.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",舟山公共生活
 http://live.wifizs.cn/ggsh/sd/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",舟山新闻综合 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",舟山新闻综合
 http://live.wifizs.cn/xwzh/sd/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://static2.tvzhe.com/channel/logo/ZJZS-ZH.jpg" group-title="",舟山新闻综合 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://static2.tvzhe.com/channel/logo/ZJZS-ZH.jpg" group-title="",舟山新闻综合
 http://stream.wifizs.cn/xwzh/sd/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",舟山群岛旅游
 http://live.wifizs.cn/qdly/sd/live.m3u8
@@ -7865,15 +7865,15 @@ http://125.210.152.20:9090/live/CPD.m3u8
 http://33058.hlsplay.aodianyun.com/guangdianyun_33058/tv_channel_325.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/jzsxwpd.jpg" group-title="",荆州新闻
 http://117.149.150.4/guangdianyun_33058/tv_channel_216__redirect__33058.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",荆州新闻 (Opt-1)
-http://hhab.chinashadt.com:2136/live/di5.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",荆州新闻 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",荆州新闻
 http://33058.hlsplay.aodianyun.com/guangdianyun_33058/tv_channel_216.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",荆州新闻
+http://hhab.chinashadt.com:2136/live/di5.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",荆门之声频率 FM89.7
 http://live.jmtv.com.cn/xwzhpl/sd/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",荆门交通音乐频率 FM99.3 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",荆门交通音乐频率 FM99.3
 http://live.jmtv.com.cn/jtyypl/sd/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",荆门交通音乐频率 FM99.3 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",荆门交通音乐频率 FM99.3
 http://ls.qingting.fm/live/60808.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",荒野挑战
 http://aldirect.hls.huya.com/huyalive/28466698-2689656358-11551986095088467968-3048959616-10057-A-1525510878-1_1200.m3u8
@@ -7993,9 +7993,9 @@ http://bsyll.qingk.cn/live/hyszzhtv/index.m3u8
 http://ls.qingting.fm/live/5079970.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",衡阳新闻综合
 http://36514.hlsplay.aodianyun.com/guangdianyun_36514/tv_channel_386.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",襄阳交通广播 FM89.0 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",襄阳交通广播 FM89.0
 http://ls.qingting.fm/live/1307.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",襄阳交通广播 FM89.0 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",襄阳交通广播 FM89.0
 http://ls.qingting.fm/live/1308.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",襄阳公共
 http://xiangyang.live.cjyun.org/video/s10125-education_hd/index.m3u8
@@ -8017,9 +8017,9 @@ http://ls.qingting.fm/live/3400411.m3u8
 http://111.44.138.251:15414/contents38/live/CHANNEL10d2ec0ddf704bb3bb45863d5b0f698f/HD_3655028264191063491/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西宁私家车音乐调频
 http://ls.qingting.fm/live/3377772.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安交通广播 FM104.3 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安交通广播 FM104.3
 http://ls.qingting.fm/live/1611.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安交通广播 FM104.3 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安交通广播 FM104.3
 http://stream3.xiancity.cn/5/sd/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安健康
 http://stream2.xiancity.cn/xatv5/sd/live.m3u8
@@ -8027,9 +8027,9 @@ http://stream2.xiancity.cn/xatv5/sd/live.m3u8
 http://stream2.xiancity.cn/xatv4/sd/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安新闻
 http://stream2.xiancity.cn/xatv1/sd/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安新闻广播 FM95.0 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安新闻广播 FM95.0
 http://ls.qingting.fm/live/1610.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安新闻广播 FM95.0 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安新闻广播 FM95.0
 http://stream3.xiancity.cn/1/sd/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安白鸽
 http://stream2.xiancity.cn/xatv2/sd/live.m3u8
@@ -8037,9 +8037,9 @@ http://stream2.xiancity.cn/xatv2/sd/live.m3u8
 http://stream2.xiancity.cn/xatv3/sd/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安资讯广播 FM106.1
 http://stream3.xiancity.cn/2/sd/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安音乐广播 FM93.1 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安音乐广播 FM93.1
 http://ls.qingting.fm/live/1612.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安音乐广播 FM93.1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安音乐广播 FM93.1
 http://stream3.xiancity.cn/4/sd/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",西安音乐综艺
 http://stream2.xiancity.cn/xatv6/sd/live.m3u8
@@ -8165,9 +8165,9 @@ http://ls.qingting.fm/live/23929.m3u8
 http://ls.qingting.fm/live/23935.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",贵州电台音乐广播 FM91.6
 http://ls.qingting.fm/live/23937.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/gztv6.jpg" group-title="",贵州科教健康 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/gztv6.jpg" group-title="",贵州科教健康
 http://39.135.16.142:6060/PLTV/88888888/224/3221225672/1/index.m3u8?fmt=ts2hls
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/gztv3.jpg" group-title="",贵州科教健康 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/gztv3.jpg" group-title="",贵州科教健康
 http://39.135.16.142:6060/PLTV/88888888/224/3221225704/1/index.m3u8?fmt=ts2hls
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://static2.tvzhe.com/channel/logo/GZYDDSPD.jpg" group-title="",贵州移动电视
 http://39.135.16.142:6060/PLTV/88888888/224/3221225774/1/index.m3u8?fmt=ts2hls
@@ -8365,7 +8365,7 @@ http://ls.qingting.fm/live/23797.m3u8
 http://ls.qingting.fm/live/23793.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",辽源新闻综合
 http://stream2.jlntv.cn/liaoyuan1/sd/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",达州[转播CCTV-1]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",达州
 rtmp://118.122.16.15:1935/tslsChannelLive/rk8Z088/live
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",达州公共
 rtmp://118.122.16.15:1935/tslsChannelLive/hHToifM/live
@@ -8633,12 +8633,12 @@ http://hwottcdn.ln.chinamobile.com/PLTV/88888890/224/3221226012/index.m3u8
 http://m-tvlmedia.public.bcs.ysten.com/ysten-business/live/jinyingkaton/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",金鹰卡通FHD
 http://120.198.235.68/112.50.243.7/PLTV/88888888/224/3221226746/1.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://ali-oss.file.icantv.cn/uploads/tvimg/jyjs.jpg" group-title="",金鹰纪实
+http://112.17.40.140/PLTV/88888888/224/3221226831/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",金鹰纪实
 http://120.198.235.70/112.50.243.12/PLTV/88888888/224/3221226737/1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.entgroup.cn/uploads/201604/2e1349bb-6844-4813-b9d4-39ce31c04d2f.jpg" group-title="",金鹰纪实 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.entgroup.cn/uploads/201604/2e1349bb-6844-4813-b9d4-39ce31c04d2f.jpg" group-title="",金鹰纪实
 http://39.135.16.142:6060/PLTV/88888888/224/3221225671/1/index.m3u8?fmt=ts2hls
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://ali-oss.file.icantv.cn/uploads/tvimg/jyjs.jpg" group-title="",金鹰纪实 (Opt-2)
-http://112.17.40.140/PLTV/88888888/224/3221226831/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",金鹰纪实HD
 http://120.198.235.68/112.50.243.7/PLTV/88888888/224/3221226613/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",钦州综合频道
@@ -8729,10 +8729,10 @@ http://stream.chinactv.com/ctv5/sd/live.m3u8
 http://ls.qingting.fm/live/5014.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/ctv4.jpg" group-title="",长春经济
 http://stream.chinactv.com/ctv4/sd/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",长春综合 (Opt-1)
-http://stream2.jlntv.cn/jlcc/sd/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/ctv1.jpg" group-title="",长春综合 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvyan.com/uploads/dianshi/ctv1.jpg" group-title="",长春综合
 http://stream.chinactv.com/ctv1/sd/live.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",长春综合
+http://stream2.jlntv.cn/jlcc/sd/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",长沙公交移动
 http://35848.hlsplay.aodianyun.com/guangdianyun_35848/tv_channel_357.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",长沙地铁移动
@@ -8805,10 +8805,10 @@ http://121.31.30.90:8085/ysten-business/live/yangguangstv/1.m3u8
 http://121.31.30.90:8085/ysten-business/live/yangguangstv/yst.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://ali-oss.file.icantv.cn/uploads/tvimg/yangjiang2.jpg" group-title="",阳江公共
 http://live.yjbc.tv:8081/live/smil:yjtv2.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://ali-oss.file.icantv.cn/uploads/tvimg/yangjiang1.jpg" group-title="",阳江综合 (Opt-1)
-http://live.yjbc.tv:8081/live/smil:yjtv1.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",阳江综合 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",阳江综合
 http://dslive.grtn.cn/yjzh/sd/live.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://ali-oss.file.icantv.cn/uploads/tvimg/yangjiang1.jpg" group-title="",阳江综合
+http://live.yjbc.tv:8081/live/smil:yjtv1.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",阳泉交通广播
 http://ls.qingting.fm/live/4592896.m3u8?aac
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",阳泉新闻综合广播
@@ -9251,18 +9251,18 @@ http://111.40.205.87/PLTV/88888888/224/3221225640/index.m3u8
 http://111.40.205.87/PLTV/88888888/224/3221225658/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",黑龙江卫视
 http://112.25.77.147:8080/live/hdheilongjiangstv/1.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/4/49/HLJTV_logo.png" group-title="",黑龙江卫视
+http://112.50.243.8/PLTV/88888888/224/3221225940/3.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",黑龙江卫视
 http://125.210.152.20:9090/live/HLJWSHD_H265.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",黑龙江卫视
+http://hljjms.chinashadt.com:2036/live/1003.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",黑龙江卫视
 http://ivi.bupt.edu.cn/hls/hljtv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",黑龙江卫视
 http://m-tvlmedia.public.bcs.ysten.com/ysten-business/live/hdheilongjiangstv/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",黑龙江卫视
 http://playerv1.hoge.cn/player.swf?config=177live.xml&id=3
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",黑龙江卫视 (Opt-1)
-http://hljjms.chinashadt.com:2036/live/1003.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/4/49/HLJTV_logo.png" group-title="",黑龙江卫视 (Opt-2)
-http://112.50.243.8/PLTV/88888888/224/3221225940/3.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",黑龙江卫视FHD
 http://120.198.235.68/112.50.243.7/PLTV/88888888/224/3221225862/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",黑龙江卫视HD
@@ -9343,17 +9343,17 @@ http://yslk.chinashadt.com:1635/live/stream:di2.stream/playlist.m3u8
 http://stream.lytv.net.cn/1/sd/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",龙岩综合
 http://stream.lytv.net.cn/2/sd/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",龙广乡村广播 AM945 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",龙广乡村广播 AM945
 http://ls.qingting.fm/live/4977.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",龙广乡村广播 AM945 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",龙广乡村广播 AM945
 http://stream3.hljtv.com/hljrdnc/sd/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",龙广交通广播 FM99.8
 http://ls.qingting.fm/live/4973.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",龙广北大荒之声 FM104.6
 http://stream3.hljtv.com/hljrdgx/sd/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",龙广新闻广播 FM94.6 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",龙广新闻广播 FM94.6
 http://ls.qingting.fm/live/4974.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",龙广新闻广播 FM94.6 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",龙广新闻广播 FM94.6
 http://stream3.hljtv.com/hljrdjt/sd/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",龙广朝鲜语广播 AM873
 http://stream3.hljtv.com/hljrdcy/sd/live.m3u8
diff --git a/channels/co.m3u b/channels/co.m3u
index 1645764e9..045ccc5dc 100644
--- a/channels/co.m3u
+++ b/channels/co.m3u
@@ -3,9 +3,9 @@
 https://5b464b69d264e.streamlock.net/live/smil:Televitrola.smil/chunklist_w454440596_b1048000_slES.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7YB94Hf.png" group-title="Religious",Avivamiento
 https://s3.abntelevision.com/avivamiento/avivamiento/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/sRZN7Tn.png" group-title="",Cali TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/sRZN7Tn.png" group-title="",Cali TV
 http://vbox.cehis.net/live-calitv/calitv1/chunklist_w1780377540.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/sRZN7Tn.png" group-title="",Cali TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/sRZN7Tn.png" group-title="",Cali TV
 http://vbox.cehis.net/live-calitv/calitv1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2BpgO62.png" group-title="",Canal 8 Teleenvigado
 http://iptvcolombia.ddns.net/hls-live/livepkgr/_definst_/liveevent/vivo.m3u8
@@ -23,9 +23,9 @@ https://cdn.logicideas.media/canaltrece-live/smil:canal13.smil/chunklist_b450000
 https://video.cosmovision.tv/live/sd_720p2628kbs/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/phHdw4Y.png" group-title="",CTV Barranquilla
 http://wmoy8w6ky2a7-hls-live.5centscdn.com/ctvbaq/live/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2WVxg8A.jpg" group-title="",Melody Channel TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2WVxg8A.jpg" group-title="",Melody Channel TV
 http://186.155.200.118:1935/live/MelodyChannel/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2WVxg8A.jpg" group-title="",Melody Channel TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2WVxg8A.jpg" group-title="",Melody Channel TV
 http://186.155.200.118:1935/live/MelodyChannel/playlist.m3u8?iptvgratis?chile.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AAcPKgE.png" group-title="",MIPTV
 https://videoplayer.amelbasoluciones.co/hls/miptvco.m3u8
diff --git a/channels/cr.m3u b/channels/cr.m3u
index 2d0792b93..4f4e160e0 100644
--- a/channels/cr.m3u
+++ b/channels/cr.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i0.wp.com/unored.tv/wp-content/uploads/2015/08/Extrema-TV-portal-Unored-1.png" group-title="",Extrema TV
 http://livestreamcdn.net:1935/ExtremaTV/ExtremaTV/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",HBTV TICAVISION [880p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",HBTV TICAVISION
 http://k3.usastreams.com:1935/HBTV/HBTV/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Multimedios Costa Rica
 http://mdstrm.com/live-stream-playlist/5a7b1e63a8da282c34d65445.m3u8?ref=http://www.multimedios.com
diff --git a/channels/cw.m3u b/channels/cw.m3u
index 31147afee..16212f809 100644
--- a/channels/cw.m3u
+++ b/channels/cw.m3u
@@ -1,8 +1,8 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/EMGIQYP.png" group-title="",Dutch Caribbean TV (Opt-1)
-https://nlengine1.cur.watch/dctv/auto/dctv/720p/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/EMGIQYP.png" group-title="",Dutch Caribbean TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/EMGIQYP.png" group-title="",Dutch Caribbean TV
 http://dcunilive36-lh.akamaihd.net/i/dclive_1@667431/index_150_av-p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/EMGIQYP.png" group-title="",Dutch Caribbean TV
+https://nlengine1.cur.watch/dctv/auto/dctv/720p/chunks.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="",TeleCuraçao
diff --git a/channels/cz.m3u b/channels/cz.m3u
index 157cda6ac..4088bacb4 100644
--- a/channels/cz.m3u
+++ b/channels/cz.m3u
@@ -35,41 +35,41 @@ http://83.167.253.110:5000/live/prima_hd/playlist.m3u8
 http://92.62.234.223/104/mystream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://krimi.iprima.cz/sites/all/themes/prima_channels/images/logos/logo-krimi-cover.jpg" group-title="",Prima Krimi
 http://83.167.253.116:5000/live/prima_krimi/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/bDQDSXL.png" group-title="",Prima Love (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/bDQDSXL.png" group-title="",Prima Love
 http://83.240.95.152:4022/udp/239.1.1.81:11111
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://2.bp.blogspot.com/-nbAar05h3ZU/TV4Kwi0PX2I/AAAAAAAAAHI/pFwNnGVVJeA/s1600/Prima_Love_logo_2011.png" group-title="",Prima Love (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://2.bp.blogspot.com/-nbAar05h3ZU/TV4Kwi0PX2I/AAAAAAAAAHI/pFwNnGVVJeA/s1600/Prima_Love_logo_2011.png" group-title="",Prima Love
 http://92.62.234.223/101/mystream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://max.iprima.cz/sites/all/themes/prima_channels/images/logos/logo-max-cover.jpg" group-title="",Prima Max
 http://70.32.0.9:5000/live/518/playlist.m3u8
-#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="https://www.o2tv.cz/assets/images/tv-logos/original/retro-music.png" group-title="Music",Retro Music Television (Opt-1)
-http://stream.mediawork.cz/retrotv//retrotvHQ1/chunklist_w1911133387.m3u8
-#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="https://www.o2tv.cz/assets/images/tv-logos/original/retro-music.png" group-title="Music",Retro Music Television (Opt-2)
-http://stream.mediawork.cz/retrotv/retrotvHQ1/chunklist_w627639048.m3u8?iptvgratis?chile.m3u8
-#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="https://www.o2tv.cz/assets/images/tv-logos/original/retro-music.png" group-title="Music",Retro Music Television (Opt-3)
-http://stream.mediawork.cz/retrotv/retrotvHQ1/playlist.m3u8
-#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="https://www.o2tv.cz/assets/images/tv-logos/original/retro-music.png" group-title="Music",Retro Music Television (Opt-4)
-http://stream.mediawork.cz/retrotv//retrotvHQ1/playlist.m3u8
-#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="https://www.o2tv.cz/assets/images/tv-logos/original/retro-music.png" group-title="Music",Retro Music Television (Opt-5)
-http://stream.mediawork.cz/retrotv/retrotvHQ1/chunklist_w1652320907.m3u8
-#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="https://i.postimg.cc/C53XtK5f/zaltv.png" group-title="Music",Retro Music Television (Opt-6)
+#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="https://i.postimg.cc/C53XtK5f/zaltv.png" group-title="Music",Retro Music Television
 http://89.185.253.55/retrotv/retrotvHQ1/playlist.m3u8
-#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="http://tv.wurtlitzer.com/imagenes/canales/musica/retrotv.png" group-title="Music",Retro Music Television (Opt-7)
-http://stream.mediawork.cz/retrotv//retrotvHQ1/playlist.m3u8?GrupoTopIptv
-#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="" group-title="Music",Retro Music Television (Opt-8)
+#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="" group-title="Music",Retro Music Television
 http://bit.ly/2m3sY3Y
-#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="https://i0.wp.com/willmckinley.files.wordpress.com/2014/05/logo.png?w=640" group-title="Music",Retro Music Television (Opt-9)
+#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="https://i0.wp.com/willmckinley.files.wordpress.com/2014/05/logo.png?w=640" group-title="Music",Retro Music Television
 http://stream.mediawork.cz/retrotv//retrotvHQ1/chunklist_w119998573.m3u8
+#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="https://www.o2tv.cz/assets/images/tv-logos/original/retro-music.png" group-title="Music",Retro Music Television
+http://stream.mediawork.cz/retrotv//retrotvHQ1/chunklist_w1911133387.m3u8
+#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="https://www.o2tv.cz/assets/images/tv-logos/original/retro-music.png" group-title="Music",Retro Music Television
+http://stream.mediawork.cz/retrotv//retrotvHQ1/playlist.m3u8
+#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="http://tv.wurtlitzer.com/imagenes/canales/musica/retrotv.png" group-title="Music",Retro Music Television
+http://stream.mediawork.cz/retrotv//retrotvHQ1/playlist.m3u8?GrupoTopIptv
+#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="https://www.o2tv.cz/assets/images/tv-logos/original/retro-music.png" group-title="Music",Retro Music Television
+http://stream.mediawork.cz/retrotv/retrotvHQ1/chunklist_w1652320907.m3u8
+#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="https://www.o2tv.cz/assets/images/tv-logos/original/retro-music.png" group-title="Music",Retro Music Television
+http://stream.mediawork.cz/retrotv/retrotvHQ1/chunklist_w627639048.m3u8?iptvgratis?chile.m3u8
+#EXTINF:-1 tvg-id="Retro Music TV-CZ" tvg-name="Retro Music TV-CZ" tvg-logo="https://www.o2tv.cz/assets/images/tv-logos/original/retro-music.png" group-title="Music",Retro Music Television
+http://stream.mediawork.cz/retrotv/retrotvHQ1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.iinfo.cz/images/409/v1-vychodoceska-televize-1.jpg" group-title="",Východočeská TV
 https://stream.polar.cz/vctv/vctvlive-1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Óčko (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Óčko
 http://ocko-live.ssl.cdn.cra.cz/channels/ocko/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Óčko (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Óčko
 http://ocko-live.ssl.cdn.cra.cz/channels/ocko/playlist/cze/live_hq.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Óčko Expres
 http://ocko-live.ssl.cdn.cra.cz/channels/ocko_expres/playlist/cze/live_hq.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Óčko Gold (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Óčko Gold
 http://ocko-live.ssl.cdn.cra.cz/channels/ocko_gold/playlist/cze/live_hq.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/nrWNyLc.jpg" group-title="Music",Óčko Gold (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/nrWNyLc.jpg" group-title="Music",Óčko Gold
 https://ocko-live-dash.ssl.cdn.cra.cz/cra_live2/ocko_gold.stream.1.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/2/2f/%C4%8CT1_logo_2012.svg/225px-%C4%8CT1_logo_2012.svg.png" group-title="",ČT1
 http://213.151.233.20:8000/dna-5100-tv-pc/hls/4002v105.m3u8
diff --git a/channels/de.m3u b/channels/de.m3u
index 074b991a8..66445cb26 100644
--- a/channels/de.m3u
+++ b/channels/de.m3u
@@ -5,17 +5,17 @@ https://vipottbpkstream.vip.hr/Content/a1-hls-vmx/Live/Channel(A1_Now_HD)/index.
 https://sdn-global-live-http-cache.3qsdn.com/live/_definst_/amlst:7649-sbr/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Allgäu TV
 http://tvallgaeu.iptv-playoutcenter.de:1935/tvallgaeu/tvallgaeu.stream_2/playlist.m3u8
-#EXTINF:-1 tvg-id="Augsburg TV DE" tvg-name="Augsburg TV DE" tvg-logo="https://i.imgur.com/tupATym.png" group-title="",Augsburg TV (Opt-1)
-http://augsburgtv.iptv-playoutcenter.de:1935/augsburgtv/augsburgtv.stream_1/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Augsburg TV DE" tvg-name="Augsburg TV DE" tvg-logo="http://www.augsburg.tv/wp-content/themes/atv/img/icons/microsoft-icon-310x310.png" group-title="",Augsburg TV (Opt-2)
+#EXTINF:-1 tvg-id="Augsburg TV DE" tvg-name="Augsburg TV DE" tvg-logo="http://www.augsburg.tv/wp-content/themes/atv/img/icons/microsoft-icon-310x310.png" group-title="",Augsburg TV
 http://augsburgtv.iptv-playoutcenter.de:1935/augsburgtv/augsburgtv.stream_1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Babestation24 (Opt-1)
+#EXTINF:-1 tvg-id="Augsburg TV DE" tvg-name="Augsburg TV DE" tvg-logo="https://i.imgur.com/tupATym.png" group-title="",Augsburg TV
+http://augsburgtv.iptv-playoutcenter.de:1935/augsburgtv/augsburgtv.stream_1/playlist.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Babestation24
 http://sdn-global-live-http-cache.3qsdn.com/live/_definst_/amlst:9528-mbr/chunklist_b1728000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Babestation24 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Babestation24
 http://sdn-global-live-http-cache.3qsdn.com/live/_definst_/amlst:9528-mbr/chunklist_b1728000.m3u8?fluxuslust.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Baden TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Baden TV
 http://badentv-stream2.siebnich.info/rtplive/btv.stream/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.iptvdigital.com/images/canal_live/22_canal_live_28_canal_live_baden_tv.png" group-title="",Baden TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.iptvdigital.com/images/canal_live/22_canal_live_28_canal_live_baden_tv.png" group-title="",Baden TV
 https://cdn.icu.de/rtplive/btv.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Bayern
 http://muenchentv.iptv-playoutcenter.de/muenchentv/muenchentv.stream_1/chunklist_w146192926.m3u8
@@ -39,53 +39,53 @@ http://livestreams.br.de/i/bfssued_germany@119890/master.m3u8
 http://livestreams.br.de/i/bfsnord_germany@119898/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://images.live-stream.tv/picons/br.png" group-title="",BR Fernsehen Worldwide
 https://br_hdslive-f.akamaihd.net/i/bfssued_worldwide@119891/index_3776_av-p.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://yt3.ggpht.com/-p6SxYHWfzPA/AAAAAAAAAAI/AAAAAAAAAAA/v8ceLuwU1Qg/s900-c-k-no-mo-rj-c0xffffff/photo.jpg" group-title="",Campus TV Magdeburg (Opt-1)
-http://iptvcodes.blogspot.com@62.113.210.250/medienasa-live/ok-wernigerode_high/hasbahca.m3u8?bitrate=800
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Campus TV Magdeburg (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Campus TV Magdeburg
 http://iptvcodes.blogspot.com@62.113.210.250/medienasa-live/ok-wernigerode_high/hasbahca.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://yt3.ggpht.com/-p6SxYHWfzPA/AAAAAAAAAAI/AAAAAAAAAAA/v8ceLuwU1Qg/s900-c-k-no-mo-rj-c0xffffff/photo.jpg" group-title="",Campus TV Magdeburg
+http://iptvcodes.blogspot.com@62.113.210.250/medienasa-live/ok-wernigerode_high/hasbahca.m3u8?bitrate=800
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CBSN
 https://cbsnhls-i.akamaihd.net/hls/live/264710/CBSN_mdialog/prodstream/master_2200.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/VTCCMrn.png" group-title="",Chemnitz Fernsehen
 http://chemnitz.iptv-playoutcenter.de:1935/chemnitz/chemnitzfernsehen.stream_2/playlist.m3u8
+#EXTINF:-1 tvg-id="Das Erste DE" tvg-name="Das Erste DE" tvg-logo="https://www.daserste.de/mediasrc/img/tv/ard/ard-daserste-logo.png" group-title="",Das Erste
+https://daserstehdde-lh.akamaihd.net/i/daserstehd_de@629196/index_3776_av-p.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Das Erste
 https://daserstehdint-lh.akamaihd.net/i/daserstehd_int@629195/index_3776_av-b.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="Das Erste DE" tvg-name="Das Erste DE" tvg-logo="https://i.imgur.com/7wABSuo.png" group-title="",Das Erste (Opt-1)
+#EXTINF:-1 tvg-id="Das Erste DE" tvg-name="Das Erste DE" tvg-logo="https://i.imgur.com/7wABSuo.png" group-title="",Das Erste
 https://mcdn.daserste.de/daserste/de/profile1/index.m3u8
-#EXTINF:-1 tvg-id="Das Erste DE" tvg-name="Das Erste DE" tvg-logo="https://www.daserste.de/mediasrc/img/tv/ard/ard-daserste-logo.png" group-title="",Das Erste (Opt-2)
-https://daserstehdde-lh.akamaihd.net/i/daserstehd_de@629196/index_3776_av-p.m3u8
 #EXTINF:-1 tvg-id="Deluxe Music" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/d/d7/DeluxeMusic2013.svg/220px-DeluxeMusic2013.svg.png" group-title="",Deluxe Music
 http://streaming-02.mivitec.net/live/smil:test.smil/chunklist_w1073861416_b879931_slDE.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Deutsches Musik Fernsehen DE" tvg-name="Deutsches Musik Fernsehen DE" tvg-logo="https://i1.wp.com/www.broadbandtvnews.com/wp-content/uploads/2015/03/Deutsches-Musik-Fernsehen.jpg" group-title="",Deutsches Musik Fernsehen (Opt-1)
-https://tv.artcom-venture.de/dmf/tv_720.m3u8
-#EXTINF:-1 tvg-id="Deutsches Musik Fernsehen DE" tvg-name="Deutsches Musik Fernsehen DE" tvg-logo="https://i.imgur.com/SztpK9s.png" group-title="",Deutsches Musik Fernsehen (Opt-2)
+#EXTINF:-1 tvg-id="Deutsches Musik Fernsehen DE" tvg-name="Deutsches Musik Fernsehen DE" tvg-logo="https://i.imgur.com/SztpK9s.png" group-title="",Deutsches Musik Fernsehen
 http://tv.artcom-venture.de:1322/dmf/tv_360.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Deutsches Musik Fernsehen DE" tvg-name="Deutsches Musik Fernsehen DE" tvg-logo="" group-title="",Deutsches Musik Fernsehen (Opt-3)
+#EXTINF:-1 tvg-id="Deutsches Musik Fernsehen DE" tvg-name="Deutsches Musik Fernsehen DE" tvg-logo="" group-title="",Deutsches Musik Fernsehen
 http://tv.artcom-venture.de:1322/dmf/tv_720.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/donautv.png" group-title="",Donau TV (Opt-1)
+#EXTINF:-1 tvg-id="Deutsches Musik Fernsehen DE" tvg-name="Deutsches Musik Fernsehen DE" tvg-logo="https://i1.wp.com/www.broadbandtvnews.com/wp-content/uploads/2015/03/Deutsches-Musik-Fernsehen.jpg" group-title="",Deutsches Musik Fernsehen
+https://tv.artcom-venture.de/dmf/tv_720.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/donautv.png" group-title="",Donau TV
 http://donautv.iptv-playoutcenter.de:1935/donautv/donautv.stream_1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ygv8ASn.png" group-title="",Donau TV (Opt-2)
-http://donautv.iptv-playoutcenter.de:1935/donautv/donautv.stream_2/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Donau TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Donau TV
 http://donautv.iptv-playoutcenter.de:1935/donautv/donautv.stream_2/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ygv8ASn.png" group-title="",Donau TV
+http://donautv.iptv-playoutcenter.de:1935/donautv/donautv.stream_2/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0XnMWF7.png" group-title="",Dresden Fernsehen
 http://dresden.iptv-playoutcenter.de:1935/dresden/dresdenfernsehen.stream_2/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",DRF1 (Opt-1)
-http://62.67.13.54:1935/drf1/drf1_livestream_3/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",DRF1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",DRF1
 http://62.67.13.54:1935/drf1/drf1_livestream_1/playlist.m3u8
-#EXTINF:-1 tvg-id="DW DE" tvg-name="DW DE" tvg-logo="" group-title="News",DW (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",DRF1
+http://62.67.13.54:1935/drf1/drf1_livestream_3/playlist.m3u8
+#EXTINF:-1 tvg-id="DW DE" tvg-name="DW DE" tvg-logo="" group-title="News",DW
 http://dwstream5-lh.akamaihd.net/i/dwstream5_live@124540/master.m3u8
-#EXTINF:-1 tvg-id="DW DE" tvg-name="DW DE" tvg-logo="https://static.iptv-epg.com/de/DeutscheWelle.de.png" group-title="News",DW (Opt-2)
-http://dwstream72-lh.akamaihd.net/i/dwstream72_live@123556/index_1_av-b.m3u8
-#EXTINF:-1 tvg-id="DW DE" tvg-name="DW DE" tvg-logo="https://static.iptv-epg.com/de/DeutscheWelle.de.png" group-title="News",DW (Opt-3)
-http://dwstream6-lh.akamaihd.net/i/dwstream6_live@123962/master.m3u8
-#EXTINF:-1 tvg-id="DW DE" tvg-name="DW DE" tvg-logo="https://static.iptv-epg.com/de/DeutscheWelle.de.png" group-title="News",DW (Opt-4)
+#EXTINF:-1 tvg-id="DW DE" tvg-name="DW DE" tvg-logo="https://static.iptv-epg.com/de/DeutscheWelle.de.png" group-title="News",DW
 http://dwstream6-lh.akamaihd.net/i/dwstream6_live@123962/index_1_av-b.m3u8
-#EXTINF:-1 tvg-id="DW DE" tvg-name="DW DE" tvg-logo="https://static.iptv-epg.com/de/DeutscheWelle.de.png" group-title="News",DW (Opt-5)
+#EXTINF:-1 tvg-id="DW DE" tvg-name="DW DE" tvg-logo="https://static.iptv-epg.com/de/DeutscheWelle.de.png" group-title="News",DW
+http://dwstream6-lh.akamaihd.net/i/dwstream6_live@123962/master.m3u8
+#EXTINF:-1 tvg-id="DW DE" tvg-name="DW DE" tvg-logo="https://static.iptv-epg.com/de/DeutscheWelle.de.png" group-title="News",DW
+http://dwstream72-lh.akamaihd.net/i/dwstream72_live@123556/index_1_av-b.m3u8
+#EXTINF:-1 tvg-id="DW DE" tvg-name="DW DE" tvg-logo="https://static.iptv-epg.com/de/DeutscheWelle.de.png" group-title="News",DW
 http://dwstream72-lh.akamaihd.net/i/dwstream72_live@123556/index_1_av-p.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="DW DE" tvg-name="DW DE" tvg-logo="https://static.iptv-epg.com/de/DeutscheWelle.de.png" group-title="News",DW (Opt-6)
+#EXTINF:-1 tvg-id="DW DE" tvg-name="DW DE" tvg-logo="https://static.iptv-epg.com/de/DeutscheWelle.de.png" group-title="News",DW
 http://dwstream72-lh.akamaihd.net/i/dwstream72_live@123556/master.m3u8
-#EXTINF:-1 tvg-id="DW DE" tvg-name="" tvg-logo="" group-title="News",DW TV (Opt-8)
+#EXTINF:-1 tvg-id="DW DE" tvg-name="" tvg-logo="" group-title="News",DW TV
 http://210.210.155.35/session/de566102-7b7a-11e8-aa50-c81f66f89318/qwr9ew/s/s26/01.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ELBEKANAL
 http://62.113.210.250/medienasa-live/_definst_/mp4:elbe_high/chunklist_w1146564478.m3u8
@@ -97,69 +97,69 @@ https://cldf-wzw-live.r53.cdn.tv1.eu/14000erf/_definst_/live/app610238466/w23715
 http://62.67.13.53:1935/kabeljournal/live.stream/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/19iKLvf.png" group-title="",Filstalwelle
 http://62.113.210.2/filstalwelle-live/_definst_/mp4:livestream/chunklist_w660034089.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.broadbandtvnews.com/wp-content/uploads/2015/07/Folx-TV.jpg" group-title="",Folx TV (Opt-1)
-http://46.101.244.86:8081/folx-abr/live-abr/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.broadbandtvnews.com/wp-content/uploads/2015/07/Folx-TV.jpg" group-title="",Folx TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.broadbandtvnews.com/wp-content/uploads/2015/07/Folx-TV.jpg" group-title="",Folx TV
 http://46.101.244.86:8081/folx-abr/live-abr/fle/fle1/chunks.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.broadbandtvnews.com/wp-content/uploads/2015/07/Folx-TV.jpg" group-title="",Folx TV
+http://46.101.244.86:8081/folx-abr/live-abr/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Franken Fernsehen
 http://frankentv.iptv-playoutcenter.de:1935/frankentv/frankentv.stream_1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jynL4Xl.png" group-title="",FRF1
 http://58e5fdd27293a.streamlock.net:1935/friesischerRundfunk-live/_definst_/mp4:friesischerrundfunk/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",H1 (Opt-1)
-http://livestream.htp.tv/hls-live/livepkgr/_definst_/H1/H1_LQ.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/H1-logo.svg/1200px-H1-logo.svg.png" group-title="",H1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/H1-logo.svg/1200px-H1-logo.svg.png" group-title="",H1
 http://livestream.htp.tv/hls-live/livepkgr/_definst_/H1/H1_HQ.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Halle (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",H1
+http://livestream.htp.tv/hls-live/livepkgr/_definst_/H1/H1_LQ.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Halle
 http://62.113.210.250/medienasa-live/tvhalle_high/HasBahCa.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/hr.png" group-title="",HR Event 2
 http://hrevent2-lh.akamaihd.net/i/hr_event2@309240/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",HR Fernsehen (Opt-1)
-http://hrlive1-lh.akamaihd.net/i/hr_fernsehen@75910/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/hr.png" group-title="",HR Fernsehen (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/hr.png" group-title="",HR Fernsehen
 http://hrlive1-lh.akamaihd.net/i/hr_fernsehen@75910/index_3584_av-b.m3u8
-#EXTINF:-1 tvg-id="HR HD DE" tvg-name="HR HD DE" tvg-logo="" group-title="",HR HD (Opt-1)
-http://livestream-1.hr.de/i/hr_fernsehen@75910/index_3584_av-b.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="HR HD DE" tvg-name="HR HD DE" tvg-logo="" group-title="",HR HD (Opt-2)
-http://live1_hr-lh.akamaihd.net/i/hr_fernsehen@75910/master.m3u8
-#EXTINF:-1 tvg-id="HR HD DE" tvg-name="HR HD DE" tvg-logo="http://programm.ard.de/files/265/2007/2778/28108.jpg" group-title="",HR HD (Opt-3)
-http://livestream-1.hr.de:80/i/hr_fernsehen@75910/master.m3u8
-#EXTINF:-1 tvg-id="HR HD DE" tvg-name="HR HD DE" tvg-logo="http://programm.ard.de/files/265/2007/2778/28108.jpg" group-title="",HR HD (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",HR Fernsehen
+http://hrlive1-lh.akamaihd.net/i/hr_fernsehen@75910/master.m3u8
+#EXTINF:-1 tvg-id="HR HD DE" tvg-name="HR HD DE" tvg-logo="http://programm.ard.de/files/265/2007/2778/28108.jpg" group-title="",HR HD
 http://hrlive1-lh.akamaihd.net/i/hr_fernsehen@75910/index_3584_av-p.m3u8
+#EXTINF:-1 tvg-id="HR HD DE" tvg-name="HR HD DE" tvg-logo="" group-title="",HR HD
+http://live1_hr-lh.akamaihd.net/i/hr_fernsehen@75910/master.m3u8
+#EXTINF:-1 tvg-id="HR HD DE" tvg-name="HR HD DE" tvg-logo="" group-title="",HR HD
+http://livestream-1.hr.de/i/hr_fernsehen@75910/index_3584_av-b.m3u8?sd=10&rebase=on
+#EXTINF:-1 tvg-id="HR HD DE" tvg-name="HR HD DE" tvg-logo="http://programm.ard.de/files/265/2007/2778/28108.jpg" group-title="",HR HD
+http://livestream-1.hr.de:80/i/hr_fernsehen@75910/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Isar TV
 http://isar-tv.iptv-playoutcenter.de:1935/isar-tv/isar-tv.stream_1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/kabeljournal.png" group-title="",KabelJournal
 http://62.67.13.53:1935/kabeljournal/live.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Kultur MD
 http://62.113.210.250/medienasa-live/_definst_/mp4:kulturmd_high/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/ltv.png" group-title="",L-TV (Opt-1)
-http://62.113.221.4/tv2000plus-live/_definst_/mp4:livestream3.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Y850GVQ.png" group-title="",L-TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Y850GVQ.png" group-title="",L-TV
 http://62.113.221.4/tv2000plus-live/_definst_/mp4:livestream3.stream/chunklist_w2029534871.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/ltv.png" group-title="",L-TV
+http://62.113.221.4/tv2000plus-live/_definst_/mp4:livestream3.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qskVMhF.png" group-title="",Light Channel
 http://streamer1.streamhost.org:1935/salive/lctvde/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qrI3W8M.png" group-title="Music",MagentaMusik 360
 http://streaming-magenta-music-360.akamaized.net/hls/live/504581/magentamusik1/magentamusik1_1/magentamusik1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MDF 1 (Opt-1)
-http://62.113.210.250/medienasa-live/mdf1_high/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MDF 1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MDF 1
 http://62.113.210.250/medienasa-live/mdf1_high/agustiny.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.msa-online.de/cms/upload/Sender/TV/gfx_tv_MDF1.gif" group-title="",MDF 1 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.msa-online.de/cms/upload/Sender/TV/gfx_tv_MDF1.gif" group-title="",MDF 1
 http://62.113.210.250/medienasa-live/mdf1_high/HasBahCa.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",München TV (Opt-1)
-http://muenchentv.iptv-playoutcenter.de:1935/muenchentv/muenchentv.stream_1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",München TV (Opt-2)
-http://muenchentv.iptv-playoutcenter.de:1935/muenchentv/muenchentv.stream_2/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",München TV (Opt-3)
-http://muenchentv.iptv-playoutcenter.de:1935/muenchentv/muenchentv.stream_2/hasbahca.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",München TV (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MDF 1
+http://62.113.210.250/medienasa-live/mdf1_high/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",München TV
 http://muenchentv.iptv-playoutcenter.de:1935/muenchentv/muenchentv.stream_1/.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",München TV (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",München TV
 http://muenchentv.iptv-playoutcenter.de:1935/muenchentv/muenchentv.stream_1/chunklist_w1585276943.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",München TV (Opt-6)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",München TV
+http://muenchentv.iptv-playoutcenter.de:1935/muenchentv/muenchentv.stream_1/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",München TV
 http://muenchentv.iptv-playoutcenter.de:1935/muenchentv/muenchentv.stream_2/.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",München TV
+http://muenchentv.iptv-playoutcenter.de:1935/muenchentv/muenchentv.stream_2/hasbahca.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",München TV
+http://muenchentv.iptv-playoutcenter.de:1935/muenchentv/muenchentv.stream_2/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/893.png" group-title="",NDR Fernsehen
 http://ndrfs-lh.akamaihd.net/i/ndrfs_nds@430233/master.m3u8
-#EXTINF:-1 tvg-id="NDR DE" tvg-name="NDR DE" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/1/1e/NDR_HD.svg/240px-NDR_HD.svg.png" group-title="",NDR Hamburg (Opt-1)
+#EXTINF:-1 tvg-id="NDR DE" tvg-name="NDR DE" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/1/1e/NDR_HD.svg/240px-NDR_HD.svg.png" group-title="",NDR Hamburg
 https://ndrfs-lh.akamaihd.net/i/ndrfs_hh@430231/master.m3u8
 #EXTINF:-1 tvg-id="NDR DE" tvg-name="NDR DE" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/1/1e/NDR_HD.svg/240px-NDR_HD.svg.png" group-title="",NDR Mecklenburg-Vorpommern
 https://ndrfs-lh.akamaihd.net/i/ndrfs_mv@430232/master.m3u8
@@ -171,44 +171,44 @@ https://ndrfs-lh.akamaihd.net/i/ndrfs_sh@430234/master.m3u8
 http://hls1.wtnet.de/noa4hh/apple/wifi6500.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://s3.vefire.ru/l/en/NOA4.gif" group-title="",Noa 4 Norderstedt
 http://hls1.wtnet.de/noa4/apple/wifi6500.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RkF2Kmx.png" group-title="",NRWision (Opt-1)
-https://fms.nrwision.de/live/livestreamHD.stream_source/chunklist_w1070249849.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/nrwision.png" group-title="",NRWision (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/nrwision.png" group-title="",NRWision
 https://fms.nrwision.de/live/livestreamHD.stream_360p/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RkF2Kmx.png" group-title="",NRWision
+https://fms.nrwision.de/live/livestreamHD.stream_source/chunklist_w1070249849.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Oberpfalz TV
 http://oberpfalztv.iptv-playoutcenter.de:1935/oberpfalztv/oberpfalztv.stream_1/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Offener Kanal Dessau (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Offener Kanal Dessau
 http://iptvcodes.blogspot.com@62.113.210.250/medienasa-live/ok-dessau_high/hasbahca.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.youngspeech.de/wp-content/gallery/pop10-konzert/d-logode.jpg" group-title="",Offener Kanal Dessau (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.youngspeech.de/wp-content/gallery/pop10-konzert/d-logode.jpg" group-title="",Offener Kanal Dessau
 http://iptvcodes.blogspot.com@62.113.210.250/medienasa-live/ok-dessau_high/hasbahca.m3u8?bitrate=800
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/BHTsPMP.png" group-title="",Offener Kanal Magdeburg (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/BHTsPMP.png" group-title="",Offener Kanal Magdeburg
 http://62.113.210.250/medienasa-live/ok-magdeburg_high/FluxusTV.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Offener Kanal Magdeburg (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Offener Kanal Magdeburg
 http://iptvcodes.blogspot.com@62.113.210.250/medienasa-live/ok-magdeburg_high/hasbahca.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ok-magdeburg.de/wp-content/themes/okm/images/logo-offener-kanal-magdeburg.png" group-title="",Offener Kanal Magdeburg (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ok-magdeburg.de/wp-content/themes/okm/images/logo-offener-kanal-magdeburg.png" group-title="",Offener Kanal Magdeburg
 http://iptvcodes.blogspot.com@62.113.210.250/medienasa-live/ok-magdeburg_high/hasbahca.m3u8?bitrate=800
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/B5obZtE.png" group-title="",Offener Kanal Salzwedel (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/B5obZtE.png" group-title="",Offener Kanal Salzwedel
 http://62.113.210.250/medienasa-live/ok-salzwedel_high/FluxusTV.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Offener Kanal Salzwedel (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Offener Kanal Salzwedel
 http://62.113.210.250/medienasa-live/ok-salzwedel_high/HasBahCa.m3u8?bitrate=800
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",OK-Stendal (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",OK-Stendal
 http://62.113.210.250/medienasa-live/ok-stendal_high/hasbahca.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",OK-Stendal (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",OK-Stendal
 http://62.113.210.250/medienasa-live/ok-stendal_high/hasbahca.m3u8?bitrate=800
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ok54.de/wp-content/uploads/2012/01/ok54.png" group-title="",OK54
 http://stream-cdn.ok54.de/hls/ok54.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/oldenburgeins.png" group-title="",Oldenburg Eins (Opt-1)
-http://188.40.16.94:1935/live/studio/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/K1hkyd7.png" group-title="",Oldenburg Eins (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/K1hkyd7.png" group-title="",Oldenburg Eins
 http://188.40.16.94:1935/live/studio/chunklist_w27232713.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/oldenburgeins.png" group-title="",Oldenburg Eins
+http://188.40.16.94:1935/live/studio/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/parlamentsfernsehen.png" group-title="",Parlamentsfernsehen 1
 https://c13014-l-hls.u.core.cdn.streamfarm.net/1000153copo/hk1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/parlamentsfernsehen.png" group-title="",Parlamentsfernsehen 2
 https://c13014-l-hls.u.core.cdn.streamfarm.net/1000153copo/hk2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AjN5EBF.png" group-title="",Potsdam TV (Opt-1)
-https://sdn-global-live-http-cache.3qsdn.com/live/_definst_/mp4:5654_9rRqfHQLh4Yd6pm/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/potsdamtv.png" group-title="",Potsdam TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/potsdamtv.png" group-title="",Potsdam TV
 https://sdn-global-live-http-cache.3qsdn.com/live/_definst_/mp4:5654_9rRqfHQLh4Yd6pm/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AjN5EBF.png" group-title="",Potsdam TV
+https://sdn-global-live-http-cache.3qsdn.com/live/_definst_/mp4:5654_9rRqfHQLh4Yd6pm/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ubEUBmB.png" group-title="Music",Radio 21 TV
 http://api.new.livestream.com/accounts/22300508/events/6675945/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9pvCYaA.png" group-title="Music",Radio Weser TV Bremen
@@ -221,10 +221,10 @@ http://regiotv.iptv-playoutcenter.de:1935/regiotv/regiotv.stream_1/playlist.m3u8
 http://rfo.iptv-playoutcenter.de:1935/rfo/rfo.stream_2/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Rheinmain TV
 http://62.67.13.54:1935/rmtv/rmtv_livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/rnf.png" group-title="",RNF (Opt-1)
-http://rnf.iptv-playoutcenter.de:1935/rnf/rnf.stream_1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/rnf.png" group-title="",RNF (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/rnf.png" group-title="",RNF
 http://rnf.iptv-playoutcenter.de/rnf/rnf.stream_1/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/rnf.png" group-title="",RNF
+http://rnf.iptv-playoutcenter.de:1935/rnf/rnf.stream_1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Nvw7SaN.png" group-title="",Saarland Fernsehen 1
 http://saarland1.iptv-playoutcenter.de/saarland1/saarland1.stream_1/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Nvw7SaN.png" group-title="",Saarland Fernsehen 2
@@ -241,18 +241,18 @@ http://www.sonus.fm:1935/public/stream_240p/playlist.m3u8
 https://str-4.mediabay.tv/SophiaTV/playlist.m3u8?token=6fa2dede5728cb1847c4ad1cf028bbcb7af88ef4-e302200857cc631684ef0c702491fed6-1566594491-1566583691
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",SYLT1
 http://62.67.13.54:1935/sylt1/sylt1_high.stream/chunklist.m3u8
-#EXTINF:-1 tvg-id="tagesschau 24 DE" tvg-name="tagesschau 24 DE" tvg-logo="" group-title="",tagesschau 24 (Opt-1)
+#EXTINF:-1 tvg-id="tagesschau 24 DE" tvg-name="tagesschau 24 DE" tvg-logo="" group-title="",tagesschau 24
 http://tagesschau-lh.akamaihd.net/i/tagesschau_1@119231/index_3776_av-p.m3u8
-#EXTINF:-1 tvg-id="tagesschau 24 DE" tvg-name="tagesschau 24 DE" tvg-logo="" group-title="",tagesschau 24 (Opt-2)
+#EXTINF:-1 tvg-id="tagesschau 24 DE" tvg-name="tagesschau 24 DE" tvg-logo="" group-title="",tagesschau 24
 http://tagesschau-lh.akamaihd.net/i/tagesschau_1@119231/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Tagesschau24 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Tagesschau24
 http://tagesschau-lh.akamaihd.net/i/tagesschau_1@119231/index_3776_av-p.m3u8?sd=10&rebase=on
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/a8JgvKq.png" group-title="",Tele Regional Passau 1
 http://teleregionalpassau1.iptv-playoutcenter.de:1935/teleregionalpassau1/teleregionalpassau1.stream_1/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.portmann-media.com/wp-content/uploads/2015/06/telebasel.png" group-title="",Telebasel (Opt-1)
-http://xapp510394368c1000199.f.l.z.lb.core-cdn.net/10096xtelebase/ios_500/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Telebasel (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Telebasel
 http://xapp510394368c1000199.f.l.z.lb.core-cdn.net/10096xtelebase/ios_500/hasbahca.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.portmann-media.com/wp-content/uploads/2015/06/telebasel.png" group-title="",Telebasel
+http://xapp510394368c1000199.f.l.z.lb.core-cdn.net/10096xtelebase/ios_500/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/trp1.png" group-title="",TRP1
 http://teleregionalpassau1.iptv-playoutcenter.de:1935/teleregionalpassau1/teleregionalpassau1.stream_1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Aktuell
@@ -261,36 +261,36 @@ http://tvaktuellr.iptv-playoutcenter.de:1935/tvaktuellr/tvaktuellr.stream_3/play
 https://sdn-global-live-http-cache.3qsdn.com/live/_definst_/amlst:7649-sbr/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GUBVccx.png" group-title="",TV Halle
 http://62.113.210.250/medienasa-live/tvhalle_high/hasbahca.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Mainfranken (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Mainfranken
 http://tvtouringw.iptv-playoutcenter.de:1935/tvtouringw/tvtouringw.stream_1/chunklist_w893326909.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Mainfranken (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Mainfranken
 http://tvtouringw.iptv-playoutcenter.de:1935/tvtouringw/tvtouringw.stream_1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Mittelrhein
 https://sdn-global-live-http-cache.3qsdn.com/live/_definst_/smil:5714-mbr.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/927.png" group-title="",TV Oberfranken (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/927.png" group-title="",TV Oberfranken
 http://tvoberfranken.iptv-playoutcenter.de:1935/tvoberfranken/tvoberfranken.stream_1/chunklist_w1654226206.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Oberfranken (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Oberfranken
 http://tvoberfranken.iptv-playoutcenter.de:1935/tvoberfranken/tvoberfranken.stream_1/chunklist_w1855878409.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Oberfranken (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Oberfranken
 http://tvoberfranken.iptv-playoutcenter.de:1935/tvoberfranken/tvoberfranken.stream_1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVA Ostbayern (Opt-1)
-http://tvaktuellr.iptv-playoutcenter.de:1935/tvaktuellr/tvaktuellr.stream_1/hasbahca.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.firstonetv.eu/images/logos/de/TVA.png" group-title="",TVA Ostbayern (Opt-2)
-http://tvaktuellr.iptv-playoutcenter.de:1935/tvaktuellr/tvaktuellr.stream_1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.tvaktuell.com/storage/thumbs/700x/r:1428659201/128312.jpg" group-title="",TVA Ostbayern (Opt-3)
-http://tvaktuellr.iptv-playoutcenter.de:1935/tvaktuellr/tvaktuellr.stream_1/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/925.png" group-title="",TVA Ostbayern (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/925.png" group-title="",TVA Ostbayern
 http://tvaktuellr.iptv-playoutcenter.de:1935/tvaktuellr/tvaktuellr.stream_1/chunklist_w639935191.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVA Ostbayern (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVA Ostbayern
 http://tvaktuellr.iptv-playoutcenter.de:1935/tvaktuellr/tvaktuellr.stream_1/chunklist_w670613508.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVA Ostbayern
+http://tvaktuellr.iptv-playoutcenter.de:1935/tvaktuellr/tvaktuellr.stream_1/hasbahca.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.tvaktuell.com/storage/thumbs/700x/r:1428659201/128312.jpg" group-title="",TVA Ostbayern
+http://tvaktuellr.iptv-playoutcenter.de:1935/tvaktuellr/tvaktuellr.stream_1/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.firstonetv.eu/images/logos/de/TVA.png" group-title="",TVA Ostbayern
+http://tvaktuellr.iptv-playoutcenter.de:1935/tvaktuellr/tvaktuellr.stream_1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/fr/7/78/UnserDing_logo_2013_203x143.png" group-title="",Unserding
 http://srunserding-lh.akamaihd.net/i/visualradio_ud@197013/index_1662_av-b.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="WDR DE" tvg-name="WDR DE" tvg-logo="" group-title="",WDR (Opt-1)
-http://wdr_fs-lh.akamaihd.net/i/wdrfs_weltweit@112033/index_3776_av-p.m3u8
-#EXTINF:-1 tvg-id="WDR DE" tvg-name="WDR DE" tvg-logo="" group-title="",WDR (Opt-2)
-http://wdr_fs-lh.akamaihd.net/i/wdrfs_weltweit@112033/master.m3u8
-#EXTINF:-1 tvg-id="WDR DE" tvg-name="WDR DE" tvg-logo="http://www.yilmaztv.com/logo/wdr.png" group-title="",WDR (Opt-3)
+#EXTINF:-1 tvg-id="WDR DE" tvg-name="WDR DE" tvg-logo="http://www.yilmaztv.com/logo/wdr.png" group-title="",WDR
 http://wdr_fs-lh.akamaihd.net/i/wdrfs_weltweit@112033/index_3776_av-b.m3u8
+#EXTINF:-1 tvg-id="WDR DE" tvg-name="WDR DE" tvg-logo="" group-title="",WDR
+http://wdr_fs-lh.akamaihd.net/i/wdrfs_weltweit@112033/index_3776_av-p.m3u8
+#EXTINF:-1 tvg-id="WDR DE" tvg-name="WDR DE" tvg-logo="" group-title="",WDR
+http://wdr_fs-lh.akamaihd.net/i/wdrfs_weltweit@112033/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/westerwaldtv.png" group-title="",Westerwald TV
 https://sdn-global-live-http-cache.3qsdn.com/live/_definst_/smil:5715-mbr.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/smyvTHD.jpg" group-title="Sport",World Of Free Sports TV
diff --git a/channels/dk.m3u b/channels/dk.m3u
index ce9fd9d47..933532f0e 100644
--- a/channels/dk.m3u
+++ b/channels/dk.m3u
@@ -3,9 +3,9 @@
 https://59b954022ec35.streamlock.net:443/liveTV2/_definst_/smil:liveTVstream2.transcoder.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/1541.png" group-title="",KKRtv
 http://stream.kkr.dk/live/ngrp:kkr_adaptive/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/f/f6/Kringvarp_foroya.jpg/300px-Kringvarp_foroya.jpg" group-title="",KVF (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/f/f6/Kringvarp_foroya.jpg/300px-Kringvarp_foroya.jpg" group-title="",KVF
 https://w1.kringvarp.fo/uttanlands/_definst_/smil:uttanlands.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NliaZhK.png" group-title="",KVF (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NliaZhK.png" group-title="",KVF
 https://w2.kringvarp.fo/uttanlands/480/manifest.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="TV 2 Fyn DK" tvg-name="TV 2 Fyn DK" tvg-logo="https://i.imgur.com/wamEY0w.png" group-title="",TV 2 Fyn
 https://cdn-lt-live.tv2fyn.dk/dc-0/live/hls/p/1966291/e/0_vsfrv0zm/sd/6000/t/2eGlsBmOnpkK1g0-J_56AA/index-s32.m3u8
@@ -21,7 +21,7 @@ https://cdn-lt-live.tv2oj.dk/dc-1/live/hls/p/2102081/e/0_x4p3licd/sd/6000/t/5aoq
 http://live.tv2bornholm.dk/stream/live/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/yIismAO.jpg" group-title="",TV Midtvest
 https://cdn-lt-live.tvmidtvest.dk/dc-0/live/hls/p/1953371/e/0_ghzg9q0q/sd/6000/t/EG-gDRIyoxKp9xWooxW-8w/index-s32.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Syd+ (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Syd+
 http://cdn-lt-live.tvsyd.dk/dc-1/live/hls/p/1956351/e/0_e9slj9wh/t/ut3_n5VQ1FqzlqMhwbQmJg/index-s32.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Syd+ (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Syd+
 https://cdn-lt-live.tvsyd.dk/dc-0/live/hls/p/1956351/e/0_e9slj9wh/sd/6000/t/nhL_cf3qCsI0cg242553pQ/index-s33.m3u8
diff --git a/channels/do.m3u b/channels/do.m3u
index c04247764..6b287bd4d 100644
--- a/channels/do.m3u
+++ b/channels/do.m3u
@@ -9,17 +9,17 @@ http://canaldelsol01.streamprolive.com/hls/live.m3u8
 http://ss6.domint.net:2012/tes_str/teleelsalvador/chunklist_w718025904.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.canal19.do/wp-content/uploads/2018/06/logo-300-x-300.png" group-title="",Cinevision Canal 19
 http://cinevision01.streamprolive.com/hls/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://3.bp.blogspot.com/-qnBTdXIAwmo/WSzJWOzajII/AAAAAAAADa4/fRwpY0v-ViMHc4uLHvUz3rpegI681QQCgCLcB/s1600/color%2Bvision%2Ben%2Bvivo.png" group-title="",Color Vision 9 (Opt-1)
-http://ss2.domint.net:2138/cvh_str/colorvisionhd/chunklist_w854987298.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://colorvision.com.do/wp-content/uploads/2018/10/LOGO-HD-full.png" group-title="",Color Vision 9 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://colorvision.com.do/wp-content/uploads/2018/10/LOGO-HD-full.png" group-title="",Color Vision 9
 http://ss2.domint.net:2138/cvh_str/colorvisionhd/chunklist_w854987298.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/BNtmf7o.png" group-title="",Comunion TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://3.bp.blogspot.com/-qnBTdXIAwmo/WSzJWOzajII/AAAAAAAADa4/fRwpY0v-ViMHc4uLHvUz3rpegI681QQCgCLcB/s1600/color%2Bvision%2Ben%2Bvivo.png" group-title="",Color Vision 9
+http://ss2.domint.net:2138/cvh_str/colorvisionhd/chunklist_w854987298.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/BNtmf7o.png" group-title="",Comunion TV
 http://50.30.37.36:1935/live/smil:MyStream.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/BNtmf7o.png" group-title="",Comunion TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/BNtmf7o.png" group-title="",Comunion TV
 http://50.30.37.36:1935/live/stream/chunklist_w1329394356.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ZPbU5er.png" group-title="",Digital 15
 http://api.new.livestream.com/accounts/27456795/events/8268514/live.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",DIGITAL VISION 63 [480p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",DIGITAL VISION 63
 http://ss1.domint.net:2106/dv6_str/digitalvision/chunklist_w635489753.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9HnBtC9.png" group-title="",Faro Vision
 http://184.173.181.2:1935/8060/8060/playlist.m3u8
@@ -27,9 +27,9 @@ http://184.173.181.2:1935/8060/8060/playlist.m3u8
 http://184.173.181.2:1935/8020/8020/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zpMhsAJ.png" group-title="",La Voz de Maria
 https://uni01rtmp.tulix.tv/playout2multi9/lavozdemaria.stream/chunklist_w567330199.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://lunatv.do/images/gestor/logo-canal53.png" group-title="",Luna TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://lunatv.do/images/gestor/logo-canal53.png" group-title="",Luna TV
 http://ss1.domint.net:2140/luna_str/lunatv/chunklist_w321264520.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.lunatv.do/stream/imagen/logo-stream.png" group-title="",Luna TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.lunatv.do/stream/imagen/logo-stream.png" group-title="",Luna TV
 http://ss1.domint.net:2140/luna_str/lunatv/chunklist_w321264520.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Sbv9mq5.png" group-title="",Microvision 10
 http://190.103.183.24:1935/live/MicroHD/chunklist_w1468779956.m3u8
@@ -53,13 +53,13 @@ http://cm.hostlagarto.com:8081/Telecanal-28/telecanal.myStream/playlist.m3u8
 http://stream.grupotelemicro.com/13.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.ytimg.com/vi/ktGu7ySJobA/maxresdefault.jpg" group-title="",Telekaribe
 http://ss1.domint.net:2208/tka_str/telekaribe/chunklist_w37205285.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iE1xhA5.png" group-title="",Telenord 12 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iE1xhA5.png" group-title="",Telenord 12
 http://newyorkstream.ddns.net:1935/telenord12/telenord12/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iE1xhA5.png" group-title="",Telenord 12 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iE1xhA5.png" group-title="",Telenord 12
 http://newyorkstreamss2.ddns.net:28987/telenord12/telenord12/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iE1xhA5.png" group-title="",Telenord 8 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iE1xhA5.png" group-title="",Telenord 8
 http://newyorkstream.ddns.net:1935/telenord8/telenord8/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iE1xhA5.png" group-title="",Telenord 8 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iE1xhA5.png" group-title="",Telenord 8
 http://newyorkstreamss2.ddns.net:28987/telenord8/telenord8/media_w1713557519.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.teleradioamerica.com/wp-content/themes/tra2017/imagenes/logo.png" group-title="",Teleradio America 45
 http://ss1.domint.net:2310/tra_str/canal45/chunklist_w1884577868.m3u8
diff --git a/channels/ec.m3u b/channels/ec.m3u
index 4aae19fab..1356ae320 100644
--- a/channels/ec.m3u
+++ b/channels/ec.m3u
@@ -15,7 +15,7 @@ https://5c21f7ec1999d.streamlock.net/8054/8054/chunklist_w664187666.m3u8
 http://api.new.livestream.com/accounts/1359588/events/4428723/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/rlAX3jS.jpg" group-title="",Telecuenca
 http://api.new.livestream.com/accounts/280758/events/8705297/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/otOhIe8.png" group-title="",UCSG (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/otOhIe8.png" group-title="",UCSG
 http://ecuastream.net:1935/UCSGHQ/UCSGHQ/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/otOhIe8.png" group-title="",UCSG (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/otOhIe8.png" group-title="",UCSG
 http://ecuastreamhd.com:1935/UCSGHQ/UCSGHQ/playlist.m3u8
diff --git a/channels/eg.m3u b/channels/eg.m3u
index 9abc47c59..cab16266f 100644
--- a/channels/eg.m3u
+++ b/channels/eg.m3u
@@ -3,30 +3,30 @@
 https://svs.itworkscdn.net/alfatehlive/fatehtv/chunklist.m3u8
 #EXTINF:-1 tvg-id="Al Kahera Wal Nass 1 ARB" tvg-name="Al Kahera Wal Nass 1 ARB" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/04/AlKaheraWalNas.png" group-title="",Al Kahera Wal Nas
 http://livecdnh2.tvanywhere.ae/hls/kahera_nas/04.m3u8
-#EXTINF:-1 tvg-id="Al Nahar Drama ARB" tvg-name="Al Nahar Drama ARB" tvg-logo="http://www.ethnicchannels.com/images/channeldetail/alnahar-drama/al-nahar-drama-logo.png" group-title="",Al Nahar Drama (Opt-1)
-http://livecdnh2.tvanywhere.ae:80/hls/nahar_sd_drama/03.m3u8
-#EXTINF:-1 tvg-id="Al Nahar Drama ARB" tvg-name="Al Nahar Drama ARB" tvg-logo="http://www.ethnicchannels.com/images/channeldetail/alnahar-drama/al-nahar-drama-logo.png" group-title="",Al Nahar Drama (Opt-2)
+#EXTINF:-1 tvg-id="Al Nahar Drama ARB" tvg-name="Al Nahar Drama ARB" tvg-logo="http://www.ethnicchannels.com/images/channeldetail/alnahar-drama/al-nahar-drama-logo.png" group-title="",Al Nahar Drama
 http://livecdnh2.tvanywhere.ae/hls/nahar_sd_drama/03.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="Al Nahar Drama ARB" tvg-name="Al Nahar Drama ARB" tvg-logo="http://www.ethnicchannels.com/images/channeldetail/alnahar-drama/al-nahar-drama-logo.png" group-title="",Al Nahar Drama (Opt-3)
-http://livecdnh2.tvanywhere.ae/hls/nahar_sd_drama/index.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="Al Nahar Drama ARB" tvg-name="Al Nahar Drama ARB" tvg-logo="http://www.ethnicchannels.com/images/channeldetail/alnahar-drama/al-nahar-drama-logo.png" group-title="",Al Nahar Drama (Opt-4)
+#EXTINF:-1 tvg-id="Al Nahar Drama ARB" tvg-name="Al Nahar Drama ARB" tvg-logo="http://www.ethnicchannels.com/images/channeldetail/alnahar-drama/al-nahar-drama-logo.png" group-title="",Al Nahar Drama
 http://livecdnh2.tvanywhere.ae/hls/nahar_sd_drama/04.m3u8
-#EXTINF:-1 tvg-id="Al Nahar TV ARB" tvg-name="Al Nahar TV ARB" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/AlNaharTV.png" group-title="",Al Nahar TV (Opt-1)
-http://livecdnh2.tvanywhere.ae:80/hls/nahar_sd/03.m3u8
-#EXTINF:-1 tvg-id="Al Nahar TV ARB" tvg-name="Al Nahar TV ARB" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/AlNaharTV.png" group-title="",Al Nahar TV (Opt-2)
+#EXTINF:-1 tvg-id="Al Nahar Drama ARB" tvg-name="Al Nahar Drama ARB" tvg-logo="http://www.ethnicchannels.com/images/channeldetail/alnahar-drama/al-nahar-drama-logo.png" group-title="",Al Nahar Drama
+http://livecdnh2.tvanywhere.ae/hls/nahar_sd_drama/index.m3u8?sd=10&rebase=on
+#EXTINF:-1 tvg-id="Al Nahar Drama ARB" tvg-name="Al Nahar Drama ARB" tvg-logo="http://www.ethnicchannels.com/images/channeldetail/alnahar-drama/al-nahar-drama-logo.png" group-title="",Al Nahar Drama
+http://livecdnh2.tvanywhere.ae:80/hls/nahar_sd_drama/03.m3u8
+#EXTINF:-1 tvg-id="Al Nahar TV ARB" tvg-name="Al Nahar TV ARB" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/AlNaharTV.png" group-title="",Al Nahar TV
 http://livecdnh2.tvanywhere.ae/hls/nahar_sd/03.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="Al Nahar TV ARB" tvg-name="Al Nahar TV ARB" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/AlNaharTV.png" group-title="",Al Nahar TV (Opt-3)
-http://livecdnh2.tvanywhere.ae/hls/nahar_sd/index.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="Al Nahar TV ARB" tvg-name="Al Nahar TV ARB" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/AlNaharTV.png" group-title="",Al Nahar TV (Opt-4)
+#EXTINF:-1 tvg-id="Al Nahar TV ARB" tvg-name="Al Nahar TV ARB" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/AlNaharTV.png" group-title="",Al Nahar TV
 http://livecdnh2.tvanywhere.ae/hls/nahar_sd/04.m3u8
+#EXTINF:-1 tvg-id="Al Nahar TV ARB" tvg-name="Al Nahar TV ARB" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/AlNaharTV.png" group-title="",Al Nahar TV
+http://livecdnh2.tvanywhere.ae/hls/nahar_sd/index.m3u8?sd=10&rebase=on
+#EXTINF:-1 tvg-id="Al Nahar TV ARB" tvg-name="Al Nahar TV ARB" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/AlNaharTV.png" group-title="",Al Nahar TV
+http://livecdnh2.tvanywhere.ae:80/hls/nahar_sd/03.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/UAAK15T.jpg" group-title="",Al Rahma TV
 http://199.167.151.237:1935/live/shk35_11.stream/chunklist_w2113050275.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.alhayat.com/themes/hayat/images/alhayat-logo.jpg" group-title="",Alhayah TV (Opt-1)
-http://livecdnh2.tvanywhere.ae/hls/hayat/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Alhayah TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Alhayah TV
 http://livecdnh2.tvanywhere.ae/hls/hayat/02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Alhayah TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Alhayah TV
 http://livecdnh2.tvanywhere.ae/hls/hayat/03.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.alhayat.com/themes/hayat/images/alhayat-logo.jpg" group-title="",Alhayah TV
+http://livecdnh2.tvanywhere.ae/hls/hayat/04.m3u8
 #EXTINF:-1 tvg-id="Cairo Drama ARB" tvg-name="Cairo Drama ARB" tvg-logo="https://ik.imagekit.io/ulangotv/image/upload/tr:w-150/8035_logo_cairo_drama.png" group-title="",Cairo Drama
 http://109.236.92.216:9090/Cairo_Drama/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="CBC ARB" tvg-name="CBC ARB" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/CBC.png" group-title="",CBC
@@ -35,37 +35,37 @@ http://95.170.215.109/hls/CBC-Backup-M.m3u8
 http://livecdnh2.tvanywhere.ae/hls/cbc_drama/04.m3u8
 #EXTINF:-1 tvg-id="CBC Sofra ARB" tvg-name="CBC Sofra ARB" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/5/53/Cbc_sofra_logo.png" group-title="",CBC Sofra
 http://95.170.215.109/hls/CBC-Sofra-Backup-M.m3u8
-#EXTINF:-1 tvg-id="dmc Drama ARB" tvg-name="dmc Drama ARB" tvg-logo="http://webtvonlive.com/wp-content/uploads/DMC-Drama-webtvonlive-com.jpg" group-title="",DMC Drama (Opt-1)
-http://livecdnh1.tvanywhere.ae/hls/dmcdrama/03.m3u8
-#EXTINF:-1 tvg-id="dmc Drama ARB" tvg-name="dmc Drama ARB" tvg-logo="http://webtvonlive.com/wp-content/uploads/DMC-Drama-webtvonlive-com.jpg" group-title="",DMC Drama (Opt-2)
-http://livecdnh1.tvanywhere.ae/hls/dmcdrama/04.m3u8
-#EXTINF:-1 tvg-id="dmc Drama ARB" tvg-name="dmc Drama ARB" tvg-logo="" group-title="",DMC Drama (Opt-3)
+#EXTINF:-1 tvg-id="dmc Drama ARB" tvg-name="dmc Drama ARB" tvg-logo="" group-title="",DMC Drama
 http://livecdnh1.tvanywhere.ae/hls/dmcdrama/02.m3u8
+#EXTINF:-1 tvg-id="dmc Drama ARB" tvg-name="dmc Drama ARB" tvg-logo="http://webtvonlive.com/wp-content/uploads/DMC-Drama-webtvonlive-com.jpg" group-title="",DMC Drama
+http://livecdnh1.tvanywhere.ae/hls/dmcdrama/03.m3u8
+#EXTINF:-1 tvg-id="dmc Drama ARB" tvg-name="dmc Drama ARB" tvg-logo="http://webtvonlive.com/wp-content/uploads/DMC-Drama-webtvonlive-com.jpg" group-title="",DMC Drama
+http://livecdnh1.tvanywhere.ae/hls/dmcdrama/04.m3u8
 #EXTINF:-1 tvg-id="dmc HD ARB" tvg-name="dmc HD ARB" tvg-logo="https://dmc.com.eg/wp-content/themes/dmc/images/dmc-hd.png" group-title="",DMC HD
 http://livecdnh3.tvanywhere.ae/hls/dmchd/05.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/CsF2nUa.jpg" group-title="",Elsharq TV
 http://149.202.79.190:8081/elsharqtv/live_1024p/chunks.m3u8
 #EXTINF:-1 tvg-id="MBC Masr 1 ARB" tvg-name="MBC Masr 1 ARB" tvg-logo="https://upload.wikimedia.org/wikipedia/en/8/8f/Wikipedia-MBC-MASR-LOGO.jpg" group-title="",MBC Masr 1
 http://livecdnh2.tvanywhere.ae:80/hls/mbc_msr/02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/tFAg2dY.png" group-title="",Mekameleen TV (Opt-1)
-https://mn-nl.mncdn.com/mekameleen/smil:mekameleentv.smil/chunklist_b1800000.m3u8?__mn_sid=6592483289574006816
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/f4n479f.png" group-title="",Mekameleen TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/f4n479f.png" group-title="",Mekameleen TV
 http://mn-nl.mncdn.com/mekameleen/smil:mekameleentv.smil/chunklist_b1200000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tunisvista.com/medias/mekameleen-tv-live-online-egypt.jpg" group-title="",Mekameleen TV (Opt-3)
-http://mn-nl.mncdn.com/mekameleen/smil:mekameleentv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Mekameleen TV (Opt-4)
-http://mn-nl.mncdn.com/mekameleen/smil:mekameleentv.smil/chunklist_b800000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Mekameleen TV (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Mekameleen TV
 http://mn-nl.mncdn.com/mekameleen/smil:mekameleentv.smil/chunklist_b1800000.m3u8
-#EXTINF:-1 tvg-id="Nile Drama ARB" tvg-name="Nile Drama ARB" tvg-logo="http://www.niletc.tv/images/live/live.png" group-title="",Nile Drama (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Mekameleen TV
+http://mn-nl.mncdn.com/mekameleen/smil:mekameleentv.smil/chunklist_b800000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tunisvista.com/medias/mekameleen-tv-live-online-egypt.jpg" group-title="",Mekameleen TV
+http://mn-nl.mncdn.com/mekameleen/smil:mekameleentv.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/tFAg2dY.png" group-title="",Mekameleen TV
+https://mn-nl.mncdn.com/mekameleen/smil:mekameleentv.smil/chunklist_b1800000.m3u8?__mn_sid=6592483289574006816
+#EXTINF:-1 tvg-id="Nile Drama ARB" tvg-name="Nile Drama ARB" tvg-logo="http://www.niletc.tv/images/live/live.png" group-title="",Nile Drama
 http://livecdnh2.tvanywhere.ae/hls/nile_drama/02.m3u8
-#EXTINF:-1 tvg-id="Nile Drama ARB" tvg-name="Nile Drama ARB" tvg-logo="" group-title="",Nile Drama (Opt-2)
+#EXTINF:-1 tvg-id="Nile Drama ARB" tvg-name="Nile Drama ARB" tvg-logo="" group-title="",Nile Drama
 http://livecdnh2.tvanywhere.ae/hls/nile_drama/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",ON Sport HD
 http://162.210.198.17:8080/ONSportHD/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/6Cgnn9x.jpg" group-title="",Watan TV (Opt-1)
-http://watantv.origin.technostreaming.net:8081/watantv_source2/live/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/6Cgnn9x.jpg" group-title="",Watan TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/6Cgnn9x.jpg" group-title="",Watan TV
 http://51.15.246.58:8081/watantv_source2/live/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Watan TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/6Cgnn9x.jpg" group-title="",Watan TV
+http://watantv.origin.technostreaming.net:8081/watantv_source2/live/chunks.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Watan TV
 http://watantv.origin.technostreaming.net:8081/watantv_source2/live/playlist.m3u8
diff --git a/channels/es.m3u b/channels/es.m3u
index 9243748f9..44d798e9e 100644
--- a/channels/es.m3u
+++ b/channels/es.m3u
@@ -1,20 +1,20 @@
 #EXTM3U x-tvg-url="http://195.154.221.171/epg/guidespain.xml.gz"
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/es/24Horas.es.png" group-title="News",24 Horas (Opt-1)
-http://rtvev4-live.hss.adaptive.level3.net/egress/ahandler/rtvegl8/24hca_lv3_aosv4_gl8/24hca_lv3_aosv4_gl8.isml/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/4c/Logo_TVE-24h.svg/702px-Logo_TVE-24h.svg.png" group-title="News",24 Horas (Opt-2)
-http://rtvev4-live.hss.adaptive.level3.net/egress/ahandler/rtvegl8/24hca_lv3_aosv4_gl8/24hca_lv3_aosv4_gl8.isml/master.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",24 Horas (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",24 Horas
 http://hlsliveamdgl8-lh.akamaihd.net/i/hlsdvrlive_1@583030/index_1500_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/1459.png" group-title="News",24 Horas (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/1459.png" group-title="News",24 Horas
 http://hlsliveamdgl8-lh.akamaihd.net/i/hlsdvrlive_1@583030/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/es/24Horas.es.png" group-title="News",24 Horas
+http://rtvev4-live.hss.adaptive.level3.net/egress/ahandler/rtvegl8/24hca_lv3_aosv4_gl8/24hca_lv3_aosv4_gl8.isml/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/4c/Logo_TVE-24h.svg/702px-Logo_TVE-24h.svg.png" group-title="News",24 Horas
+http://rtvev4-live.hss.adaptive.level3.net/egress/ahandler/rtvegl8/24hca_lv3_aosv4_gl8/24hca_lv3_aosv4_gl8.isml/master.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/sADbx7S.png" group-title="",25 TV
 http://cdnlive.shooowit.net/25televisiolive/25tv.smil/.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",3/24 (Opt-1)
-http://ccma-tva-int-abertis-live.hls.adaptive.level3.net/int/ngrp:324_web/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",3/24 (Opt-2)
-http://ccma-tva-int-abertis-live.hls.adaptive.level3.net/int/ngrp:324_mobil/chunklist_b548000_DVR.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",3/24 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",3/24
 http://ccma-tva-int-abertis-live.hls.adaptive.level3.net/int/ngrp:324_mobil/chunklist_b548000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",3/24
+http://ccma-tva-int-abertis-live.hls.adaptive.level3.net/int/ngrp:324_mobil/chunklist_b548000_DVR.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",3/24
+http://ccma-tva-int-abertis-live.hls.adaptive.level3.net/int/ngrp:324_web/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://7tvregiondemurcia.es/wp-content/uploads/2015/04/LOGO.jpg" group-title="Local",7 Murcia
 http://rtvmurcia_01-lh.akamaihd.net/i/rtvmurcia_1_0@507973/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/ROPlvzc.png" group-title="Local",A Punt
@@ -25,20 +25,20 @@ http://5.39.65.105/hls/alacantixa.m3u8?fluxustv.m3u8
 http://217.182.77.27/live/alcarriatv-livestream.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="Aragon TV ES" tvg-name="Aragon TV ES" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/d/d4/Logo_aragon_tv_2016.png" group-title="",Aragon TV
 https://cartv.streaming.aranova.es/hls/live/aragontv_canal1.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Be Mad (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Be Mad
 https://mdslivehlsb-i.akamaihd.net/hls/live/623615/bemad/bitrate_2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gD5eYVs.jpg" group-title="",Be Mad (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gD5eYVs.jpg" group-title="",Be Mad
 https://mdslivehlsb-i.akamaihd.net/hls/live/623615/bemad/bitrate_4.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NC3rEUq.png" group-title="",Betis TV
 https://cdnlive.shooowit.net/rbetislive/smil:television.smil/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Boing ES" tvg-name="Boing ES" tvg-logo="" group-title="Kids",Boing (Opt-1)
+#EXTINF:-1 tvg-id="Boing ES" tvg-name="Boing ES" tvg-logo="" group-title="Kids",Boing
 https://mdslivehlsb-i.akamaihd.net/hls/live/623616/boing/bitrate_2.m3u8
-#EXTINF:-1 tvg-id="Boing ES" tvg-name="Boing ES" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/f/f3/Boing_circular_500.png" group-title="Kids",Boing (Opt-2)
+#EXTINF:-1 tvg-id="Boing ES" tvg-name="Boing ES" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/f/f3/Boing_circular_500.png" group-title="Kids",Boing
 https://mdslivehlsb-i.akamaihd.net/hls/live/623616/boing/bitrate_4.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/4/4f/Logo_Bon_Dia_TV.png" group-title="",Bon Dia TV (Opt-1)
-https://ccma-tva-int-cellnex-live-hls.secure.footprint.net/int/ngrp:bnd_web/master_DVR.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/4f/Logo_Bon_Dia_TV.png/210px-Logo_Bon_Dia_TV.png" group-title="Local",Bon Dia TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/4f/Logo_Bon_Dia_TV.png/210px-Logo_Bon_Dia_TV.png" group-title="Local",Bon Dia TV
 https://ccma-tva-int-cellnex-live-hls.secure.footprint.net/int/ngrp:bnd_web/master_DVR.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/4/4f/Logo_Bon_Dia_TV.png" group-title="",Bon Dia TV
+https://ccma-tva-int-cellnex-live-hls.secure.footprint.net/int/ngrp:bnd_web/master_DVR.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AFT43kx.png" group-title="",Cadena Elite
 https://5b38ce71f1f00.streamlock.net/8066/8066/master.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2BBGZ1H.png" group-title="",Canal 25 Barbastro
@@ -47,24 +47,24 @@ http://common01.todostreaming.es/live/tvbarbastro-livestream.m3u8?fluxustv.m3u8
 https://5ab29cc78f681.streamlock.net/canal33tvmadridgmailcom/livestream/master.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gyGKUcL.png" group-title="",Canal 4 Mancha Centro
 https://5924d3ad0efcf.streamlock.net/canal4/canal4live/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Canal 4 Tenerife (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Canal 4 Tenerife
 http://5940924978228.streamlock.net:1935/Directo2/Directo2/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.canal4tenerife.tv/wp-content/uploads/2017/02/LOGO-CANAL-4-azul-80.png" group-title="Local",Canal 4 Tenerife (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.canal4tenerife.tv/wp-content/uploads/2017/02/LOGO-CANAL-4-azul-80.png" group-title="Local",Canal 4 Tenerife
 https://5940924978228.streamlock.net/Directo2/Directo2/chunklist_w221845664.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://canal56.com/wp-content/uploads/2017/06/logoc56header.png" group-title="Local",Canal 56
 https://cdn01.yowi.tv/VI76V4AZS4/live-1000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Canal Extremadura (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Canal Extremadura
 http://hlstv.canalextremadura.es/livetv/smil:multistream.smil/chunklist_b1596000_DVR.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Canal Extremadura (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Canal Extremadura
 http://hlstv.canalextremadura.es/livetv/smil:multistream.smil/chunklist_b264000_DVR.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="Extremadura TV" tvg-logo="" group-title="Local",Canal Extremadura (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="Extremadura TV" tvg-logo="" group-title="Local",Canal Extremadura
 http://hlstv.canalextremadura.es/livetv/smil:multistream.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://7tvregiondemurcia.es/wp-content/uploads/2015/04/logo1.png" group-title="Local",Canal Málaga (Opt-1)
-http://canalmalaga-tv-live.flumotion.com/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://7tvregiondemurcia.es/wp-content/uploads/2015/04/logo1.png" group-title="Local",Canal Málaga (Opt-2)
-https://5940924978228.streamlock.net/Directo2/Directo2/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/MCaturZ.png" group-title="Local",Canal Málaga (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/MCaturZ.png" group-title="Local",Canal Málaga
 http://canalmalaga-tv-live.flumotion.com/chunks.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://7tvregiondemurcia.es/wp-content/uploads/2015/04/logo1.png" group-title="Local",Canal Málaga
+http://canalmalaga-tv-live.flumotion.com/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://7tvregiondemurcia.es/wp-content/uploads/2015/04/logo1.png" group-title="Local",Canal Málaga
+https://5940924978228.streamlock.net/Directo2/Directo2/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/tZEu1dV.png" group-title="",Canal Parlament
 http://cdn.s6.eu.nice264.com:1935/niceLiveServer/pcatlive_canal1_MB_800/.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://directostv.teleame.com/wp-content/uploads/2018/02/CANAL-PARLAMENTO.png" group-title="",Canal Parlamento
@@ -73,107 +73,107 @@ http://congresodirecto-f.akamaihd.net/i/congreso6_1@54665/master.m3u8
 http://common01.todostreaming.es/live/sanroque-livestream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9OirosV.png" group-title="",Canal Sur Andalucia
 http://canalsur-pair302-live.hls.adaptive.level3.net/egress/bhandler/sandetel/rtva/master.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://pngimage.net/wp-content/uploads/2018/05/canal-sur-png-5-300x200.png" group-title="Local",Canal Sur Cocina (Opt-1)
-https://593fa17dec176.streamlock.net/cscocina/cscocina.stream/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Canal Sur Cocina (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Canal Sur Cocina
 http://593fa17dec176.streamlock.net:1935/cscocina/cscocina.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://vod.streamingconnect.tv/cscocina/admin/Uploads/medias/logo.png" group-title="",Canal Sur Cocina (Opt-3)
-https://593fa17dec176.streamlock.net:443/cscocina/cscocina.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3siqxhh.png" group-title="",Canal Sur Cocina (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://pngimage.net/wp-content/uploads/2018/05/canal-sur-png-5-300x200.png" group-title="Local",Canal Sur Cocina
+https://593fa17dec176.streamlock.net/cscocina/cscocina.stream/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3siqxhh.png" group-title="",Canal Sur Cocina
 https://593fa17dec176.streamlock.net/cscocina/cscocina.stream/master.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://vod.streamingconnect.tv/cscocina/admin/Uploads/medias/logo.png" group-title="",Canal Sur Cocina
+https://593fa17dec176.streamlock.net:443/cscocina/cscocina.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JkM7YSM.png" group-title="",Canal Sur Eventos 1
 http://canalsur-pair302-live.hls.adaptive.level3.net/egress/bhandler/sandetel/eventos_01/master.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/CIOQGyj.png" group-title="",Canal Sur Flamenco (Opt-1)
-https://593fa17dec176.streamlock.net/csflamenco/csflamenco.stream/master.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ik.imagekit.io/ulangotv/image/upload/15912_logo_canal_sur_flamenco2.png" group-title="",Canal Sur Flamenco (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ik.imagekit.io/ulangotv/image/upload/15912_logo_canal_sur_flamenco2.png" group-title="",Canal Sur Flamenco
 https://593fa17dec176.streamlock.net/csflamenco/csflamenco.stream/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Canal Sur La Banda (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/CIOQGyj.png" group-title="",Canal Sur Flamenco
+https://593fa17dec176.streamlock.net/csflamenco/csflamenco.stream/master.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Canal Sur La Banda
 http://593fa17dec176.streamlock.net:1935/cslabanda/cslabanda.stream/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9hve8V5.png" group-title="",Canal Sur La Banda (Opt-2)
-https://593fa17dec176.streamlock.net/cslabanda/cslabanda.stream/master.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.labanda.canalsur.es/css/cssimg/logo.png" group-title="Local",Canal Sur La Banda (Opt-3)
-https://593fa17dec176.streamlock.net/cslabanda/cslabanda.stream/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.diariodesevilla.es/resources/images/0001688255.jpg" group-title="Local",Canal Sur La Banda (Opt-4)
-https://593fa17dec176.streamlock.net/cslabanda/cslabanda.stream/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Canal Sur La Banda (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Canal Sur La Banda
 https://593fa17dec176.streamlock.net/cslabanda/cslabanda.stream/chunklist_w1970326303.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ngU6UBb.png" group-title="",Canal Sur Turismo (Opt-1)
-https://593fa17dec176.streamlock.net/csturismo/csturismo.stream/master.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://directostv.teleame.com/wp-content/uploads/2017/09/CANAL-SUR-TURISMO.png" group-title="",Canal Sur Turismo (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.diariodesevilla.es/resources/images/0001688255.jpg" group-title="Local",Canal Sur La Banda
+https://593fa17dec176.streamlock.net/cslabanda/cslabanda.stream/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.labanda.canalsur.es/css/cssimg/logo.png" group-title="Local",Canal Sur La Banda
+https://593fa17dec176.streamlock.net/cslabanda/cslabanda.stream/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9hve8V5.png" group-title="",Canal Sur La Banda
+https://593fa17dec176.streamlock.net/cslabanda/cslabanda.stream/master.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://directostv.teleame.com/wp-content/uploads/2017/09/CANAL-SUR-TURISMO.png" group-title="",Canal Sur Turismo
 https://593fa17dec176.streamlock.net/csturismo/csturismo.stream/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ngU6UBb.png" group-title="",Canal Sur Turismo
+https://593fa17dec176.streamlock.net/csturismo/csturismo.stream/master.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/OFZCqGj.png" group-title="",Canal Taronja Osona
 http://ventdelnord.tv:8080/taronja/directe.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/btUKfIa.png" group-title="",Canal Terrassa (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/btUKfIa.png" group-title="",Canal Terrassa
 http://5.189.181.203:1935/terrassaweb/terrassaweb/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="Canal Terrassa" tvg-logo="New Logo" group-title="Local",Canal Terrassa (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="Canal Terrassa" tvg-logo="New Logo" group-title="Local",Canal Terrassa
 http://cast.streamingconnect.tv:1935/terrassaweb/terrassaweb/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1RVS7Wh.png" group-title="",Canalcosta TV (Opt-1)
-http://stream.canalcostatv.es:1935/web/IKbtqOuj/master.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.Canalcostatv.es/wp-content/uploads/2013/12/logo-cabecera.png" group-title="",Canalcosta TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.Canalcostatv.es/wp-content/uploads/2013/12/logo-cabecera.png" group-title="",Canalcosta TV
 http://stream.canalcostatv.es:1935/web/IKbtqOuj/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1RVS7Wh.png" group-title="",Canalcosta TV
+http://stream.canalcostatv.es:1935/web/IKbtqOuj/master.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/90JtWsA.png" group-title="",CCMA Exclusiu 1
 https://ccma-tva-int-cellnex-live-hls.secure.footprint.net/int/ngrp:oca1_web/master_DVR.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.bonaresdigital.es/wp-content/uploads/2011/02/condavision1-1024x246.png" group-title="",Condavision
 http://145.239.141.154:1935/live/uSCQc5ky/master.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Cuatro ES" tvg-name="Cuatro ES" tvg-logo="https://static.iptv-epg.com/es/Cosmo.es.png" group-title="General",Cuatro (Opt-1)
-https://livehlsdai-i.akamaihd.net/hls/live/571643/cuatro/bitrate_4.m3u8
-#EXTINF:-1 tvg-id="Cuatro ES" tvg-name="Cuatro ES" tvg-logo="https://i.imgur.com/09qP7mv.png" group-title="General",Cuatro (Opt-2)
+#EXTINF:-1 tvg-id="Cuatro ES" tvg-name="Cuatro ES" tvg-logo="https://i.imgur.com/09qP7mv.png" group-title="General",Cuatro
 https://livehlsdai-i.akamaihd.net/hls/live/571643/cuatro/bitrate_2.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="Cuatro ES" tvg-name="Cuatro ES" tvg-logo="https://static.iptv-epg.com/es/Cosmo.es.png" group-title="General",Cuatro
+https://livehlsdai-i.akamaihd.net/hls/live/571643/cuatro/bitrate_4.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/nMXmRPZ.png" group-title="",CYL TV Castilla Leon
 http://nws.nice264.com/ilive/cyl/cyl_aaf8301a8e99d2acb611ceca62441ec5/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/es/Divinity.es.png" group-title="General",Divinity (Opt-1)
-https://mdslivehls-i.akamaihd.net/hls/live/571648/divinity/bitrate_4.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/0/06/Divinity_2012.png" group-title="General",Divinity (Opt-2)
-https://mdslivehls-i.akamaihd.net/hls/live/571648/divinity/bitrate_3.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Divinity (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Divinity
 https://mdslivehls-i.akamaihd.net/hls/live/571648/divinity/bitrate_1.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/0/06/Divinity_2012.png" group-title="General",Divinity
+https://mdslivehls-i.akamaihd.net/hls/live/571648/divinity/bitrate_3.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/es/Divinity.es.png" group-title="General",Divinity
+https://mdslivehls-i.akamaihd.net/hls/live/571648/divinity/bitrate_4.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2sdmBlz.png" group-title="",Dubbi Kids
 https://livelist01.yowi.tv/lista/2772ab10257fcbb71bc1eb00d0660c0bfddd4075/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/mRnasqG.png" group-title="",Ecija Comarca TV
 http://stream.teleonuba.es:1935/live/GdZpE8ef/chunklist_w1202791317.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",EITB (Opt-1)
-http://etbvnogeo-lh.akamaihd.net/i/ETBEITBEUS_1@300391/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",EITB (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",EITB
 http://etbvnogeo-lh.akamaihd.net/i/ETBEITBEUS_1@300391/index_0564_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",EITB (Opt-3)
-http://etbvnogeo-lh.akamaihd.net/i/ETBEITBEUS_1@300391/index_0748_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://oklivetv.com/wp-content/uploads/media/08e7076d5fc3c9e6eed8c746408de958.jpeg" group-title="Local",EITB (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://oklivetv.com/wp-content/uploads/media/08e7076d5fc3c9e6eed8c746408de958.jpeg" group-title="Local",EITB
 http://etbvnogeo-lh.akamaihd.net/i/ETBEITBEUS_1@300391/index_0748_av-b.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/44/33_%28CCMA%29.svg/1200px-33_%28CCMA%29.svg.png" group-title="",El 33 (Opt-1)
-http://ccma-tva-int-abertis-live.hls.adaptive.level3.net/int/ngrp:c33_web/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/44/33_%28CCMA%29.svg/1200px-33_%28CCMA%29.svg.png" group-title="",El 33 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",EITB
+http://etbvnogeo-lh.akamaihd.net/i/ETBEITBEUS_1@300391/index_0748_av-p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",EITB
+http://etbvnogeo-lh.akamaihd.net/i/ETBEITBEUS_1@300391/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/44/33_%28CCMA%29.svg/1200px-33_%28CCMA%29.svg.png" group-title="",El 33
 http://ccma-tva-es-cellnex-live-hls.secure.footprint.net/cat/ngrp:c33_web/chunklist_b1296000_DVR.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",El 33 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",El 33
 http://ccma-tva-int-abertis-live.hls.adaptive.level3.net/int/ngrp:c33_web/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/44/33_%28CCMA%29.svg/1200px-33_%28CCMA%29.svg.png" group-title="",El 33
+http://ccma-tva-int-abertis-live.hls.adaptive.level3.net/int/ngrp:c33_web/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/UxjG3AB.png" group-title="",El Correo de Andalucia
 http://common01.todostreaming.es/live/elcorreotv-livestream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/6ZwygmS.png" group-title="",Elche 7TV
 https://streaming.elche7tv.es/hls/canal1.m3u8
-#EXTINF:-1 tvg-id="Energy ES" tvg-name="Energy ES" tvg-logo="https://static.iptv-epg.com/es/Energy.es.png" group-title="General",Energy (Opt-1)
-https://mdslivehlsb-i.akamaihd.net/hls/live/623617/energy/bitrate_4.m3u8
-#EXTINF:-1 tvg-id="Energy ES" tvg-name="Energy ES" tvg-logo="https://album.mediaset.es/file/10002/2017/11/21/energy_circular_500_-1_4048.png" group-title="General",Energy (Opt-2)
+#EXTINF:-1 tvg-id="Energy ES" tvg-name="Energy ES" tvg-logo="https://album.mediaset.es/file/10002/2017/11/21/energy_circular_500_-1_4048.png" group-title="General",Energy
 https://mdslivehlsb-i.akamaihd.net/hls/live/623617/energy/bitrate_1.m3u8
+#EXTINF:-1 tvg-id="Energy ES" tvg-name="Energy ES" tvg-logo="https://static.iptv-epg.com/es/Energy.es.png" group-title="General",Energy
+https://mdslivehlsb-i.akamaihd.net/hls/live/623617/energy/bitrate_4.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/adySzI2.png" group-title="",Esplugues Televisio
 https://vodingesta1083.cdnmedia.tv/video/etv/lcnhpgm134311015ceb4c0c-e8af_H,700,1500,.MP4.urlset/master.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.programacion-tdt.com/imgAPP/Esport3.min.png" group-title="Sport",ESport3 (Opt-1)
-https://ccma-tva-int-cellnex-live-hls.secure.footprint.net/int/ngrp:es3_web/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.couperogers.com/wp-content/uploads/sites/3/2015/06/Logo-TVA-Sports-1-vertical-CMYK.jpg" group-title="Sport",ESport3 (Opt-2)
-https://ccma-tva-int-cellnex-live-hls.secure.footprint.net/int/ngrp:es3_web/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",ESport3 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",ESport3
 http://ccma-tva-int-abertis-live.hls.adaptive.level3.net/int/ngrp:es3_web/chunklist_b1296000_DVR.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.couperogers.com/wp-content/uploads/sites/3/2015/06/Logo-TVA-Sports-1-vertical-CMYK.jpg" group-title="Sport",ESport3
+https://ccma-tva-int-cellnex-live-hls.secure.footprint.net/int/ngrp:es3_web/chunklist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.programacion-tdt.com/imgAPP/Esport3.min.png" group-title="Sport",ESport3
+https://ccma-tva-int-cellnex-live-hls.secure.footprint.net/int/ngrp:es3_web/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/rMAB720.png" group-title="",Estepona TV
 https://5b38ce71f1f00.streamlock.net/8122/8122/chunklist_w310432579.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a6/ETB1_Spain.svg/1200px-ETB1_Spain.svg.png" group-title="Local",ETB 1 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a6/ETB1_Spain.svg/1200px-ETB1_Spain.svg.png" group-title="Local",ETB 1
 http://etbvnogeo-lh.akamaihd.net/i/ETBSTR1_1@595581/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a6/ETB1_Spain.svg/1200px-ETB1_Spain.svg.png" group-title="Local",ETB 1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a6/ETB1_Spain.svg/1200px-ETB1_Spain.svg.png" group-title="Local",ETB 1
 https://etbvnogeo-lh.akamaihd.net/i/ETBSTR1_1@595581/index_2596_av-b.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/98/ETB2_Spain.svg/1200px-ETB2_Spain.svg.png" group-title="Local",ETB 2 (Opt-1)
-https://etbvnogeo-lh.akamaihd.net/i/ETBSTR2_1@595582/index_2596_av-b.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/mrGvcPV.png" group-title="Local",ETB 2 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/mrGvcPV.png" group-title="Local",ETB 2
 http://etbvnogeo-lh.akamaihd.net/i/ETBSTR2_1@595582/master.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="FDF ES" tvg-name="FDF ES" tvg-logo="" group-title="",FDF (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/98/ETB2_Spain.svg/1200px-ETB2_Spain.svg.png" group-title="Local",ETB 2
+https://etbvnogeo-lh.akamaihd.net/i/ETBSTR2_1@595582/index_2596_av-b.m3u8
+#EXTINF:-1 tvg-id="FDF ES" tvg-name="FDF ES" tvg-logo="" group-title="",FDF
 https://mdslivehls-i.akamaihd.net/hls/live/571650/fdf/bitrate_3.m3u8
-#EXTINF:-1 tvg-id="FDF ES" tvg-name="FDF ES" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/42/Factor%C3%ADa_de_Ficci%C3%B3n.svg/225px-Factor%C3%ADa_de_Ficci%C3%B3n.svg.png" group-title="",FDF (Opt-2)
+#EXTINF:-1 tvg-id="FDF ES" tvg-name="FDF ES" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/42/Factor%C3%ADa_de_Ficci%C3%B3n.svg/225px-Factor%C3%ADa_de_Ficci%C3%B3n.svg.png" group-title="",FDF
 https://mdslivehls-i.akamaihd.net/hls/live/571650/fdf/bitrate_4.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/es/TVGalicia.es.png" group-title="",Galicia TV América
 http://america-crtvg.flumotion.com/crtvg/america_high/chunks.m3u8
@@ -195,20 +195,20 @@ https://play.cdn.enetres.net/16011939C62D44ED91350508FB25828B021/021/playlist.m3
 http://hlsliveamdgl7-lh.akamaihd.net/i/hlsdvrlive_1@583042/index_2800_av-b.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jVxJ4lW.png" group-title="",La 2
 http://hlsliveamdgl0-lh.akamaihd.net/i/hlslive_1@586367/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/f/f3/Logo_La_7.svg/150px-Logo_La_7.svg.png" group-title="Local",La 7 Castilla (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/f/f3/Logo_La_7.svg/150px-Logo_La_7.svg.png" group-title="Local",La 7 Castilla
 http://cdn.s3.eu.nice264.com:1935/niceLiveServer/cyl_aaf8301a8e99d2acb611ceca62441ec5/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/Logo_RTVCYL.svg/245px-Logo_RTVCYL.svg.png" group-title="Local",La 7 Castilla (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/Logo_RTVCYL.svg/245px-Logo_RTVCYL.svg.png" group-title="Local",La 7 Castilla
 http://cdn.s3.eu.nice264.com:1935/niceLiveServer/cyl_aaf8301a8e99d2acb611ceca62441ec5/master.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/2/20/7TVRM.svg/330px-7TVRM.svg.png" group-title="Local",La 7 TV Murcia
 http://rtvmurcia_01-lh.akamaihd.net/i/rtvmurcia_1_0@507973/index_0_av-p.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ocio.lne.es/img_contenido/noticias/2018/12/717579/la_voz_canal_24_horas.jpg" group-title="Entertainment",La Voz 24h
 https://pull12.atresmedia.com/lavoz/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Lancelot TV (Opt-1)
-http://62.210.141.18:1935/directo/lancelot.television/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Lancelot TV (Opt-2)
-http://62.210.141.18:1935/directo/lancelot.television/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Lancelot TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Lancelot TV
 http://62.210.141.18:1935/directo/lancelot.television/chunklist_w350778724.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Lancelot TV
+http://62.210.141.18:1935/directo/lancelot.television/live.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Lancelot TV
+http://62.210.141.18:1935/directo/lancelot.television/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.lebrija.tv/wp-content/uploads/2016/06/logo-web-2.png" group-title="",Lebrija TV
 http://212.104.160.156:1935/live/lebrijatv2/playlist3.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/8/80/Los_40.svg/1200px-Los_40.svg.png" group-title="",Los 40
@@ -221,49 +221,49 @@ http://melillatv-hls.flumotion.com/melillatv/melillatv_all/melillatv/live_source
 http://mijas.hls.flumotion.com/mijas/live-hls/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.colectivosvip.com/public/colectivos/390/logo.png" group-title="",Mola TV
 http://ventdelnord.tv:8080/mola/directe.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/I9QX555.png" group-title="",mtmad 24h (Opt-1)
-https://mdssplive-lh.akamaihd.net/i/mtmad_1@744785/index_2500_av-p.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://album.mediaset.es//parrillas/2018/12/10/a73d6e6782962b1b45a2ae20e9d06ed21544435933.jpg" group-title="",mtmad 24h (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://album.mediaset.es//parrillas/2018/12/10/a73d6e6782962b1b45a2ae20e9d06ed21544435933.jpg" group-title="",mtmad 24h
 https://mdssplive-lh.akamaihd.net/i/mtmad_1@744785/index_2500_av-p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/I9QX555.png" group-title="",mtmad 24h
+https://mdssplive-lh.akamaihd.net/i/mtmad_1@744785/index_2500_av-p.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Onda Cádiz
 http://api.new.livestream.com/accounts/22727797/events/7923562/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/66/OndaMadrid.svg/1280px-OndaMadrid.svg.png" group-title="",Onda Madrid
 http://telemadridhls-live.hls.adaptive.level3.net/telemadrid/tvradio/index.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/5/5e/Paramount.png" group-title="",Paramount Channel
 http://paramount.live.flumotion.com/live/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hwlTrtF.png" group-title="Local",Popular TV Melilla (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hwlTrtF.png" group-title="Local",Popular TV Melilla
 https://5940924978228.streamlock.net/8009/8009/chunklist_w922827150.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i0.wp.com/populartvmelilla.es/wp-content/uploads/2019/03/popweb.png" group-title="Local",Popular TV Melilla (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i0.wp.com/populartvmelilla.es/wp-content/uploads/2019/03/popweb.png" group-title="Local",Popular TV Melilla
 https://5940924978228.streamlock.net/8009/8009/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.albertoballesteros.com/wp-content/uploads/2016/04/onda-W900-W900.jpg" group-title="",Radio Onda Madrid
 http://telemadridhls-live.hls.adaptive.level3.net/telemadrid/tvradio/bitrate_2.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://thumb.besoccerapps.com/rbetis/img_web/logo_shield.png" group-title="Sport",Real Betis TV
 https://cdnlive.shooowit.net/rbetislive/smil:television.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://1.bp.blogspot.com/-QaVUh3LAh2g/WVJEIoTdIYI/AAAAAAAAHeE/PPaKtUxVtwIziTuY46721XotnxUMnwn8ACLcBGAs/s1600/real_madrid_tv_es_english.png" group-title="Sport",Real Madrid TV (English) (Opt-1)
-http://rmtv24hweblive-lh.akamaihd.net/i/rmtv24hweben_1@300662/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.imaginaus.com/es/wp-content/uploads/2014/02/real-madrid.jpg" group-title="Sport",Real Madrid TV (English) (Opt-2)
-http://rmtv24hweblive-lh.akamaihd.net/i/rmtv24hweben_1@300662/index_3_av-b.m3u8
-#EXTINF:-1 tvg-id="Real Madrid TV ES" tvg-name="Real Madrid TV ES" tvg-logo="http://srv00.epimg.net/programacion-tv/iconos/canales/realm.png" group-title="Sport",Real Madrid TV (Opt-1)
-http://rmtv24hweblive-lh.akamaihd.net:80/i/rmtv24hwebes_1@300661/index_3_av-p.m3u8
-#EXTINF:-1 tvg-id="Real Madrid TV ES" tvg-name="Real Madrid TV ES" tvg-logo="http://www.imaginaus.com/es/wp-content/uploads/2014/02/real-madrid.jpg" group-title="Sport",Real Madrid TV (Opt-2)
-http://rmtvlive-lh.akamaihd.net/i/rmtv_1@154306/index_1000_av-p.m3u8
-#EXTINF:-1 tvg-id="Real Madrid TV ES" tvg-name="Real Madrid TV ES" tvg-logo="" group-title="Sport",Real Madrid TV (Opt-3)
-http://rmtv24hweblive-lh.akamaihd.net/i/rmtv24hwebes_1@300661/master.m3u8
-#EXTINF:-1 tvg-id="Real Madrid TV ES" tvg-name="Real Madrid TV ES" tvg-logo="http://srv00.epimg.net/programacion-tv/iconos/canales/realm.png" group-title="Sport",Real Madrid TV (Opt-4)
-http://rmtvlive-lh.akamaihd.net/i/rmtv_1@154306/master.m3u8
-#EXTINF:-1 tvg-id="Real Madrid TV ES" tvg-name="Real Madrid TV ES" tvg-logo="" group-title="Sport",Real Madrid TV (Opt-5)
-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="Real Madrid TV ES" tvg-name="Real Madrid TV ES" tvg-logo="http://www.imaginaus.com/es/wp-content/uploads/2014/02/real-madrid.jpg" group-title="Sport",Real Madrid TV (Opt-6)
+#EXTINF:-1 tvg-id="Real Madrid TV ES" tvg-name="Real Madrid TV ES" tvg-logo="http://www.imaginaus.com/es/wp-content/uploads/2014/02/real-madrid.jpg" group-title="Sport",Real Madrid TV
 http://rmtv24hweblive-lh.akamaihd.net/i/rmtv24hwebes_1@300661/index_3_av-b.m3u8
+#EXTINF:-1 tvg-id="Real Madrid TV ES" tvg-name="Real Madrid TV ES" tvg-logo="" group-title="Sport",Real Madrid TV
+http://rmtv24hweblive-lh.akamaihd.net/i/rmtv24hwebes_1@300661/master.m3u8
+#EXTINF:-1 tvg-id="Real Madrid TV ES" tvg-name="Real Madrid TV ES" tvg-logo="http://srv00.epimg.net/programacion-tv/iconos/canales/realm.png" group-title="Sport",Real Madrid TV
+http://rmtv24hweblive-lh.akamaihd.net:80/i/rmtv24hwebes_1@300661/index_3_av-p.m3u8
+#EXTINF:-1 tvg-id="Real Madrid TV ES" tvg-name="Real Madrid TV ES" tvg-logo="http://www.imaginaus.com/es/wp-content/uploads/2014/02/real-madrid.jpg" group-title="Sport",Real Madrid TV
+http://rmtvlive-lh.akamaihd.net/i/rmtv_1@154306/index_1000_av-p.m3u8
+#EXTINF:-1 tvg-id="Real Madrid TV ES" tvg-name="Real Madrid TV ES" tvg-logo="" 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="Real Madrid TV ES" tvg-name="Real Madrid TV ES" tvg-logo="http://srv00.epimg.net/programacion-tv/iconos/canales/realm.png" group-title="Sport",Real Madrid TV
+http://rmtvlive-lh.akamaihd.net/i/rmtv_1@154306/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.imaginaus.com/es/wp-content/uploads/2014/02/real-madrid.jpg" group-title="Sport",Real Madrid TV (English)
+http://rmtv24hweblive-lh.akamaihd.net/i/rmtv24hweben_1@300662/index_3_av-b.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://1.bp.blogspot.com/-QaVUh3LAh2g/WVJEIoTdIYI/AAAAAAAAHeE/PPaKtUxVtwIziTuY46721XotnxUMnwn8ACLcBGAs/s1600/real_madrid_tv_es_english.png" group-title="Sport",Real Madrid TV (English)
+http://rmtv24hweblive-lh.akamaihd.net/i/rmtv24hweben_1@300662/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/o8EtLad.png" group-title="",RiberaTV
 http://common01.todostreaming.es/live/ribera-livestream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://doc-it.es/wp-content/uploads/2016/06/RTPA_logo.svg_.png" group-title="",RTPA Asturias
 https://cdnlive.shooowit.net/rtpalive/smil:directo.smil/chunklist_b1500000.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rtvce.es/fotos/logo-web-new_15400183441_15443530361.png" group-title="Local",RTVCE (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rtvce.es/fotos/logo-web-new_15400183441_15443530361.png" group-title="Local",RTVCE
 http://teledifusion.tv:1935/rtvcetv/mp4:rtvcetvlive/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/ca/RtvCeuta.svg/1200px-RtvCeuta.svg.png" group-title="Local",RTVCE (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/ca/RtvCeuta.svg/1200px-RtvCeuta.svg.png" group-title="Local",RTVCE
 http://teledifusion.tv:1935/rtvcetv/mp4:rtvcetvlive/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://yt3.ggpht.com/-VmyM6ux4ivw/AAAAAAAAAAI/AAAAAAAAAAA/PyvyJBePBbk/s900-c-k-no-mo-rj-c0xffffff/photo.jpg" group-title="Local",RTVCE (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://yt3.ggpht.com/-VmyM6ux4ivw/AAAAAAAAAAI/AAAAAAAAAAA/PyvyJBePBbk/s900-c-k-no-mo-rj-c0xffffff/photo.jpg" group-title="Local",RTVCE
 http://teledifusion.tv:1935/rtvcetv/rtvcetvlive/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
@@ -275,61 +275,61 @@ http://ccma-tva-int-cellnex-live-hls.secure.footprint.net/int/ngrp:c33_web/chunk
 http://93.93.67.117:1935/taroteame/tarot_web/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0w1W0vE.png" group-title="Religious",TBN España
 http://wowzaprod161-i.akamaihd.net/hls/live/598486/e049734e/playlist.m3u8
-#EXTINF:-1 tvg-id="Telecinco ES" tvg-name="Telecinco ES" tvg-logo="https://i.imgur.com/8TMYWI0.png" group-title="General",Telecinco (Opt-1)
+#EXTINF:-1 tvg-id="Telecinco ES" tvg-name="Telecinco ES" tvg-logo="https://i.imgur.com/8TMYWI0.png" group-title="General",Telecinco
 https://livehlsdai-i.akamaihd.net/hls/live/571640/telecinco/bitrate_2.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Telecinco ES" tvg-name="Telecinco ES" tvg-logo="https://i.imgur.com/8TMYWI0.png" group-title="General",Telecinco (Opt-2)
+#EXTINF:-1 tvg-id="Telecinco ES" tvg-name="Telecinco ES" tvg-logo="https://i.imgur.com/8TMYWI0.png" group-title="General",Telecinco
 https://livehlsdai-i.akamaihd.net/hls/live/571640/telecinco/bitrate_4.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vpWSsZ7.png" group-title="",Teleonuba
 http://stream.teleonuba.es:1935/live/GdZpE8ef/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/UJrapXK.jpg" group-title="Local",TeleSafor (Opt-1)
-http://video.telesafor.com/hls/video_low.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/UJrapXK.jpg" group-title="Local",TeleSafor (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/UJrapXK.jpg" group-title="Local",TeleSafor
 http://video.telesafor.com/hls/video_high.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/UJrapXK.jpg" group-title="Local",TeleSafor
+http://video.telesafor.com/hls/video_low.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RdXtnhF.jpg" group-title="",Televigo
 http://5.189.181.203:1935/gcm4/gcm4/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/khRXhT1.png" group-title="",Televisio Girona
 http://ventdelnord.tv:8080/girona/directe.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/a4/Logo-tpa7.jpg" group-title="Local",TPA 7
 https://cdnlive.shooowit.net/rtpalive/directo.smil/.m3u8
-#EXTINF:-1 tvg-id="TV Galicia ES" tvg-name="TV Galicia ES" tvg-logo="https://static.iptv-epg.com/es/TVGalicia.es.png" group-title="",TV Galicia (Opt-1)
-http://europa-crtvg.flumotion.com/playlist.m3u8
-#EXTINF:-1 tvg-id="TV Galicia ES" tvg-name="TV Galicia ES" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/3623.png" group-title="",TV Galicia (Opt-2)
+#EXTINF:-1 tvg-id="TV Galicia ES" tvg-name="TV Galicia ES" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/3623.png" group-title="",TV Galicia
 http://europa-crtvg.flumotion.com/crtvg/europa_med/chunks.m3u8
+#EXTINF:-1 tvg-id="TV Galicia ES" tvg-name="TV Galicia ES" tvg-logo="https://static.iptv-epg.com/es/TVGalicia.es.png" group-title="",TV Galicia
+http://europa-crtvg.flumotion.com/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/A89L7IJ.png" group-title="",TV Galicia 2
 http://amodino-crtvg.flumotion.com/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/A4idkRI.png" group-title="",TV Hellin
 http://hellin-hls-live.flumotion.com/hellin/hellin-live_source/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HAbq91X.png" group-title="",TV Municipal Cordoba
 http://teledifusion.tv:1935/cordoba/cordobalive/.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="TV3 Cat ES" tvg-name="TV3 Cat ES" tvg-logo="" group-title="Local",TV3 (Opt-1)
-http://www.tv3.cat/directetv3cat/tv3catpc.m3u8
-#EXTINF:-1 tvg-id="TV3 Cat ES" tvg-name="TV3 Cat ES" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/97/TV3CAT.svg/1200px-TV3CAT.svg.png" group-title="Local",TV3 (Opt-2)
-https://ccma-tva-int-cellnex-live-hls.secure.footprint.net/int/ngrp:tv3_web/playlist.m3u8
-#EXTINF:-1 tvg-id="TV3 Cat ES" tvg-name="TV3 Cat ES" tvg-logo="" group-title="Local",TV3 (Opt-3)
+#EXTINF:-1 tvg-id="TV3 Cat ES" tvg-name="TV3 Cat ES" tvg-logo="" group-title="Local",TV3
 http://ccma-tva-int-abertis-live.hls.adaptive.level3.net/int/ngrp:tv3_web/.m3u8
-#EXTINF:-1 tvg-id="TV3 Cat ES" tvg-name="TV3 Cat ES" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/1355.png" group-title="Local",TV3 (Opt-4)
+#EXTINF:-1 tvg-id="TV3 Cat ES" tvg-name="TV3 Cat ES" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/1355.png" group-title="Local",TV3
 http://ccma-tva-int-abertis-live.hls.adaptive.level3.net/int/ngrp:tv3cat_tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/KoTonIp.png" group-title="",TVG 2 (Opt-1)
-http://events3-crtvg.flumotion.com/crtvg/events3/chunks.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/v5d0xMH.png" group-title="",TVG 2 (Opt-2)
+#EXTINF:-1 tvg-id="TV3 Cat ES" tvg-name="TV3 Cat ES" tvg-logo="" group-title="Local",TV3
+http://www.tv3.cat/directetv3cat/tv3catpc.m3u8
+#EXTINF:-1 tvg-id="TV3 Cat ES" tvg-name="TV3 Cat ES" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/97/TV3CAT.svg/1200px-TV3CAT.svg.png" group-title="Local",TV3
+https://ccma-tva-int-cellnex-live-hls.secure.footprint.net/int/ngrp:tv3_web/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/v5d0xMH.png" group-title="",TVG 2
 http://events2-crtvg.flumotion.com/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c3/TvG2.jpg/330px-TvG2.jpg" group-title="Local",TVG 2 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c3/TvG2.jpg/330px-TvG2.jpg" group-title="Local",TVG 2
 http://events3-crtvg.flumotion.com/crtvg/events3/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/es/TVGalicia.es.png" group-title="Local",TVG Cultural (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/KoTonIp.png" group-title="",TVG 2
+http://events3-crtvg.flumotion.com/crtvg/events3/chunks.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/es/TVGalicia.es.png" group-title="Local",TVG Cultural
 http://cultural-crtvg.flumotion.com/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/v5d0xMH.png" group-title="",TVG Cultural (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/v5d0xMH.png" group-title="",TVG Cultural
 http://cultural-crtvg.flumotion.com/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/v5d0xMH.png" group-title="",TVG Evento 1
 http://events1-crtvg.flumotion.com/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/v5d0xMH.png" group-title="",TVG Infantil (Opt-1)
-http://infantil-crtvg.flumotion.com/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/es/TVGalicia.es.png" group-title="Local",TVG Infantil (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/es/TVGalicia.es.png" group-title="Local",TVG Infantil
 http://infantil-crtvg.flumotion.com/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/v5d0xMH.png" group-title="",TVG Infantil
+http://infantil-crtvg.flumotion.com/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/es/TVGalicia.es.png" group-title="Local",TVG Momento
 http://momentog-crtvg.flumotion.com/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/es/TVGalicia.es.png" group-title="Local",TVG Musigal (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/es/TVGalicia.es.png" group-title="Local",TVG Musigal
 http://musigal-crtvg.flumotion.com/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/v5d0xMH.png" group-title="",TVG Musigal (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/v5d0xMH.png" group-title="",TVG Musigal
 http://musigal-crtvg.flumotion.com/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/w83wr1S.png" group-title="",Urola Telebista
 https://5940924978228.streamlock.net/j_Directo1/j_Directo1.smil/.m3u8
diff --git a/channels/et.m3u b/channels/et.m3u
index 81def586d..8bb1a456b 100644
--- a/channels/et.m3u
+++ b/channels/et.m3u
@@ -1,8 +1,8 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/KAg6MOI.png" group-title="",Addis TV (Opt-1)
-https://rrsatrtmp.tulix.tv/addis1/addis1multi.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/KAg6MOI.png" group-title="",Addis TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/KAg6MOI.png" group-title="",Addis TV
 https://rrsatrtmp.tulix.tv/addis1/addis1multi.smil/chunklist_w418104290_b2130000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/KAg6MOI.png" group-title="",Addis TV
+https://rrsatrtmp.tulix.tv/addis1/addis1multi.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5OOSgTG.png" group-title="",Fana TV
 https://wowhe1.vixtream.net/vcdnedge1/_definst_/smil:fbctv.smil/chunklist_w463791793_b596000_tkd3RDdXN0b21JcD0yMTMyMTkxNzcyMDQmd3RlbmR0aW1lPTE1NjY5OTI3Njgmd3RoYXNoPXBwaW91NGhhYWMtR0o4X0VUSXY4Ym1jWk56eE1zUEk0N2U3akd0cnAyUzg9.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/z3eWH8a.png" group-title="",Walta
diff --git a/channels/fo.m3u b/channels/fo.m3u
index de3f96ccf..38cbb1803 100644
--- a/channels/fo.m3u
+++ b/channels/fo.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KVF (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KVF
 https://w1.kringvarp.fo/uttanlands/_definst_/smil:uttanlands.smil/chunklist_w65435769_b2236000_slfao.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KVF (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KVF
 https://w1.kringvarp.fo/uttanlands/_definst_/smil:uttanlands.smil/chunklist_w65435769_b300000_slfao.m3u8
diff --git a/channels/fr.m3u b/channels/fr.m3u
index a14bdb2be..79a4e29c0 100644
--- a/channels/fr.m3u
+++ b/channels/fr.m3u
@@ -5,11 +5,11 @@ https://str-3.mediabay.tv/A2iMusic/playlist.m3u8?token=89f5edc5a14fdb0455a0bdf27
 https://str-2.mediabay.tv/A2itv/playlist.m3u8?token=5de362ef664d3efce706ae29f1bdd5d3a58c448f-2c973d83861c11acd228083135866a20-1566585805-1566575005
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",A2itv Religion
 https://str-3.mediabay.tv/A2iReligion/playlist.m3u8?token=7328ac279881ef7407cce7276e460c0f7740536f-ba12e40c3d875b184e9ec0e4404743c0-1566585862-1566575062
-#EXTINF:-1 tvg-id="Alsace 20 FR" tvg-name="Alsace 20 FR" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/1051.png" group-title="",Alsace 20 (Opt-1)
-http://live.alsace20.fr:1935/live/alsace20/livestream/chunklist_.m3u8
-#EXTINF:-1 tvg-id="Alsace 20 FR" tvg-name="Alsace 20 FR" tvg-logo="http://www.televisionslocales.com/wp-content/uploads/photo-gallery/thumb/alsace20-300x200.png" group-title="",Alsace 20 (Opt-2)
+#EXTINF:-1 tvg-id="Alsace 20 FR" tvg-name="Alsace 20 FR" tvg-logo="http://www.televisionslocales.com/wp-content/uploads/photo-gallery/thumb/alsace20-300x200.png" group-title="",Alsace 20
 http://live.alsace20.fr/live/alsace20/ngrp:alsace20_all/playlist.m3u8
-#EXTINF:-1 tvg-id="Arte FR" tvg-name="Arte FR" tvg-logo="https://i.imgur.com/zthzjPs.png" group-title="",Arte (Opt-2)
+#EXTINF:-1 tvg-id="Alsace 20 FR" tvg-name="Alsace 20 FR" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/1051.png" group-title="",Alsace 20
+http://live.alsace20.fr:1935/live/alsace20/livestream/chunklist_.m3u8
+#EXTINF:-1 tvg-id="Arte FR" tvg-name="Arte FR" tvg-logo="https://i.imgur.com/zthzjPs.png" group-title="",Arte
 https://s1.tntendirect.com/arte/live/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://blackbeautyfair.com/wp-content/uploads/2015/08/logo_bblack_africa-820x442.png" group-title="",Bblack! Africa
 http://ec.playmedia.fr/beblack/africa/playlist.m3u8
@@ -19,9 +19,9 @@ http://ec.playmedia.fr/beblack/caribbean/playlist.m3u8
 http://ec.playmedia.fr/beblack/classik/playlist.m3u8
 #EXTINF:-1 tvg-id="BFM Business FR" tvg-name="BFM Business FR" tvg-logo="http://db.radioline.fr/pictures/radio_48566ee80198edc8188a34286e41ee46/logo200.jpg?size=200" group-title="",BFM Business
 https://bfmbusisecure-i.akamaihd.net/hls/live/265375/876450612001/BFMBusinessS/video_1/video_1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://d24j9r7lck9cin.cloudfront.net/l/o/6/6904.1504800162.png" group-title="",BFM Paris (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://d24j9r7lck9cin.cloudfront.net/l/o/6/6904.1504800162.png" group-title="",BFM Paris
 https://bfmparishdslive-lh.akamaihd.net/i/BFMPARIS_KB@429747/index_1236_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://d24j9r7lck9cin.cloudfront.net/l/o/6/6904.1504800162.png" group-title="",BFM Paris (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://d24j9r7lck9cin.cloudfront.net/l/o/6/6904.1504800162.png" group-title="",BFM Paris
 https://bfmparishdslive-lh.akamaihd.net/i/BFMPARIS_KB@429747/master.m3u8
 #EXTINF:-1 tvg-id="BFM TV FR" tvg-name="BFM TV FR" tvg-logo="https://i.imgur.com/ClMYrD0.png" group-title="",BFM TV
 https://s1.tntendirect.com/bmftv/live/playlist.m3u8
@@ -45,10 +45,10 @@ https://emcifr-i.akamaihd.net/hls/live/577363/emcifr/04.m3u8
 http://api.new.livestream.com/accounts/7861901/events/8505052/live.m3u8
 #EXTINF:-1 tvg-id="France 2 FR" tvg-name="France 2 FR" tvg-logo="https://i.imgur.com/zg1VRRE.png" group-title="",France 2
 https://s1.tntendirect.com/france2/live/playlist.m3u8
-#EXTINF:-1 tvg-id="France 3 FR" tvg-name="France 3 FR" tvg-logo="https://i.imgur.com/R1qAZ5N.jpg" group-title="",France 3 (Opt-1)
-https://s1.tntendirect.com/france3/live/playlist.m3u8
-#EXTINF:-1 tvg-id="France 3 FR" tvg-name="France 3 FR" tvg-logo="https://static.iptv-epg.com/fr/France3.fr.png" group-title="",France 3 (Opt-2)
+#EXTINF:-1 tvg-id="France 3 FR" tvg-name="France 3 FR" tvg-logo="https://static.iptv-epg.com/fr/France3.fr.png" group-title="",France 3
 http://109.236.92.216:9090/France3/tracks-v1a1/mono.m3u8
+#EXTINF:-1 tvg-id="France 3 FR" tvg-name="France 3 FR" tvg-logo="https://i.imgur.com/R1qAZ5N.jpg" group-title="",France 3
+https://s1.tntendirect.com/france3/live/playlist.m3u8
 #EXTINF:-1 tvg-id="France 4 FR" tvg-name="France 4 FR" tvg-logo="https://i.imgur.com/FLaq3fo.png" group-title="",France 4
 https://s1.tntendirect.com/france4/live/playlist.m3u8
 #EXTINF:-1 tvg-id="France 5 FR" tvg-name="France 5 FR" tvg-logo="https://i.imgur.com/eRQAsS5.png" group-title="",France 5
@@ -57,16 +57,16 @@ https://s1.tntendirect.com/france5/live/playlist.m3u8
 https://s1.tntendirect.com/franceo/live/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Francophonie
 http://mv2.tvfrancophonie.org/live/Stream1/media_b776739_w671289549.m3u8
-#EXTINF:-1 tvg-id="Gong FR" tvg-name="Gong FR" tvg-logo="" group-title="",Gong (Opt-1)
+#EXTINF:-1 tvg-id="Gong FR" tvg-name="Gong FR" tvg-logo="" group-title="",Gong
 http://51.254.215.79/appflux/gong/GONG/gong_0640/chunks.m3u8
-#EXTINF:-1 tvg-id="Gong FR" tvg-name="Gong FR" tvg-logo="" group-title="",Gong (Opt-2)
-http://ec.playmedia.fr/gong-base/live/playlist.m3u8
-#EXTINF:-1 tvg-id="Gong FR" tvg-name="Gong FR" tvg-logo="" group-title="",Gong (Opt-3)
+#EXTINF:-1 tvg-id="Gong FR" tvg-name="Gong FR" tvg-logo="" group-title="",Gong
 http://51.254.215.79/appflux/gong/GONG/gong_1280/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.firstonetv.net/images/logos/fr/GONGMAX.png" group-title="",Gong Max (Opt-1)
-http://51.254.215.79/appflux/gongmax/GONGMAX/gongmax_1280/chunks.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Gong Max (Opt-2)
+#EXTINF:-1 tvg-id="Gong FR" tvg-name="Gong FR" tvg-logo="" group-title="",Gong
+http://ec.playmedia.fr/gong-base/live/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Gong Max
 http://51.254.215.79/appflux/gongmax/GONGMAX/gongmax_1280/chunks.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.firstonetv.net/images/logos/fr/GONGMAX.png" group-title="",Gong Max
+http://51.254.215.79/appflux/gongmax/GONGMAX/gongmax_1280/chunks.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="Gulli FR" tvg-name="Gulli FR" tvg-logo="https://i.imgur.com/U2KsDA0.png" group-title="",Gulli
 https://s1.tntendirect.com/gulli/live/playlist.m3u8
 #EXTINF:-1 tvg-id="I24news FR" tvg-name="I24news FR" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/f/fb/I24_official_logo.png" group-title="News",i24 News
@@ -79,19 +79,19 @@ http://str81.creacast.com:80/iltv/high/playlist.m3u8
 http://livehdkto-lh.akamaihd.net/i/LiveStream_1@178944/master.m3u8
 #EXTINF:-1 tvg-id="LEquipe 21 FR" tvg-name="LEquipe 21 FR" tvg-logo="https://i.imgur.com/B6r4RgK.jpg" group-title="",L'Equipe 21
 https://s1.tntendirect.com/lequipe21/live/playlist.m3u8
-#EXTINF:-1 tvg-id="La Chaine Normande TV FR" tvg-name="La Chaine Normande TV FR" tvg-logo="http://i.imgur.com/pYK8baq.png" group-title="Family",La Chaine Normande TV (Opt-1)
-http://live.lachainenormande.fr:80/live/lcn/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="La Chaine Normande TV FR" tvg-name="La Chaine Normande TV FR" tvg-logo="https://i.imgur.com/xDLwsbY.png" group-title="Family",La Chaine Normande TV (Opt-2)
+#EXTINF:-1 tvg-id="La Chaine Normande TV FR" tvg-name="La Chaine Normande TV FR" tvg-logo="https://i.imgur.com/xDLwsbY.png" group-title="Family",La Chaine Normande TV
 http://live.lachainenormande.fr/live/lcn/livestream/playlist.m3u8
+#EXTINF:-1 tvg-id="La Chaine Normande TV FR" tvg-name="La Chaine Normande TV FR" tvg-logo="http://i.imgur.com/pYK8baq.png" group-title="Family",La Chaine Normande TV
+http://live.lachainenormande.fr:80/live/lcn/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="M6 FR" tvg-name="M6 FR" tvg-logo="https://i.imgur.com/FNonACy.png" group-title="",M6
 https://s1.tntendirect.com/m6/live/playlist.m3u8
-#EXTINF:-1 tvg-id="MCM Top HD FR" tvg-name="MCM Top HD FR" tvg-logo="https://i.imgur.com/n2trOy5.png" group-title="Music",MCM Top HD (Opt-1)
-http://ott-cdn.ucom.am/s49/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="MCM Top HD FR" tvg-name="MCM Top HD FR" tvg-logo="" group-title="Music",MCM Top HD (Opt-2)
+#EXTINF:-1 tvg-id="MCM Top HD FR" tvg-name="MCM Top HD FR" tvg-logo="" group-title="Music",MCM Top HD
 http://92.43.140.249/s49/04.m3u8
-#EXTINF:-1 tvg-id="Mezzo Live HD FR" tvg-name="Mezzo Live HD FR" tvg-logo="https://static.iptv-epg.com/fr/Mezzo.fr.png" group-title="",Mezzo (Opt-1)
+#EXTINF:-1 tvg-id="MCM Top HD FR" tvg-name="MCM Top HD FR" tvg-logo="https://i.imgur.com/n2trOy5.png" group-title="Music",MCM Top HD
+http://ott-cdn.ucom.am/s49/index.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="Mezzo Live HD FR" tvg-name="Mezzo Live HD FR" tvg-logo="https://static.iptv-epg.com/fr/Mezzo.fr.png" group-title="",Mezzo
 http://ott-cdn.ucom.am/s35/04.m3u8
-#EXTINF:-1 tvg-id="Mezzo Live HD FR" tvg-name="Mezzo Live HD FR" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a8/Mezzo_Logo.svg/1280px-Mezzo_Logo.svg.png" group-title="",Mezzo (Opt-2)
+#EXTINF:-1 tvg-id="Mezzo Live HD FR" tvg-name="Mezzo Live HD FR" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a8/Mezzo_Logo.svg/1280px-Mezzo_Logo.svg.png" group-title="",Mezzo
 http://ott-cdn.ucom.am/s35/index.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/EgSC2QT.jpg" group-title="",MYComedy
 http://live.creacast.com/mycomedy/smil:mycomedy.smil/chunklist_w1113167704_b1928000.m3u8
@@ -103,13 +103,13 @@ http://contact-lh.akamaihd.net/i/CONTACT_1@321283/index_400_av-p.m3u8?sd=10&reba
 https://s1.tntendirect.com/rmcdecouverte/live/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Bdmw9Ll.jpg" group-title="",RMC Story
 https://s1.tntendirect.com/numero23/live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/b/b8/RT-France-logo.svg/200px-RT-France-logo.svg.png" group-title="News",RT France (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/b/b8/RT-France-logo.svg/200px-RT-France-logo.svg.png" group-title="News",RT France
 http://rt-france.secure.footprint.net/1107.m3u8?streamType=live
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/b/b8/RT-France-logo.svg/200px-RT-France-logo.svg.png" group-title="News",RT France (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/b/b8/RT-France-logo.svg/200px-RT-France-logo.svg.png" group-title="News",RT France
 https://str-4.mediabay.tv/RussiaTodayFrance/playlist.m3u8?token=d12484fe9a138a620b98c353cd589e5c6a4bbbd5-7eacca2fecd8fcde8e67003b33416780-1566590865-1566580065
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Acyl3az.jpg" group-title="Sport",STAD'AFRIC (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Acyl3az.jpg" group-title="Sport",STAD'AFRIC
 https://stadafric.streamakaci.tv/str_stadafric_stadafric/str_stadafric_multi/str_stadafric_stadafric/str_stadafric_player_1080p/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",STAD'AFRIC (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",STAD'AFRIC
 https://stadafric.streamakaci.tv/str_stadafric_stadafric/str_stadafric_multi/str_stadafric_stadafric/str_stadafric_player_480p/chunks.m3u8
 #EXTINF:-1 tvg-id="TF1 FR" tvg-name="TF1 FR" tvg-logo="https://i.imgur.com/06fP5xL.jpg" group-title="",TF1
 https://s1.tntendirect.com/tf1/live/playlist.m3u8
@@ -123,30 +123,30 @@ https://s1.tntendirect.com/tmc/live/playlist.m3u8
 https://tv3v.hdr-tv.com/live/tv3v/livestream/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://nowtv.now.com/shares/channelPreview/img/en_hk/color/ch713_170_122.jpg" group-title="",TV5 Style
 https://tv5styleen-i.akamaihd.net/hls/live/631650/tv5styleen/tv5style_eng_1200.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV5Monde Info (Opt-1)
-http://v3plusinfo247hls-i.akamaihd.net/hls/live/218877/v3plusinfo247hls/v3plusinfo247hls_1_1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV5Monde Info (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV5Monde Info
 http://v3plusinfo247hls-i.akamaihd.net/hls/live/218877-b/v3plusinfo247hls/v3plusinfo247hls_1_1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AJx5Fy2.png" group-title="",TV5Monde Info (Opt-3)
-http://v3plusinfo247hls-i.akamaihd.net/hls/live/218877/v3plusinfo247hls/v3plusinfo247hls_1_2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AJx5Fy2.png" group-title="",TV5Monde Info (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AJx5Fy2.png" group-title="",TV5Monde Info
 http://v3plusinfo247hls-i.akamaihd.net/hls/live/218877-b/v3plusinfo247hls/v3plusinfo247hls_1_2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV5Monde Info (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV5Monde Info
 http://v3plusinfo247hls-i.akamaihd.net/hls/live/218877/v3plusinfo247hls/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/fr/TV5MondeAsia.fr.png" group-title="",TV5Monde Maghreb-Orient (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV5Monde Info
+http://v3plusinfo247hls-i.akamaihd.net/hls/live/218877/v3plusinfo247hls/v3plusinfo247hls_1_1.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AJx5Fy2.png" group-title="",TV5Monde Info
+http://v3plusinfo247hls-i.akamaihd.net/hls/live/218877/v3plusinfo247hls/v3plusinfo247hls_1_2.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/fr/TV5MondeAsia.fr.png" group-title="",TV5Monde Maghreb-Orient
 http://livecdnh1.tvanywhere.ae:80/hls/tv5/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/fr/TV5MondeAsia.fr.png" group-title="",TV5Monde Maghreb-Orient (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/fr/TV5MondeAsia.fr.png" group-title="",TV5Monde Maghreb-Orient
 http://livecdnh1.tvanywhere.ae:80/hls/tv5/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.centraltv.fr/wp-content/uploads/tv7_colmar_fr.png" group-title="",TV7 Colmar (Opt-1)
-http://tv7.hdr-tv.com:1935/live/tv7/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.centraltv.fr/wp-content/uploads/tv7_colmar_fr.png" group-title="",TV7 Colmar (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.centraltv.fr/wp-content/uploads/tv7_colmar_fr.png" group-title="",TV7 Colmar
 http://tv7.hdr-tv.com/live/tv7/livestream/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.centraltv.fr/wp-content/uploads/tv7_colmar_fr.png" group-title="",TV7 Colmar
+http://tv7.hdr-tv.com:1935/live/tv7/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="TV8 Montblanc FR" tvg-name="TV8 Montblanc FR" tvg-logo="https://i.imgur.com/bQ0qIxF.jpg" group-title="",TV8 Montblanc
 http://www.digiclic-streaming.com:8134/hls-live/livepkgr/_definst_/liveevent/tv82.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/fr/9/92/TVPI_logo.png" group-title="",TVPI (Opt-1)
-http://streamcast.oc3n.net:1935/TVPI/myStream700.sdp/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvpi.fr/wp-content/themes/tvpi/images/logo-tvpi.jpg" group-title="",TVPI (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvpi.fr/wp-content/themes/tvpi/images/logo-tvpi.jpg" group-title="",TVPI
 http://streamcast.oc3n.net:1935/TVPI/myStream700.sdp/chunklist_w595309586.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/fr/9/92/TVPI_logo.png" group-title="",TVPI
+http://streamcast.oc3n.net:1935/TVPI/myStream700.sdp/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GMp9M5A.jpg" group-title="",TVR
 https://origin1.dvmr.fr/hls/tvr/tvr-800k/index.m3u8
 #EXTINF:-1 tvg-id="TeleToonPlus FR" tvg-name="TeleToonPlus FR" tvg-logo="https://upload.wikimedia.org/wikipedia/en/5/55/T%C3%A9l%C3%A9toon_2016.png" group-title="Kids",TéléToon+
diff --git a/channels/ge.m3u b/channels/ge.m3u
index ae3e465b1..7c14be833 100644
--- a/channels/ge.m3u
+++ b/channels/ge.m3u
@@ -1,8 +1,8 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/mX080in.png" group-title="",1TV (Opt-1)
-https://tv.cdn.xsg.ge/gpb-1tv/tracks-v2a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://1tv.ge/app/themes/wi-theme/resources/assets/img/logo/ge.png" group-title="",1TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://1tv.ge/app/themes/wi-theme/resources/assets/img/logo/ge.png" group-title="",1TV
 http://tv.cdn.xsg.ge/gpb-1tv/tracks-v1a1/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/mX080in.png" group-title="",1TV
+https://tv.cdn.xsg.ge/gpb-1tv/tracks-v2a1/mono.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/VBmQCH7.png" group-title="",2TV
 https://tv.cdn.xsg.ge/gpb-2tv/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RJAT25i.jpg" group-title="",Enki-Benki
@@ -13,11 +13,11 @@ http://hls.t.stream-dns.net/hls/imedi/imedi.m3u8
 http://188.93.95.34/marao/mono.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ku9kLp8.png" group-title="",Music Box Georgia
 http://94.43.239.178:8080/CHANNEL470/BITRATE0/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AqSRphj.png" group-title="",Palitra News (Opt-1)
-https://livestream.palitra.ge/hls/palitratv/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AqSRphj.png" group-title="",Palitra News (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AqSRphj.png" group-title="",Palitra News
 http://stream.it-solutions.ge:1935/livetv/stream3/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rustavi2.ge/img/logo2018_ka.png" group-title="",Rustavi 2 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AqSRphj.png" group-title="",Palitra News
+https://livestream.palitra.ge/hls/palitratv/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rustavi2.ge/img/logo2018_ka.png" group-title="",Rustavi 2
 http://hls.t.stream-dns.net/hls/rustavi2/rustavi2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rustavi2.ge/img/logo2018_ka.png" group-title="",Rustavi 2 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rustavi2.ge/img/logo2018_ka.png" group-title="",Rustavi 2
 http://md-store4.tulix.tv/rustavi2/index.m3u8
diff --git a/channels/gr.m3u b/channels/gr.m3u
index f8d799f66..8c8048e01 100644
--- a/channels/gr.m3u
+++ b/channels/gr.m3u
@@ -7,9 +7,9 @@ https://itv.streams.ovh/ALEERT/ALEERT/playlist.m3u8
 http://www.hellasnet.tv/rest.live.hn/ws.alf/playlist.m3u8
 #EXTINF:-1 tvg-id="ALPHA GR" tvg-name="ALPHA GR" tvg-logo="http://greektv.pbworks.com/f/ALPHA.png" group-title="",Alpha
 https://alphalive-i.akamaihd.net/hls/live/682300/live/master.m3u8
-#EXTINF:-1 tvg-id="ANT1 GR" tvg-name="ANT1 GR" tvg-logo="https://www.worldtvpc.com/onlinevideosites/img/ant1.jpg" group-title="",ANT1 (Opt-1)
+#EXTINF:-1 tvg-id="ANT1 GR" tvg-name="ANT1 GR" tvg-logo="https://www.worldtvpc.com/onlinevideosites/img/ant1.jpg" group-title="",ANT1
 https://antennalivesp-lh.akamaihd.net/i/live_1@715138/index_1500_av-p.m3u8
-#EXTINF:-1 tvg-id="ANT1 GR" tvg-name="ANT1 GR" tvg-logo="https://goo.gl/q5aDRg" group-title="",ANT1 (Opt-2)
+#EXTINF:-1 tvg-id="ANT1 GR" tvg-name="ANT1 GR" tvg-logo="https://goo.gl/q5aDRg" group-title="",ANT1
 https://antennalivesp-lh.akamaihd.net/i/live_1@715138/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/s3qWC9W.png" group-title="",Attica TV
 http://176.9.123.140:1935/atticatv/atticatv/playlist.m3u8
@@ -35,10 +35,10 @@ http://www.hellasnet.tv/rest.live.hn/diktyo1r/playlist.m3u8
 http://176.9.30.75:1935/live/epsilon/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://207.36.91.70/images/2015/ellastv-logo-2015-main.png" group-title="",Ellas TV
 http://ellastv.gotdns.com:88/freetv/promo/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://greektv.pbworks.com/f/ENA_CHANNEL.png" group-title="Local",Ena Channel (Opt-1)
-https://server.tvdj.info:8222/1c/stream/chunklist_w1023861619.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://greektv.pbworks.com/f/ENA_CHANNEL.png" group-title="Local",Ena Channel (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://greektv.pbworks.com/f/ENA_CHANNEL.png" group-title="Local",Ena Channel
 http://176.9.123.140:1935/1c/stream/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://greektv.pbworks.com/f/ENA_CHANNEL.png" group-title="Local",Ena Channel
+https://server.tvdj.info:8222/1c/stream/chunklist_w1023861619.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AIPYTd0.png" group-title="",Eoe TV
 https://live.cast-control.eu:443/organismos/organismos/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://greektv.pbworks.com/f/EPIRUS_TV1.png" group-title="Local",Epirus TV1
@@ -57,9 +57,9 @@ http://bit.ly/2p6JqSo
 https://stream.ioniantv.gr/ionian/live_abr/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gn5sdCt.png" group-title="Local",Irida TV
 https://www.hellasnet.tv/rest.live.hn/ws.iri/playlist.m3u8
-#EXTINF:-1 tvg-id="Kontra Channel GR" tvg-name="Kontra Channel GR" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=56014296&t=1544180280413" group-title="",Kontra Channel (Opt-1)
+#EXTINF:-1 tvg-id="Kontra Channel GR" tvg-name="Kontra Channel GR" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=56014296&t=1544180280413" group-title="",Kontra Channel
 http://flashcloud.mediacdn.com/live/kontratv/.m3u8
-#EXTINF:-1 tvg-id="Kontra Channel GR" tvg-name="Kontra Channel GR" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=56014296&t=1544180280413" group-title="",Kontra Channel (Opt-2)
+#EXTINF:-1 tvg-id="Kontra Channel GR" tvg-name="Kontra Channel GR" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=56014296&t=1544180280413" group-title="",Kontra Channel
 http://flashcloud.mediacdn.com/live/kontratv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/QZQhg6C.png" group-title="Music",Magic TV
 https://itv.streams.ovh/magictv/magictv/playlist.m3u8
@@ -71,14 +71,14 @@ http://176.9.123.140:1935/messinia/messinia/master.m3u8
 http://94.130.180.175:8081/live/greektv/playlist.m3u8
 #EXTINF:-1 tvg-id="Nea TV GR" tvg-name="Nea TV GR" tvg-logo="http://greektv.pbworks.com/w/file/fetch/46926622/NEA_TV.png" group-title="Local",Nea TV
 https://live.neatv.gr:8888/hls/neatv_high/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/pK2p5ey.png" group-title="Music",NG (Opt-1)
-https://live.streams.ovh/NGradio/NGradio/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/pK2p5ey.png" group-title="Music",NG (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/pK2p5ey.png" group-title="Music",NG
 http://live.streams.ovh:1935/NGradio/NGradio/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1Zl1OJ5.png" group-title="",NRG 91 (Opt-1)
-https://w1.viastreaming.net/onweb/live/chunklist_w1080573781.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1Zl1OJ5.png" group-title="",NRG 91 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/pK2p5ey.png" group-title="Music",NG
+https://live.streams.ovh/NGradio/NGradio/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1Zl1OJ5.png" group-title="",NRG 91
 http://tv.nrg91.gr:1935/onweb/live/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1Zl1OJ5.png" group-title="",NRG 91
+https://w1.viastreaming.net/onweb/live/chunklist_w1080573781.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/c9hgL1c.jpg" group-title="",Open TV
 https://liveopen.siliconweb.com/openTvLive/stream2a/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/100uuWA.png" group-title="Music",Play TV
@@ -121,9 +121,9 @@ http://live.streams.ovh:1935/tvfilopoli/tvfilopoli/playlist.m3u8
 https://5948d12b760bb.streamlock.net/TvKosmosLive/TvKosmosLive/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/3Juhubo.png" group-title="",TV Mall
 http://master.cystreams.com:25461/live/tvmall/tvmall/539.m3u8
-#EXTINF:-1 tvg-id="Vouli GR" tvg-name="Vouli GR" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=41706922&t=1524412256156" group-title="",Vouli Tileorasi (Opt-1)
+#EXTINF:-1 tvg-id="Vouli GR" tvg-name="Vouli GR" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=41706922&t=1524412256156" group-title="",Vouli Tileorasi
 http://streamer-cache.grnet.gr/parliament/hls/webtv.m3u8
-#EXTINF:-1 tvg-id="Vouli GR" tvg-name="Vouli GR" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Vouli Tileorasi (Opt-2)
+#EXTINF:-1 tvg-id="Vouli GR" tvg-name="Vouli GR" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Vouli Tileorasi
 http://streamer-cache.grnet.gr/parliament/parltv.sdp/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hfia0wN.png" group-title="Movies",Wixlar
 http://web.onair-radio.eu:1935/wixlar/wixlar/playlist.m3u8
@@ -137,11 +137,11 @@ http://web.onair-radio.eu:1935/explorecy/explorecy/playlist.m3u8
 https://live.cast-control.eu/ekpdipso/ekpdipso/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://goo.gl/oJ9YrY" group-title="",Θράκη Νετ TV
 http://video.onestreaming.com:8081/thraki/thrakinettv/playlist.m3u8
-#EXTINF:-1 tvg-id="Krete TV GR" tvg-name="Krete TV GR" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/1025.png" group-title="",ΚρήτηTV (Opt-1)
+#EXTINF:-1 tvg-id="Krete TV GR" tvg-name="Krete TV GR" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/1025.png" group-title="",ΚρήτηTV
 http://live.cretetv.gr:1935/cretetv/myStream/f1tv.m3u8
-#EXTINF:-1 tvg-id="Krete TV GR" tvg-name="Krete TV GR" tvg-logo="https://goo.gl/BnX9DJ" group-title="",ΚρήτηTV (Opt-2)
+#EXTINF:-1 tvg-id="Krete TV GR" tvg-name="Krete TV GR" tvg-logo="https://goo.gl/BnX9DJ" group-title="",ΚρήτηTV
 http://live.cretetv.gr:1935/cretetv/myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="Krete TV GR" tvg-name="Krete TV GR" tvg-logo="https://goo.gl/naS6gM" group-title="",ΚρήτηTV (Opt-3)
+#EXTINF:-1 tvg-id="Krete TV GR" tvg-name="Krete TV GR" tvg-logo="https://goo.gl/naS6gM" group-title="",ΚρήτηTV
 http://live.streams.ovh:1935/tvcreta/tvcreta/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://greektv.pbworks.com/w/file/fetch/51265944/LYCHNOS.PNG" group-title="Local",λύχνος TV
 http://erato.multiserver.gr:1935/imp/imp/playlist.m3u8
diff --git a/channels/hk.m3u b/channels/hk.m3u
index 0adb08f70..a8493247f 100644
--- a/channels/hk.m3u
+++ b/channels/hk.m3u
@@ -77,9 +77,9 @@ http://61.58.60.230:9319/live/202.m3u8
 http://61.58.60.230:9319/live/244.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.goldentv.com.tw/Public/core/edit/attached/20170503040645_77060.jpg" group-title="Kids",靖洋卡通 / Nice Bingo
 http://61.58.60.230:9319/live/206.m3u8
-#EXTINF:-1 tvg-id="HKSTV-HKS" tvg-name="" tvg-logo="" group-title="",香港开电视 / HKSTV-HKS (Opt-1)
+#EXTINF:-1 tvg-id="HKSTV-HKS" tvg-name="" tvg-logo="" group-title="",香港开电视 / HKSTV-HKS
 http://media.fantv.hk/m3u8/archive/channel2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/c/cd/Hong_Kong_Open_TV.png" group-title="",香港开电视 / HKSTV-HKS (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/c/cd/Hong_Kong_Open_TV.png" group-title="",香港开电视 / HKSTV-HKS
 http://media.fantv.hk/m3u8/archive/channel2_stream1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",香港电影频道 (Dead link)
 http://aldirect.hls.huya.com/huyalive/29106097-2689453724-11551115788685410304-2847687506-10057-A-1525422901-1_1200.m3u8
diff --git a/channels/hn.m3u b/channels/hn.m3u
index 4d4f2fb70..69521bcb7 100644
--- a/channels/hn.m3u
+++ b/channels/hn.m3u
@@ -11,12 +11,12 @@ http://stream.innovandote.com:1935/cci/cci/playlist.m3u8
 http://audiotvserver.net:1935/livemedia/cholusat/chunklist_w1981374450.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/huAN6ZG.jpg" group-title="",Dios Te Ve
 https://cdn.hostlagarto.com:4445/Diosteve/Diosteve.myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ANW1pIH.png" group-title="",Ebenezer TV (Opt-1)
-http://p1.worldkast.com/ebenezertv2/ngrp:ebenezertv2_all/chunklist_w1071930476_b1228800.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ANW1pIH.png" group-title="",Ebenezer TV (Opt-2)
-http://hds4.worldkast.com:1935/ebenezertv2/ebenezertv2_source/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ANW1pIH.png" group-title="",Ebenezer TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ANW1pIH.png" group-title="",Ebenezer TV
 http://hds4.worldkast.com:1935/ebenezertv2/ebenezertv2/live.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ANW1pIH.png" group-title="",Ebenezer TV
+http://hds4.worldkast.com:1935/ebenezertv2/ebenezertv2_source/live.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ANW1pIH.png" group-title="",Ebenezer TV
+http://p1.worldkast.com/ebenezertv2/ngrp:ebenezertv2_all/chunklist_w1071930476_b1228800.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ZuLqAfN.png" group-title="",EDN TV
 http://181.189.225.36:8990/EDN-TV/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/R7o4uIu.jpg" group-title="",Enlace
@@ -41,38 +41,38 @@ https://5b50404ec5e4c.streamlock.net/8056/smil:8056.smil/chunklist_w577085172_b1
 http://st2.worldkast.com/8030/8030/chunklist_w278915523.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/mIMat1y.jpg" group-title="",Sercano TV
 http://stream.grupoabchn.com:1935/SERCANOHD/SERCANOLive.smil/chunklist_w330137931_b1848000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/trzcUdT.png" group-title="",Si TV (Opt-1)
-https://5b50404ec5e4c.streamlock.net/8030/8030/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/trzcUdT.png" group-title="",Si TV (Opt-2)
-http://st2.worldkast.com/8030/8030/Sitv-Honduras.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/trzcUdT.png" group-title="",Si TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/trzcUdT.png" group-title="",Si TV
 http://st2.worldkast.com/8030/8030/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/trzcUdT.png" group-title="",Si TV
+http://st2.worldkast.com/8030/8030/Sitv-Honduras.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/trzcUdT.png" group-title="",Si TV
+https://5b50404ec5e4c.streamlock.net/8030/8030/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/CsWIDc3.jpg" group-title="",Suyapa TV
 http://173.236.71.62:1935/canal48/c48.sdp/chunklist_w892064858.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/CUdSmFo.png" group-title="",Telecadena 7 y 4
 https://trinity-lh.akamaihd.net/i/TelevicentroLive3_d@687450/index_400_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wIcvdMQ.jpg" group-title="",Teleceiba Canal 7 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wIcvdMQ.jpg" group-title="",Teleceiba Canal 7
 http://190.11.224.14:8134/liveevent.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wIcvdMQ.jpg" group-title="",Teleceiba Canal 7 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wIcvdMQ.jpg" group-title="",Teleceiba Canal 7
 http://bit.ly/2NLhkKX
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HQiKyHy.jpg" group-title="",TEN Canal 10 (Opt-1)
-http://stream.grupoabchn.com:1935/TENHD/TENLive.smil/chunklist_w1969563977_b1848000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HQiKyHy.jpg" group-title="",TEN Canal 10 (Opt-2)
-http://stream.grupoabchn.com:1935/TENHD/TENLive.smil/chunklist_w1445105875_b1848000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HQiKyHy.jpg" group-title="",TEN Canal 10 (Opt-3)
-http://stream.grupoabchn.com:1935/TENHD/TENLive.smil/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HQiKyHy.jpg" group-title="",TEN Canal 10 (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HQiKyHy.jpg" group-title="",TEN Canal 10
 http://5a90011f1fc27.streamlock.net:443/TENHD/TENLive.smil/chunklist_w517207077_b1848000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HQiKyHy.jpg" group-title="",TEN Canal 10 (Opt-5)
-http://stream.grupoabchn.com:1935/TENHD/TENLive.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HQiKyHy.jpg" group-title="",TEN Canal 10 (Opt-6)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HQiKyHy.jpg" group-title="",TEN Canal 10
 http://stream.grupoabchn.com:1935/TENHD/TENLive.smil/chunklist_w1445105875_b1248000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HQiKyHy.jpg" group-title="",TEN Canal 10
+http://stream.grupoabchn.com:1935/TENHD/TENLive.smil/chunklist_w1445105875_b1848000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HQiKyHy.jpg" group-title="",TEN Canal 10
+http://stream.grupoabchn.com:1935/TENHD/TENLive.smil/chunklist_w1969563977_b1848000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HQiKyHy.jpg" group-title="",TEN Canal 10
+http://stream.grupoabchn.com:1935/TENHD/TENLive.smil/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HQiKyHy.jpg" group-title="",TEN Canal 10
+http://stream.grupoabchn.com:1935/TENHD/TENLive.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/mmxfC0F.png" group-title="",TSi
 https://trinity-lh.akamaihd.net/i/TelevicentroLive2_d@508538/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://imgur.com/SVFUP73.jpeg" group-title="",TV Azteca Honduras (Opt-1)
-http://aztecalive-lh.akamaihd.net/i/0dcqjxkgx_1@502208/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://imgur.com/SVFUP73.jpeg" group-title="",TV Azteca Honduras (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://imgur.com/SVFUP73.jpeg" group-title="",TV Azteca Honduras
 http://aztecalive-lh.akamaihd.net/i/0dcqjxkgx_1@502208/index_1_av-p.m3u8?sd=10&rebase=on
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://imgur.com/SVFUP73.jpeg" group-title="",TV Azteca Honduras
+http://aztecalive-lh.akamaihd.net/i/0dcqjxkgx_1@502208/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3qswWhy.jpg" group-title="",Une TV
 http://181.189.225.36:8990/UneTv/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5Okd0wi.jpg" group-title="",Waldivision
diff --git a/channels/hr.m3u b/channels/hr.m3u
index d6d489c90..cd3aea33a 100644
--- a/channels/hr.m3u
+++ b/channels/hr.m3u
@@ -1,68 +1,68 @@
 #EXTM3U x-tvg-url="http://tvprofil.net/xmltv/data/epg_tvprofil.net.xml"
-#EXTINF:-1 tvg-id="htv1.hr" tvg-name="HTV1" tvg-logo="https://i.imgur.com/PxBCBms.png" group-title="",HRT 1 (Opt-1)
-http://195.29.70.67/PLTV/88888888/224/3221226139/index.m3u8
-#EXTINF:-1 tvg-id="htv1.hr" tvg-name="HTV1" tvg-logo="https://i.imgur.com/PxBCBms.png" group-title="",HRT 1 (Opt-2)
+#EXTINF:-1 tvg-id="htv1.hr" tvg-name="HTV1" tvg-logo="https://i.imgur.com/PxBCBms.png" group-title="",HRT 1
 http://195.29.70.67/PLTV/88888888/224/3221226139/01.m3u8
-#EXTINF:-1 tvg-id="htv1.hr" tvg-name="HTV1" tvg-logo="https://i.imgur.com/PxBCBms.png" group-title="",HRT 1 (Opt-3)
+#EXTINF:-1 tvg-id="htv1.hr" tvg-name="HTV1" tvg-logo="https://i.imgur.com/PxBCBms.png" group-title="",HRT 1
 http://195.29.70.67/PLTV/88888888/224/3221226139/03.m3u8
-#EXTINF:-1 tvg-id="htv1.hr" tvg-name="HTV1" tvg-logo="https://i.imgur.com/PxBCBms.png" group-title="",HRT 1 (Opt-5)
+#EXTINF:-1 tvg-id="htv1.hr" tvg-name="HTV1" tvg-logo="https://i.imgur.com/PxBCBms.png" group-title="",HRT 1
+http://195.29.70.67/PLTV/88888888/224/3221226139/index.m3u8
+#EXTINF:-1 tvg-id="htv1.hr" tvg-name="HTV1" tvg-logo="https://i.imgur.com/PxBCBms.png" group-title="",HRT 1
 http://195.29.70.84/PLTV/88888888/224/3221226139/04.m3u8
-#EXTINF:-1 tvg-id="htv2.hr" tvg-name="HTV2" tvg-logo="https://i.imgur.com/RWZfIJ1.png" group-title="",HRT 2 (Opt-1)
-http://195.29.70.82/PLTV/88888888/224/3221226140/index.m3u8
-#EXTINF:-1 tvg-id="htv2.hr" tvg-name="HTV2" tvg-logo="https://i.imgur.com/RWZfIJ1.png" group-title="",HRT 2 (Opt-2)
+#EXTINF:-1 tvg-id="htv2.hr" tvg-name="HTV2" tvg-logo="https://i.imgur.com/RWZfIJ1.png" group-title="",HRT 2
 http://195.29.70.67/PLTV/88888888/224/3221226140/01.m3u8
-#EXTINF:-1 tvg-id="htv2.hr" tvg-name="HTV2" tvg-logo="https://i.imgur.com/RWZfIJ1.png" group-title="",HRT 2 (Opt-3)
+#EXTINF:-1 tvg-id="htv2.hr" tvg-name="HTV2" tvg-logo="https://i.imgur.com/RWZfIJ1.png" group-title="",HRT 2
 http://195.29.70.67/PLTV/88888888/224/3221226140/02.m3u8
-#EXTINF:-1 tvg-id="htv2.hr" tvg-name="HTV2" tvg-logo="https://i.imgur.com/RWZfIJ1.png" group-title="",HRT 2 (Opt-4)
+#EXTINF:-1 tvg-id="htv2.hr" tvg-name="HTV2" tvg-logo="https://i.imgur.com/RWZfIJ1.png" group-title="",HRT 2
 http://195.29.70.67/PLTV/88888888/224/3221226140/03.m3u8
-#EXTINF:-1 tvg-id="htv2.hr" tvg-name="HTV2" tvg-logo="https://i.imgur.com/RWZfIJ1.png" group-title="",HRT 2 (Opt-5)
+#EXTINF:-1 tvg-id="htv2.hr" tvg-name="HTV2" tvg-logo="https://i.imgur.com/RWZfIJ1.png" group-title="",HRT 2
 http://195.29.70.82/PLTV/88888888/224/3221226140/04.m3u8
-#EXTINF:-1 tvg-id="htv3.hr" tvg-name="HTV3" tvg-logo="https://i.imgur.com/PxBCBms.png" group-title="",HRT 3 (Opt-1)
-http://195.29.70.67/PLTV/88888888/224/3221226280/index.m3u8
-#EXTINF:-1 tvg-id="htv3.hr" tvg-name="HTV3" tvg-logo="https://i.imgur.com/Pe1RxFG.png" group-title="",HRT 3 (Opt-2)
+#EXTINF:-1 tvg-id="htv2.hr" tvg-name="HTV2" tvg-logo="https://i.imgur.com/RWZfIJ1.png" group-title="",HRT 2
+http://195.29.70.82/PLTV/88888888/224/3221226140/index.m3u8
+#EXTINF:-1 tvg-id="htv3.hr" tvg-name="HTV3" tvg-logo="https://i.imgur.com/Pe1RxFG.png" group-title="",HRT 3
 http://195.29.70.67/PLTV/88888888/224/3221226280/01.m3u8
-#EXTINF:-1 tvg-id="htv3.hr" tvg-name="HTV3" tvg-logo="https://i.imgur.com/Pe1RxFG.png" group-title="",HRT 3 (Opt-3)
+#EXTINF:-1 tvg-id="htv3.hr" tvg-name="HTV3" tvg-logo="https://i.imgur.com/Pe1RxFG.png" group-title="",HRT 3
 http://195.29.70.67/PLTV/88888888/224/3221226280/03.m3u8
-#EXTINF:-1 tvg-id="htv3.hr" tvg-name="HTV3" tvg-logo="https://i.imgur.com/Pe1RxFG.png" group-title="",HRT 3 (Opt-4)
+#EXTINF:-1 tvg-id="htv3.hr" tvg-name="HTV3" tvg-logo="https://i.imgur.com/Pe1RxFG.png" group-title="",HRT 3
 http://195.29.70.67/PLTV/88888888/224/3221226280/04.m3u8
-#EXTINF:-1 tvg-id="htv4.hr" tvg-name="HTV4" tvg-logo="https://i.imgur.com/rnsl4dO.png" group-title="",HRT 4 (Opt-1)
-http://195.29.70.67/PLTV/88888888/224/3221226281/index.m3u8
-#EXTINF:-1 tvg-id="htv4.hr" tvg-name="HTV4" tvg-logo="https://i.imgur.com/rnsl4dO.png" group-title="",HRT 4 (Opt-2)
+#EXTINF:-1 tvg-id="htv3.hr" tvg-name="HTV3" tvg-logo="https://i.imgur.com/PxBCBms.png" group-title="",HRT 3
+http://195.29.70.67/PLTV/88888888/224/3221226280/index.m3u8
+#EXTINF:-1 tvg-id="htv4.hr" tvg-name="HTV4" tvg-logo="https://i.imgur.com/rnsl4dO.png" group-title="",HRT 4
 http://195.29.70.67/PLTV/88888888/224/3221226281/01.m3u8
-#EXTINF:-1 tvg-id="htv4.hr" tvg-name="HTV4" tvg-logo="https://i.imgur.com/rnsl4dO.png" group-title="",HRT 4 (Opt-3)
+#EXTINF:-1 tvg-id="htv4.hr" tvg-name="HTV4" tvg-logo="https://i.imgur.com/rnsl4dO.png" group-title="",HRT 4
 http://195.29.70.67/PLTV/88888888/224/3221226281/03.m3u8
-#EXTINF:-1 tvg-id="htv4.hr" tvg-name="HTV4" tvg-logo="https://i.imgur.com/rnsl4dO.png" group-title="",HRT 4 (Opt-4)
+#EXTINF:-1 tvg-id="htv4.hr" tvg-name="HTV4" tvg-logo="https://i.imgur.com/rnsl4dO.png" group-title="",HRT 4
+http://195.29.70.67/PLTV/88888888/224/3221226281/index.m3u8
+#EXTINF:-1 tvg-id="htv4.hr" tvg-name="HTV4" tvg-logo="https://i.imgur.com/rnsl4dO.png" group-title="",HRT 4
 http://195.29.70.89/PLTV/88888888/224/3221226281/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RApnwWl.jpg" group-title="",MAXtv Promo Kanal (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RApnwWl.jpg" group-title="",MAXtv Promo Kanal
 http://195.29.70.67/PLTV/88888888/224/3221226027/01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RApnwWl.jpg" group-title="",MAXtv Promo Kanal (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RApnwWl.jpg" group-title="",MAXtv Promo Kanal
 http://195.29.70.67/PLTV/88888888/224/3221226027/02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RApnwWl.jpg" group-title="",MAXtv Promo Kanal (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RApnwWl.jpg" group-title="",MAXtv Promo Kanal
 http://195.29.70.67/PLTV/88888888/224/3221226027/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RApnwWl.jpg" group-title="",MAXtv Promo Kanal (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RApnwWl.jpg" group-title="",MAXtv Promo Kanal
 http://195.29.70.67/PLTV/88888888/224/3221226027/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RApnwWl.jpg" group-title="",MAXtv Promo Kanal (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RApnwWl.jpg" group-title="",MAXtv Promo Kanal
 http://195.29.70.84/PLTV/88888888/224/3221226027/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Q8eH5zN.jpg" group-title="",NewsBar (Opt-1)
-http://195.29.70.67/PLTV/88888888/224/3221226407/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Q8eH5zN.jpg" group-title="",NewsBar (Opt-2)
-http://195.29.70.89/PLTV/88888888/224/3221226407/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Q8eH5zN.jpg" group-title="",NewsBar (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Q8eH5zN.jpg" group-title="",NewsBar
 http://195.29.70.67/PLTV/88888888/224/3221226407/01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Q8eH5zN.jpg" group-title="",NewsBar (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Q8eH5zN.jpg" group-title="",NewsBar
 http://195.29.70.67/PLTV/88888888/224/3221226407/02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Q8eH5zN.jpg" group-title="",NewsBar (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Q8eH5zN.jpg" group-title="",NewsBar
 http://195.29.70.67/PLTV/88888888/224/3221226407/03.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Q8eH5zN.jpg" group-title="",NewsBar
+http://195.29.70.67/PLTV/88888888/224/3221226407/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Q8eH5zN.jpg" group-title="",NewsBar
+http://195.29.70.89/PLTV/88888888/224/3221226407/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7q3g8AS.png" group-title="",Radio Televizija Banovina
 rtmp://video.radio-banovina.hr/live/myStream
-#EXTINF:-1 tvg-id="rtl.hr" tvg-name="RTL" tvg-logo="https://i.imgur.com/YaX7dse.png" group-title="",RTL (Opt-1)
-http://195.29.70.67/PLTV/88888888/224/3221226195/index.m3u8
-#EXTINF:-1 tvg-id="rtl.hr" tvg-name="RTL" tvg-logo="https://i.imgur.com/YaX7dse.png" group-title="",RTL (Opt-2)
+#EXTINF:-1 tvg-id="rtl.hr" tvg-name="RTL" tvg-logo="https://i.imgur.com/YaX7dse.png" group-title="",RTL
 http://195.29.70.67/PLTV/88888888/224/3221226195/01.m3u8
-#EXTINF:-1 tvg-id="rtl.hr" tvg-name="RTL" tvg-logo="https://i.imgur.com/YaX7dse.png" group-title="",RTL (Opt-3)
+#EXTINF:-1 tvg-id="rtl.hr" tvg-name="RTL" tvg-logo="https://i.imgur.com/YaX7dse.png" group-title="",RTL
 http://195.29.70.67/PLTV/88888888/224/3221226195/03.m3u8
-#EXTINF:-1 tvg-id="rtl.hr" tvg-name="RTL" tvg-logo="https://i.imgur.com/YaX7dse.png" group-title="",RTL (Opt-4)
+#EXTINF:-1 tvg-id="rtl.hr" tvg-name="RTL" tvg-logo="https://i.imgur.com/YaX7dse.png" group-title="",RTL
 http://195.29.70.67/PLTV/88888888/224/3221226195/04.m3u8
+#EXTINF:-1 tvg-id="rtl.hr" tvg-name="RTL" tvg-logo="https://i.imgur.com/YaX7dse.png" group-title="",RTL
+http://195.29.70.67/PLTV/88888888/224/3221226195/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/S75GJym.png" group-title="",Slavonska TV
 http://89.201.163.244:8080/hls/hdmi.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/QMQqXgS.jpg" group-title="",Televizija Aurora
diff --git a/channels/ht.m3u b/channels/ht.m3u
index f0dea1242..100fb0b1e 100644
--- a/channels/ht.m3u
+++ b/channels/ht.m3u
@@ -3,10 +3,10 @@
 https://hbiptv.live/live/hebdotvcom/video.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/fPJqdGy.png" group-title="",Impact TV
 https://impacttele.vedge.infomaniak.com/livecast/impacttele/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Nago TV (Opt-1)
-http://haititivi.com:8088/haititv/tele6NY/tracks-v1a1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/uisopuM.png" group-title="Music",Nago TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/uisopuM.png" group-title="Music",Nago TV
 http://haititivi.com:8088/haititv/tele6NY/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Nago TV
+http://haititivi.com:8088/haititv/tele6NY/tracks-v1a1/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8AWBgau.jpg" group-title="",Opa TV
 http://mt1.cdnak.mt.neulion.com/nlds/hln/hln_opatv/as/live/hln_opatv_3.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/6EEHWNg.jpg" group-title="",Radio Tele Ginen | Chaine 18
@@ -19,9 +19,9 @@ http://mt2.cdnak.mt.neulion.com/nlds/hln/hln_eclair/as/live/hln_eclair_4.m3u8
 http://66.175.238.147:1935/live/myStream/chunklist_w667560194.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vZmlq9N.jpg" group-title="",Tele Louange
 https://5790d294af2dc.streamlock.net/8124/8124/chunklist_w1272554163.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/smM6gXQ.jpg" group-title="",Tele Nationale d'Haiti (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/smM6gXQ.jpg" group-title="",Tele Nationale d'Haiti
 http://mt1.cdnak.mt.neulion.com/nlds/hln/hln_nhaiti/as/live/hln_nhaiti_1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/smM6gXQ.jpg" group-title="",Tele Nationale d'Haïti (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/smM6gXQ.jpg" group-title="",Tele Nationale d'Haïti
 http://162.244.81.145:1935/rtnh01/livestream/chunklist_w1531813659.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/tgvN6s3.jpg" group-title="",Tele Soleil
 http://mt1.cdnak.mt.neulion.com/nlds/hln/hln_soleil/as/live/hln_soleil_1.m3u8
diff --git a/channels/hu.m3u b/channels/hu.m3u
index 4ca676f08..d75200ae4 100644
--- a/channels/hu.m3u
+++ b/channels/hu.m3u
@@ -1,17 +1,17 @@
 #EXTM3U x-tvg-url="http://epg.streamstv.me/epg/guide-hungry.xml.gz"
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/26X2Jih.jpg" group-title="Music",1 Music Channel (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/26X2Jih.jpg" group-title="Music",1 Music Channel
 http://92.249.129.152/stream/1music.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/26X2Jih.jpg" group-title="Music",1 Music Channel (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/26X2Jih.jpg" group-title="Music",1 Music Channel
 http://stream.1music.hu/stream/1music.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/26X2Jih.jpg" group-title="Music",1 Music Channel (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/26X2Jih.jpg" group-title="Music",1 Music Channel
 http://stream.1music.hu/stream/1music.m3u8?GrupoTopIptv
 #EXTINF:-1 tvg-id="ATV-HU" tvg-name="ATV-HU" tvg-logo="https://i.imgur.com/i1K6sQW.jpg" group-title="",ATV
 http://nodes.stream.atv.hu/atvliveedge/_definst_//atvstream_2_aac/playlist.m3u8
-#EXTINF:-1 tvg-id="Bonum TV-HU" tvg-name="Bonum TV-HU" tvg-logo="https://i.imgur.com/dpGX5SH.png" group-title="Religious",Bonum TV (Opt-1)
+#EXTINF:-1 tvg-id="Bonum TV-HU" tvg-name="Bonum TV-HU" tvg-logo="https://i.imgur.com/dpGX5SH.png" group-title="Religious",Bonum TV
 http://cdn.y5.hu/stream/bonum/hls/stream.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="Bonum TV-HU" tvg-name="Bonum TV-HU" tvg-logo="https://i.imgur.com/dpGX5SH.png" group-title="Religious",Bonum TV (Opt-2)
+#EXTINF:-1 tvg-id="Bonum TV-HU" tvg-name="Bonum TV-HU" tvg-logo="https://i.imgur.com/dpGX5SH.png" group-title="Religious",Bonum TV
 https://cdn.y5.hu:443/stream/bonum/hls/stream.m3u8?
-#EXTINF:-1 tvg-id="Bonum TV-HU" tvg-name="Bonum TV-HU" tvg-logo="https://i.imgur.com/dpGX5SH.png" group-title="Religious",Bonum TV (Opt-3)
+#EXTINF:-1 tvg-id="Bonum TV-HU" tvg-name="Bonum TV-HU" tvg-logo="https://i.imgur.com/dpGX5SH.png" group-title="Religious",Bonum TV
 https://stream.y5.hu/stream/stream_bonum/stream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/oxF5vwl.png" group-title="",Budapest Európa Televízió
 http://cloudfront44.lexanetwork.com:1730/HDE021/hls/livestream.sdp.m3u8?fluxustv.m3u8
diff --git a/channels/id.m3u b/channels/id.m3u
index 5803898b8..4710591ad 100644
--- a/channels/id.m3u
+++ b/channels/id.m3u
@@ -3,63 +3,63 @@
 http://210.210.155.35/qwr9ew/s/s50/index2.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://dojo-box.com/wp-content/uploads/2015/09/logo-aditv.png" group-title="",ADiTV
 http://aditv.onlivestreaming.net/aditv/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Ahsan TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Ahsan TV
 http://119.82.224.75:1935/live/ahsantv/chunk.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Ahsan TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Ahsan TV
 http://119.82.224.75:1935/live/ahsantv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",All Sports
 http://cdn1.live.irib.ir:1935/channel-live/smil:varzesh.smil/chunklist_b307200_slFa.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/Animaxlogo-20160701.png/180px-Animaxlogo-20160701.png" group-title="",Animax (Opt-1)
-http://210.210.155.35:80/dr9445/h/h144/index2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/Animaxlogo-20160701.png/180px-Animaxlogo-20160701.png" group-title="",Animax (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/Animaxlogo-20160701.png/180px-Animaxlogo-20160701.png" group-title="",Animax
 http://210.210.155.35:80/dr9445/h/h144/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/Animaxlogo-20160701.png/180px-Animaxlogo-20160701.png" group-title="",Animax
+http://210.210.155.35:80/dr9445/h/h144/index2.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/b/b8/Aniplus_Asia_Logo.png/220px-Aniplus_Asia_Logo.png" group-title="",Aniplus
 http://210.210.155.35/session/0d216142-f3f5-11e8-ab67-89df93dc8d44/dr9445/h/h02/01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/1/19/Antv.png" group-title="",ANTV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/1/19/Antv.png" group-title="",ANTV
 http://202.80.222.130/000001/2/ch14061215034900095272/1001.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ANTV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ANTV
 http://202.80.222.170/000001/2/ch14061215034900095272/index.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/6/62/Balitv_2002.png" group-title="",Bali TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/6/62/Balitv_2002.png" group-title="",Bali TV
 http://202.80.222.171/000001/2/ch00000090990000001729/1001.m3u8.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Bali TV (Opt-2)
+#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="News",BeritaSatu (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",BeritaSatu
 http://edge.linknetott.swiftserve.com/live/BsNew/amlst:beritasatunewsbs/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://firstmedia.com/uploads/LOGO%20berita%20satu.png?1383203151" group-title="News",BeritaSatu (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://firstmedia.com/uploads/LOGO%20berita%20satu.png?1383203151" group-title="News",BeritaSatu
 http://edge.linknetott.swiftserve.com/live/BsNew/amlst:bsnew/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://image.azuza.web.id/images/agus-1545452020.jpg" group-title="",BeritaSatu World
 http://edge.linknetott.swiftserve.com/live/BsNew/amlst:bsworld/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",Celestial Movies (Opt-1)
-http://210.210.155.35/qwr9ew/s/s33/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://alchetron.com/cdn/celestial-movies-1c9f0f99-d3a2-4a6e-acdd-de1ec02be11-resize-750.jpeg" group-title="Movies",Celestial Movies (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://alchetron.com/cdn/celestial-movies-1c9f0f99-d3a2-4a6e-acdd-de1ec02be11-resize-750.jpeg" group-title="Movies",Celestial Movies
 http://210.210.155.35/qwr9ew/s/s33/01.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://mncvision.id/userfiles/image/channel/celestial.png" group-title="Movies",Celestial Movies (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",Celestial Movies
+http://210.210.155.35/qwr9ew/s/s33/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://mncvision.id/userfiles/image/channel/celestial.png" group-title="Movies",Celestial Movies
 http://210.210.155.35/session/1e5fe170-829b-11e8-9d75-c81f66f89318/qwr9ew/s/s33/02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",CNA (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",CNA
 http://210.210.155.35/session/35be7296-7b7a-11e8-8077-c81f66f89318/uq2663/h/h29/01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",CNA (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",CNA
 http://210.210.155.35/uq2663/h/h29/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/id/3/35/CNBC_Indonesia.png" group-title="",CNBC Indonesia
 https://live.cnbcindonesia.com/livecnbc/smil:cnbctv.smil/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/e/eb/CNN_Indonesia.svg/1200px-CNN_Indonesia.svg.png" group-title="News",CNN Indonesia (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/e/eb/CNN_Indonesia.svg/1200px-CNN_Indonesia.svg.png" group-title="News",CNN Indonesia
 http://live.cnnindonesia.com/livecnn/smil:cnntv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="CNIH" tvg-name="CNN Indonesia HD" tvg-logo="https://cdn.cnnindonesia.com/cnnid/images/logo_cnn_fav.png" group-title="News",CNN Indonesia (Opt-2)
-https://live.cnnindonesia.com/livecnn/smil:cnntv.smil/chunklist_w672934803_b384000_sleng.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/e/eb/CNN_Indonesia.svg/1200px-CNN_Indonesia.svg.png" group-title="News",CNN Indonesia (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/e/eb/CNN_Indonesia.svg/1200px-CNN_Indonesia.svg.png" group-title="News",CNN Indonesia
 https://live.cnnindonesia.com/livecnn/smil:cnntv.smil/chunklist_w1285822120_b384000_sleng.m3u8
+#EXTINF:-1 tvg-id="CNIH" tvg-name="CNN Indonesia HD" tvg-logo="https://cdn.cnnindonesia.com/cnnid/images/logo_cnn_fav.png" group-title="News",CNN Indonesia
+https://live.cnnindonesia.com/livecnn/smil:cnntv.smil/chunklist_w672934803_b384000_sleng.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CNTV 2
 http://210.210.155.35/qwr9ew/s/s29/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/id/thumb/3/3f/CTV_Banten.png/200px-CTV_Banten.png" group-title="",CTV Banten
 http://103.23.201.170:1935/live/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.daaitv.co.id/DAAI-WP/wp-content/uploads/2017/11/logo_no_text.gif" group-title="",Da Ai Indonesia (Opt-1)
-http://210.210.155.35/qwr9ew/s/s13/index2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.daaitv.co.id/DAAI-WP/wp-content/uploads/2017/11/logo_no_text.gif" group-title="",Da Ai Indonesia (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.daaitv.co.id/DAAI-WP/wp-content/uploads/2017/11/logo_no_text.gif" group-title="",Da Ai Indonesia
 http://210.210.155.35/qwr9ew/s/s13/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.daaitv.co.id/DAAI-WP/wp-content/uploads/2017/11/logo_no_text.gif" group-title="",Da Ai Indonesia
+http://210.210.155.35/qwr9ew/s/s13/index2.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.vod-logo.net/photos/6a935ccbf26bb9180f9a06f2741d24c0.JPG" group-title="",Disney Junior Indonesia
 http://103.47.132.164/PLTV/88888888/224/3221226011/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://upload.wikimedia.org/wikipedia/commons/thumb/6/68/Diva_logo.svg/500px-Diva_logo.svg.png" group-title="Entertainment",Diva (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://upload.wikimedia.org/wikipedia/commons/thumb/6/68/Diva_logo.svg/500px-Diva_logo.svg.png" group-title="Entertainment",Diva
 http://210.210.155.35/uq2663/h/h11/01.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/68/Diva_logo.svg/375px-Diva_logo.svg.png" group-title="Entertainment",Diva (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/68/Diva_logo.svg/375px-Diva_logo.svg.png" group-title="Entertainment",Diva
 http://45.126.83.51:443/uq2663/h/h11/01.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PJyf6oq.png" group-title="",DMI Channel
 http://stream1.ninmedia.tv/dmitv/udp.stream_360p/playlist.m3u8
@@ -69,42 +69,42 @@ http://edge.linknetott.swiftserve.com/live/BSgroup/amlst:dangdutch/playlist.m3u8
 http://210.210.155.35/uq2663/h/h10/01.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/id/thumb/3/3f/Elshinta_tv_logo.jpg/200px-Elshinta_tv_logo.jpg" group-title="",Elshinta
 http://210.210.155.35/qwr9ew/s/s10/01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Food",Foodie Channel (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Food",Foodie Channel
 http://edge.linknetott.swiftserve.com/live/BSgroup/amlst:foodiee/chunklist_b2288000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FMy8rhc.png" group-title="Food",Foodie Channel (Opt-2)
-http://edge.linknetott.swiftserve.com/live/BSgroup/amlst:foodiee/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Food",Foodie Channel (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Food",Foodie Channel
 http://edge.linknetott.swiftserve.com/live/BSgroup/amlst:foodiee/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FMy8rhc.png" group-title="Food",Foodie Channel
+http://edge.linknetott.swiftserve.com/live/BSgroup/amlst:foodiee/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",FOX
 http://210.210.155.35/uq2663/h/h04/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",FOX Movie Premium
 http://210.210.155.35/session/3e87cff6-7c80-11e8-9332-b82a72d63267/uq2663/h/h04/index1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/8/86/Sony_GEM_logo.jpg" group-title="Entertainment",Gem TV Asia (Opt-1)
-http://210.210.155.35/uq2663/h/h19/index2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",Gem TV Asia (Opt-2)
-http://45.126.83.51/uq2663/h/h19/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",Gem TV Asia (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",Gem TV Asia
 http://210.210.155.35/session/f438f266-7bf0-11e8-b712-b82a72d63267/uq2663/h/h19/index1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",Gem TV Asia (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",Gem TV Asia
 http://210.210.155.35/session/f438f266-7bf0-11e8-b712-b82a72d63267/uq2663/h/h19/index2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9c/GTV_%282017%29.svg/1200px-GTV_%282017%29.svg.png" group-title="",Global TV (Opt-1)
-http://202.80.222.182:80/000001/2/ch14041511505498448705/index.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/4/4a/Global_TV_2008.png" group-title="",Global TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/8/86/Sony_GEM_logo.jpg" group-title="Entertainment",Gem TV Asia
+http://210.210.155.35/uq2663/h/h19/index2.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",Gem TV Asia
+http://45.126.83.51/uq2663/h/h19/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/4/4a/Global_TV_2008.png" group-title="",Global TV
 http://202.80.222.182:80/000001/2/ch14041511505498448705/1001.m3u8?virtualDomain=000001.live_hls.zte.com
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9c/GTV_%282017%29.svg/1200px-GTV_%282017%29.svg.png" group-title="",Global TV
+http://202.80.222.182:80/000001/2/ch14041511505498448705/index.m3u8?virtualDomain=000001.live_hls.zte.com
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9c/GTV_%282017%29.svg/1200px-GTV_%282017%29.svg.png" group-title="",GTV
 http://id6.indostreamingtv.com/live/tv1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/0/0b/Hits_TV_Asia_logo.jpg/200px-Hits_TV_Asia_logo.jpg" group-title="Entertainment",Hits (Opt-1)
-http://210.210.155.35/uq2663/h/h37/index2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://astrocontent.s3.amazonaws.com/Images/ChannelLogo/Pos/720_300.png" group-title="",Hits (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://astrocontent.s3.amazonaws.com/Images/ChannelLogo/Pos/720_300.png" group-title="",Hits
 http://210.210.155.35/session/b664cd50-6b66-11e9-88bd-a3eeb50c438d/uq2663/h/h37/index2.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/6/62/MNC_HomeLiving.jpeg" group-title="",Home & Living (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/0/0b/Hits_TV_Asia_logo.jpg/200px-Hits_TV_Asia_logo.jpg" group-title="Entertainment",Hits
+http://210.210.155.35/uq2663/h/h37/index2.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/6/62/MNC_HomeLiving.jpeg" group-title="",Home & Living
 http://edge.linknetott.swiftserve.com/live/BSgroup/amlst:homelivinghd/chunklist_b2288000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Home & Living (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Home & Living
 http://edge.linknetott.swiftserve.com/live/BSgroup/amlst:homelivinghd/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/3/39/INDOSIAR_Logo.png" group-title="",Indosiar (Opt-1)
-http://202.80.222.182/000001/2/ch15051810235326945512/index.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Indosiar_2015.svg/1200px-Indosiar_2015.svg.png" group-title="",Indosiar (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Indosiar_2015.svg/1200px-Indosiar_2015.svg.png" group-title="",Indosiar
 http://202.80.222.182/000001/2/ch15051810235326945512/1001.m3u8?virtualDomain=000001.live_hls.zte.com
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/3/39/INDOSIAR_Logo.png" group-title="",Indosiar
+http://202.80.222.182/000001/2/ch15051810235326945512/index.m3u8?virtualDomain=000001.live_hls.zte.com
 #EXTINF:-1 tvg-id="ext" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/id/d/d6/INews_TV.png" group-title="",Inews
 http://202.80.222.175/000001/2/ch14041511541532132975/1001.m3u8?virtualDomain=000001.live_hls.zte.com
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://maramissetiawan.files.wordpress.com/2012/03/logo.png" group-title="",InsanTV
@@ -115,46 +115,46 @@ http://edge.linknetott.swiftserve.com/live/BSgroup/amlst:jgoch/chunklist_b228800
 http://edge.linknetott.swiftserve.com/live/BSgroup/amlst:jgoch/chunklist_b2288000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vMpr2r6.jpg" group-title="News",Jakarta Globe
 http://edge.linknetott.swiftserve.com/live/BsNew/amlst:bsenglish/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5L2EGWA.png" group-title="",JakTV (Opt-1)
-http://202.80.222.182:80/000001/2/ch00000090990000001695/index.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.techinasia.com/data/images/YesyMxHgCzyipuMqU5TLhs83cINKGYj6V0z7HB0U.jpeg" group-title="",JakTV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.techinasia.com/data/images/YesyMxHgCzyipuMqU5TLhs83cINKGYj6V0z7HB0U.jpeg" group-title="",JakTV
 http://202.80.222.182:80/000001/2/ch00000090990000001695/1001.m3u8?virtualDomain=000001.live_hls.zte.com
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5L2EGWA.png" group-title="",JakTV
+http://202.80.222.182:80/000001/2/ch00000090990000001695/index.m3u8?virtualDomain=000001.live_hls.zte.com
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/id/thumb/8/8e/JTV_%282012%29.svg/1200px-JTV_%282012%29.svg.png" group-title="",JTV Surabaya
 http://202.80.222.175/000001/2/ch00000090990000001731/1001.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/id/c/c8/K-drama_logo.jpg" group-title="",K Drama (Opt-1)
-http://210.210.155.35/session/315760d4-7c81-11e8-ba87-b82a72d63267/qwr9ew/s/s42/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/id/c/c8/K-drama_logo.jpg" group-title="",K Drama (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/id/c/c8/K-drama_logo.jpg" group-title="",K Drama
 http://210.210.155.35/qwr9ew/s/s42/index2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://astrocontent.s3.amazonaws.com/Images/ChannelLogo/aotg/k-plus/pos/k-plus_300.png" group-title="",K+ (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/id/c/c8/K-drama_logo.jpg" group-title="",K Drama
+http://210.210.155.35/session/315760d4-7c81-11e8-ba87-b82a72d63267/qwr9ew/s/s42/index.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://astrocontent.s3.amazonaws.com/Images/ChannelLogo/aotg/k-plus/pos/k-plus_300.png" group-title="",K+
 http://210.210.155.35/uq2663/h/h08/01.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",K+ (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",K+
 http://210.210.155.35/uq2663/h/h08/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://mncchannels.com/files/logo/1440755188_logo_mnc-karaoke.png" group-title="Music",Karaoke Channel (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://mncchannels.com/files/logo/1440755188_logo_mnc-karaoke.png" group-title="Music",Karaoke Channel
 http://edge.linknetott.swiftserve.com/live/BSgroup/amlst:karaokech/chunklist_b2288000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/CUgQtCo.jpg" group-title="Music",Karaoke Channel (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/CUgQtCo.jpg" group-title="Music",Karaoke Channel
 http://edge.linknetott.swiftserve.com/live/BSgroup/amlst:karaokech/chunklist_b2288000.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.postimg.cc/C53XtK5f/zaltv.png" group-title="Music",Karaoke Channel (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.postimg.cc/C53XtK5f/zaltv.png" group-title="Music",Karaoke Channel
 http://edge.linknetott.swiftserve.com/live/BSgroup/amlst:karaokech/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KBS World (Indonesia)
 http://210.210.155.35:80/session/4bbb073a-34cf-11e9-8af5-9ad690129ed3/qwr9ew/s/s42/01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tough.kix-tv.com/Public/images/kix-hd-logo.png" group-title="",Kix (Opt-1)
-http://210.210.155.35/uq2663/h/h07/01.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tough.kix-tv.com/Public/images/kix-hd-logo.png" group-title="",Kix (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tough.kix-tv.com/Public/images/kix-hd-logo.png" group-title="",Kix
 http://210.210.155.35/session/e269237c-7e3d-11e8-a249-b82a72d63267/uq2663/h/h07/01.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Kix (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Kix
 http://210.210.155.35/session/e269237c-7e3d-11e8-a249-b82a72d63267/uq2663/h/h07/index1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Kix (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tough.kix-tv.com/Public/images/kix-hd-logo.png" group-title="",Kix
+http://210.210.155.35/uq2663/h/h07/01.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Kix
 http://210.210.155.35/uq2663/h/h07/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/2/2e/Logo-Kompas_TV.png" group-title="",Kompas TV
 http://202.80.222.130/000001/2/ch00000090990000001730/1001.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://u-channel.tv/wp-content/uploads/2017/07/Logo-UChannel-400-72dpi-300x125.png" group-title="",Madani (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://u-channel.tv/wp-content/uploads/2017/07/Logo-UChannel-400-72dpi-300x125.png" group-title="",Madani
 http://210.210.155.35/qwr9ew/s/s41/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://u-channel.tv/wp-content/uploads/2017/07/Logo-UChannel-400-72dpi-300x125.png" group-title="",Madani (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://u-channel.tv/wp-content/uploads/2017/07/Logo-UChannel-400-72dpi-300x125.png" group-title="",Madani
 http://210.210.155.35/qwr9ew/s/s41/index2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Metro TV (Opt-1)
-http://edge.metrotvnews.com:1935/live-edge/smil:metro.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Metro TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Metro TV
 http://45.126.83.51/uq2663/h/h05/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Metro TV
+http://edge.metrotvnews.com:1935/live-edge/smil:metro.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.postimg.cc/C53XtK5f/zaltv.png" group-title="Music",Mix TV
 http://edge.linknetott.swiftserve.com/live/BSgroup/amlst:mixch/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/69/MNCTV_logo.png" group-title="",MNC
@@ -169,12 +169,12 @@ http://210.210.155.35/qwr9ew/s/s31/index2.m3u8
 http://210.210.155.35/x6bnqe/s/s31/S4/mnf.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",My Kids
 http://210.210.155.35/qwr9ew/s/s30/index2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/6yIpjUJ.png" group-title="",Net TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/6yIpjUJ.png" group-title="",Net TV
 http://202.80.222.170/000001/2/ch00000090990000001723/index.m3u8?virtualDomain=000001.live_hls.zte.com&IASHttpSessionId=OTT219782019062322524313983108
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://dens.tv/images/channel-logo_backup/13.jpg" group-title="",Net TV (Opt-2)
-http://boosstalive1-a.akamaihd.net:80/f894a6ebf56c4569bea516042afd1d55/ap-southeast-1/5664852414001/profile_0/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/7/7c/Netmediatama.png/300px-Netmediatama.png" group-title="",Net TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/7/7c/Netmediatama.png/300px-Netmediatama.png" group-title="",Net TV
 http://boosstalive1-a.akamaihd.net/f894a6ebf56c4569bea516042afd1d55/ap-southeast-1/5664852414001/profile_0/chunklist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://dens.tv/images/channel-logo_backup/13.jpg" group-title="",Net TV
+http://boosstalive1-a.akamaihd.net:80/f894a6ebf56c4569bea516042afd1d55/ap-southeast-1/5664852414001/profile_0/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/EJCbDAn.png" group-title="",Nu Channel
 http://stream1.ninmedia.tv/nuchannel/udp.stream_360p/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Padang TV
@@ -185,13 +185,13 @@ http://radartasikmalaya.onlivestreaming.net/radartasikmalaya/livestream/playlist
 http://59d7d6f47d7fc.streamlock.net/canale51/canale51/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="RAI GULP" tvg-logo="Logo N/A" group-title="",Rai Gulp
 http://b2everyrai-lh.akamaihd.net/i/raigulp_1@66350/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://upload.wikimedia.org/wikipedia/en/thumb/5/5a/Rajawali_Televisi.svg/500px-Rajawali_Televisi.svg.png" group-title="",Rajawali TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://upload.wikimedia.org/wikipedia/en/thumb/5/5a/Rajawali_Televisi.svg/500px-Rajawali_Televisi.svg.png" group-title="",Rajawali TV
 http://202.80.222.170/000001/2/ch00000090990000001716/index.m3u8?virtualDomain=000001.live_hls.zte.com&IASHttpSessionId=OTT219992019062322543114287379
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gHDcCfx.png" group-title="",RCTI (Opt-1)
-http://202.80.222.182/000001/2/ch14041511532707866226/index.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gHDcCfx.png" group-title="",RCTI (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gHDcCfx.png" group-title="",RCTI
 http://202.80.222.130/000001/2/ch14041511532707866226/1001.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gHDcCfx.png" group-title="",RCTI (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gHDcCfx.png" group-title="",RCTI
+http://202.80.222.182/000001/2/ch14041511532707866226/index.m3u8?virtualDomain=000001.live_hls.zte.com
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gHDcCfx.png" group-title="",RCTI
 https://live.rctiplus.id/rctiplus/rcti_720p.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://image.azuza.web.id/images/agus-1545452020.jpg" group-title="",Reformed 21
 http://edge.linknetott.swiftserve.com/live/BsNew/amlst:reformedch/playlist.m3u8
@@ -203,56 +203,56 @@ http://210.210.155.35/session/efcc94f6-7b7a-11e8-afd3-b82a72d63267/qwr9ew/s/s23/
 http://210.210.155.35/session/e269237c-7e3d-11e8-a249-b82a72d63267/uq2663/h/h07/01.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",RTP
 http://210.210.155.35/qwr9ew/s/s38/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://upload.wikimedia.org/wikipedia/en/thumb/5/5a/Rajawali_Televisi.svg/500px-Rajawali_Televisi.svg.png" group-title="",RTV (Opt-1)
-http://202.80.222.171:80/000001/2/ch00000090990000001716/index.m3u8?virtualDomain=000001.live_hls.zte.com&IASHttpSessionId=OTT2198020181031055334464619
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/5/5a/Rajawali_Televisi.svg/375px-Rajawali_Televisi.svg.png" group-title="",RTV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/5/5a/Rajawali_Televisi.svg/375px-Rajawali_Televisi.svg.png" group-title="",RTV
 http://202.80.222.171:80/000001/2/ch00000090990000001716/1001.m3u8?virtualDomain=000001.live_hls.zte.com&IASHttpSessionId=OTT2198020181031055334464619
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://upload.wikimedia.org/wikipedia/en/thumb/5/5a/Rajawali_Televisi.svg/500px-Rajawali_Televisi.svg.png" group-title="",RTV
+http://202.80.222.171:80/000001/2/ch00000090990000001716/index.m3u8?virtualDomain=000001.live_hls.zte.com&IASHttpSessionId=OTT2198020181031055334464619
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/i3EI1vB.png" group-title="",Rumah TV
 https://video2.onlivestreaming.net/rumahtv/livestream/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Gw8JvF4.png" group-title="",Saling Sapa TV
 http://stream1.ninmedia.tv/salingsapa/rtmp.stream_360p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",SBS-in (Opt-1)
-http://210.210.155.35/qwr9ew/s/s42/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/mffNC0H.png" group-title="",SBS-in (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/mffNC0H.png" group-title="",SBS-in
 http://210.210.155.35/qwr9ew/s/s42/01.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/cc/SCTV_Logo.svg/1200px-SCTV_Logo.svg.png" group-title="",SCTV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",SBS-in
+http://210.210.155.35/qwr9ew/s/s42/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/cc/SCTV_Logo.svg/1200px-SCTV_Logo.svg.png" group-title="",SCTV
 http://202.80.222.182/000001/2/ch15010918464887721048/index.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/cc/SCTV_Logo.svg/1200px-SCTV_Logo.svg.png" group-title="",SCTV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/cc/SCTV_Logo.svg/1200px-SCTV_Logo.svg.png" group-title="",SCTV
 http://id2.indostreamingtv.com/live/tv2/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/id/thumb/e/e3/Spacetoon.png/300px-Spacetoon.png" group-title="",Spacetoon Indonesia
 http://210.210.155.35/x6bnqe/s/s80/index2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Super Soccer TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Super Soccer TV
 http://210.210.155.35/session/6761fe90-7bf1-11e8-a850-b82a72d63267/uq2663/h/h20/index1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Super Soccer TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Super Soccer TV
 http://210.210.155.35/session/6761fe90-7bf1-11e8-a850-b82a72d63267/uq2663/h/h20/index2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Tahfizh TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Tahfizh TV
 http://119.235.249.58:1935/tahfidztv/live/chunk.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/VwHUMHe.png" group-title="",Tahfizh TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/VwHUMHe.png" group-title="",Tahfizh TV
 http://119.235.249.58:1935/tahfidztv/live/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TATV Solo
 http://video2.onlivestreaming.net/tatv/live.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TBN
 http://210.210.155.35/qwr9ew/s/s39/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dqvXrhd.jpg" group-title="",The Indonesia Channel (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dqvXrhd.jpg" group-title="",The Indonesia Channel
 http://202.93.133.3:1935/svr2/tic.com.stream_720p/chunklist_w752720676.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dqvXrhd.jpg" group-title="",The Indonesia Channel (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dqvXrhd.jpg" group-title="",The Indonesia Channel
 http://202.93.133.3:1935/svr2/tic.com.stream_720p/chunklist_w752720676.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",Thrill (Opt-1)
-http://210.210.155.35/qwr9ew/s/s34/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/a0/Thrill_logo.jpg" group-title="Entertainment",Thrill (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/a0/Thrill_logo.jpg" group-title="Entertainment",Thrill
 http://210.210.155.35/qwr9ew/s/s34/01.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/a0/Thrill_logo.jpg" group-title="Entertainment",Thrill (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",Thrill
+http://210.210.155.35/qwr9ew/s/s34/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/a0/Thrill_logo.jpg" group-title="Entertainment",Thrill
 http://210.210.155.35/qwr9ew/s/s34/index2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logo-timeline/images/3/31/TRANS_7.png" group-title="",Trans 7 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logo-timeline/images/3/31/TRANS_7.png" group-title="",Trans 7
 http://202.80.222.182/000001/2/ch14041511545447343123/1001.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://career.trans7.co.id/images/trans7.png" group-title="",Trans 7 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://career.trans7.co.id/images/trans7.png" group-title="",Trans 7
 http://202.80.222.182/000001/2/ch14041511545447343123/index.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://1.bp.blogspot.com/-ntWIQ3h6jfY/VtxHKTuef4I/AAAAAAAAAEg/GHp3iYd9Bmw/s1600/TRANS_TV.png" group-title="",Trans TV (Opt-1)
-http://202.80.222.182/000001/2/ch14041511552652254306/index.m3u8?virtualDomain=000001.live_hls.zte.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.transtv.co.id/template/front/source/images/bg/logo.png" group-title="",Trans TV (Opt-2)
-http://id6.indostreamingtv.com/live/tv33/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://1.bp.blogspot.com/-ntWIQ3h6jfY/VtxHKTuef4I/AAAAAAAAAEg/GHp3iYd9Bmw/s1600/TRANS_TV.png" group-title="",Trans TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://1.bp.blogspot.com/-ntWIQ3h6jfY/VtxHKTuef4I/AAAAAAAAAEg/GHp3iYd9Bmw/s1600/TRANS_TV.png" group-title="",Trans TV
 http://202.80.222.174/000001/2/ch14041511552652254306/index.m3u8?virtualDomain=000001.live_hls.zte.com&IASHttpSessionId=OTT2931201906232251491158010
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://1.bp.blogspot.com/-ntWIQ3h6jfY/VtxHKTuef4I/AAAAAAAAAEg/GHp3iYd9Bmw/s1600/TRANS_TV.png" group-title="",Trans TV
+http://202.80.222.182/000001/2/ch14041511552652254306/index.m3u8?virtualDomain=000001.live_hls.zte.com
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.transtv.co.id/template/front/source/images/bg/logo.png" group-title="",Trans TV
+http://id6.indostreamingtv.com/live/tv33/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Chosun
 http://live.chosun.gscdn.com/live/_definst_/tvchosun3.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/ms/thumb/7/7e/TvOne_Logo%282011%29.svg/1200px-TvOne_Logo%282011%29.svg.png" group-title="",TV1
@@ -261,75 +261,75 @@ http://202.80.222.182/000001/2/ch14061215030555428637/1001.m3u8?virtualDomain=00
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIjabarbandung)/Stream(02)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qeoc99J.jpg" group-title="",TVKU
 http://103.30.1.14:8080/hls/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9iFoNvF.png" group-title="",TVRI (Opt-1)
-http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRINasional)/Stream(04)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://images2.useetv.com/logo_tvri_big1.png" group-title="",TVRI (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://images2.useetv.com/logo_tvri_big1.png" group-title="",TVRI
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIdki)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRINasional)/Stream(02)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9iFoNvF.png" group-title="",TVRI
+http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRINasional)/Stream(04)/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI
 http://tvristream-i.akamaihd.net/hls/live/761941/akamai-tvri/stream04/streamPlaylist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="TVRI 1" tvg-logo="https://vignette.wikia.nocookie.net/logo-timeline/images/1/11/Tvri_jadul.svg/revision/latest?cb=20140908195246" group-title="",TVRI 1
 http://210.210.155.35/qwr9ew/s/s11/01.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI 404P
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRINasional)/Stream(03)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Aceh (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Aceh
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIACEH)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://image.azuza.web.id/images/agus-1545452020.jpg" group-title="",TVRI Aceh (Opt-2)
-http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIaceh)/Stream(02)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Aceh (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Aceh
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIAceh)/Stream(01)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Aceh (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://image.azuza.web.id/images/agus-1545452020.jpg" group-title="",TVRI Aceh
+http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIaceh)/Stream(02)/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Aceh
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIAceh)/Stream(03)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Babel
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIbabel)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Bali (Opt-1)
-http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIbali)/Stream(03)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Bali (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Bali
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIBali)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Bali (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Bali
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIbali)/Stream(01)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Bali (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Bali
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIbali)/Stream(02)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Bangka Belitung (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Bali
+http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIbali)/Stream(03)/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Bangka Belitung
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIbabel)/Stream(01)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Bengkulu (Opt-1)
-http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIbengkulu)/Stream(03)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Bengkulu (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Bengkulu
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIBENGKULU)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Bengkulu (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Bengkulu
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIbengkulu)/Stream(01)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Bengkulu (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Bengkulu
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIbengkulu)/Stream(02)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Budaya (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Bengkulu
+http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIbengkulu)/Stream(03)/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Budaya
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRI3)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Budaya (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Budaya
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRI3)/Stream(01)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI DKI
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIdki)/Stream(02)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Gorontalo (Opt-1)
-http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIGORONTALO)/Stream(03)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Gorontalo (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Gorontalo
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIGorontalo)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Gorontalo (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Gorontalo
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIGorontalo)/Stream(01)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Jambi (Opt-1)
-http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIjambi)/Stream(02)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Jambi (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Gorontalo
+http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIGORONTALO)/Stream(03)/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Jambi
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIJAMBI)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://image.azuza.web.id/images/agus-1545452020.jpg" group-title="",TVRI Jambi (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Jambi
+http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIjambi)/Stream(02)/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://image.azuza.web.id/images/agus-1545452020.jpg" group-title="",TVRI Jambi
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIjambi)/Stream(03)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://image.azuza.web.id/images/agus-1545452020.jpg" group-title="",TVRI JATENG SEMARANG
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIjatengsemarang)/Stream(03)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Jawa Barat (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Jawa Barat
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIjabarbandung)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Jawa Barat (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Jawa Barat
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIJABARBANDUNG)/Stream(03)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Jawa Tengah (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Jawa Tengah
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIJatengsemarang)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Jawa Tiwar (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Jawa Tiwar
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIJatimsurabaya)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Jawa Tiwar (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Jawa Tiwar
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIJATIMSURABAYA)/Stream(03)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Jogja
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIyogyakarta)/Stream(02)/index.m3u8
@@ -375,19 +375,19 @@ http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIsumsel)/Stream(02)/index.m3u8
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIPAPUA)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Pekan Baru
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIriau)/Stream(02)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Riau (Opt-1)
-http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIriau)/Stream(03)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Riau (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Riau
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIRiau)/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Riau
+http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIriau)/Stream(03)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://image.azuza.web.id/images/agus-1545452020.jpg" group-title="",TVRI Samarinda
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIkaltimsamarinda)/Stream(02)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Semarang
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIjatengsemarang)/Stream(02)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI SULAWESI BARAT
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRISulbarmajene)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Sulawesi Selatan (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Sulawesi Selatan
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRISulselmakasar)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Sulawesi Selatan (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Sulawesi Selatan
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRISULSELMAKASAR)/Stream(03)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI SULAWESI TENGAH
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRISultengpalu)/index.m3u8
@@ -397,20 +397,20 @@ http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRISultra)/index.m3u8
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRISulutmanado)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Sulut
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIsulutmanado)/Stream(03)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Sumatera Barat (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Sumatera Barat
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRISUMBARPADANG)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI SUMATERA SELATAN
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRISumsel)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Sumatera Utara (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Sumatera Utara
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRISumutmedan)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Sumbar
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIsumbarpadang)/Stream(03)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Surabaya
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIjatimsurabaya)/Stream(02)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Yogyakarta (Opt-1)
-http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIYOGYAKARTA)/Stream(03)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Yogyakarta (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRI Yogyakarta
 http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIYogyakarta)/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tvri.co.id/images/logo.png" group-title="",TVRI Yogyakarta
+http://ott.tvri.co.id/Content/HLS/Live/Channel(TVRIYOGYAKARTA)/Stream(03)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",UA TV
 http://210.210.155.35/qwr9ew/s/s47/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="WFTV 9" tvg-logo="Logo N/A" group-title="",WFTV 9
diff --git a/channels/il.m3u b/channels/il.m3u
index 177ba7c6d..dadaa16f8 100644
--- a/channels/il.m3u
+++ b/channels/il.m3u
@@ -1,52 +1,52 @@
 #EXTM3U x-tvg-url="http://epg.streamstv.me/epg/guide-israel.xml.gz"
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="News",Channel 2 News (Opt-1)
-http://keshethlslive-lh.akamaihd.net/i/c2n_1@195269/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="News",Channel 2 News (Opt-2)
-http://keshethlslive-lh.akamaihd.net/i/c2nsec_1@195268/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="News",Channel 2 News (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="News",Channel 2 News
 http://ch2live-i.akamaihd.net/hls/live/252343/252343/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="News",Channel 2 News (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="News",Channel 2 News
 http://keshethlslive-lh.akamaihd.net/i/c2n_1@195269/index_2200_av-p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="News",Channel 2 News
+http://keshethlslive-lh.akamaihd.net/i/c2n_1@195269/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="News",Channel 2 News
+http://keshethlslive-lh.akamaihd.net/i/c2nsec_1@195268/master.m3u8
 #EXTINF:-1 tvg-id="Channel 20-IS" tvg-name="IL: ISRAEL Channel 20" tvg-logo="https://i.imgur.com/Jsck6fw.jpg" group-title="News",Channel 20
 http://live.ch20-cdnwiz.com/ch20-abr/ch20-abr/playlist.m3u8
-#EXTINF:-1 tvg-id="Hidabroot Channel-IS" tvg-name="Hidabroot Channel-IS" tvg-logo="https://i.imgur.com/wKi97Pg.png" group-title="",Hidabroot (Opt-1)
-https://stream72.shidur.net/htvlive2/_definst_/smil:live2.smil/chunklist_b1248000.m3u8
-#EXTINF:-1 tvg-id="Hidabroot Channel-IS" tvg-name="Hidabroot Channel-IS" tvg-logo="https://i.imgur.com/wKi97Pg.png" group-title="",Hidabroot (Opt-2)
-https://stream71.shidur.net/htvlive2/_definst_/smil:live2.smil/chunklist_b1248000.m3u8
-#EXTINF:-1 tvg-id="Hidabroot Channel-IS" tvg-name="Hidabroot Channel-IS" tvg-logo="https://i.imgur.com/wKi97Pg.png" group-title="",Hidabroot (Opt-3)
+#EXTINF:-1 tvg-id="Hidabroot Channel-IS" tvg-name="Hidabroot Channel-IS" tvg-logo="https://i.imgur.com/wKi97Pg.png" group-title="",Hidabroot
 http://stream5.shidur.net/htvlive2/_definst_/smil:live2.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8R1UWRw.jpg" group-title="",Kabbalah for the People (Israel) (Opt-1)
+#EXTINF:-1 tvg-id="Hidabroot Channel-IS" tvg-name="Hidabroot Channel-IS" tvg-logo="https://i.imgur.com/wKi97Pg.png" group-title="",Hidabroot
+https://stream71.shidur.net/htvlive2/_definst_/smil:live2.smil/chunklist_b1248000.m3u8
+#EXTINF:-1 tvg-id="Hidabroot Channel-IS" tvg-name="Hidabroot Channel-IS" tvg-logo="https://i.imgur.com/wKi97Pg.png" group-title="",Hidabroot
+https://stream72.shidur.net/htvlive2/_definst_/smil:live2.smil/chunklist_b1248000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8R1UWRw.jpg" group-title="",Kabbalah for the People (Israel)
 http://edge1.il.kab.tv/rtplive/tv66-heb-high.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8R1UWRw.jpg" group-title="",Kabbalah for the People (Israel) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8R1UWRw.jpg" group-title="",Kabbalah for the People (Israel)
 https://edge2.uk.kab.tv/rtplive/tv66-heb-medium.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="Kan 11-IS" tvg-name="IL: Kan 11" tvg-logo="https://i.imgur.com/vqfNbEU.png" group-title="",Kan 11
 https://kanlivep2event-i.akamaihd.net/hls/live/747610/747610/source1_2.5k/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zCZH65G.png" group-title="",Kan Educational
 https://kanlivep2event-i.akamaihd.net/hls/live/747600/747600/source1_2.5k/chunklist.m3u8
-#EXTINF:-1 tvg-id="Keshet 12-IS" tvg-name="Keshet 12-IS" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="",Keshet 12 (Opt-1)
+#EXTINF:-1 tvg-id="Keshet 12-IS" tvg-name="Keshet 12-IS" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="",Keshet 12
 https://keshethlslive-i.akamaihd.net/hls/live/512033/CH2LIVE_HIGH/index.m3u8?as=1&hdnea=st%3D1566047006%7Eexp%3D1566047906%7Eacl%3D%2F*%7Ehmac%3D31e3e19778dda65ebf40fe7d47bfa3cb0f9ae317de435b9c484868101a3a4e0b
-#EXTINF:-1 tvg-id="Keshet 12-IS" tvg-name="Keshet 12-IS" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="",Keshet 12 (Opt-2)
-https://keshethlslive-i.akamaihd.net/hls/live/512033/CH2LIVE_HIGH/index_850.m3u8
-#EXTINF:-1 tvg-id="Keshet 12-IS" tvg-name="Keshet 12-IS" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="",Keshet 12 (Opt-3)
+#EXTINF:-1 tvg-id="Keshet 12-IS" tvg-name="Keshet 12-IS" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="",Keshet 12
 https://keshethlslive-i.akamaihd.net/hls/live/512033/CH2LIVE_HIGH/index_1400.m3u8
-#EXTINF:-1 tvg-id="Keshet 12-IS" tvg-name="Keshet 12-IS" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="",Keshet 12 (Opt-4)
+#EXTINF:-1 tvg-id="Keshet 12-IS" tvg-name="Keshet 12-IS" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="",Keshet 12
 https://keshethlslive-i.akamaihd.net/hls/live/512033/CH2LIVE_HIGH/index_2200.m3u8
-#EXTINF:-1 tvg-id="Keshet 12-IS" tvg-name="Keshet 12-IS" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="",Keshet 12 (Opt-5)
+#EXTINF:-1 tvg-id="Keshet 12-IS" tvg-name="Keshet 12-IS" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="",Keshet 12
 https://keshethlslive-i.akamaihd.net/hls/live/512033/CH2LIVE_HIGH/index_3100.m3u8
+#EXTINF:-1 tvg-id="Keshet 12-IS" tvg-name="Keshet 12-IS" tvg-logo="https://i.imgur.com/NmnXn2z.jpg" group-title="",Keshet 12
+https://keshethlslive-i.akamaihd.net/hls/live/512033/CH2LIVE_HIGH/index_850.m3u8
 #EXTINF:-1 tvg-id="Knesset Channel-IS" tvg-name="Knesset Channel-IS" tvg-logo="https://i.imgur.com/clKv6Ar.png" group-title="",Knesset Channel
 http://w3.013.gostreaming.tv:1935/Knesset/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/YwGfdIs.png" group-title="",Makan 33
 https://kanlivep2event-i.akamaihd.net/hls/live/747613/747613/source1_2.5k/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/lBbbPI4.jpg" group-title="Music",Music 24
 https://keshethlslive-lh.akamaihd.net/i/24live_1@195271/index_1400_av-b.m3u8
-#EXTINF:-1 tvg-id="Channel 13 Reshet-IS" tvg-name="IL: ISRAEL Channel 13 Reshet" tvg-logo="https://i.imgur.com/WmgyRCF.png" group-title="",Reshet 13 (Opt-1)
-http://nana10-hdl-il.ctedgecdn.net/Nana10-Live/amlst:hd_,1000,1500,1800,/playlist.m3u8
-#EXTINF:-1 tvg-id="Channel 13 Reshet-IS" tvg-name="IL: ISRAEL Channel 13 Reshet" tvg-logo="https://i.imgur.com/WmgyRCF.png" group-title="",Reshet 13 (Opt-2)
-http://nana10-hdl.ctedgecdn.net/Nana10-Live/amlst:hd_%2C1000%2C1500%2C1800%2C/chunklist_b1000000.m3u8
-#EXTINF:-1 tvg-id="Channel 13 Reshet-IS" tvg-name="IL: ISRAEL Channel 13 Reshet" tvg-logo="https://i.imgur.com/WmgyRCF.png" group-title="",Reshet 13 (Opt-3)
+#EXTINF:-1 tvg-id="Channel 13 Reshet-IS" tvg-name="IL: ISRAEL Channel 13 Reshet" tvg-logo="https://i.imgur.com/WmgyRCF.png" group-title="",Reshet 13
 http://nana10-hdl-il-sw.ctedgecdn.net/Nana10-Live/amlst:hd_,500,1000,1200,2400,/playlist.m3u8
-#EXTINF:-1 tvg-id="Channel 13 Reshet-IS" tvg-name="IL: ISRAEL Channel 13 Reshet" tvg-logo="https://i.imgur.com/WmgyRCF.png" group-title="",Reshet 13 (Opt-4)
+#EXTINF:-1 tvg-id="Channel 13 Reshet-IS" tvg-name="IL: ISRAEL Channel 13 Reshet" tvg-logo="https://i.imgur.com/WmgyRCF.png" group-title="",Reshet 13
+http://nana10-hdl-il.ctedgecdn.net/Nana10-Live/amlst:hd_,1000,1500,1800,/playlist.m3u8
+#EXTINF:-1 tvg-id="Channel 13 Reshet-IS" tvg-name="IL: ISRAEL Channel 13 Reshet" tvg-logo="https://i.imgur.com/WmgyRCF.png" group-title="",Reshet 13
 http://nana10-hdl-uk.ctedgecdn.net/Nana10-Live/amlst:hd_,500,1000,1200,2400,/playlist.m3u8
+#EXTINF:-1 tvg-id="Channel 13 Reshet-IS" tvg-name="IL: ISRAEL Channel 13 Reshet" tvg-logo="https://i.imgur.com/WmgyRCF.png" group-title="",Reshet 13
+http://nana10-hdl.ctedgecdn.net/Nana10-Live/amlst:hd_%2C1000%2C1500%2C1800%2C/chunklist_b1000000.m3u8
 #EXTINF:-1 tvg-id="Shopping Channel-IS" tvg-name="IL: shopping channel" tvg-logo="https://i.imgur.com/9AggY4H.png" group-title="Shop",Shopping Channel
 http://82.80.192.30/shoppingil_ShoppingIL21TVRepeat/_definst_/smil:ShoppingIL21TV.smil/chunklist_w2043660694_b2128000.m3u8?ttl=1524643697&cdn_token=5a6c4f1270440ae72118c8ae16c58de4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7JH43wB.jpg" group-title="",Yeshua Chai TV
diff --git a/channels/in.m3u b/channels/in.m3u
index 2c111ecc7..b05268307 100644
--- a/channels/in.m3u
+++ b/channels/in.m3u
@@ -19,7 +19,7 @@ https://acv.asianetmobiletvplus.com/channels/acvjukebox_awannbgiynqynhufohawnvbm
 http://akaal.zecast.net/akaal-live/smil:akaaltv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wWIknEr.jpg" group-title="",Akaram Gallata TV
 http://akaram.zecast.net/akaram-live/ngrp:akaramgalatta1_all/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hAgaVPa.jpg" group-title="",Akaram Kidz (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hAgaVPa.jpg" group-title="",Akaram Kidz
 http://akaram.zecast.net/akaram-live/akaramkidz/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://saalaitv.com/logo/Akaram.png" group-title="",Akaram Mix
 http://akaram.zecast.net/akaram-live/akarammix1/index.m3u8
@@ -43,19 +43,19 @@ http://195.181.169.151:8080/AlphaETCPunjabi-punjabi/tracks-v1a1/mono.m3u8
 http://103.199.161.254/Content/b4umovies/Live/Channel(B4UMovies)/Stream(01)/index.m3u8
 #EXTINF:-1 tvg-id="B4U Music-IN" tvg-name="B4U Music-IN" tvg-logo="https://upload.wikimedia.org/wikipedia/en/7/74/B4U_Music_logo.png" group-title="Music",B4U Music
 http://103.199.161.254/Content/B4Umusic/Live/Channel(B4Umusic)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Bhakti Sagar (Opt-1)
-http://linear02hun-lh.akamaihd.net/i/bhaktisagar_1@665239/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.bhaktisagartv.com/images/HD-Logo.png" group-title="",Bhakti Sagar (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.bhaktisagartv.com/images/HD-Logo.png" group-title="",Bhakti Sagar
 http://linear02hun-lh.akamaihd.net/i/bhaktisagar_1@665239/index_2128_av-p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Bhakti Sagar
+http://linear02hun-lh.akamaihd.net/i/bhaktisagar_1@665239/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.bloombergquint.com/bq-logo.png" group-title="Business",Bloomberg Quint
 https://d1yhck4nr3rup7.cloudfront.net/bqbackup_2.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://iptv.live/images/logo/channel/smalls/4b865f70179ee2a8bebc3260a0315f67.png" group-title="",Bollywood Classic
 http://telekomtv-ro.akamaized.net/shls/LIVE$BollywoodClassic/6.m3u8/Level(1677721)?start=LIVE&end=END
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/w06sLAh.jpg" group-title="",Bollywood Now
 https://a.jsrdn.com/broadcast/d4dba2e3/+0000/hi/c.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Boogle Bollywood (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Boogle Bollywood
 http://95erywm2dwn4-hls-live.wmncdn.net/1173/booglebollywood/774e3ea9f3fa9bcdac47f445b83b6653.sdp/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://booglebollywood.com/wp-content/uploads/2018/02/boogle-bollywood-final_2-300x96.png" group-title="",Boogle Bollywood (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://booglebollywood.com/wp-content/uploads/2018/02/boogle-bollywood-final_2-300x96.png" group-title="",Boogle Bollywood
 http://live.agmediachandigarh.com/booglebollywood/774e3ea9f3fa9bcdac47f445b83b6653.sdp/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Boss TV
 http://bosstv3.chennaistream.net/bosstv/mp4:bosstvlive/index.m3u8
@@ -69,33 +69,33 @@ http://edge-ap2.cloudfrontcdn.in:1935/edge1/mystream.stream_aac/playlist.m3u8
 http://cdn19.live247stream.com/channely/tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Chardikla Time TV-IN" tvg-name="Chardikla Time TV-IN" tvg-logo="http://mylivechannels.com/uploads/thumbs/1539443516_CHARDIKLATIME.png" group-title="",Chardikla Time TV
 http://195.181.169.151:8080/ChardiklaTIMETV-punjabi/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/VCUhufk.jpg" group-title="",Cine Voice (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/VCUhufk.jpg" group-title="",Cine Voice
 http://live.wmncdn.net/cinevoice/508a8ec9dfdb9c61df9823aac272b719.sdp/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://is2-ssl.mzstatic.com/image/thumb/Purple122/v4/66/5d/c8/665dc866-df03-0f5f-8f37-fba059f74155/source/512x512bb.jpg" group-title="",Cine Voice (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://is2-ssl.mzstatic.com/image/thumb/Purple122/v4/66/5d/c8/665dc866-df03-0f5f-8f37-fba059f74155/source/512x512bb.jpg" group-title="",Cine Voice
 http://lzyr7zo8dvw2-hls-live.wmncdn.net/1164/cinevoice/508a8ec9dfdb9c61df9823aac272b719.sdp/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/a/a7/CNBC_Awaaz_2010.png" group-title="Business",CNBC Awaaz
 https://cnbcawaaz-lh.akamaihd.net/i/cnbcawaaz_1@174872/index_5_av-p.m3u8
-#EXTINF:-1 tvg-id="DD News-IN" tvg-name="DD News-IN" tvg-logo="http://smumcdnems05.cdnsrv.jio.com/mumsite.cdnsrv.jio.com/jiotv.catchup.cdn.jio.com/dare_images/images/DD_News.png" group-title="News",DD News (Opt-1)
-http://nicls1-lh.akamaihd.net/i/ddnews_1@409133/master.m3u8
-#EXTINF:-1 tvg-id="DD News-IN" tvg-name="DD News-IN" tvg-logo="http://smumcdnems05.cdnsrv.jio.com/mumsite.cdnsrv.jio.com/jiotv.catchup.cdn.jio.com/dare_images/images/DD_News.png" group-title="News",DD News (Opt-2)
+#EXTINF:-1 tvg-id="DD News-IN" tvg-name="DD News-IN" tvg-logo="http://smumcdnems05.cdnsrv.jio.com/mumsite.cdnsrv.jio.com/jiotv.catchup.cdn.jio.com/dare_images/images/DD_News.png" group-title="News",DD News
 http://bit.ly/2m4L4mi
+#EXTINF:-1 tvg-id="DD News-IN" tvg-name="DD News-IN" tvg-logo="http://smumcdnems05.cdnsrv.jio.com/mumsite.cdnsrv.jio.com/jiotv.catchup.cdn.jio.com/dare_images/images/DD_News.png" group-title="News",DD News
+http://nicls1-lh.akamaihd.net/i/ddnews_1@409133/master.m3u8
 #EXTINF:-1 tvg-id="DD Punjabi-IN" tvg-name="DD Punjabi-IN" tvg-logo="http://webcast.gov.in/images/ddPunjabi.png" group-title="",DD Punjabi
 http://playhls.media.nic.in/live/ddpunjabi-360p/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",DD Sports (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",DD Sports
 http://103.199.161.254/Content/ddsports/Live/Channel(DDSPORTS)/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.livenewsmag.com/wp-content/uploads/2017/03/DD-Sports-TV.jpg" group-title="Sport",DD Sports (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.livenewsmag.com/wp-content/uploads/2017/03/DD-Sports-TV.jpg" group-title="Sport",DD Sports
 http://103.199.161.254/Content/ddsports/Live/Channel(DDSPORTS)/Stream(02)/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webcast.gov.in/images/channel_two.png" group-title="",DD Vyas
 http://playhls.media.nic.in/live/vyas-360p/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.dhamaal.tv/images/logo.png" group-title="",Dhamaal (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.dhamaal.tv/images/logo.png" group-title="",Dhamaal
 http://linear06hun-lh.akamaihd.net/i/dhamaal_1@665243/index_2128_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Dhamaal (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Dhamaal
 http://linear06hun-lh.akamaihd.net/i/dhamaal_1@665243/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.asianetmobiletv.com/channels/Dheeran.png" group-title="",Dheeran
 https://5c75277727cd1.streamlock.net/dheeran/dheeran/chunklist_w1814131663.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.vod-logo.net/photos/ced60aa5db0a1c93f771b3d5bdea10d6.jpg" group-title="Music",Dil Se (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.vod-logo.net/photos/ced60aa5db0a1c93f771b3d5bdea10d6.jpg" group-title="Music",Dil Se
 http://linear07hun-lh.akamaihd.net/i/dilse_1@673921/index_2128_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Dil Se (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Dil Se
 http://linear07hun-lh.akamaihd.net/i/dilse_1@673921/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Kids",Disney Junior
 http://103.47.132.164/PLTV/88888888/224/3221226011/index.m3u8
@@ -139,12 +139,12 @@ http://ibn7_hls-lh.akamaihd.net/i/ibn7_hls_n_1@174951/index_3.m3u8
 http://imagetvonline.imagekhabar.com:1935/live/image/playlist.m3u8
 #EXTINF:-1 tvg-id="India Today-IN" tvg-name="India Today-IN" tvg-logo="https://streamvlog.com/wp-content/uploads/2018/12/india-today-tv-english-news-live.jpg" group-title="",India Today
 https://feeds.intoday.in/hltapps/api/master.m3u8
+#EXTINF:-1 tvg-id="India TV-IN" tvg-name="India TV-IN" tvg-logo="http://jadootv.com/wp-content/uploads/2015/05/ai1.png" group-title="",India TV
+http://indiatvnews-lh.akamaihd.net/i/ITV_1@199237//master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://images.indiatvnews.com/businessindia/India_TV_awards2634.jpg" group-title="News",India TV
 http://indiatvnews-lh.akamaihd.net/i/ITV_1@199237/master.m3u8
-#EXTINF:-1 tvg-id="India TV-IN" tvg-name="India TV-IN" tvg-logo="https://static.indiatvnews.com/ins-web/images/sitelogo.png" group-title="",India TV (Opt-1)
+#EXTINF:-1 tvg-id="India TV-IN" tvg-name="India TV-IN" tvg-logo="https://static.indiatvnews.com/ins-web/images/sitelogo.png" group-title="",India TV
 https://live-indiatvnews.akamaized.net/indiatv-origin/liveabr/indiatv-origin/ITV_1_3@199237/chunks.m3u8
-#EXTINF:-1 tvg-id="India TV-IN" tvg-name="India TV-IN" tvg-logo="http://jadootv.com/wp-content/uploads/2015/05/ai1.png" group-title="",India TV (Opt-2)
-http://indiatvnews-lh.akamaihd.net/i/ITV_1@199237//master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Ishwar TV
 http://cdn.clive.in:1935/ishwartv/ishwartv.stream_HDp/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/8/88/ITN_TV_Sri_Lanka.png" group-title="",ITN
@@ -209,15 +209,15 @@ https://hls2.newsstate.com/NS1_HTTP_LIVE/ngrp:myStream_all/chunklist.m3u8
 https://hls3.newsnation.in/NS2_HTTP_LIVE/ngrp:mystream3_all/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",News18 Lokmat
 https://news18lokmat-lh.akamaihd.net/i/n18lokmat_1@178974/index_5_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://d3jnkp3lrs2hd5.cloudfront.net/images/320x180/ae922e8f-fe3a-4698-92e8-ecbcb1816844.jpg" group-title="Music",PBN Music (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://d3jnkp3lrs2hd5.cloudfront.net/images/320x180/ae922e8f-fe3a-4698-92e8-ecbcb1816844.jpg" group-title="Music",PBN Music
 http://live.wmncdn.net/pbnmusic/b437d1e185b4c95b08b9c830a9d97cff.sdp/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i63.tinypic.com/28w2akj.jpg" group-title="Music",PBN Music (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i63.tinypic.com/28w2akj.jpg" group-title="Music",PBN Music
 http://live.wmncdn.net/pbnmusic/b437d1e185b4c95b08b9c830a9d97cff.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.dantv.tv/images/dan-007.jpg" group-title="",Pirai TV
 http://askmedia.livebox.co.in/PiraiTVhls/piraitv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Pop Pataka (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Pop Pataka
 http://linear04hun-lh.akamaihd.net/i/poppataka_1@665241/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.hungama.com/assets/images/logo.png" group-title="",Pop Pataka (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.hungama.com/assets/images/logo.png" group-title="",Pop Pataka
 https://linear04hun-lh.akamaihd.net/i/poppataka_1@665241/index_2128_av-p.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Pratidin Time
 https://rtmp.smartstream.video/pratidintime/pratidintime/playlist.m3u8
@@ -243,10 +243,10 @@ http://stream.pztv.online/pztv/tracks-v1a1/mono.m3u8
 http://account11.livebox.co.in/ntvhls/ntv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/DnfNtzq.png" group-title="",Raonuk Punjab Dee
 http://195.181.169.151:8080/raonuk_pun/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.reporter.live/wp-content/themes/reporter_v2/images/logo_latest.png" group-title="News",Reporter TV (Opt-1)
-http://livecdnh1.tvanywhere.ae:80/hls/reporter/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.reporter.live/wp-content/themes/reporter_v2/images/logo_latest.png" group-title="News",Reporter TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.reporter.live/wp-content/themes/reporter_v2/images/logo_latest.png" group-title="News",Reporter TV
 http://livecdnh1.tvanywhere.ae:80/hls/reporter/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.reporter.live/wp-content/themes/reporter_v2/images/logo_latest.png" group-title="News",Reporter TV
+http://livecdnh1.tvanywhere.ae:80/hls/reporter/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.asianetmobiletv.com/channels/RoseBowl.png" group-title="",Rosebowl
 https://acv.asianetmobiletvplus.com/channels/ef22daf97d61acb4bf52376c4105ad02.smil/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://livetv.freeiptv.in/image.php?img=images/RPLUS.png" group-title="News",RPlus News
@@ -283,10 +283,10 @@ http://cdn61.liveonlineservices.com/hls/subrang.m3u8
 http://sursagar24.dyndns.tv:8080/sstv/720p/tracks-v1a1/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/0/0c/SVBCTVLogo.png/220px-SVBCTVLogo.png" group-title="",SVBC TV
 http://367449830.r.cdnsun.net/367449830/_definst_/svbctv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.tamil.de/wp-content/uploads/2018/01/Bildschirmfoto-2018-01-28-um-12.33.09.png" group-title="",Tamil Business TV (Opt-1)
-http://santhoratv.zecast.net/tamilbusinesstv/tamilbusinesstv/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Dwfiylo.png" group-title="",Tamil Business TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Dwfiylo.png" group-title="",Tamil Business TV
 http://rtmp.santhoratv.zecast.net/tamilbusinesstv//tamilbusinesstv/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.tamil.de/wp-content/uploads/2018/01/Bildschirmfoto-2018-01-28-um-12.33.09.png" group-title="",Tamil Business TV
+http://santhoratv.zecast.net/tamilbusinesstv/tamilbusinesstv/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/03/Screenshot_1.png" group-title="",Tamil MTV
 http://santhora.de.flash.glb.ipercast.net/santhora.de-live/tamilmtv/tamilmtv/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9DIG5pT.jpg" group-title="",Ten Digital
@@ -311,12 +311,12 @@ http://54.169.75.117:1935/live/livestream/chunklist.m3u8
 http://95.216.167.183:5080/LiveApp/streams/443106610169904881506470.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.livedesitv.com/wp-content/uploads/2017/11/velicham-live-tv-channel.jpg" group-title="",Velicham TV
 http://edge-ind.inapcdn.in:1935/wrap/smarts4n.stream_aac/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://images.jdmagicbox.com/chennai/e6/044pxx44.xx44.121015162838.h7e6/logo/eb28694445bcefbea53fff28807770f5.jpg" group-title="",Vendharm TV (Opt-1)
-http://45.79.203.234:1935/vendharm/myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://pbs.twimg.com/profile_images/532196435702198274/Dcl1GXNu_400x400.png" group-title="",Vendharm TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://pbs.twimg.com/profile_images/532196435702198274/Dcl1GXNu_400x400.png" group-title="",Vendharm TV
 http://45.79.203.234:1935/vendharm/myStream/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://img9.downloadapk.net/9/9d/92c4e9_0.png" group-title="",Vendharm TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://img9.downloadapk.net/9/9d/92c4e9_0.png" group-title="",Vendharm TV
 http://45.79.203.234:1935/vendharm/myStream/chunklist_w2001796311.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://images.jdmagicbox.com/chennai/e6/044pxx44.xx44.121015162838.h7e6/logo/eb28694445bcefbea53fff28807770f5.jpg" group-title="",Vendharm TV
+http://45.79.203.234:1935/vendharm/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/aa5yNvc.png" group-title="",Vismaya TV
 http://150.242.21.2/vismaya.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Vyas Higher Education Channel
diff --git a/channels/int.m3u b/channels/int.m3u
index 0bf478a3f..9027c12a3 100644
--- a/channels/int.m3u
+++ b/channels/int.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="8kanal-eu" tvg-name="8 канал International" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/8kanal_ru.jpg" group-title="Entertainment",8 Канал (Европа) (Opt-1)
+#EXTINF:-1 tvg-id="8kanal-eu" tvg-name="8 канал International" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/8kanal_ru.jpg" group-title="Entertainment",8 Канал (Европа)
 http://v1.proofix.ru/live-tv8-2/europe/playlist.m3u8
-#EXTINF:-1 tvg-id="8kanal-eu" tvg-name="8 канал International" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/8kanal_ru.jpg" group-title="Entertainment",8 Канал (Европа) (Opt-2)
+#EXTINF:-1 tvg-id="8kanal-eu" tvg-name="8 канал International" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/8kanal_ru.jpg" group-title="Entertainment",8 Канал (Европа)
 https://str-3.mediabay.tv/8TV/playlist.m3u8?token=1b7e15a3968bfdf78d1c1035f7914b216484e92a-482b8b8216c84b2be97904066b9576a3-1566588929-1566578129
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vn9jvdV.png" group-title="",Africa TV2
 http://africatv.live.net.sa:1935/live/africatv2/playlist.m3u8
@@ -9,10 +9,10 @@ http://africatv.live.net.sa:1935/live/africatv2/playlist.m3u8
 http://africatv.live.net.sa:1935/live/africatv3/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Al Arabiya
 https://live.alarabiya.net/alarabiapublish/alarabiya.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="New EPG" tvg-name="" tvg-logo="http://www.twsool.com/wp-content/uploads/2016/09/%D9%82%D9%86%D8%A7%D8%A9-%D8%A7%D9%84%D8%B9%D8%B1%D8%A8%D9%8A.png" group-title="News",Al Araby 1 (Opt-1)
-http://alaraby.cdn.octivid.com/alaraby/smil:alaraby.stream.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/8/87/Alaraby_TV_Logo.png/280px-Alaraby_TV_Logo.png" group-title="News",Al Araby 1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/8/87/Alaraby_TV_Logo.png/280px-Alaraby_TV_Logo.png" group-title="News",Al Araby 1
 http://213.162.202.9:8000/play/a01u/index.m3u8
+#EXTINF:-1 tvg-id="New EPG" tvg-name="" tvg-logo="http://www.twsool.com/wp-content/uploads/2016/09/%D9%82%D9%86%D8%A7%D8%A9-%D8%A7%D9%84%D8%B9%D8%B1%D8%A8%D9%8A.png" group-title="News",Al Araby 1
+http://alaraby.cdn.octivid.com/alaraby/smil:alaraby.stream.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://4.bp.blogspot.com/-EoHa7_Pqu3Y/WOV44deMAwI/AAAAAAAAExA/SGJ8x8sPiWYN5ZBfQvYQjc70nPl_FSy6wCLcB/s1600/alaraby_tv_uk_2.png" group-title="",Al Araby 2
 http://213.162.202.9:8000/play/a01j/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Al Hadath
@@ -21,108 +21,108 @@ https://av.alarabiya.net/alarabiapublish/alhadath.smil/chunklist.m3u8
 http://media.islamexplained.com:1935/live/_definst_mp4:ahme.stream_360p/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="Al Horreya TV" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/331.png" group-title="Religious",Al Horreya TV
 http://media.smc-host.com:1935/alhorreya.tv/_definst_/mp4:alhorreya3/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.aljazeera.com/assets/images/aj-logo-lg-124.png" group-title="News",Al Jazeera (Opt-1)
-http://ott-cdn.ucom.am/s69/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera (Opt-2)
-http://aljazeera-eng-hd-live.hls.adaptive.level3.net/aljazeera/english2/index255.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://s15.postimg.org/4wvvvudl7/aljazeera.jpg" group-title="News",Al Jazeera (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://s15.postimg.org/4wvvvudl7/aljazeera.jpg" group-title="News",Al Jazeera
 http://aljazeera-eng-apple-live.adaptive.level3.net/apple/aljazeera/english/800.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="Al Jazeera" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/b/be/Al-jazeera-logo.jpg" group-title="News",Al Jazeera (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="Al Jazeera" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/b/be/Al-jazeera-logo.jpg" group-title="News",Al Jazeera
 http://aljazeera-eng-hd-live.hls.adaptive.level3.net/aljazeera/english2/index1296.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera Arabic (Opt-1)
-http://aljazeera-ara-apple-live.adaptive.level3.net/apple/aljazeera/arabic/800.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera Arabic (Opt-2)
-http://aljazeera-ara-hd-live.hls.adaptive.level3.net/aljazeera/arabic2/index2073.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera Arabic (Opt-3)
-http://aljazeera-ara-hd-live.hls.adaptive.level3.net/aljazeera/arabic2/index.m3u8
-#EXTINF:-1 tvg-id="20296" tvg-name="Al Jazeera Arabic" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/639.png" group-title="News",Al Jazeera Arabic (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera
+http://aljazeera-eng-hd-live.hls.adaptive.level3.net/aljazeera/english2/index255.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.aljazeera.com/assets/images/aj-logo-lg-124.png" group-title="News",Al Jazeera
+http://ott-cdn.ucom.am/s69/04.m3u8
+#EXTINF:-1 tvg-id="20296" tvg-name="Al Jazeera Arabic" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/639.png" group-title="News",Al Jazeera Arabic
 http://aljazeera-ara-apple-live.adaptive.level3.net/apple/aljazeera/arabic/160.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera Arabic (Opt-5)
-http://ott-cdn.ucom.am/s69/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera Arabic (Opt-6)
-https://aja-hd-web-hls-live.secure.footprint.net/egress/chandler/aljazeera2/arabichd/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera Arabic (Opt-7)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera Arabic
+http://aljazeera-ara-apple-live.adaptive.level3.net/apple/aljazeera/arabic/800.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera Arabic
+http://aljazeera-ara-hd-live.hls.adaptive.level3.net/aljazeera/arabic2/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera Arabic
+http://aljazeera-ara-hd-live.hls.adaptive.level3.net/aljazeera/arabic2/index2073.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera Arabic
 http://aljazeera-ara-hd-live.hls.adaptive.level3.net/aljazeera/arabic2/index255.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/e/e6/Al_Jazeera_Doc.png/225px-Al_Jazeera_Doc.png" group-title="Documentary",Al Jazeera Documentary (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera Arabic
+http://ott-cdn.ucom.am/s69/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera Arabic
+https://aja-hd-web-hls-live.secure.footprint.net/egress/chandler/aljazeera2/arabichd/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/e/e6/Al_Jazeera_Doc.png/225px-Al_Jazeera_Doc.png" group-title="Documentary",Al Jazeera Documentary
 http://aljazeera-doc-apple-live.adaptive.level3.net/apple/aljazeera/hq-doc/1600kStream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Documentary",Al Jazeera Documentary (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Documentary",Al Jazeera Documentary
 http://aljazeera-doc-apple-live.adaptive.level3.net/apple/aljazeera/hq-doc/800kStream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera English (Opt-1)
-http://aljazeera-eng-apple-live.adaptive.level3.net/apple/aljazeera/english/appleman.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/b/be/Al-jazeera-logo.jpg/682px-Al-jazeera-logo.jpg" group-title="News",Al Jazeera English (Opt-2)
-https://english.streaming.aljazeera.net/aljazeera/english2/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera English (Opt-3)
-http://aljazeera-eng-hd-live.hls.adaptive.level3.net/aljazeera/english2/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera English (Opt-4)
-http://aljazeera-eng-hd-live.hls.adaptive.level3.net/aljazeera/english2/index576.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera English (Opt-5)
-http://ott-cdn.ucom.am/s23/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.mjh.nz/nz/images/tv.46.png" group-title="News",Al Jazeera English (Opt-6)
-http://i.mjh.nz/nz/tv.46.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://pluspng.com/img-png/al-jazeera-png-al-jazeera-logo-1431.png" group-title="News",Al Jazeera English (Opt-7)
-http://ott-cdn.ucom.am/s23/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera English (Opt-8)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera English
 http://210.210.155.35/session/fa0aa530-7b79-11e8-b63d-c81f66f89318/qwr9ew/s/s17/01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera Mubasher (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera English
+http://aljazeera-eng-apple-live.adaptive.level3.net/apple/aljazeera/english/appleman.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera English
+http://aljazeera-eng-hd-live.hls.adaptive.level3.net/aljazeera/english2/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera English
+http://aljazeera-eng-hd-live.hls.adaptive.level3.net/aljazeera/english2/index576.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.mjh.nz/nz/images/tv.46.png" group-title="News",Al Jazeera English
+http://i.mjh.nz/nz/tv.46.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera English
+http://ott-cdn.ucom.am/s23/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://pluspng.com/img-png/al-jazeera-png-al-jazeera-logo-1431.png" group-title="News",Al Jazeera English
+http://ott-cdn.ucom.am/s23/index.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/b/be/Al-jazeera-logo.jpg/682px-Al-jazeera-logo.jpg" group-title="News",Al Jazeera English
+https://english.streaming.aljazeera.net/aljazeera/english2/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al Jazeera Mubasher
 http://aljazeera-mubasher-apple-live.adaptive.level3.net/apple/aljazeera/mubasher/300.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://network.aljazeera.com/sites/aj_corporate/files/ajm-sm.png" group-title="News",Al Jazeera Mubasher (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://network.aljazeera.com/sites/aj_corporate/files/ajm-sm.png" group-title="News",Al Jazeera Mubasher
 http://aljazeera-mubasher-apple-live.adaptive.level3.net/apple/aljazeera/mubasher/800.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Al Jazeera Mubasher (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Al Jazeera Mubasher
 http://aljazeera-mubasher-apple-live.adaptive.level3.net/apple/aljazeera/mubasher/appleman.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vqz9oc6.jpg" group-title="",Al Magharibia
 http://api.new.livestream.com/accounts/7861901/events/6247367/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="Al Hiwar TV" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/2002.png" group-title="",Al-Hiwar (Opt-1)
-http://mn-nl.mncdn.com/alhiwar_live/smil:alhiwar.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Al-Hiwar (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Al-Hiwar
 http://mn-nl.mncdn.com/alhiwar_live/smil:alhiwar.smil/chunklist.m3u8?v=1771904733&__mn_sid=13380223219124813958
+#EXTINF:-1 tvg-id="" tvg-name="Al Hiwar TV" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/2002.png" group-title="",Al-Hiwar
+http://mn-nl.mncdn.com/alhiwar_live/smil:alhiwar.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",ALHorreya TV
 http://media.smc-host.com:1935/alhorreya.tv/_definst_mp4:alhorreya3/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://kimelli.nfshost.com/images/424.png" group-title="",Alhurra (Opt-1)
-http://mbnhls-lh.akamaihd.net/i/MBN_1@118619/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Alhurra (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Alhurra
 http://mbn-lh.akamaihd.net/i/mbn_univ_live_1_1@190422/master.m3u8?v=1558393494
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://kimelli.nfshost.com/images/424.png" group-title="",Alhurra
+http://mbnhls-lh.akamaihd.net/i/MBN_1@118619/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.centraltv.fr/wp-content/uploads/AlMasar-Aloula_logo.jpg" group-title="",AlMasar AlOula
 http://212.18.231.213:1935/almasar/_definst_/almasar_source/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AlZahra TV Turkic (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AlZahra TV Turkic
 https://live.al-zahratv.com/live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AlZahra TV Turkic (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AlZahra TV Turkic
 https://live.al-zahratv.com/live/playlist2/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AlZahra TV Turkic (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AlZahra TV Turkic
 https://str-2.mediabay.tv/Al_Zahra/playlist.m3u8?token=36cec7164340b92be13e18f0e776b610348864e0-39bc5bfae9244c110b4b56a97c38818c-1566586654-1566575854
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Amazing Discoveries TV [EN][720p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Amazing Discoveries TV
 https://uni01rtmp.tulix.tv/amazingdtv/amazingdtv/chunklist_w906756729.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/lWuU2wq.jpg" group-title="News",Arise News (Opt-1)
-http://contributionstreams.ashttp9.visionip.tv/live/visiontv-contributionstreams-arise-tv-hsslive-25f-16x9-SDh/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Arise News (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Arise News
 http://contributionstreams.ashttp9.visionip.tv/live/visiontv-contributionstreams-arise-tv-hsslive-25f-16x9-SD/chunklist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/lWuU2wq.jpg" group-title="News",Arise News
+http://contributionstreams.ashttp9.visionip.tv/live/visiontv-contributionstreams-arise-tv-hsslive-25f-16x9-SDh/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",AST TV 1
 http://www.ast.tv/stream/1/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",AST TV 2
 https://www.ast.tv/stream/2/normal.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XZcLqWk.jpg" group-title="",Bahrain International
 http://185.105.4.106:1935/live/Bahrain%20International/chunklist_w672423170.m3u8
-#EXTINF:-1 tvg-id="BBCArabic.sa" tvg-name="" tvg-logo="" group-title="News",BBC Arabic (Opt-1)
-http://bbcwshdlive01-lh.akamaihd.net/i/atv_1@61433/index_800_av-p.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",BBC Arabic (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",BBC Arabic
 http://bbcwshdlive01-lh.akamaihd.net/i/atv_1@61433/index_800_av-p.m3u8
-#EXTINF:-1 tvg-id="BBCArabic.sa" tvg-name="" tvg-logo="" group-title="News",BBC Arabic (Opt-3)
-http://bbcwshdlive01-lh.akamaihd.net/i/ptv_1@78015/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",BBC Arabic (Opt-4)
-http://bbcwslive.mmdlive.lldns.net/bbcwslive/333091d555e2404785a0339bf4779ac1/chunklist.m3u8?v=1771904733
-#EXTINF:-1 tvg-id="BBCArabic.sa" tvg-name="" tvg-logo="" group-title="News",BBC Arabic (Opt-5)
+#EXTINF:-1 tvg-id="BBCArabic.sa" tvg-name="" tvg-logo="" group-title="News",BBC Arabic
+http://bbcwshdlive01-lh.akamaihd.net/i/atv_1@61433/index_800_av-p.m3u8?sd=10&rebase=on
+#EXTINF:-1 tvg-id="BBCArabic.sa" tvg-name="" tvg-logo="" group-title="News",BBC Arabic
 http://bbcwshdlive01-lh.akamaihd.net/i/atv_1@61433/master.m3u8
+#EXTINF:-1 tvg-id="BBCArabic.sa" tvg-name="" tvg-logo="" group-title="News",BBC Arabic
+http://bbcwshdlive01-lh.akamaihd.net/i/ptv_1@78015/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",BBC Arabic
+http://bbcwslive.mmdlive.lldns.net/bbcwslive/333091d555e2404785a0339bf4779ac1/chunklist.m3u8?v=1771904733
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",BBC Persian
 http://bbcwshdlive01-lh.akamaihd.net/i/ptv_1@78015/index_800_av-p.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/BBCWorldNews.uk.png" group-title="News",BBC World News (Opt-1)
-http://ott-cdn.ucom.am/s24/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/BBCWorldNews.uk.png" group-title="News",BBC World News (Opt-2)
-http://ott-cdn.ucom.am/s24/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.digitaltveurope.com/files/2011/12/BBC-World-News1.jpg" group-title="News",BBC World News (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.digitaltveurope.com/files/2011/12/BBC-World-News1.jpg" group-title="News",BBC World News
 http://92.43.140.249/s24/04.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/BloombergTV.uk.png" group-title="Business",Bloomberg TV (Opt-1)
-https://liveprodeuwest.akamaized.net/eu1/Channel-EUTVqvs-AWS-ireland-1/Source-EUTVqvs-1000-1_live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/1089.png" group-title="",Bloomberg TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/BBCWorldNews.uk.png" group-title="News",BBC World News
+http://ott-cdn.ucom.am/s24/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/BBCWorldNews.uk.png" group-title="News",BBC World News
+http://ott-cdn.ucom.am/s24/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/1089.png" group-title="",Bloomberg TV
 http://liveprodeucentral.global.ssl.fastly.net/btv/desktop/eu_live.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/BloombergTV.uk.png" group-title="Business",Bloomberg TV
+https://liveprodeuwest.akamaized.net/eu1/Channel-EUTVqvs-AWS-ireland-1/Source-EUTVqvs-1000-1_live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Bloomberg TV Asia HD
 https://liveprodapnortheast.global.ssl.fastly.net/btv/desktop/ap_live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Bloomberg TV Asia Live Event HD
@@ -131,80 +131,80 @@ https://liveprodapnortheast.global.ssl.fastly.net/btv/desktop/ap_event.m3u8
 https://liveprodeuwest.global.ssl.fastly.net/btv/desktop/eu_event.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Bloomberg TV Europe HD
 https://liveprodeuwest.global.ssl.fastly.net/btv/desktop/eu_live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-Русский (Opt-1)
-http://live.cgtn.com/cctv-r.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/d/d2/Cgtn.jpg" group-title="",CCTV-Русский (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/d/d2/Cgtn.jpg" group-title="",CCTV-Русский
 http://live.cgtn.com/1000r/prog_index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/au/CGTN.au.png" group-title="News",CGTN (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCTV-Русский
+http://live.cgtn.com/cctv-r.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/au/CGTN.au.png" group-title="News",CGTN
 http://39.135.16.142:6060/PLTV/88888888/224/3221225664/1/index.m3u8?fmt=ts2hls
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/AusIPTV/IPTVLogos/master/cgtn_logo.png" group-title="News",CGTN (Opt-2)
-http://live.cgtn.com/500/prog_index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/AusIPTV/IPTVLogos/master/cgtn_logo.png" group-title="",CGTN (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/AusIPTV/IPTVLogos/master/cgtn_logo.png" group-title="",CGTN
 http://live.cgtn.com/1000/prog_index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/9/97/CGTN_arabic.png" group-title="",CGTN Arabic (Opt-1)
-http://live.cgtn.com/1000a/prog_index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ui.cgtn.com/static/resource/images/icon_new/live/live_AR.png" group-title="",CGTN Arabic (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/AusIPTV/IPTVLogos/master/cgtn_logo.png" group-title="News",CGTN
+http://live.cgtn.com/500/prog_index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ui.cgtn.com/static/resource/images/icon_new/live/live_AR.png" group-title="",CGTN Arabic
 http://39.135.16.142:6060/PLTV/88888888/224/3221225669/1/index.m3u8?fmt=ts2hls
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/9/97/CGTN_arabic.png" group-title="",CGTN Arabic (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/9/97/CGTN_arabic.png" group-title="",CGTN Arabic
+http://live.cgtn.com/1000a/prog_index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/9/97/CGTN_arabic.png" group-title="",CGTN Arabic
 http://live.cgtn.com/1000a/prog_index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",CGTN Arabic (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",CGTN Arabic
 http://livear.cgtn.com/1000a/prog_index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Documentary",CGTN Documentary (Opt-1)
-http://bit.ly/2D1FvME
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Documentary",CGTN Documentary (Opt-2)
-https://news.cgtn.com/resource/live/document/cgtn-doc.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Documentary",CGTN Documentary (Opt-3)
-https://livedoc.cgtn.com/1000d/prog_index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Documentary",CGTN Documentary (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Documentary",CGTN Documentary
 http://210.210.155.35/session/77d6180e-7b7b-11e8-a194-c81f66f89318/qwr9ew/s/s20/01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CGTN Español (Opt-1)
-http://live.cgtn.com/1000e/prog_index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CGTN Español (Opt-2)
-http://www.radiosargentina.com.ar/php/tvm3u.php?id=DIAR0011
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CGTN Español (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Documentary",CGTN Documentary
+http://bit.ly/2D1FvME
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Documentary",CGTN Documentary
+https://livedoc.cgtn.com/1000d/prog_index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Documentary",CGTN Documentary
+https://news.cgtn.com/resource/live/document/cgtn-doc.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CGTN Español
 http://bit.ly/2F0ODBz
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://chileiptv.cl/img/logos/file_1522636293.png" group-title="",CGTN Español (Opt-4)
-https://livees.cgtn.com/1000e/prog_index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CGTN Español (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CGTN Español
+http://live.cgtn.com/1000e/prog_index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CGTN Español
 http://livees.cgtn.com/500e/prog_index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CGTN Français (Opt-1)
-http://live.cgtn.com/cctv-f.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/d/d2/Cgtn.jpg" group-title="",CGTN Français (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CGTN Español
+http://www.radiosargentina.com.ar/php/tvm3u.php?id=DIAR0011
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://chileiptv.cl/img/logos/file_1522636293.png" group-title="",CGTN Español
+https://livees.cgtn.com/1000e/prog_index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/d/d2/Cgtn.jpg" group-title="",CGTN Français
 http://live.cgtn.com/1000f/prog_index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/78/CGTN_-_fran%C3%A7ais.png/200px-CGTN_-_fran%C3%A7ais.png" group-title="",CGTN Français (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CGTN Français
+http://live.cgtn.com/cctv-f.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/78/CGTN_-_fran%C3%A7ais.png/200px-CGTN_-_fran%C3%A7ais.png" group-title="",CGTN Français
 https://news.cgtn.com/resource/live/french/cgtn-f.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/4s1NlRf.jpg" group-title="",Chaine Nord Africaine
 http://live.creacast.com/cna/smil:cna.smil/chunklist_w1780122037_b864000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://cycnow.com/site/images/system/logo.png" group-title="",Christian Youth Channel
 http://media.smc-host.com:1935/cycnow.com/cyc2/chunklist_w258510680.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/CNBC.uk.png" group-title="Business",CNBC (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/CNBC.uk.png" group-title="Business",CNBC
 https://1674331492.rsc.cdn77.org/LS-ATL-54548-14/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/e3/CNBC_logo.svg/2000px-CNBC_logo.svg.png" group-title="Business",CNBC (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/e3/CNBC_logo.svg/2000px-CNBC_logo.svg.png" group-title="Business",CNBC
 https://1674331492.rsc.cdn77.org/LS-ATL-54548-14/index.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Business",CNBC Arabia
 http://vod.hibridcdn.net/cnbc/liveabr/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/e3/CNBC_logo.svg/2000px-CNBC_logo.svg.png" group-title="Business",CNBC Europe (Opt-1)
-http://ott-cdn.ucom.am/s65/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/CNBCWorld.us.png" group-title="Business",CNBC Europe (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/CNBCWorld.us.png" group-title="Business",CNBC Europe
 http://ott-cdn.ucom.am/s65/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/CNBCWorld.us.png" group-title="Business",CNBC Europe (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/CNBCWorld.us.png" group-title="Business",CNBC Europe
 http://ott-cdn.ucom.am/s65/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.cnbctv18.com/assets/images/cnbc-logo.png?v=1.png" group-title="Business",CNBC TV18 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/e3/CNBC_logo.svg/2000px-CNBC_logo.svg.png" group-title="Business",CNBC Europe
+http://ott-cdn.ucom.am/s65/index.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.cnbctv18.com/assets/images/cnbc-logo.png?v=1.png" group-title="Business",CNBC TV18
 https://cnbctv18-lh.akamaihd.net/i/cnbctv18_1@174868/index_5_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.cnbctv18.com/assets/images/cnbc-logo.png?v=1.png" group-title="Business",CNBC TV18 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.cnbctv18.com/assets/images/cnbc-logo.png?v=1.png" group-title="Business",CNBC TV18
 https://cnbctv18-lh.akamaihd.net/i/cnbctv18_1@174868/index_5_av-p.m3u8?sd=10
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://encrypted-tbn1.gstatic.com/images?q=tbn:ANd9GcRcXw-CP5hCDuUu-FeMsh8MdyTuSDL1MfmZd38WpEmScpewZDYgQ1jPRA" group-title="Business",CNBC TV18 Prime HD
 http://b_cnbcprimehd_dv-lh.akamaihd.net/i/b_cnbcprimehd_dvr_1@100511/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/KacMcVa.png" group-title="",CNN International (Opt-1)
-http://ott-cdn.ucom.am/s27/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/KacMcVa.png" group-title="",CNN International (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/KacMcVa.png" group-title="",CNN International
 http://92.43.140.249/s27/04.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/KacMcVa.png" group-title="",CNN International
+http://ott-cdn.ucom.am/s27/index.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://csat.tv/images/1234.PNG" group-title="Religious",CSat TV
 http://media.smc-host.com:1935/csat.tv/smil:csat.smil/chunklist_w1421926306_b692000_slar_t64SEQ=.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",CTNi (Opt-1)
-http://184.164.158.202:1936/48/smil:48.smil/playlist.m3u8?iptvgratis?chile.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",CTNi (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",CTNi
 http://184.164.158.202:1936/48/smil:48.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",CTNi
+http://184.164.158.202:1936/48/smil:48.smil/playlist.m3u8?iptvgratis?chile.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",DJing
 http://www.djing.com/tv/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",DJing Animation
@@ -213,7 +213,7 @@ http://www.djing.com/tv/animation.m3u8
 http://www.djing.com/tv/session_avicii.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",DJing Classic
 http://www.djing.com/tv/classics.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/djing.png" group-title="Music",DJing Classics (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/djing.png" group-title="Music",DJing Classics
 https://www.djing.com/tv/hits.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",DJing Dance Floor
 http://djing.com/tv/dancefloor.m3u8
@@ -227,7 +227,7 @@ http://www.djing.com/tv/session_hedonist.m3u8
 http://www.djing.com/tv/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",DJing Hot Hot Hot
 http://www.djing.com/tv/buster-poindexter-his-banshees-of-blue-hot-hot-hot/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/djing.png" group-title="Music",DJing Hot Hot Hot (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/djing.png" group-title="Music",DJing Hot Hot Hot
 https://www.djing.com/tv/h-01-fta.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",DJing Karaoke
 https://www.djing.com/tv/karaoke.m3u8
@@ -241,128 +241,128 @@ http://djing.com/tv/underground.m3u8
 http://www.djing.com/tv/session_wild-edm.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.docuboxlive.com/img/docu_logo.png" group-title="",DocuBox
 http://livecdnh3.tvanywhere.ae/hls/docubox/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",DW Arabic (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",DW Arabic
 http://dwstream2-lh.akamaihd.net/i/dwstream2_live@124400/index_1_av-b.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",DW Arabic (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",DW Arabic
 http://dwstream2-lh.akamaihd.net/i/dwstream2_live@124400/index_2_av-b.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.itver.cc/wp-content/uploads/2015/05/DW-TV-Arabia-670x300.jpg" group-title="News",DW Arabic (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.itver.cc/wp-content/uploads/2015/05/DW-TV-Arabia-670x300.jpg" group-title="News",DW Arabic
 http://dwstream2-lh.akamaihd.net/i/dwstream2_live@124400/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://1.bp.blogspot.com/-JxU-7vnKBFs/U2ZXY-Jn-MI/AAAAAAAABKI/d_PYUb_bD_w/s1600/dw.jpg" group-title="News",DW English (Opt-1)
-http://dwstream4-lh.akamaihd.net:80/i/dwstream4_live@131329/index_1_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",DW English (Opt-2)
-http://dwstream4-lh.akamaihd.net/i/dwstream4_live@131329/index_1_av-b.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",DW English (Opt-3)
-http://dwstream1-lh.akamaihd.net/i/dwstream1_live@120422/index_1_av-p.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/75/Deutsche_Welle_symbol_2012.svg/240px-Deutsche_Welle_symbol_2012.svg.png" group-title="News",DW English (Opt-4)
-https://dwstream4-lh.akamaihd.net/i/dwstream4_live@131329/index_1_av-p.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",DW English (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",DW English
 http://dwstream1-lh.akamaihd.net/i/dwstream1_live@120422/index_1_av-b.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",DW English (Opt-6)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",DW English
+http://dwstream1-lh.akamaihd.net/i/dwstream1_live@120422/index_1_av-p.m3u8?sd=10&rebase=on
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",DW English
+http://dwstream4-lh.akamaihd.net/i/dwstream4_live@131329/index_1_av-b.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",DW English
 http://dwstream4-lh.akamaihd.net/i/dwstream4_live@131329/index_1_av-b.m3u8?sd=10&rebase;=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/75/Deutsche_Welle_symbol_2012.svg/1200px-Deutsche_Welle_symbol_2012.svg.png" group-title="News",DW English (Opt-7)
-https://dwstream4-lh.akamaihd.net/i/dwstream4_live@131329/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/de/DeutscheWelleEn.de.png" group-title="News",DW English (Opt-8)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://1.bp.blogspot.com/-JxU-7vnKBFs/U2ZXY-Jn-MI/AAAAAAAABKI/d_PYUb_bD_w/s1600/dw.jpg" group-title="News",DW English
+http://dwstream4-lh.akamaihd.net:80/i/dwstream4_live@131329/index_1_av-p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/de/DeutscheWelleEn.de.png" group-title="News",DW English
 https://dwstream1-lh.akamaihd.net/i/dwstream1_live@120422/index_1_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",DW Español (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/75/Deutsche_Welle_symbol_2012.svg/240px-Deutsche_Welle_symbol_2012.svg.png" group-title="News",DW English
+https://dwstream4-lh.akamaihd.net/i/dwstream4_live@131329/index_1_av-p.m3u8?sd=10&rebase=on
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/75/Deutsche_Welle_symbol_2012.svg/1200px-Deutsche_Welle_symbol_2012.svg.png" group-title="News",DW English
+https://dwstream4-lh.akamaihd.net/i/dwstream4_live@131329/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",DW Español
 http://dwstream3-lh.akamaihd.net/i/dwstream3_live@124409/index_1_av-b.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/de/DeutscheWelleEs.de.png" group-title="News",DW Español (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/de/DeutscheWelleEs.de.png" group-title="News",DW Español
 http://dwstream3-lh.akamaihd.net/i/dwstream3_live@124409/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://goo.gl/hlH9Uc" group-title="",EBS (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://goo.gl/hlH9Uc" group-title="",EBS
 http://ott.ec.streamcloud.be/live/disk1/EBS/hls_el/EBS.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/M1vn8hv.png" group-title="",EBS (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/M1vn8hv.png" group-title="",EBS
 http://ott.ec.streamcloud.be/live/disk1/EBSplus/hls_el/EBSplus.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zNjUBun.png" group-title="",EbS Live
 http://ott.ec.streamcloud.be/live/disk1/EBS/hls_el/EBS-audio_AACL_ell_66400_207=66400-video=800000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://english-club.tv/wp-content/uploads/2015/09/logo-round.png" group-title="",English Club (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://english-club.tv/wp-content/uploads/2015/09/logo-round.png" group-title="",English Club
 http://livecdnh2.tvanywhere.ae/hls/english_club/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://english-club.tv/wp-content/uploads/2015/09/logo-round.png" group-title="",English Club (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://english-club.tv/wp-content/uploads/2015/09/logo-round.png" group-title="",English Club
 http://livecdnh2.tvanywhere.ae/hls/english_club/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Euronews
 http://210.210.155.35/session/dff6d9c0-7b79-11e8-810e-c81f66f89318/qwr9ew/s/s15/01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/E38ZhCz.jpg" group-title="Fashion",Fashion TV L'Original (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/E38ZhCz.jpg" group-title="Fashion",Fashion TV L'Original
 https://a.jsrdn.com/broadcast/ftv2_1/-0800/c.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/E38ZhCz.jpg" group-title="Fashion",Fashion TV L'Original (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/E38ZhCz.jpg" group-title="Fashion",Fashion TV L'Original
 https://a.jsrdn.com/broadcast/ftv2_2/-0800/c.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV Midnite (Opt-1)
-http://fash1043.cloudycdn.services/slive/_definst_/ftv_midnite_secrets_adaptive.smil/chunklist_b4700000_t64MTA4MHA=.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://files.company.fashiontv.com/wp-content/uploads/2017/03/fashiontv_logo_blue_horizontal.png" group-title="Fashion",Fashion TV Midnite (Opt-2)
-https://fash1043.cloudycdn.services/slive/_definst_/ftv_ftv_midnite_k1y_27049_midnite_secr_108_hls.smil/chunklist_b2800000_t64NzIwcA==.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV Midnite (Opt-3)
-https://fash1043.cloudycdn.services/slive/_definst_/ftv_midnite_secrets_adaptive.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV Midnite (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV Midnite
 http://fash1043.cloudycdn.services/slive/_definst_/ftv_ftv_midnite_k1y_27049_midnite_secr_108_hls.smil/media.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://files.company.fashiontv.com/wp-content/uploads/2017/03/fashiontv_logo_blue_horizontal.png" group-title="Fashion",Fashion TV Paris (Opt-1)
-http://fash1043.cloudycdn.services/slive/_definst_/ftv_paris_adaptive.smil/chunklist.m3u8?xtreamiptv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV Paris (Opt-2)
-http://fash1043.cloudycdn.services/slive/_definst_/ftv_paris_adaptive.smil/chunklist_b680000_t64MzYwcA==.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.fashiontv.com/wp-content/uploads/2017/01/fashuiontvlogo-horisontal-300x90.png" group-title="Fashion",Fashion TV Paris (Opt-3)
-http://fash1043.cloudycdn.services/slive/_definst_/ftv_paris_adaptive.smil/chunklist_b4500000_t64MTA4MHA=.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://files.company.fashiontv.com/wp-content/uploads/2017/03/fashiontv_logo_blue_horizontal.png" group-title="Fashion",Fashion TV Paris (Opt-4)
-https://fash1043.cloudycdn.services/slive/_definst_/ftv_ftv_paris_pg_4dg_27027_paris_pg18_188_hls.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/7a/Fashion_TV_logo.svg/1200px-Fashion_TV_logo.svg.png" group-title="Fashion",Fashion TV Paris (Opt-5)
-https://fash1043.cloudycdn.services/slive/_definst_/ftv_ftv_paris_pg_4dg_27027_paris_pg18_188_hls.smil/chunklist_b4700000_t64MTA4MHA=.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV Paris (Opt-6)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV Midnite
+http://fash1043.cloudycdn.services/slive/_definst_/ftv_midnite_secrets_adaptive.smil/chunklist_b4700000_t64MTA4MHA=.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://files.company.fashiontv.com/wp-content/uploads/2017/03/fashiontv_logo_blue_horizontal.png" group-title="Fashion",Fashion TV Midnite
+https://fash1043.cloudycdn.services/slive/_definst_/ftv_ftv_midnite_k1y_27049_midnite_secr_108_hls.smil/chunklist_b2800000_t64NzIwcA==.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV Midnite
+https://fash1043.cloudycdn.services/slive/_definst_/ftv_midnite_secrets_adaptive.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV Paris
 http://bit.ly/2zOVkbF
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV PG13 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://files.company.fashiontv.com/wp-content/uploads/2017/03/fashiontv_logo_blue_horizontal.png" group-title="Fashion",Fashion TV Paris
+http://fash1043.cloudycdn.services/slive/_definst_/ftv_paris_adaptive.smil/chunklist.m3u8?xtreamiptv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.fashiontv.com/wp-content/uploads/2017/01/fashuiontvlogo-horisontal-300x90.png" group-title="Fashion",Fashion TV Paris
+http://fash1043.cloudycdn.services/slive/_definst_/ftv_paris_adaptive.smil/chunklist_b4500000_t64MTA4MHA=.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV Paris
+http://fash1043.cloudycdn.services/slive/_definst_/ftv_paris_adaptive.smil/chunklist_b680000_t64MzYwcA==.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/7a/Fashion_TV_logo.svg/1200px-Fashion_TV_logo.svg.png" group-title="Fashion",Fashion TV Paris
+https://fash1043.cloudycdn.services/slive/_definst_/ftv_ftv_paris_pg_4dg_27027_paris_pg18_188_hls.smil/chunklist_b4700000_t64MTA4MHA=.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://files.company.fashiontv.com/wp-content/uploads/2017/03/fashiontv_logo_blue_horizontal.png" group-title="Fashion",Fashion TV Paris
+https://fash1043.cloudycdn.services/slive/_definst_/ftv_ftv_paris_pg_4dg_27027_paris_pg18_188_hls.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV PG13
 http://fash1043.cloudycdn.services/slive/_definst_/ftv_pg13_adaptive.smil/media.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.postimg.cc/C53XtK5f/zaltv.png" group-title="Fashion",Fashion TV PG13 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.postimg.cc/C53XtK5f/zaltv.png" group-title="Fashion",Fashion TV PG13
 http://fash1043.cloudycdn.services/slive/ftv_pg13_adaptive.smil/chunklist_b4700000_t64MTA4MHA=.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV PG13 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV PG13
 https://fash1043.cloudycdn.services/slive/_definst_/ftv_ftv_pg13_zw9_27065_ftv_pg13_196_hls.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/E38ZhCz.jpg" group-title="Fashion",Fashion TV PG16 (Opt-1)
-https://dstroscal1.s.llnwi.net/ftv/ftv_pg16_adaptive_v3.smil/chunklist_b4700000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV PG16 (Opt-2)
-https://fash1043.cloudycdn.services/slive/_definst_/ftv_ftv_pg16_d9y_27042_ftv_pg16_194_hls.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV PG16 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV PG16
 http://fash1043.cloudycdn.services/slive/_definst_/ftv_pg16_adaptive.smil/media.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.postimg.cc/C53XtK5f/zaltv.png" group-title="Fashion",Fashion TV PG16 (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.postimg.cc/C53XtK5f/zaltv.png" group-title="Fashion",Fashion TV PG16
 http://fash1043.cloudycdn.services/slive/ftv_pg16_adaptive.smil/chunklist_b4700000_t64MTA4MHA=.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV PG16 (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV PG16
 http://ott-cdn.ucom.am/s30/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://2upyml2xgast2pwf71r0ycaj.wpengine.netdna-cdn.com/wp-content/uploads/fightsports140.jpg" group-title="Sport",Fight Sports (Opt-1)
-http://210.210.155.35/uq2663/h/h05/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Fight Sports (Opt-2)
-http://210.210.155.35/uq2663/h/h05/01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Fight Sports (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/E38ZhCz.jpg" group-title="Fashion",Fashion TV PG16
+https://dstroscal1.s.llnwi.net/ftv/ftv_pg16_adaptive_v3.smil/chunklist_b4700000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Fashion",Fashion TV PG16
+https://fash1043.cloudycdn.services/slive/_definst_/ftv_ftv_pg16_d9y_27042_ftv_pg16_194_hls.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Fight Sports
 http://210.210.155.35/session/b09f20ac-0755-11e9-90c8-c81f66f89318/uq2663/h/h05/02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.fightbox.com/images/stories/menu_fb_roll.png" group-title="Sport",FightBox (Opt-1)
-http://92.43.140.249/s86/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://ulango.tv/uploads/channels/3781870/logo_fightbox.png" group-title="Sport",FightBox (Opt-2)
-http://ott-cdn.ucom.am/s86/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",FightBox (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Fight Sports
+http://210.210.155.35/uq2663/h/h05/01.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://2upyml2xgast2pwf71r0ycaj.wpengine.netdna-cdn.com/wp-content/uploads/fightsports140.jpg" group-title="Sport",Fight Sports
+http://210.210.155.35/uq2663/h/h05/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",FightBox
 http://92.43.140.200/s86/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/djeM9yx.png" group-title="Sport",Flow Sports 1 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.fightbox.com/images/stories/menu_fb_roll.png" group-title="Sport",FightBox
+http://92.43.140.249/s86/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://ulango.tv/uploads/channels/3781870/logo_fightbox.png" group-title="Sport",FightBox
+http://ott-cdn.ucom.am/s86/index.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/djeM9yx.png" group-title="Sport",Flow Sports 1
 http://161.0.157.5/PLTV/88888888/224/3221226899/01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/djeM9yx.png" group-title="Sport",Flow Sports 1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/djeM9yx.png" group-title="Sport",Flow Sports 1
 http://161.0.157.9/PLTV/88888888/224/3221226899/02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcT5TOrbFYQYZm6G61y3HMTmQmFBrCfPiRO_AXx33Mv0XaVeL0O2QQaf6w" group-title="Sport",Flow Sports 1 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcT5TOrbFYQYZm6G61y3HMTmQmFBrCfPiRO_AXx33Mv0XaVeL0O2QQaf6w" group-title="Sport",Flow Sports 1
 http://161.0.157.9/PLTV/88888888/224/3221226899/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/djeM9yx.png" group-title="Sport",Flow Sports 1 (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/djeM9yx.png" group-title="Sport",Flow Sports 1
 http://161.0.157.9/PLTV/88888888/224/3221226899/04.m3u8
-#EXTINF:-1 tvg-id="France 24" tvg-name="France 24" tvg-logo="http://www.ecfr.eu/page/-/France_24.png?v=1440585546204" group-title="News",France 24 Arabic (Opt-1)
+#EXTINF:-1 tvg-id="France 24" tvg-name="France 24" tvg-logo="http://www.ecfr.eu/page/-/France_24.png?v=1440585546204" group-title="News",France 24 Arabic
 http://static.france24.com/live/F24_AR_LO_HLS/live_web.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gDOEH0A.png" group-title="News",France 24 Arabic (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gDOEH0A.png" group-title="News",France 24 Arabic
 http://static.france24.com:80/live/F24_AR_HI_HLS/live_tv.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gDOEH0A.png" group-title="News",France 24 Arabic (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gDOEH0A.png" group-title="News",France 24 Arabic
 https://str-2.mediabay.tv/France24_Arab/playlist.m3u8?token=f415586b8d1a42cb3059565ff0d85d8ad1086322-695ae855664ae441cc81052eecc0ebee-1566585947-1566575147
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/fr/France24English.fr.png" group-title="News",France 24 English (Opt-1)
-http://static.france24.com/live/F24_EN_LO_HLS/live_web.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/id/thumb/6/65/FRANCE_24_logo.svg/1024px-FRANCE_24_logo.svg.png" group-title="News",France 24 English (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/id/thumb/6/65/FRANCE_24_logo.svg/1024px-FRANCE_24_logo.svg.png" group-title="News",France 24 English
 http://f24hls-i.akamaihd.net/hls/live/221147/F24_EN_HI_HLS/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/id/thumb/6/65/FRANCE_24_logo.svg/1024px-FRANCE_24_logo.svg.png" group-title="News",France 24 English (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/fr/France24English.fr.png" group-title="News",France 24 English
+http://static.france24.com/live/F24_EN_LO_HLS/live_web.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/id/thumb/6/65/FRANCE_24_logo.svg/1024px-FRANCE_24_logo.svg.png" group-title="News",France 24 English
 https://str-4.mediabay.tv/France24_EN/playlist.m3u8?token=1b02450137b51b16c6f92f077a916394ebc2cc54-2f98acbaf79adca3a83c310c1d3ec9ca-1566586002-1566575202
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",France 24 Español
 https://str-2.mediabay.tv/France24_ESP/playlist.m3u8?token=6aaf5b5d259fa08ad7518961e0d768991b1a2592-c87c0e8b46faf6fe6fa6b73ae285708d-1566586039-1566575239
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gDOEH0A.png" group-title="News",France 24 French (Opt-1)
-http://static.france24.com:80/live/F24_FR_HI_HLS/live_tv.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",France 24 French (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",France 24 French
 http://ott-cdn.ucom.am/s25/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",France 24 French (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gDOEH0A.png" group-title="News",France 24 French
+http://static.france24.com:80/live/F24_FR_HI_HLS/live_tv.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",France 24 French
 https://str-3.mediabay.tv/France24/playlist.m3u8?token=379552e885f1e30706fa5c09e8764369cf89302c-b9669f94feff6822c988823faf2f6bc9-1566584974-1566574174
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qcrsf49.png" group-title="Fashion",Global Fashion Channel (Opt-1)
-https://vcnglobalfashionchannel.teleosmedia.com/stream/globalfashionchannel/globalfashionchannel/seglist_720p.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qcrsf49.png" group-title="Fashion",Global Fashion Channel (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qcrsf49.png" group-title="Fashion",Global Fashion Channel
 https://vcnglobalfashionchannel.teleosmedia.com/stream/globalfashionchannel/globalfashionchannel/seglist_720p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qcrsf49.png" group-title="Fashion",Global Fashion Channel
+https://vcnglobalfashionchannel.teleosmedia.com/stream/globalfashionchannel/globalfashionchannel/seglist_720p.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/05/god_tv_uk.png" group-title="Religious",God TV
 https://msllive.yuppcdn.net/live/yuppsin1msl/hls/live/2003785/godtv/playlist/master.m3u8?b=100-2500&dw=59&hdnea=st=1567621266~exp=1567635666~acl=!*/2003785/godtv/*!/payload/yupptvnewservice_5_-1_na_IN_146.88.24.128/*~hmac=df4659dd126982e5f93869f9baf4c8a02c54a605289116bee4a9f31ff6decca8&partnerid=1000&partnername=YUPPIN
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",God TV Africa
@@ -373,171 +373,171 @@ https://str-3.mediabay.tv/GODAsia/playlist.m3u8?token=3518c3f2390fe7b975ad4cf8b6
 https://str-2.mediabay.tv/GODEvent/playlist.m3u8?token=76fcf35cde89c44064de6746821b4cff10f828ec-2bbefb8f9ad908ba457940f983980fd2-1566591722-1566580922
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",God TV Prayer
 https://str-4.mediabay.tv/GODPrayer/playlist.m3u8?token=d90c1ddf913b5a9b1024148d1a5a9f2df2e59217-d3d503493a6adfeaf4b09c21992714fe-1566591754-1566580954
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/f/fb/I24_official_logo.png" group-title="News",i24 News (Opt-1)
-https://i24alive1-a.akamaihd.net/6e3dd61ac4c34d6f8fb9698b565b9f50/eu-central-1/5377161796001/profile_0/chunklist_dvr.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RSssxcw.jpg" group-title="News",i24 News (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RSssxcw.jpg" group-title="News",i24 News
 https://i24alive1-a.akamaihd.net/6e3dd61ac4c34d6f8fb9698b565b9f50/eu-central-1/5377161796001/profile_0/chunklist_dvr.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/f/fb/I24_official_logo.png" group-title="News",i24 News
+https://i24alive1-a.akamaihd.net/6e3dd61ac4c34d6f8fb9698b565b9f50/eu-central-1/5377161796001/profile_0/chunklist_dvr.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2tnZJmq.jpg" group-title="",Imagine Movies
 http://95.170.215.109/hls/Imagine-M-Backup-M.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 1 TV Farsi (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 1 TV Farsi
 http://live.imamhossaintv.com/live/ih1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 1 TV Farsi (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 1 TV Farsi
 https://str-3.mediabay.tv/ImamHussein1/playlist.m3u8?token=1797a7126233e2626bffd7006cb4e6f758758f93-586d95d4b5e65b633d8498ca96206484-1566586214-1566575414
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 2 TV Arabic (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 2 TV Arabic
 http://live.imamhossaintv.com/live/ih2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 2 TV Arabic (Opt-2)
-https://str-3.mediabay.tv/ImamHussein2/playlist.m3u8?token=69265c46d675d4cef7cb788654ec25a940b33fba-d3d3bce25f8c21e0500eb2c4af1a77ac-1566586525-1566575725
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 2 TV Arabic (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 2 TV Arabic
 https://ar.imamhusseintv.com/live/ih201/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 3 TV English (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 2 TV Arabic
+https://str-3.mediabay.tv/ImamHussein2/playlist.m3u8?token=69265c46d675d4cef7cb788654ec25a940b33fba-d3d3bce25f8c21e0500eb2c4af1a77ac-1566586525-1566575725
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 3 TV English
 http://live.imamhossaintv.com/live/ih3.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 3 TV English (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 3 TV English
 https://str-2.mediabay.tv/ImamHussein3/playlist.m3u8?token=e3f6bf3b49ead3a171a9c98fc797ac8ff6e7b9f2-de1a027bfd53a4d610eaeb52098fa425-1566586572-1566575772
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 4 TV Urdu (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 4 TV Urdu
 http://live.imamhossaintv.com/live/ih4.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 4 TV Urdu (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 4 TV Urdu
 https://str-2.mediabay.tv/ImamHussein4/playlist.m3u8?token=d7238860a38a402829e5e9d0e72f563d90d2d8be-2664865419d2092ac86e65dd91efcdd6-1566586599-1566575799
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 4 TV Urdu (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Imam Hussein 4 TV Urdu
 https://ur.imamhusseintv.com/live/ih4.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://indiewaveentertainment.com/wp-content/uploads/2017/09/logo_square.png" group-title="Music",IndieWave
 https://vcnindiewave.teleosmedia.com/stream/indiewave/indiewave/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Iran International
 https://svs.itworkscdn.net/iinternationallive/iintl.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV (Opt-1)
-http://109.71.162.112:1935/live/hd.jasminchannel.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV (Opt-10)
-http://109.71.162.112:1935/live/sd.jasminchannel.stream/chunklist_w513145911.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV (Opt-11)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV
 http://109.71.162.112/live/sd.jasminchannel.stream/chunklist_w233748568.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV (Opt-2)
-http://109.71.162.112:1935/live/hd.jasminchannel.stream/chunklist_w1770948941.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV (Opt-3)
-http://109.71.162.112:1935/live/sd.jasminchannel.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV (Opt-4)
-http://109.71.162.112:1935/live/hd.jasminchannel.stream/chunklist_w1639491303.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV (Opt-5)
-http://109.71.162.112:1935/live/sd.jasminchannel.stream/PAZ_Chega_de_Guerras.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV (Opt-6)
-http://109.71.162.112:1935/live/sd.jasminchannel.stream/media_w852484650_6656.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV (Opt-7)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV
 http://109.71.162.112:1935/live/hd.jasminchannel.stream/chunklist_w1190948669.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV (Opt-8)
-http://109.71.162.112:1935/live/hd.jasminchannel.stream/chunklist_w934179313.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV (Opt-9)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV
+http://109.71.162.112:1935/live/hd.jasminchannel.stream/chunklist_w1639491303.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV
+http://109.71.162.112:1935/live/hd.jasminchannel.stream/chunklist_w1770948941.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV
 http://109.71.162.112:1935/live/hd.jasminchannel.stream/chunklist_w815696992.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV
+http://109.71.162.112:1935/live/hd.jasminchannel.stream/chunklist_w934179313.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV
+http://109.71.162.112:1935/live/hd.jasminchannel.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV
+http://109.71.162.112:1935/live/sd.jasminchannel.stream/chunklist_w513145911.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV
+http://109.71.162.112:1935/live/sd.jasminchannel.stream/media_w852484650_6656.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV
+http://109.71.162.112:1935/live/sd.jasminchannel.stream/PAZ_Chega_de_Guerras.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Jasmin TV
+http://109.71.162.112:1935/live/sd.jasminchannel.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/Kix.uk.png" group-title="Entertainment",KIX
 http://210.210.155.35/uq2663/h/h07/01.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Manoto
 https://dzll8dnb13thz.cloudfront.net/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 1 (Opt-1)
-http://livecdnh2.tvanywhere.ae/hls/mbc1/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 1
 http://livecdnh2.tvanywhere.ae/hls/mbc1/02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 1 (Opt-3)
-http://livecdnh2.tvanywhere.ae/hls/mbc1/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 1 (Opt-4)
-http://livecdnh2.tvanywhere.ae/hls/mbc1/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 1 (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 1
 http://livecdnh2.tvanywhere.ae/hls/mbc1/02.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ae/MBC1.ae.png" group-title="",MBC 1 (Opt-6)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 1
+http://livecdnh2.tvanywhere.ae/hls/mbc1/03.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 1
+http://livecdnh2.tvanywhere.ae/hls/mbc1/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 1
+http://livecdnh2.tvanywhere.ae/hls/mbc1/05.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ae/MBC1.ae.png" group-title="",MBC 1
 http://livecdnh2.tvanywhere.ae/hls/mbc1/index.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_2_hd-1.png" group-title="Movies",MBC 2 HD (Opt-1)
-http://livecdnh3.tvanywhere.ae/hls/mbc2/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_2_hd-1.png" group-title="Movies",MBC 2 HD (Opt-2)
-http://livecdnh3.tvanywhere.ae/hls/mbc2/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_2_hd-1.png" group-title="Movies",MBC 2 HD (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_2_hd-1.png" group-title="Movies",MBC 2 HD
 http://livecdnh3.tvanywhere.ae/hls/mbc2/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ae/MBC2.ae.png" group-title="Movies",MBC 2 HD (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_2_hd-1.png" group-title="Movies",MBC 2 HD
+http://livecdnh3.tvanywhere.ae/hls/mbc2/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_2_hd-1.png" group-title="Movies",MBC 2 HD
+http://livecdnh3.tvanywhere.ae/hls/mbc2/05.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ae/MBC2.ae.png" group-title="Movies",MBC 2 HD
 http://livecdnh3.tvanywhere.ae:80/hls/mbc2/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ae/MBC2.ae.png" group-title="Movies",MBC 2 HD (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ae/MBC2.ae.png" group-title="Movies",MBC 2 HD
 http://livecdnh3.tvanywhere.ae:80/hls/mbc2/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 3 (Opt-1)
-http://livecdnh2.tvanywhere.ae/hls/mbc3/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 3 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 3
 http://livecdnh2.tvanywhere.ae/hls/mbc3/02.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 3 (Opt-3)
-http://livecdnh2.tvanywhere.ae/hls/mbc3/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ae/MBC3.ae.png" group-title="",MBC 3 (Opt-4)
-http://livecdnh2.tvanywhere.ae/hls/mbc3/index.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FVNVC73.png" group-title="",MBC 3 (Opt-5)
-http://livecdnh2.tvanywhere.ae/hls/mbc3/05.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 3 (Opt-6)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 3
 http://livecdnh2.tvanywhere.ae/hls/mbc3/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 4 (Opt-1)
-http://livecdnh3.tvanywhere.ae/hls/mbc4/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 4 (Opt-2)
-http://livecdnh3.tvanywhere.ae/hls/mbc4/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 4 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 3
+http://livecdnh2.tvanywhere.ae/hls/mbc3/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 3
+http://livecdnh2.tvanywhere.ae/hls/mbc3/05.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FVNVC73.png" group-title="",MBC 3
+http://livecdnh2.tvanywhere.ae/hls/mbc3/05.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ae/MBC3.ae.png" group-title="",MBC 3
+http://livecdnh2.tvanywhere.ae/hls/mbc3/index.m3u8?sd=10&rebase=on
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 4
 http://livecdnh3.tvanywhere.ae/hls/mbc4/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/8/8e/MBC_4_logo.png" group-title="",MBC 4 (Opt-4)
-http://livecdnh3.tvanywhere.ae:80/hls/mbc4/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/8/8e/MBC_4_logo.png" group-title="",MBC 4 (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 4
+http://livecdnh3.tvanywhere.ae/hls/mbc4/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC 4
+http://livecdnh3.tvanywhere.ae/hls/mbc4/05.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/8/8e/MBC_4_logo.png" group-title="",MBC 4
 http://livecdnh3.tvanywhere.ae/hls/mbc4/05.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/8/8e/MBC_4_logo.png" group-title="",MBC 4 (Opt-6)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/8/8e/MBC_4_logo.png" group-title="",MBC 4
 http://livecdnh3.tvanywhere.ae:80/hls/mbc4/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_action_hd.png" group-title="Movies",MBC Action HD (Opt-1)
-http://livecdnh3.tvanywhere.ae/hls/mbcaction/02.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_action_hd.png" group-title="Movies",MBC Action HD (Opt-2)
-http://livecdnh3.tvanywhere.ae/hls/mbcaction/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_action_hd.png" group-title="Movies",MBC Action HD (Opt-3)
-http://livecdnh3.tvanywhere.ae/hls/mbcaction/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_action_hd.png" group-title="Movies",MBC Action HD (Opt-4)
-http://livecdnh3.tvanywhere.ae/hls/mbcaction/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_action_hd.png" group-title="Movies",MBC Action HD (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/8/8e/MBC_4_logo.png" group-title="",MBC 4
+http://livecdnh3.tvanywhere.ae:80/hls/mbc4/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_action_hd.png" group-title="Movies",MBC Action HD
 http://livecdnh3.tvanywhere.ae/hls/mbcaction/02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://iptv.luxe/images/logo/channel/crops/c97b50e14f083712f2fa0bb7302c223d.png" group-title="Movies",MBC Action HD (Opt-6)
-http://livecdnh3.tvanywhere.ae:80/hls/mbcaction/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/MBCAction.png" group-title="Movies",MBC Action HD (Opt-7)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_action_hd.png" group-title="Movies",MBC Action HD
+http://livecdnh3.tvanywhere.ae/hls/mbcaction/02.m3u8?sd=10&rebase=on
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_action_hd.png" group-title="Movies",MBC Action HD
+http://livecdnh3.tvanywhere.ae/hls/mbcaction/03.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_action_hd.png" group-title="Movies",MBC Action HD
+http://livecdnh3.tvanywhere.ae/hls/mbcaction/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_action_hd.png" group-title="Movies",MBC Action HD
+http://livecdnh3.tvanywhere.ae/hls/mbcaction/05.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/MBCAction.png" group-title="Movies",MBC Action HD
 http://livecdnh3.tvanywhere.ae:80/hls/mbcaction/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/MBC_Bollywood.png" group-title="Entertainment",MBC Bollywood (Opt-1)
-http://livecdnh2.tvanywhere.ae/hls/mbc_bolly/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/MBC_Bollywood.png" group-title="Entertainment",MBC Bollywood (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://iptv.luxe/images/logo/channel/crops/c97b50e14f083712f2fa0bb7302c223d.png" group-title="Movies",MBC Action HD
+http://livecdnh3.tvanywhere.ae:80/hls/mbcaction/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/MBC_Bollywood.png" group-title="Entertainment",MBC Bollywood
 http://livecdnh2.tvanywhere.ae/hls/mbc_bolly/02.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/MBC_Bollywood.png" group-title="Entertainment",MBC Bollywood (Opt-3)
-http://livecdnh2.tvanywhere.ae/hls/mbc_bolly/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/MBC_Bollywood.png" group-title="Entertainment",MBC Bollywood (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/MBC_Bollywood.png" group-title="Entertainment",MBC Bollywood
 http://livecdnh2.tvanywhere.ae/hls/mbc_bolly/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/MBCBollywoodTV.png" group-title="Entertainment",MBC Bollywood (Opt-5)
-http://livecdnh2.tvanywhere.ae:80/hls/mbc_bolly/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/MBCBollywoodTV.png" group-title="Entertainment",MBC Bollywood (Opt-6)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/MBC_Bollywood.png" group-title="Entertainment",MBC Bollywood
+http://livecdnh2.tvanywhere.ae/hls/mbc_bolly/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/MBC_Bollywood.png" group-title="Entertainment",MBC Bollywood
+http://livecdnh2.tvanywhere.ae/hls/mbc_bolly/05.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/MBCBollywoodTV.png" group-title="Entertainment",MBC Bollywood
 http://livecdnh2.tvanywhere.ae:80/hls/mbc_bolly/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",MBC Drama (Opt-1)
-http://livecdnh2.tvanywhere.ae/hls/mbc_drama/index.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",MBC Drama (Opt-2)
-http://livecdnh2.tvanywhere.ae/hls/mbc_drama/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",MBC Drama (Opt-3)
-http://livecdnh2.tvanywhere.ae/hls/mbc_drama/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",MBC Drama (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/MBCBollywoodTV.png" group-title="Entertainment",MBC Bollywood
+http://livecdnh2.tvanywhere.ae:80/hls/mbc_bolly/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",MBC Drama
 http://livecdnh2.tvanywhere.ae/hls/mbc_drama/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/MBCDrama.png" group-title="Movies",MBC Drama (Opt-5)
-http://livecdnh2.tvanywhere.ae:80/hls/mbc_drama/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/MBCDrama.png" group-title="Movies",MBC Drama (Opt-6)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",MBC Drama
+http://livecdnh2.tvanywhere.ae/hls/mbc_drama/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",MBC Drama
+http://livecdnh2.tvanywhere.ae/hls/mbc_drama/05.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",MBC Drama
+http://livecdnh2.tvanywhere.ae/hls/mbc_drama/index.m3u8?sd=10&rebase=on
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/MBCDrama.png" group-title="Movies",MBC Drama
 http://livecdnh2.tvanywhere.ae:80/hls/mbc_drama/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC Masr (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/03/MBCDrama.png" group-title="Movies",MBC Drama
+http://livecdnh2.tvanywhere.ae:80/hls/mbc_drama/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC Masr
 http://livecdnh2.tvanywhere.ae/hls/mbc_msr/02.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC Masr (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC Masr
 http://livecdnh2.tvanywhere.ae/hls/mbc_msr/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_max_hd.png" group-title="Movies",MBC Max HD (Opt-1)
-http://livecdnh3.tvanywhere.ae/hls/mbcmax/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_max_hd.png" group-title="Movies",MBC Max HD (Opt-2)
-http://livecdnh3.tvanywhere.ae/hls/mbcmax/02.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_max_hd.png" group-title="Movies",MBC Max HD (Opt-3)
-http://livecdnh3.tvanywhere.ae/hls/mbcmax/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_max_hd.png" group-title="Movies",MBC Max HD (Opt-4)
-http://livecdnh3.tvanywhere.ae/hls/mbcmax/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_max_hd.png" group-title="Movies",MBC Max HD (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_max_hd.png" group-title="Movies",MBC Max HD
 http://livecdnh3.tvanywhere.ae/hls/mbcmax/02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ae/MBCMax.ae.png" group-title="Movies",MBC Max HD (Opt-6)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_max_hd.png" group-title="Movies",MBC Max HD
+http://livecdnh3.tvanywhere.ae/hls/mbcmax/02.m3u8?sd=10&rebase=on
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_max_hd.png" group-title="Movies",MBC Max HD
+http://livecdnh3.tvanywhere.ae/hls/mbcmax/03.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_max_hd.png" group-title="Movies",MBC Max HD
+http://livecdnh3.tvanywhere.ae/hls/mbcmax/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/mbc_ae_max_hd.png" group-title="Movies",MBC Max HD
+http://livecdnh3.tvanywhere.ae/hls/mbcmax/05.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ae/MBCMax.ae.png" group-title="Movies",MBC Max HD
 http://livecdnh3.tvanywhere.ae:80/hls/mbcmax/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ae/MBCMax.ae.png" group-title="Movies",MBC Max HD (Opt-7)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ae/MBCMax.ae.png" group-title="Movies",MBC Max HD
 http://livecdnh3.tvanywhere.ae:80/hls/mbcmax/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MBC Sat
 http://52.24.12.57/live/test1/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Middle East Television
 http://cdg3.edge.tmed.pw/metv/abr_live/metv/live_1024p/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/1/1b/Mta_1_int.png" group-title="",MTA 1 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/1/1b/Mta_1_int.png" group-title="",MTA 1
 http://ooyalahd2-f.akamaihd.net:80/i/mtaorigin_delivery@353498/index_1100_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xT3X6L9.png" group-title="",MTA 1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xT3X6L9.png" group-title="",MTA 1
 https://ooyalahd2-f.akamaihd.net/i/mtaorigin_delivery@353498/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/2/23/MTA_International.PNG" group-title="",MTA 1 English
 https://ooyalahd2-f.akamaihd.net/i/mtaeng_delivery@345736/index_3000_av-p.m3u8
@@ -547,56 +547,56 @@ https://ooyalahd2-f.akamaihd.net/i/mtaurdu_delivery@350117/index_3000_av-p.m3u8
 https://ooyalahd2-f.akamaihd.net/i/mtach7audio_delivery@65519/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/2/23/MTA_International.PNG" group-title="",MTA 2 Urdu
 https://ooyalahd2-f.akamaihd.net/i/mtageraudio_delivery@308889/index_1100_av-p.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/2/23/MTA_International.PNG" group-title="",MTA 3 (Opt-1)
-https://ooyalahd2-f.akamaihd.net/i/mtach7_delivery@348438/index_3000_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/79/MTA_3.jpg/520px-MTA_3.jpg" group-title="",MTA 3 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/79/MTA_3.jpg/520px-MTA_3.jpg" group-title="",MTA 3
 http://ooyalahd2-f.akamaihd.net/i/mtach7_delivery@348438/index_1700_av-p.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xT3X6L9.png" group-title="",MTA 3 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/2/23/MTA_International.PNG" group-title="",MTA 3
+https://ooyalahd2-f.akamaihd.net/i/mtach7_delivery@348438/index_3000_av-p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xT3X6L9.png" group-title="",MTA 3
 https://ooyalahd2-f.akamaihd.net/i/mtach7_delivery@348438/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/2/23/MTA_International.PNG" group-title="",MTA Africa (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/2/23/MTA_International.PNG" group-title="",MTA Africa
 https://ooyalahd2-f.akamaihd.net/i/mtaengaudio_delivery@138280/index_3000_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xT3X6L9.png" group-title="",MTA Africa (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xT3X6L9.png" group-title="",MTA Africa
 https://ooyalahd2-f.akamaihd.net/i/mtaengaudio_delivery@138280/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FOiUOeW.png" group-title="Entertainment",MTV (Latin America)
 http://161.0.157.9/PLTV/88888888/224/3221226825/index.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://iptv.live/images/logo/channel/smalls/88eaac40b27c1b47df9a3f7b7d71e3e3.png" group-title="Entertainment",MTV (Nordic)
 http://unilivemtveu-lh.akamaihd.net/i/mtvno_1@346424/index_3500_av-b.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/natgeo_34us_hd.png" group-title="",Nat Geo (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/natgeo_34us_hd.png" group-title="",Nat Geo
 http://livecdnh1.tvanywhere.ae/hls/nat_geo/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/NatGeo.uk.png" group-title="",Nat Geo (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/NatGeo.uk.png" group-title="",Nat Geo
 http://livecdnh1.tvanywhere.ae:80/hls/nat_geo/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9f/New_NatGeo_People_logo.svg/1200px-New_NatGeo_People_logo.svg.png" group-title="",Nat Geo People (Opt-1)
-http://livecdnh1.tvanywhere.ae:80/hls/nat_geo_people/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/02/nat_geo_people_asia.png" group-title="",Nat Geo People (Opt-2)
-http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/02/nat_geo_people_asia.png" group-title="",Nat Geo People (Opt-3)
-http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/02/nat_geo_people_asia.png" group-title="",Nat Geo People (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/02/nat_geo_people_asia.png" group-title="",Nat Geo People
 http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/02.m3u8
-#EXTINF:-1 tvg-id="Nat Geo Wild" tvg-name="Nat Geo Wild" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSLjuMUDEr3oIb9gbSDOAhD9URCgo-snmSLiyND7LipNMg-oJV2LWaUsA" group-title="",Nat Geo Wild (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/02/nat_geo_people_asia.png" group-title="",Nat Geo People
+http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/02/nat_geo_people_asia.png" group-title="",Nat Geo People
+http://livecdnh1.tvanywhere.ae/hls/nat_geo_people/05.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9f/New_NatGeo_People_logo.svg/1200px-New_NatGeo_People_logo.svg.png" group-title="",Nat Geo People
+http://livecdnh1.tvanywhere.ae:80/hls/nat_geo_people/05.m3u8
+#EXTINF:-1 tvg-id="Nat Geo Wild" tvg-name="Nat Geo Wild" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSLjuMUDEr3oIb9gbSDOAhD9URCgo-snmSLiyND7LipNMg-oJV2LWaUsA" group-title="",Nat Geo Wild
 http://6dfbb588.melpakomn.ru/iptv/QZH6CQVGHR6Z99 /216/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo Wild (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Nat Geo Wild
 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)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/NatGeoWild.us.png" group-title="",Nat Geo Wild
 http://livecdnh1.tvanywhere.ae/hls/nat_geo_wild/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.abu.org.my/images/articles/news/NHK_WORLD_sq_2017.jpg" group-title="News",NHK World (Opt-1)
-https://b-nhkwlive-xjp.akamaized.net/hls/live/2003458-b/nhkwlive-xjp/index_1180.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",NHK World (Opt-2)
-https://b-nhkwlive-xjp.akamaized.net/hls/live/2003458-b/nhkwlive-xjp/index_2100.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/7b/NHK_World.svg/250px-NHK_World.svg.png" group-title="News",NHK World (Opt-3)
-https://nhkwlive-xjp.akamaized.net/hls/live/2003458/nhkwlive-xjp/index_1180.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",NHK World (Opt-4)
-https://nhkworld.webcdn.stream.ne.jp/www11/nhkworld-tv/global/263941/live_high2_s.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",NHK World (Opt-5)
-https://nhkworld.webcdn.stream.ne.jp/www11/nhkworld-tv/global/263941/live_wa_s.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",NHK World (Opt-6)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",NHK World
 http://210.210.155.35/uq2663/h/h23/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.abu.org.my/images/articles/news/NHK_WORLD_sq_2017.jpg" group-title="News",NHK World
+https://b-nhkwlive-xjp.akamaized.net/hls/live/2003458-b/nhkwlive-xjp/index_1180.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",NHK World
+https://b-nhkwlive-xjp.akamaized.net/hls/live/2003458-b/nhkwlive-xjp/index_2100.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/7b/NHK_World.svg/250px-NHK_World.svg.png" group-title="News",NHK World
+https://nhkwlive-xjp.akamaized.net/hls/live/2003458/nhkwlive-xjp/index_1180.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",NHK World
+https://nhkworld.webcdn.stream.ne.jp/www11/nhkworld-tv/global/263941/live_high2_s.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",NHK World
+https://nhkworld.webcdn.stream.ne.jp/www11/nhkworld-tv/global/263941/live_wa_s.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Olympic Channel
+http://ott-live.olympicchannel.com/out/u/OC1_3.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/OlympicChannel.us.png" group-title="Sport",Olympic Channel
+https://ott-live.olympicchannel.com/out/u/OC1_1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/a4/Olympic_Channel_logo.png" group-title="",Olympic Channel (HD)
 http://ott-live.olympicchannel.com/out/u/OC1_2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Olympic Channel (Opt-1)
-http://ott-live.olympicchannel.com/out/u/OC1_3.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/OlympicChannel.us.png" group-title="Sport",Olympic Channel (Opt-2)
-https://ott-live.olympicchannel.com/out/u/OC1_1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/a4/Olympic_Channel_logo.png" group-title="",Olympic Channel (SD)
 http://ott-live.olympicchannel.com/out/u/OC1_3.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/a4/Olympic_Channel_logo.png" group-title="",Olympic Channel (UHD)
@@ -627,24 +627,24 @@ https://ott-live.olympicchannel.com/out/u/OC9_1.m3u8
 http://51.15.229.209/hls/stream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",Privé TV
 http://08139e2f.ottv.info/iptv/S9824PT3RW2E72/877/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="Red Bull TV" tvg-logo="http://i.mjh.nz/au/images/tv.redbull.tv.png" group-title="Sport",Red Bull TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="Red Bull TV" tvg-logo="http://i.mjh.nz/au/images/tv.redbull.tv.png" group-title="Sport",Red Bull TV
 http://i.mjh.nz/au/Canberra/tv.redbull.tv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://iptv.matthuisman.nz/nz/images/tv.redbull.tv.png" group-title="Sport",Red Bull TV
+http://i.mjh.nz/nz/tv.redbull.tv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Red Bull TV
+http://rbmn-live.akamaized.net/hls/live/590964/BoRB-AT/master_1660.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7NeBmWX.jpg" group-title="",Red Bull TV
+http://rbmn-live.akamaized.net/hls/live/590964/BoRB-AT/master_6660.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Red Bull TV
+https://dms.redbull.tv/v3/linear-borb/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjYXRlZ29yeSI6InBlcnNvbmFsX2NvbXB1dGVyIiwiY291bnRyeV9jb2RlIjoidXMiLCJleHBpcmVzIjoiMjAxNy0wOS0xNlQxNzo0NjowMy45NjM0NjI4NDJaIiwib3NfZmFtaWx5IjoiaHR0cCIsInJlbW90ZV9pcCI6IjEwLjE1Ny4xMTIuMTQ4IiwidWEiOiJNb3ppbGxhLzUuMCAoTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8xMl81KSBBcHBsZVdlYktpdC82MDMuMi40IChLSFRNTCwgbGlrZSBHZWNrbykgVmVyc2lvbi8xMC4xLjEgU2FmYXJpLzYwMy4yLjQiLCJ1aWQiOiJkOGZiZWYzMC0yZDhhLTQwYTUtOGNjNy0wNzgxNGJhMTliNzMifQ.Q_38FNpW3so5yrA5FQt9qBuix3dTulKpb6uQ0dRjrtY/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="Red Bull TV" tvg-logo="http://i.mjh.nz/au/images/tv.redbull.tv.png" group-title="Sport",Red Bull TV
+https://i.mjh.nz/au/Melbourne/tv.redbull.tv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Red Bull TV
+https://rbmn-live.akamaized.net/hls/live/590964/BoRB-AT/master_3360.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://chileiptv.cl/img/logos/file_1522637574.png" group-title="Sport",Red Bull TV
+https://rbmn-live.akamaized.net/hls/live/590964/BoRB-AT/master_928.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://logos-download.com/wp-content/uploads/2016/09/Red_Bull_TV_logo.png" group-title="Sport",Red Bull TV (Opt-13)
 https://rbmn-live.akamaized.net/hls/live/590964/BoRB-AT/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="Red Bull TV" tvg-logo="http://i.mjh.nz/au/images/tv.redbull.tv.png" group-title="Sport",Red Bull TV (Opt-2)
-https://i.mjh.nz/au/Melbourne/tv.redbull.tv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Red Bull TV (Opt-3)
-https://dms.redbull.tv/v3/linear-borb/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjYXRlZ29yeSI6InBlcnNvbmFsX2NvbXB1dGVyIiwiY291bnRyeV9jb2RlIjoidXMiLCJleHBpcmVzIjoiMjAxNy0wOS0xNlQxNzo0NjowMy45NjM0NjI4NDJaIiwib3NfZmFtaWx5IjoiaHR0cCIsInJlbW90ZV9pcCI6IjEwLjE1Ny4xMTIuMTQ4IiwidWEiOiJNb3ppbGxhLzUuMCAoTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8xMl81KSBBcHBsZVdlYktpdC82MDMuMi40IChLSFRNTCwgbGlrZSBHZWNrbykgVmVyc2lvbi8xMC4xLjEgU2FmYXJpLzYwMy4yLjQiLCJ1aWQiOiJkOGZiZWYzMC0yZDhhLTQwYTUtOGNjNy0wNzgxNGJhMTliNzMifQ.Q_38FNpW3so5yrA5FQt9qBuix3dTulKpb6uQ0dRjrtY/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Red Bull TV (Opt-4)
-https://rbmn-live.akamaized.net/hls/live/590964/BoRB-AT/master_3360.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Red Bull TV (Opt-5)
-http://rbmn-live.akamaized.net/hls/live/590964/BoRB-AT/master_1660.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://iptv.matthuisman.nz/nz/images/tv.redbull.tv.png" group-title="Sport",Red Bull TV (Opt-6)
-http://i.mjh.nz/nz/tv.redbull.tv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7NeBmWX.jpg" group-title="",Red Bull TV (Opt-7)
-http://rbmn-live.akamaized.net/hls/live/590964/BoRB-AT/master_6660.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://chileiptv.cl/img/logos/file_1522637574.png" group-title="Sport",Red Bull TV (Opt-8)
-https://rbmn-live.akamaized.net/hls/live/590964/BoRB-AT/master_928.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",RedTraffic Big Ass
 http://live.redtraffic.xyz/bigass.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",RedTraffic Big Dick
@@ -693,48 +693,48 @@ http://livecdnh3.tvanywhere.ae/hls/rotkhal/04.m3u8
 http://livecdnh3.tvanywhere.ae/hls/rotmusic/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Royal Time TV
 http://stream.rtimetv.com/rtimetv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Russia-today-logo.svg/302px-Russia-today-logo.svg.png" group-title="News",RT (Opt-1)
-https://rt-news.secure.footprint.net/1103.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.rt.com/static/block/touch-icon/apple-touch-icon-144x144-precomposed.png" group-title="News",RT (Opt-2)
-http://ott-cdn.ucom.am/s96/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",RT (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",RT
 http://ott-cdn.ucom.am/s96/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",RT (Opt-4)
-https://strm.yandex.ru/kal/rt_hd/rt_hd0.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",RT (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.rt.com/static/block/touch-icon/apple-touch-icon-144x144-precomposed.png" group-title="News",RT
+http://ott-cdn.ucom.am/s96/index.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Russia-today-logo.svg/302px-Russia-today-logo.svg.png" group-title="News",RT
+https://rt-news.secure.footprint.net/1103.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",RT
 https://str-4.mediabay.tv/RussiaTodayNews/playlist.m3u8?token=9b99aa348cce185f5a4683777372ee7dabec4a62-24dde126578d26fe29de6fb1f80838c9-1566590685-1566579885
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/ru/0/06/RTarabic.jpg" group-title="",RT Arabic (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",RT
+https://strm.yandex.ru/kal/rt_hd/rt_hd0.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/ru/0/06/RTarabic.jpg" group-title="",RT Arabic
 http://rt-arab.secure.footprint.net:80/1104.m3u8?streamType=live
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/ru/0/06/RTarabic.jpg" group-title="",RT Arabic (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/ru/0/06/RTarabic.jpg" group-title="",RT Arabic
 https://str-4.mediabay.tv/RT_Arabic/playlist.m3u8?token=4ded2a7e8f48b2e8c124455cf2ff34d24e62c118-6416757de72073cda532b09a717865aa-1566589239-1566578439
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.rt.com/static/block/touch-icon/apple-touch-icon-144x144-precomposed.png" group-title="News",RT Español (Opt-1)
-https://rt-esp.secure.footprint.net/1102.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ru/RTEspanol.ru.png" group-title="News",RT Español (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ru/RTEspanol.ru.png" group-title="News",RT Español
 http://rt-esp.secure.footprint.net/1102.m3u8?streamType=live
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ru/RTEspanol.ru.png" group-title="News",RT Español (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.rt.com/static/block/touch-icon/apple-touch-icon-144x144-precomposed.png" group-title="News",RT Español
+https://rt-esp.secure.footprint.net/1102.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/ru/RTEspanol.ru.png" group-title="News",RT Español
 https://str-3.mediabay.tv/RussiaTodayEspana/playlist.m3u8?token=9c2ce23052e4ecc0781a500280ec6c5f3d86ceb9-86b6f4772e673e4a7395cdbd5caa8cc1-1566590645-1566579845
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Documentary",RT Д English (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Documentary",RT Д English
 http://ott-cdn.ucom.am/s93/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/a/ae/RTD-TV-logo.png/220px-RTD-TV-logo.png" group-title="Documentary",RT Д English (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/a/ae/RTD-TV-logo.png/220px-RTD-TV-logo.png" group-title="Documentary",RT Д English
 http://ott-cdn.ucom.am/s93/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/a/ae/RTD-TV-logo.png" group-title="Documentary",RT Д English (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/a/ae/RTD-TV-logo.png" group-title="Documentary",RT Д English
 https://rt-doc.secure.footprint.net/1101.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/a/ae/RTD-TV-logo.png" group-title="Documentary",RT Д English (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/a/ae/RTD-TV-logo.png" group-title="Documentary",RT Д English
 https://str-4.mediabay.tv/RT_Documentary_English/playlist.m3u8?token=9fea86b912aea8eaf54e10f21ab5baff028dfcfe-ded322aad088e9661e70f91a1aa59477-1566590595-1566579795
-#EXTINF:-1 tvg-id="rtd-ru" tvg-name="RT Д Русский" tvg-logo="https://static.iptv-epg.com/ru/RTD.ru.png" group-title="Documentary",RT Д Русский (Opt-1)
+#EXTINF:-1 tvg-id="rtd-ru" tvg-name="RT Д Русский" tvg-logo="https://static.iptv-epg.com/ru/RTD.ru.png" group-title="Documentary",RT Д Русский
 http://rtmp.api.rt.com/hls/rtdru.m3u8
-#EXTINF:-1 tvg-id="rtd-ru" tvg-name="RT Д Русский" tvg-logo="" group-title="Documentary",RT Д Русский (Opt-2)
-https://strm.yandex.ru/kal/rtd_hd/rtd_hd0.m3u8
-#EXTINF:-1 tvg-id="rtd-ru" tvg-name="RT Д Русский" tvg-logo="" group-title="Documentary",RT Д Русский (Opt-3)
+#EXTINF:-1 tvg-id="rtd-ru" tvg-name="RT Д Русский" tvg-logo="" group-title="Documentary",RT Д Русский
 http://uiptv.do.am/1ufc/300663722/playlist.m3u8
-#EXTINF:-1 tvg-id="rtd-ru" tvg-name="RT Д Русский" tvg-logo="" group-title="Documentary",RT Д Русский (Opt-4)
+#EXTINF:-1 tvg-id="rtd-ru" tvg-name="RT Д Русский" tvg-logo="" group-title="Documentary",RT Д Русский
 https://str-3.mediabay.tv/RTDOC/playlist.m3u8?token=85413de1e8ff42a8df6b38e929537a84a8b58ad9-8e7712b6b4ecf9d09bae4eb5c21ad4f1-1566588811-1566578011
+#EXTINF:-1 tvg-id="rtd-ru" tvg-name="RT Д Русский" tvg-logo="" group-title="Documentary",RT Д Русский
+https://strm.yandex.ru/kal/rtd_hd/rtd_hd0.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 (Opt-1)
-https://unirtmp.tulix.tv/sat7pars/satparslive-web.smil/chunklist_w879240201_b1000000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Sat 7 Pars (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Sat 7 Pars
 http://unirtmp.tulix.tv:1935/sat7pars/satparslive-web.smil/playlist.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)
@@ -743,62 +743,62 @@ http://www.streamwebtown.com/player/sat7/arabic/stream.m3u8
 http://unirtmp.tulix.tv:1935/sat7kids/sat7kids1/chunklist_w918104804.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NM0QWA0.png" group-title="",SAT7kids (JO)
 http://unirtmp.tulix.tv:1935/sat7kids/sat7kids1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Silence TV WORLD HD (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Silence TV WORLD HD
 http://109.236.85.100:8081/SilenceTV/live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Silence TV WORLD HD (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Silence TV WORLD HD
 http://93.190.140.42:8081/SilenceTV/live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://julianlennon.com/wp-content/uploads/2014/12/large-square-sky-news-logo.png" group-title="News",Sky News (Opt-1)
-http://skydvn-nowtv-atv-prod.skydvn.com/atv/skynews/1404/live/06.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/SkyNews.uk.png" group-title="News",Sky News (Opt-2)
-http://skydvn-nowtv-atv-prod.skydvn.com/atv/skynews/1404/live/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/b/b4/Sky-news-logo.png" group-title="News",Sky News (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/b/b4/Sky-news-logo.png" group-title="News",Sky News
 http://ax.micaesoft.com/YMitv/YMITV_UK_UKskytv_2.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://news.sky.com/assets/2018/sky-news-logo.png" group-title="News",Sky News (Opt-4)
-http://skydvn-nowtv-atv-prod.skydvn.com/atv/skynews/1404/live/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Sky News (Opt-5)
-http://skydvn-nowtv-atv-prod.skydvn.com/atv/skynews/1404/live/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/b/b4/Sky-news-logo.png" group-title="News",Sky News (Opt-6)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/b/b4/Sky-news-logo.png" group-title="News",Sky News
 http://ax.micaesoft.com/YMitv/YMITV_US_USnasatv_1.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.pinimg.com/originals/e6/b9/68/e6b9683e46887e5624fae46a9cb2aa33.png" group-title="News",Sky News Arabia (Opt-1)
-https://stream.skynewsarabia.com/hls/sna_720.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Sky News Arabia (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/SkyNews.uk.png" group-title="News",Sky News
+http://skydvn-nowtv-atv-prod.skydvn.com/atv/skynews/1404/live/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Sky News
+http://skydvn-nowtv-atv-prod.skydvn.com/atv/skynews/1404/live/05.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://julianlennon.com/wp-content/uploads/2014/12/large-square-sky-news-logo.png" group-title="News",Sky News
+http://skydvn-nowtv-atv-prod.skydvn.com/atv/skynews/1404/live/06.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://news.sky.com/assets/2018/sky-news-logo.png" group-title="News",Sky News
+http://skydvn-nowtv-atv-prod.skydvn.com/atv/skynews/1404/live/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Sky News Arabia
 https://stream.skynewsarabia.com/hls/sna.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",SportsMax TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.pinimg.com/originals/e6/b9/68/e6b9683e46887e5624fae46a9cb2aa33.png" group-title="News",Sky News Arabia
+https://stream.skynewsarabia.com/hls/sna_720.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",SportsMax TV
 http://161.0.157.5/PLTV/88888888/224/3221226766/01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",SportsMax TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",SportsMax TV
 http://161.0.157.5/PLTV/88888888/224/3221226766/02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",SportsMax TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",SportsMax TV
 http://161.0.157.5/PLTV/88888888/224/3221226766/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/5/54/STAR_Movies_logo.svg/1200px-STAR_Movies_logo.svg.png" group-title="Movies",Star Movies (Opt-1)
-http://livecdnh1.tvanywhere.ae:80/hls/star_movies/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/star_movies_hk_hd_in.png" group-title="Movies",Star Movies (Opt-2)
-http://livecdnh1.tvanywhere.ae/hls/star_movies/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/star_movies_hk_hd_in.png" group-title="Movies",Star Movies (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/star_movies_hk_hd_in.png" group-title="Movies",Star Movies
 http://livecdnh1.tvanywhere.ae/hls/star_movies/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/2/23/Star_World_2016_logo.png/300px-Star_World_2016_logo.png" group-title="Entertainment",Star World (Opt-1)
-http://livecdnh1.tvanywhere.ae:80/hls/star_world/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/star_world_in.png" group-title="Entertainment",Star World (Opt-2)
-http://livecdnh1.tvanywhere.ae/hls/star_world/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/star_world_in.png" group-title="Entertainment",Star World (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/star_movies_hk_hd_in.png" group-title="Movies",Star Movies
+http://livecdnh1.tvanywhere.ae/hls/star_movies/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/5/54/STAR_Movies_logo.svg/1200px-STAR_Movies_logo.svg.png" group-title="Movies",Star Movies
+http://livecdnh1.tvanywhere.ae:80/hls/star_movies/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/star_world_in.png" group-title="Entertainment",Star World
 http://livecdnh1.tvanywhere.ae/hls/star_world/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",SuperSoccer TV (Opt-1)
-http://45.126.83.51/uq2663/h/h20/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn01.supersoccer.tv/v3/img/ss.png" group-title="Sport",SuperSoccer TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/01/star_world_in.png" group-title="Entertainment",Star World
+http://livecdnh1.tvanywhere.ae/hls/star_world/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/2/23/Star_World_2016_logo.png/300px-Star_World_2016_logo.png" group-title="Entertainment",Star World
+http://livecdnh1.tvanywhere.ae:80/hls/star_world/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn01.supersoccer.tv/v3/img/ss.png" group-title="Sport",SuperSoccer TV
 http://210.210.155.35/uq2663/h/h20/01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",SuperSoccer TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",SuperSoccer TV
 http://210.210.155.35/uq2663/h/h20/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Swamiji TV (Opt-1)
-http://stream.swamiji.tv/YogaIPTV/smil:YogaStream.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.vishwaguruji.org/images/our-projects/swamiji-tv.jpg" group-title="",Swamiji TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",SuperSoccer TV
+http://45.126.83.51/uq2663/h/h20/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.vishwaguruji.org/images/our-projects/swamiji-tv.jpg" group-title="",Swamiji TV
 http://stream.swamiji.tv/YogaIPTV/smil:YogaStream.smil/chunklist_w1606422831_b400000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Swamiji TV
+http://stream.swamiji.tv/YogaIPTV/smil:YogaStream.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",TBN Baltia
 https://str-2.mediabay.tv/TBN_Baltia/playlist.m3u8?token=a37ab129fbbe1dd25f657e37ac83cf23c1a4c3f7-edddf536846128183afbc0c177f18ae1-1566593971-1566583171
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.telesurenglish.net/export/sites/telesur/arte/Texto-telesur-hd.png_1571705870.png" group-title="News",TeleSUR English (Opt-1)
-https://d7g1ebft2592.cloudfront.net/mblivev3/hd/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/b/bf/TeleSUR-Logo.svg/933px-TeleSUR-Logo.svg.png" group-title="News",TeleSUR English (Opt-2)
-https://d7g1ebft2592.cloudfront.net/mblivev3/hd/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",TeleSUR English (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",TeleSUR English
 https://d7g1ebft2592.cloudfront.net/mblivev3/hd/chunklist_w801355776.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.telesurenglish.net/export/sites/telesur/arte/Texto-telesur-hd.png_1571705870.png" group-title="News",TeleSUR English
+https://d7g1ebft2592.cloudfront.net/mblivev3/hd/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/b/bf/TeleSUR-Logo.svg/933px-TeleSUR-Logo.svg.png" group-title="News",TeleSUR English
+https://d7g1ebft2592.cloudfront.net/mblivev3/hd/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://ztalkradio.com/wp-content/uploads/2016/06/alex-jones.jpg" group-title="",The Alex Jones Show
 https://infostream.secure.footprint.net/hls-live/infostream-infostream/_definst_/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5uIXfol.jpg" group-title="",The Boat Show
@@ -817,49 +817,49 @@ https://d2ktlibtvvj8vp.cloudfront.net/trace_tropical/6/prog_index.m3u8?fluxustv.
 https://d2ktlibtvvj8vp.cloudfront.net/trace_urbaninter/5/prog_index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.batitrakya.org/wp-content/uploads/2016/01/trt-avaz.jpg" group-title="",TRT Avaz
 http://trtcanlitv-lh.akamaihd.net/i/TRTAVAZ_1@182244/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/9/9a/Trt_turk.png" group-title="",TRT Türk (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/9/9a/Trt_turk.png" group-title="",TRT Türk
 http://trtcanlitv-lh.akamaihd.net/i/TRTTURK_1@182144/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/9/9a/Trt_turk.png" group-title="",TRT Türk (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/9/9a/Trt_turk.png" group-title="",TRT Türk
 https://str-4.mediabay.tv/TRT_TURK/playlist.m3u8?token=868b89aede2f712b4db61cac42b5467f81667860-f843d2c38daec264ff6107bc4b60daff-1566585449-1566574649
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",TRT World
 https://trtcanlitv-lh.akamaihd.net/i/TRTWORLD_1@321783/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV Galicia América
 http://america-crtvg.flumotion.com/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtv.un.org/assets/img/header-logo.gif" group-title="News",UN Web TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtv.un.org/assets/img/header-logo.gif" group-title="News",UN Web TV
 https://bcliveunivsecure-lh.akamaihd.net/i/un150_A1_1@575439/index_1328_av-b.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/lPyJhBN.png" group-title="News",UN Web TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/lPyJhBN.png" group-title="News",UN Web TV
 https://bcliveunivsecure-lh.akamaihd.net/i/un150_A1_1@575439/index_1328_av-b.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Ll6GlqY.png" group-title="Music",V2BEAT TV (Opt-1)
-http://de1se01.v2beat.live/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",V2BEAT TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",V2BEAT TV
 http://139.59.166.48:8081/live/live3/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JWJ8nJB.jpg" group-title="Music",V2BEAT TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Ll6GlqY.png" group-title="Music",V2BEAT TV
+http://de1se01.v2beat.live/playlist.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JWJ8nJB.jpg" group-title="Music",V2BEAT TV
 https://de1se01.v2beat.live/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="XXX",VISIT-X
 http://stream.visit-x.tv:1935/vxtv/live_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",VOA (Opt-1)
-https://voa-lh.akamaihd.net/i/voa_mpls_tvmc6@320298/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://123tvgo.com/wp-content/uploads/2018/08/VOA-269x151.png" group-title="",VOA (Opt-2)
-https://voa-lh.akamaihd.net/i/voa_mpls_tvmc6@320298/index_0540_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",VOA (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",VOA
 http://voa-lh.akamaihd.net/i/voa_mpls_tvmc3_3@320295/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",VOA (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",VOA
 http://voa-lh.akamaihd.net/i/voapnn_7@72817/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://123tvgo.com/wp-content/uploads/2018/08/VOA-269x151.png" group-title="",VOA
+https://voa-lh.akamaihd.net/i/voa_mpls_tvmc6@320298/index_0540_av-p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",VOA
+https://voa-lh.akamaihd.net/i/voa_mpls_tvmc6@320298/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",YourTime TV
 https://hls.yourtime.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Zee Bioskop (Opt-1)
-http://210.210.155.35/qwr9ew/s/s32/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.zeebioskop.com/images/image002.png" group-title="",Zee Bioskop (Opt-2)
-http://210.210.155.35/qwr9ew/s/s32/index2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Zee Bioskop (Opt-3)
-http://210.210.155.35/session/031c454a-7d85-11e8-820c-c81f66f89318/qwr9ew/s/s32/index1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Zee Bioskop (Opt-4)
-http://210.210.155.35/session/5d6f2928-d6cb-11e8-8e98-c81f66f89318/qwr9ew/s/s32/index2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.zeeinternational.co.in/wp-content/uploads/2018/02/Zee-Bioskop.png" group-title="",Zee Bioskop (Opt-5)
-http://210.210.155.35/qwr9ew/s/s32/01.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.postimg.cc/V6xWZTgY/zeebioskop.png" group-title="Local",Zee Bioskop (Opt-6)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.postimg.cc/V6xWZTgY/zeebioskop.png" group-title="Local",Zee Bioskop
 http://210.210.155.35/qwr9ew/s/s32/01.m3u8
-#EXTINF:-1 tvg-id="rtr-planeta-eu" tvg-name="РТР-Планета Европа" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rtr_planeta_baltics.jpg" group-title="General",РТР-Планета (Европа) (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.zeeinternational.co.in/wp-content/uploads/2018/02/Zee-Bioskop.png" group-title="",Zee Bioskop
+http://210.210.155.35/qwr9ew/s/s32/01.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Zee Bioskop
+http://210.210.155.35/qwr9ew/s/s32/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.zeebioskop.com/images/image002.png" group-title="",Zee Bioskop
+http://210.210.155.35/qwr9ew/s/s32/index2.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Zee Bioskop
+http://210.210.155.35/session/031c454a-7d85-11e8-820c-c81f66f89318/qwr9ew/s/s32/index1.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Zee Bioskop
+http://210.210.155.35/session/5d6f2928-d6cb-11e8-8e98-c81f66f89318/qwr9ew/s/s32/index2.m3u8
+#EXTINF:-1 tvg-id="rtr-planeta-eu" tvg-name="РТР-Планета Европа" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rtr_planeta_baltics.jpg" group-title="General",РТР-Планета (Европа)
 http://ott-cdn.ucom.am/s15/index.m3u8
-#EXTINF:-1 tvg-id="rtr-planeta-eu" tvg-name="РТР-Планета Европа" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rtr_planeta_baltics.jpg" group-title="General",РТР-Планета (Европа) (Opt-2)
+#EXTINF:-1 tvg-id="rtr-planeta-eu" tvg-name="РТР-Планета Европа" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rtr_planeta_baltics.jpg" group-title="General",РТР-Планета (Европа)
 https://str-3.mediabay.tv/RTR_Planeta/playlist.m3u8?token=7e71aab31eef82ef52447a883f5ef62404c21727-ada09b416dd5b20d9f3a16c4cfccb1d2-1566589124-1566578324
diff --git a/channels/iq.m3u b/channels/iq.m3u
index 37e4191c0..956a8092c 100644
--- a/channels/iq.m3u
+++ b/channels/iq.m3u
@@ -1,8 +1,8 @@
 #EXTM3U x-tvg-url="http://195.154.221.171/epg/guidearab.xml.gz"
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RBdfdxI.png" group-title="",Al Rasheed TV (Opt-1)
-http://www.elahmad.com/tv/m3u8/gmswf.m3u8?id=alrasheed
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RBdfdxI.png" group-title="",Al Rasheed TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RBdfdxI.png" group-title="",Al Rasheed TV
 http://streamer11.elementssys.com:8080/alrashid/alrashid_850kbps/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RBdfdxI.png" group-title="",Al Rasheed TV
+http://www.elahmad.com/tv/m3u8/gmswf.m3u8?id=alrasheed
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qNi4rwG.jpg" group-title="News",Al Sharqiya News
 http://ns8.indexforce.com:1935/alsharqiyalive/mystream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/x5buqzt.jpg" group-title="",Al-Rafidain TV
@@ -11,11 +11,11 @@ http://149.202.79.190:8081/arrafidaintv/publish/chunks.m3u8
 http://e7wfgmi6.blue.onyxservers.com/hls-live/livepkgr/_definst_/liveevent/AmozhgaryLiveTv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/R0klqgb.jpg" group-title="",AVA TV
 http://51.15.236.137/hls/stream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/w5xVJZg.png" group-title="",Dijlah TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/w5xVJZg.png" group-title="",Dijlah TV
 http://91.134.145.75:10001/Dijlah/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/w5xVJZg.png" group-title="",Dijlah TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/w5xVJZg.png" group-title="",Dijlah TV
 https://flupanel.ghaasi.com/Dijlah/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/w5xVJZg.png" group-title="",Dijlah TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/w5xVJZg.png" group-title="",Dijlah TV
 https://ghaasiflu.online/Dijlah/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Pguy19B.png" group-title="",Dua Channel
 http://38.96.175.40:1935/liveTrans//channel5_190k/chunklist_w609791274.m3u8
diff --git a/channels/ir.m3u b/channels/ir.m3u
index 8ec8bc9c5..563881216 100644
--- a/channels/ir.m3u
+++ b/channels/ir.m3u
@@ -1,7 +1,7 @@
 #EXTM3U x-tvg-url="http://195.154.221.171/epg/guideiran.xml.gz"
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al-Alam (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al-Alam
 http://live2.alalam.ir/live/Alalam_high/index.m3u8?v=1771904733
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al-Alam (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Al-Alam
 https://live2.alalamtv.net/live/Alalam/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.assirat.tv/uploaded/HADIS.JPG" group-title="",Al-Sirat
 https://svs.itworkscdn.net/assiratvlive/assirat/playlist.m3u8
@@ -13,15 +13,15 @@ https://j7md5gvqyrwv-hls-live.5centscdn.com/glorygroup/7cc920348532e7cc63e15024f
 https://j7md5gvqyrwv-hls-live.5centscdn.com/glorygroup/db2545515c456c8ff5d2ba3c474838e3.sdp/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://hopecity.com.co/wp-content/uploads/2019/07/hopecity.png" group-title="",HopeCity TV
 https://j7md5gvqyrwv-hls-live.5centscdn.com/glorygroup/f452c68e7b76ad89f969273ee3c4b859.sdp/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2UQCl7M.png" group-title="",iFilm 2 (Opt-1)
-http://mn-nl.mncdn.com/ifilm/smil:ifilmfa2.smil/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2UQCl7M.png" group-title="",iFilm 2 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2UQCl7M.png" group-title="",iFilm 2
 http://mn-nl.mncdn.com/ifilm/smil:ifilmfa2.smil/chunklist_b1096000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2UQCl7M.png" group-title="",iFilm 2
+http://mn-nl.mncdn.com/ifilm/smil:ifilmfa2.smil/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xrebqxX.png" group-title="",iFilm Arabic
 https://5a61de8ed719d.streamlock.net:1443/ifilmlive/smil:ifilmar.smil/chunklist_w1973189296_b944100_slen.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xrebqxX.png" group-title="",iFilm English (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xrebqxX.png" group-title="",iFilm English
 http://mn-nl.mncdn.com/ifilm/smil:ifilmen.smil/chunklist_b1096000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xrebqxX.png" group-title="",iFilm English (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xrebqxX.png" group-title="",iFilm English
 http://mn-nl.mncdn.com/ifilm/smil:ifilmen.smil/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xrebqxX.png" group-title="",iFilm Persian
 https://5a61de8ed719d.streamlock.net:1443/ifilmlive/smil:ifilmtv.smil/chunklist_w205801397_b944100_slen.m3u8
@@ -57,9 +57,9 @@ http://iptv.tapesh.tv/tapesh/playlist.m3u8
 https://bozztv.com/36bay2/gin/giniko_presstv_900kb_36bay2/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.radiofarda.com/Content/responsive/RFE/fa-IR/img/logo.png" group-title="",Radio Farda
 http://rfe-lh.akamaihd.net/i/rfe_tvmc1@383622/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://amoosat.com/wp-content/uploads/2016/12/rjtv-1.jpg" group-title="",Radio Javan (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://amoosat.com/wp-content/uploads/2016/12/rjtv-1.jpg" group-title="",Radio Javan
 http://198.98.181.244/live/smil:rjtv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Radio Javan (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Radio Javan
 http://rjtv1.rjtv.me/live/smil:rjtv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://is3-ssl.mzstatic.com/image/thumb/Purple118/v4/39/90/b0/3990b0e8-e22e-feab-7f83-56a1d03dc921/source/512x512bb.jpg" group-title="",Rangarang TV
 http://iptv.rangarang.us/live/playlist.m3u8
diff --git a/channels/is.m3u b/channels/is.m3u
index 5cb39e54f..33a478cb2 100644
--- a/channels/is.m3u
+++ b/channels/is.m3u
@@ -1,9 +1,9 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/oqEUHL1.png" group-title="",Althingi
 https://213-167-154-115.netvarp.is/althingi_600/tracks-v1a1/rewind-86400.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.icelandwintergames.com/static/gallery/partners-1/.thumb/n4.png" group-title="",N4 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.icelandwintergames.com/static/gallery/partners-1/.thumb/n4.png" group-title="",N4
 http://tv.vodafoneplay.is/n4/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.n4.is/static/themes/2013/images/logo.png" group-title="",N4 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.n4.is/static/themes/2013/images/logo.png" group-title="",N4
 http://tv.vodafoneplay.is/n4/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dqJX5p1.png" group-title="",Omega
 http://sip-live.hds.adaptive.level3.net/hls-live/omega-omega/_definst_/live/stream1.m3u8
diff --git a/channels/it.m3u b/channels/it.m3u
index 7f5a04674..c2b8179b4 100644
--- a/channels/it.m3u
+++ b/channels/it.m3u
@@ -1,8 +1,8 @@
 #EXTM3U x-tvg-url="http://195.154.221.171/epg/guideitaly.xml.gz"
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/BZSFqUz.png" group-title="",111 TV Liguria (Opt-1)
-http://dcunilive36-lh.akamaihd.net/i/dclive_1@662089/master.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/OVpsupt.png" group-title="",111 TV Liguria (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/OVpsupt.png" group-title="",111 TV Liguria
 http://dcunilive36-lh.akamaihd.net/i/dclive_1@662089/index_150_av-p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/BZSFqUz.png" group-title="",111 TV Liguria
+http://dcunilive36-lh.akamaihd.net/i/dclive_1@662089/master.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.dtti.it/wp-content/uploads/2018/03/20_logo-1.jpg" group-title="",20
 https://1.ip2stream.icu/live/20_mediaset_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i65.tinypic.com/wmf409.jpg" group-title="",51 Radio TV
@@ -25,31 +25,31 @@ https://sb.top-ix.org/avtvlive/streaming/playlist.m3u8?fluxustv.m3u8
 https://1.ip2stream.icu/live/boing_hd/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.jennigandolfi.com/wp-content/uploads/2018/04/LOGO-CAFETV24-2018_01_12-15_26_50-UTC.png" group-title="",CafèTV24
 http://srv3.meway.tv:1957/cafe/live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canale 10 (Opt-1)
-http://37.187.142.147:1935/ch10live/high.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.canaledieci.it/wp-content/themes/Divi/images/logo.png" group-title="",Canale 10 (Opt-2)
-http://67.231.248.131:1935/live/PTVnews/chunklist_w1281891626.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canale 10 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canale 10
 http://37.187.142.147:1935/ch10live/high.stream/live.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canale 10
+http://37.187.142.147:1935/ch10live/high.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.canaledieci.it/wp-content/themes/Divi/images/logo.png" group-title="",Canale 10
+http://67.231.248.131:1935/live/PTVnews/chunklist_w1281891626.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/uh4R5Ih.png" group-title="",Canale 2 Altamura
 https://59d7d6f47d7fc.streamlock.net/canale2/canale2/chunklist_w811855890.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="Canale 5 IT" tvg-name="Canale 5 IT" tvg-logo="https://static.iptv-epg.com/it/Canale5.it.png" group-title="",Canale 5
 https://1.ip2stream.icu/live/canale_5_hd/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canale 7 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canale 7
 http://wms.shared.streamshow.it/canale7/canale7/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canale 7 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canale 7
 http://wms.shared.streamshow.it:1935/canale7/canale7/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canale 8
 http://wms.shared.streamshow.it:80/canale8/canale8/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.canale85.it/wp-content/uploads/2018/10/canale85.png" group-title="",Canale 85 Puglia (Opt-1)
-https://59d7d6f47d7fc.streamlock.net/redirect/canale85/canale85?type=m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canale 85 Puglia (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canale 85 Puglia
 http://wms.shared.streamshow.it/canale85/mp4:canale85/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.canale85.it/wp-content/uploads/2018/10/canale85.png" group-title="",Canale 85 Puglia
+https://59d7d6f47d7fc.streamlock.net/redirect/canale85/canale85?type=m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/it/thumb/1/1e/Canale_Italia_Logo_2015.png/260px-Canale_Italia_Logo_2015.png" group-title="",Canale Italia 83
 http://ac024fe.streamcloud.it/service/media-provider/live/4847/playlist.m3u8?accessToken=51c3544ac33a24b012ba69bf6349db78
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.altrostudio.tv/images/portfolio/carinatv.jpg" group-title="",Carina TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.altrostudio.tv/images/portfolio/carinatv.jpg" group-title="",Carina TV
 http://wms.shared.streamshow.it/carinatv/carinatv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Carina TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Carina TV
 http://wms.shared.streamshow.it/carinatv/mp4:carinatv/playlist.m3u8
 #EXTINF:-1 tvg-id="Cartoon Network IT" tvg-name="Cartoon Network IT" tvg-logo="https://static.iptv-epg.com/gb/CartoonNetwork.uk.png" group-title="Kids",Cartoon Network
 https://1.ip2stream.icu/live/cartoon_network_hd/chunks.m3u8
@@ -57,14 +57,14 @@ https://1.ip2stream.icu/live/cartoon_network_hd/chunks.m3u8
 https://1.ip2stream.icu/live/cartoonito_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="Cielo IT" tvg-name="Cielo IT" tvg-logo="https://i.imgur.com/3ooVEMl.png" group-title="",Cielo
 https://1.ip2stream.icu/live/cielo_hd/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Company TV (Opt-1)
-http://wma10.fluidstream.net/CompanyTV/smil:CompanyTV.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Company TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Company TV
 http://wma10.fluidstream.net/CompanyTV/_definst_/mp4:livestream_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="Deejay TV IT" tvg-name="Deejay TV IT" tvg-logo="" group-title="Music",DeeJay TV (Opt-1)
-http://deejay_tv-lh.akamaihd.net/i/DeejayTv_1@129866/master.m3u8
-#EXTINF:-1 tvg-id="Deejay TV IT" tvg-name="Deejay TV IT" tvg-logo="" group-title="Music",DeeJay TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Company TV
+http://wma10.fluidstream.net/CompanyTV/smil:CompanyTV.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="Deejay TV IT" tvg-name="Deejay TV IT" tvg-logo="" group-title="Music",DeeJay TV
 http://deejay_tv-lh.akamaihd.net/i/DeejayTv_1@129866/index_600_av-p.m3u8
+#EXTINF:-1 tvg-id="Deejay TV IT" tvg-name="Deejay TV IT" tvg-logo="" group-title="Music",DeeJay TV
+http://deejay_tv-lh.akamaihd.net/i/DeejayTv_1@129866/master.m3u8
 #EXTINF:-1 tvg-id="Discovery Channel IT" tvg-name="Discovery Channel IT" tvg-logo="https://static.iptv-epg.com/gb/DiscoveryChannel.uk.png" group-title="",Discovery Channel
 https://1.ip2stream.icu/live/discovery_channel_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="Discovery Science IT" tvg-name="Discovery Science IT" tvg-logo="https://static.iptv-epg.com/gb/DiscoveryScience.uk.png" group-title="",Discovery Science
@@ -73,65 +73,65 @@ https://1.ip2stream.icu/live/discovery_science_hd/chunks.m3u8
 https://1.ip2stream.icu/live/disney_channel_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="Disney Junior IT" tvg-name="Disney Junior IT" tvg-logo="https://static.iptv-epg.com/kr/DisneyChannel.kr.png" group-title="",Disney Junior
 https://1.ip2stream.icu/live/disney_junior_hd/playlist.m3u8
-#EXTINF:-1 tvg-id="DMAX IT" tvg-name="DMAX IT" tvg-logo="https://static.iptv-epg.com/gb/DiscoveryDMAX.uk.png" group-title="",DMAX (Opt-1)
+#EXTINF:-1 tvg-id="DMAX IT" tvg-name="DMAX IT" tvg-logo="https://static.iptv-epg.com/gb/DiscoveryDMAX.uk.png" group-title="",DMAX
 https://1.ip2stream.icu/live/dmax_hd/chunks.m3u8
-#EXTINF:-1 tvg-id="DMAX IT" tvg-name="DMAX IT" tvg-logo="http://tv-online.in/wp-content/uploads/2015/02/DMax-live.gif" group-title="",DMAX (Opt-2)
+#EXTINF:-1 tvg-id="DMAX IT" tvg-name="DMAX IT" tvg-logo="http://tv-online.in/wp-content/uploads/2015/02/DMax-live.gif" group-title="",DMAX
 https://sbshdlu3-lh.akamaihd.net/i/sbshdlive_4@99403/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/N6OtbVs.png" group-title="",Donna TV
 http://wms.shared.streamshow.it/okitalia/okitalia/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.elivebrescia.tv/wp-content/uploads/2018/09/Logo_nuovo_CLAIM.png" group-title="",Elive TV Brescia
 https://59d7d6f47d7fc.streamlock.net/elivebresciatv/elivebresciatv/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ottoetrenta.it/wp-content/uploads/2014/12/esperia.png" group-title="",Esperia TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ottoetrenta.it/wp-content/uploads/2014/12/esperia.png" group-title="",Esperia TV
 http://wms.shared.streamshow.it/esperiatv/esperiatv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.esperia.tv/file/2018/10/EsperiaTVwhite.png" group-title="",Esperia TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.esperia.tv/file/2018/10/EsperiaTVwhite.png" group-title="",Esperia TV
 https://59d7d6f47d7fc.streamlock.net/esperiatv/esperiatv/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.etvmarche.it/wp-content/uploads/2017/07/logo_etv.png" group-title="",ETV Marche (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.etvmarche.it/wp-content/uploads/2017/07/logo_etv.png" group-title="",ETV Marche
 http://live.sloode.com:1935/etvmarche_live/_definst_/etvmarche/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ETV Marche (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ETV Marche
 http://live.streamcaster.net:1935/etvmarche_live/etvmarche/livestream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ETV Marche (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ETV Marche
 http://vs2.streamcaster.net:1935/etvmarche_live/etvmarche/hasbahca.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/Eurosport1.uk.png" group-title="Sport",Eurosport 1
 https://1.ip2stream.icu/live/eurosport_1_hd/playlist.m3u8
-#EXTINF:-1 tvg-id="FOX IT" tvg-name="FOX IT" tvg-logo="https://raw.githubusercontent.com/teamblue65/LOGO/master/FOX.png" group-title="",Fox (Opt-1)
-https://1.ip2stream.icu/live/fox_hd/playlist.m3u8
-#EXTINF:-1 tvg-id="FOX IT" tvg-name="FOX IT" tvg-logo="https://static.iptv-epg.com/gb/FOX.uk.png" group-title="",Fox (Opt-2)
+#EXTINF:-1 tvg-id="FOX IT" tvg-name="FOX IT" tvg-logo="https://static.iptv-epg.com/gb/FOX.uk.png" group-title="",Fox
 https://1.ip2stream.icu/live/fox_hd/chunks.m3u8
+#EXTINF:-1 tvg-id="FOX IT" tvg-name="FOX IT" tvg-logo="https://raw.githubusercontent.com/teamblue65/LOGO/master/FOX.png" group-title="",Fox
+https://1.ip2stream.icu/live/fox_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="FOX Animation IT" tvg-name="FOX Animation IT" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/7/71/Fox_Animation_Logo_2015.png" group-title="",Fox Animation
 https://1.ip2stream.icu/live/fox_animation_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="FOX Comedy IT" tvg-name="FOX Comedy IT" tvg-logo="https://pbs.twimg.com/profile_images/724557428591853568/EwIhi2Sj.jpg" group-title="",Fox Comedy
 https://1.ip2stream.icu/live/fox_comedy_hd/chunks.m3u8
 #EXTINF:-1 tvg-id="FOX Crime IT" tvg-name="FOX Crime IT" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/b/b9/Fox_Crime_2017.svg/1280px-Fox_Crime_2017.svg.png" group-title="",Fox Crime
 https://1.ip2stream.icu/live/fox_crime_hd/chunks.m3u8
-#EXTINF:-1 tvg-id="FOX Life IT" tvg-name="FOX Life IT" tvg-logo="https://raw.githubusercontent.com/teamblue65/LOGO/master/FOXLIFE.png" group-title="",Fox Life (Opt-1)
-https://1.ip2stream.icu/live/fox_life_hd/playlist.m3u8
-#EXTINF:-1 tvg-id="FOX Life IT" tvg-name="FOX Life IT" tvg-logo="https://static.iptv-epg.com/us/FOXLife.us.png" group-title="",Fox Life (Opt-2)
+#EXTINF:-1 tvg-id="FOX Life IT" tvg-name="FOX Life IT" tvg-logo="https://static.iptv-epg.com/us/FOXLife.us.png" group-title="",Fox Life
 https://1.ip2stream.icu/live/fox_life_hd/chunks.m3u8
+#EXTINF:-1 tvg-id="FOX Life IT" tvg-name="FOX Life IT" tvg-logo="https://raw.githubusercontent.com/teamblue65/LOGO/master/FOXLIFE.png" group-title="",Fox Life
+https://1.ip2stream.icu/live/fox_life_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="Frisbee IT" tvg-name="Frisbee IT" tvg-logo="http://www.frisbeetv.it/wp-content/themes/mt-landing-wp/img/logo.png" group-title="",Frisbee
 https://1.ip2stream.icu/live/frisbee_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="Gambero Rosso IT" tvg-name="Gambero Rosso IT" tvg-logo="http://www2.ggori.com/wp-content/uploads/2018/10/gambero-rosso-academy-213336095.jpg" group-title="",Gambero Rosso
 https://1.ip2stream.icu/live/gambero_rosso_hd/chunks.m3u8
-#EXTINF:-1 tvg-id="Giallo IT" tvg-name="Giallo IT" tvg-logo="https://static.iptv-epg.com/it/Giallo.it.png" group-title="",Giallo (Opt-1)
+#EXTINF:-1 tvg-id="Giallo IT" tvg-name="Giallo IT" tvg-logo="https://static.iptv-epg.com/it/Giallo.it.png" group-title="",Giallo
 https://1.ip2stream.icu/live/giallo_hd/chunks.m3u8
-#EXTINF:-1 tvg-id="Giallo IT" tvg-name="Giallo IT" tvg-logo="https://raw.githubusercontent.com/teamblue65/LOGO/master/GIALLO.png" group-title="",Giallo (Opt-2)
+#EXTINF:-1 tvg-id="Giallo IT" tvg-name="Giallo IT" tvg-logo="https://raw.githubusercontent.com/teamblue65/LOGO/master/GIALLO.png" group-title="",Giallo
 https://1.ip2stream.icu/live/giallo_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8Nba42X.png" group-title="",Gold TV Roma
 http://151.0.207.99:1935/GoldTV/GOLD_17/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://directostv.teleame.com/wp-content/uploads/2017/12/Histori-Lab.png" group-title="",History Lab (Opt-1)
-http://wma10.fluidstream.net:1935/HistoryLab/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",History Lab (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",History Lab
 http://wma10.fluidstream.net/HistoryLab/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.cxtv.com.br/img/Tvs/Logo/1dd08ff2959bb19209a7a49b72765d53.png" group-title="",History Lab (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.cxtv.com.br/img/Tvs/Logo/1dd08ff2959bb19209a7a49b72765d53.png" group-title="",History Lab
 http://wma10.fluidstream.net/HistoryLab/livestream/playlist.m3u8?ANTONYGTV
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://directostv.teleame.com/wp-content/uploads/2017/12/Histori-Lab.png" group-title="",History Lab
+http://wma10.fluidstream.net:1935/HistoryLab/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/nWBWzNy.png" group-title="",Icaro TV
 https://59d7d6f47d7fc.streamlock.net/icarotv/icarotv/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://mobile.ilmeteo.it/img/app-plus-icon-2.png" group-title="",Il Meteo.It Domani
 http://media.ilmeteo.it/video/iphone/domani.m4v
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://mobile.ilmeteo.it/img/app-plus-icon-2.png" group-title="",Il Meteo.It Oggi
 http://media.ilmeteo.it/video/iphone/oggi.m4v
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",IRC Sport TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",IRC Sport TV
 http://178.32.140.155/irctv/mp4:irctv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.ircsporttv.it/assets/front/img/logo.png" group-title="Sport",IRC Sport TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.ircsporttv.it/assets/front/img/logo.png" group-title="Sport",IRC Sport TV
 http://wms.shared.streamshow.it/irctv/mp4:irctv/playlist.m3u8
 #EXTINF:-1 tvg-id="Iris IT" tvg-name="Iris IT" tvg-logo="https://static.iptv-epg.com/it/Iris.it.png" group-title="",Iris
 https://1.ip2stream.icu/live/iris_hd/playlist.m3u8
@@ -147,24 +147,24 @@ https://59ef7ad665d1d.streamlock.net:1443/julieitalia/_definst_/julieitalia/play
 https://59ef7ad665d1d.streamlock.net:1443/eslife/_definst_/eslife/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="La5 IT" tvg-name="La5 IT" tvg-logo="https://www.oggi-in-tv.it/logo_thumb/la5-thumb.png" group-title="",La5
 https://1.ip2stream.icu/live/la_5_hd/chunks.m3u8
-#EXTINF:-1 tvg-id="La7 IT" tvg-name="La7 IT" tvg-logo="https://yt3.ggpht.com/-hYWT0MBszjE/AAAAAAAAAAI/AAAAAAAAAAA/Xbg1WDitHBI/s900-c-k-no-mo-rj-c0xffffff/photo.jpg" group-title="",La7 (Opt-1)
+#EXTINF:-1 tvg-id="La7 IT" tvg-name="La7 IT" tvg-logo="https://yt3.ggpht.com/-hYWT0MBszjE/AAAAAAAAAAI/AAAAAAAAAAA/Xbg1WDitHBI/s900-c-k-no-mo-rj-c0xffffff/photo.jpg" group-title="",La7
 http://la7-vh.akamaihd.net/i/content/entry/data/0/299/0_b7o9lvba_0_kyyr8vxz_1.mp4/master.m3u8
-#EXTINF:-1 tvg-id="La7 IT" tvg-name="La7 IT" tvg-logo="http://www.la7.it/sites/default/files/la7_logo_0102_def.png" group-title="",La7 (Opt-2)
+#EXTINF:-1 tvg-id="La7 IT" tvg-name="La7 IT" tvg-logo="http://www.la7.it/sites/default/files/la7_logo_0102_def.png" group-title="",La7
 https://1.ip2stream.icu/live/la_7_hd/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.lactv.it/wp-content/uploads/2017/12/lactv-new-2.png" group-title="",LaC TV
 http://StreamCdnC3.mainstreaming.tv:80/cdn/live/100197/SOrBDPy/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/4RKmGcr.png" group-title="",Lucania Channel
 http://wms.shared.streamshow.it/lucaniatv/mp4:lucaniatv/chunklist_w852349934.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="M2O IT" tvg-name="M2O IT" tvg-logo="" group-title="Music",m2o TV (Opt-1)
-http://m2otv-lh.akamaihd.net/i/m2oTv_1@186074/index_600_av-p.m3u8
-#EXTINF:-1 tvg-id="M2O IT" tvg-name="M2O IT" tvg-logo="" group-title="Music",m2o TV (Opt-2)
+#EXTINF:-1 tvg-id="M2O IT" tvg-name="M2O IT" tvg-logo="" group-title="Music",m2o TV
 http://m2otv-lh.akamaihd.net/i/m2oTv_1@186074/index_600_av-b.m3u8
-#EXTINF:-1 tvg-id="M2O IT" tvg-name="M2O IT" tvg-logo="" group-title="Music",m2o TV (Opt-3)
+#EXTINF:-1 tvg-id="M2O IT" tvg-name="M2O IT" tvg-logo="" group-title="Music",m2o TV
 http://m2otv-lh.akamaihd.net/i/m2oTv_1@186074/index_600_av-b.m3u8?iptvgratis?chile.m3u8
-#EXTINF:-1 tvg-id="M2O IT" tvg-name="M2O IT" tvg-logo="http://digitalradio.it/wp-content/uploads/2016/10/Logo-m2o.png" group-title="Music",m2o TV (Opt-4)
-http://m2otv-lh.akamaihd.net/i/m2oTv_1@186074/index_600_av-b.m3u8?www.tecnotv.info?sd=10&rebase=on
-#EXTINF:-1 tvg-id="M2O IT" tvg-name="M2O IT" tvg-logo="https://www.m2o.it/wp-content/themes/network-m2o/img/logo_m2o_1024x1024.png" group-title="Music",m2o TV (Opt-5)
+#EXTINF:-1 tvg-id="M2O IT" tvg-name="M2O IT" tvg-logo="https://www.m2o.it/wp-content/themes/network-m2o/img/logo_m2o_1024x1024.png" group-title="Music",m2o TV
 http://m2otv-lh.akamaihd.net/i/m2oTv_1@186074/index_600_av-b.m3u8?sd=10&rebase=on?GrupoTopIptv
+#EXTINF:-1 tvg-id="M2O IT" tvg-name="M2O IT" tvg-logo="http://digitalradio.it/wp-content/uploads/2016/10/Logo-m2o.png" group-title="Music",m2o TV
+http://m2otv-lh.akamaihd.net/i/m2oTv_1@186074/index_600_av-b.m3u8?www.tecnotv.info?sd=10&rebase=on
+#EXTINF:-1 tvg-id="M2O IT" tvg-name="M2O IT" tvg-logo="" group-title="Music",m2o TV
+http://m2otv-lh.akamaihd.net/i/m2oTv_1@186074/index_600_av-p.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.motortrendtv.it/wp-content/themes/mt-landing-wp/img/logo.png" group-title="Auto",MotorTrend
 https://sbshdlu5-lh.akamaihd.net/i/sbshdl_1@810993/master.m3u8
 #EXTINF:-1 tvg-id="Nat Geo People IT" tvg-name="Nat Geo People IT" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/8/8a/NatGeo_People_logo.png" group-title="",Nat Geo People
@@ -179,9 +179,9 @@ https://sbshdlu5-lh.akamaihd.net/i/sbshdl_3@810997/master.m3u8
 http://dcunilive36-lh.akamaihd.net/i/dclive_1@662093/master.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Ia7iULa.png" group-title="",Orler TV
 https://w1.mediastreaming.it/orlertv/livestream/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2jE6ItV.png" group-title="",Otto FM TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2jE6ItV.png" group-title="",Otto FM TV
 http://217.182.192.240:8080/hls/ottofmtv/1_2/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://ottofm.com/wp-content/uploads/2017/07/01anni80.png" group-title="",Otto FM TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://ottofm.com/wp-content/uploads/2017/07/01anni80.png" group-title="",Otto FM TV
 http://217.182.192.240:8080/hls/ottofmtv/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/it/7/78/Tele_Radio_Padre_Pio.png" group-title="",Padre Pio TV
 https://56972e8bd3345.streamlock.net/TRPP_live/smil:bcffcc98-ac2f-4b73-b0a5-ad1bfb96d845_all.smil/chunklist_w1418321773_b227000_slita.m3u8
@@ -201,22 +201,22 @@ https://1.ip2stream.icu/live/premium_cinema_hd/playlist.m3u8
 https://1.ip2stream.icu/live/premium_joi/playlist.m3u8
 #EXTINF:-1 tvg-id="Premium Stories IT" tvg-name="Premium Stories IT" tvg-logo="https://www.oggi-in-tv.it/logo_thumb/premium-stories-thumb.png" group-title="",Premium Stories
 https://1.ip2stream.icu/live/premium_stories_hd/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.primativvu.it/wordpress/wp-content/uploads/2015/03/Prima-Tivvu.png" group-title="",Prima Tivvu (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.primativvu.it/wordpress/wp-content/uploads/2015/03/Prima-Tivvu.png" group-title="",Prima Tivvu
 https://sb.top-ix.org/streamtech/tvlive1/chunklist_w921110763.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Prima Tivvu (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Prima Tivvu
 https://sb.top-ix.org/streamtech/tvlive1/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ouSptk1.png" group-title="",Prima TV
 http://flash2.streaming.xdevel.com/primatv/primatv/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.simonachiavaccini.com/wp-content/uploads/2012/03/primocanale.jpg" group-title="",Primocanale Liguria (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.simonachiavaccini.com/wp-content/uploads/2012/03/primocanale.jpg" group-title="",Primocanale Liguria
 http://msh0203.stream.seeweb.it/live/stream1.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/cMs3Sp6.png" group-title="",Quarto Canale Flegreo
 http://live-fs.mariatvcdn.com/dialogos/171e41deedf405f10c7dd6311387fb43.sdp/index.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="QVC IT" tvg-name="QVC IT" tvg-logo="https://securecdn.pymnts.com/wp-content/uploads/2017/03/QVC.jpg" group-title="",QVC
 http://qvcitalia.mmdlive.lldns.net/qvcitalia/66f8359ae9c046bb8aa92144511b450a/manifest.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Radio 105 (Opt-1)
-http://fms.105.net:1935/live/105Test1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Radio 105 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Radio 105
 http://fms.105.net:1935/live/105Test1/livestream.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Radio 105
+http://fms.105.net:1935/live/105Test1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Radio 51
 https://59d7d6f47d7fc.streamlock.net/canale51/canale51/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/kzvsNo2.png" group-title="",Radio Birikina TV
@@ -225,21 +225,21 @@ https://56b50ada2d659.streamlock.net/RadioBirikinaTV/livestream/playlist.m3u8?fl
 http://37.48.83.35/radiobrunotv/radiobrunotv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Radio Bruno TV
 http://37.48.83.34:80/radiobrunotv/radiobrunotv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.firstone.tv/images/logos/it/CAPITALTIVU.png" group-title="",Radio Capital TV (Opt-1)
-http://capital_tv-lh.akamaihd.net/i/CapitalTv_1@183098/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Radio Capital TV (Opt-2)
-http://capital_tv-lh.akamaihd.net/i/CapitalTv_1@183098/index_5_av-b.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Radio Capital TV (Opt-3)
-http://capital-live-tv-01-hls.akamai.media.kataweb.it/i/CapitalTv_1@183098/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Radio Capital TV (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Radio Capital TV
 http://capital-live-tv-01-hls.akamai.media.kataweb.it/i/CapitalTv_1@183098/index_2_av-p.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://media-assets-03.thedrum.com/cache/images/thedrum-prod/public-drum_basic_article-120126-main_images-Capital_FM_Network_logo_0--default--300.png" group-title="",Radio Capital TV (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Radio Capital TV
+http://capital-live-tv-01-hls.akamai.media.kataweb.it/i/CapitalTv_1@183098/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Radio Capital TV
+http://capital_tv-lh.akamaihd.net/i/CapitalTv_1@183098/index_5_av-b.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://media-assets-03.thedrum.com/cache/images/thedrum-prod/public-drum_basic_article-120126-main_images-Capital_FM_Network_logo_0--default--300.png" group-title="",Radio Capital TV
 http://capital_tv-lh.akamaihd.net/i/CapitalTv_1@183098/index_5_av-p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.firstone.tv/images/logos/it/CAPITALTIVU.png" group-title="",Radio Capital TV
+http://capital_tv-lh.akamaihd.net/i/CapitalTv_1@183098/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/O8ByUjT.png" group-title="",Radio Freccia
 https://rtl-radio-stream-thron.akamaized.net/live-video/video2/ngrp:video2/chunklist_b2296000.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://static.radio.net/images/broadcasts/3e/ec/29681/c175.png" group-title="",Radio Iglesias (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://static.radio.net/images/broadcasts/3e/ec/29681/c175.png" group-title="",Radio Iglesias
 http://wms.shared.streamshow.it/visualradio/mp4:visualradio/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://static.radio.net/images/broadcasts/3e/ec/29681/c175.png" group-title="",Radio Iglesias (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://static.radio.net/images/broadcasts/3e/ec/29681/c175.png" group-title="",Radio Iglesias
 http://wms.shared.streamshow.it/visualradio/mp4:visualradio/playlist.m3u8
 #EXTINF:-1 tvg-id="Radio Italia Tv IT" tvg-name="Radio Italia Tv IT" tvg-logo="https://api.superguidatv.it/v1/channels/165/logo?width=120&theme=light" group-title="",Radio Italia TV
 http://radioitaliatv-lh.akamaihd.net/i/radioitaliatv_1@329645/index_720x480_av-p.m3u8
@@ -247,20 +247,20 @@ http://radioitaliatv-lh.akamaihd.net/i/radioitaliatv_1@329645/index_720x480_av-p
 http://livetr.teleromagna.it/lifestyle/live/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.nododigordio.org/assets/uploads/2018/10/RL_06-300x168.png" group-title="",Radio Lombardia TV
 https://flash7.xdevel.com/radiolombardiatv/radiolombardiatv/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.radiomontecarlo.net/images/logos/1/logo_colored.jpg" group-title="Music",Radio Monte Carlo TV (Opt-1)
-http://wow01.105.net:1935/live/rmc1/livestream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rncmusic.it/dati/upload/images/rmc.jpg" group-title="Music",Radio Monte Carlo TV (Opt-2)
-http://tv.105.net/live/rmc3/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rncmusic.it/dati/upload/images/rmc.jpg" group-title="Music",Radio Monte Carlo TV (Opt-3)
-http://wow01.105.net/live/rmc1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Radio Monte Carlo TV (Opt-4)
-http://wow01.105.net/live/rmc1/playlist.m3u8?JoCaRoIPTV.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://okteve.com/wp-content/uploads/media/b2f4d5bb1b78b392048436a272d6e7ac.jpeg" group-title="Music",Radio Monte Carlo TV (Opt-5)
-http://tv.105.net/live/rmc1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/wE5N6H3.jpg" group-title="Music",Radio Monte Carlo TV (Opt-6)
-http://fms.105.net:1935/live/rmc1/.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Radio Monte Carlo TV (Opt-7)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Radio Monte Carlo TV
 http://bit.ly/2GeFyWc
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/wE5N6H3.jpg" group-title="Music",Radio Monte Carlo TV
+http://fms.105.net:1935/live/rmc1/.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://okteve.com/wp-content/uploads/media/b2f4d5bb1b78b392048436a272d6e7ac.jpeg" group-title="Music",Radio Monte Carlo TV
+http://tv.105.net/live/rmc1/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rncmusic.it/dati/upload/images/rmc.jpg" group-title="Music",Radio Monte Carlo TV
+http://tv.105.net/live/rmc3/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rncmusic.it/dati/upload/images/rmc.jpg" group-title="Music",Radio Monte Carlo TV
+http://wow01.105.net/live/rmc1/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Radio Monte Carlo TV
+http://wow01.105.net/live/rmc1/playlist.m3u8?JoCaRoIPTV.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.radiomontecarlo.net/images/logos/1/logo_colored.jpg" group-title="Music",Radio Monte Carlo TV
+http://wow01.105.net:1935/live/rmc1/livestream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Radio Number One TV
 http://wma02.fluidstream.net/RN1TV/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/DfugVgy.png" group-title="Music",Radio Piter Pan TV
@@ -277,31 +277,31 @@ http://188.165.224.142:1935/radiotivuazzurralive/radiotivuazzurralive/playlist.m
 https://rtl-radio-stream.thron.com/live-video/video3/ngrp:video3/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="Radionorba TV IT" tvg-name="Radionorba TV IT" tvg-logo="http://guidatv.sky.it/app/guidatv/images/epgimages/channels/home/25780_home.png" group-title="Music",Radionorba TV
 http://flash5.streaming.xdevel.com/radionorbatv/smil:radionorbatv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="Rai 1 IT" tvg-name="Rai 1 IT" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/f/fa/Rai_1_-_Logo_2016.svg/200px-Rai_1_-_Logo_2016.svg.png" group-title="",Rai 1 (Opt-1)
-http://ott-cdn.ucom.am/s29/04.m3u8
-#EXTINF:-1 tvg-id="Rai 1 IT" tvg-name="Rai 1 IT" tvg-logo="" group-title="",Rai 1 (Opt-2)
-http://ott-cdn.ucom.am/s29/index.m3u8
-#EXTINF:-1 tvg-id="Rai 1 IT" tvg-name="Rai 1 IT" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/f/fa/Rai_1_-_Logo_2016.svg/1200px-Rai_1_-_Logo_2016.svg.png" group-title="",Rai 1 (Opt-3)
+#EXTINF:-1 tvg-id="Rai 1 IT" tvg-name="Rai 1 IT" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/f/fa/Rai_1_-_Logo_2016.svg/1200px-Rai_1_-_Logo_2016.svg.png" group-title="",Rai 1
 http://92.43.140.249/s29/04.m3u8
-#EXTINF:-1 tvg-id="Rai 3 IT" tvg-name="Rai 3 IT" tvg-logo="" group-title="",Rai 3 (Opt-1)
+#EXTINF:-1 tvg-id="Rai 1 IT" tvg-name="Rai 1 IT" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/f/fa/Rai_1_-_Logo_2016.svg/200px-Rai_1_-_Logo_2016.svg.png" group-title="",Rai 1
+http://ott-cdn.ucom.am/s29/04.m3u8
+#EXTINF:-1 tvg-id="Rai 1 IT" tvg-name="Rai 1 IT" tvg-logo="" group-title="",Rai 1
+http://ott-cdn.ucom.am/s29/index.m3u8
+#EXTINF:-1 tvg-id="Rai 3 IT" tvg-name="Rai 3 IT" tvg-logo="" group-title="",Rai 3
 http://wzstreaming.rai.it/TVlive/liveStream/chunklist_w823540263.m3u8
-#EXTINF:-1 tvg-id="Rai 3 IT" tvg-name="Rai 3 IT" tvg-logo="https://i.imgur.com/IIqn1oG.jpg" group-title="",Rai 3 (Opt-2)
+#EXTINF:-1 tvg-id="Rai 3 IT" tvg-name="Rai 3 IT" tvg-logo="https://i.imgur.com/IIqn1oG.jpg" group-title="",Rai 3
 http://wzstreaming.rai.it/TVlive/liveStream/playlist.m3u8
-#EXTINF:-1 tvg-id="Rai 4 IT" tvg-name="Rai 4 IT" tvg-logo="https://i.imgur.com/U2TCH5e.png" group-title="",Rai 4 (Opt-1)
+#EXTINF:-1 tvg-id="Rai 4 IT" tvg-name="Rai 4 IT" tvg-logo="https://i.imgur.com/U2TCH5e.png" group-title="",Rai 4
 http://b2everyrai-lh.akamaihd.net/i/rai4_1@181951/index_1800_av-p.m3u8
-#EXTINF:-1 tvg-id="Rai 4 IT" tvg-name="Rai 4 IT" tvg-logo="" group-title="",Rai 4 (Opt-2)
+#EXTINF:-1 tvg-id="Rai 4 IT" tvg-name="Rai 4 IT" tvg-logo="" group-title="",Rai 4
 http://b2everyrai-lh.akamaihd.net/i/rai4_1@181951/master.m3u8
-#EXTINF:-1 tvg-id="Rai 5 IT" tvg-name="Rai 5 IT" tvg-logo="" group-title="",Rai 5 (Opt-1)
-http://b2everyrai-lh.akamaihd.net:80/i/rai5_1@182695/master.m3u8
-#EXTINF:-1 tvg-id="Rai 5 IT" tvg-name="Rai 5 IT" tvg-logo="" group-title="",Rai 5 (Opt-2)
+#EXTINF:-1 tvg-id="Rai 5 IT" tvg-name="Rai 5 IT" tvg-logo="" group-title="",Rai 5
 http://b2everyrai-lh.akamaihd.net/i/rai5_1@182695/index_1800_av-p.m3u8?sd=10&rebase=on
+#EXTINF:-1 tvg-id="Rai 5 IT" tvg-name="Rai 5 IT" tvg-logo="" group-title="",Rai 5
+http://b2everyrai-lh.akamaihd.net:80/i/rai5_1@182695/master.m3u8
 #EXTINF:-1 tvg-id="Rai Gulp IT" tvg-name="Rai Gulp IT" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c1/Rai_Gulp_-_Logo_2017.svg/1200px-Rai_Gulp_-_Logo_2017.svg.png" group-title="",Rai Gulp
 http://b2everyrai-lh.akamaihd.net/i/raigulp_1@66350/master.m3u8
 #EXTINF:-1 tvg-id="Rai Movie IT" tvg-name="Rai Movie IT" tvg-logo="" group-title="Movies",Rai Movie
 http://b2everyrai-lh.akamaihd.net/i/raimovie_1@67348/master.m3u8
-#EXTINF:-1 tvg-id="Rai News 24 IT" tvg-name="Rai News 24 IT" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9c/Rai_News_24_-_Logo_2013.svg/1280px-Rai_News_24_-_Logo_2013.svg.png" group-title="News",Rai News 24 (Opt-1)
+#EXTINF:-1 tvg-id="Rai News 24 IT" tvg-name="Rai News 24 IT" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9c/Rai_News_24_-_Logo_2013.svg/1280px-Rai_News_24_-_Logo_2013.svg.png" group-title="News",Rai News 24
 http://mediapolisevent.rai.it/relinker/relinkerServlet.htm?cont=0000001
-#EXTINF:-1 tvg-id="Rai News 24 IT" tvg-name="Rai News 24 IT" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/76/Rai_News_-_Logo_2010.svg/1200px-Rai_News_-_Logo_2010.svg.png" group-title="News",Rai News 24 (Opt-2)
+#EXTINF:-1 tvg-id="Rai News 24 IT" tvg-name="Rai News 24 IT" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/76/Rai_News_-_Logo_2010.svg/1200px-Rai_News_-_Logo_2010.svg.png" group-title="News",Rai News 24
 https://rainews1-live.akamaized.net/hls/live/598326/rainews1/rainews_1800/chunklist.m3u8
 #EXTINF:-1 tvg-id="Rai Premium IT" tvg-name="Rai Premium IT" tvg-logo="https://i.imgur.com/s5CnlRh.jpg" group-title="Movies",Rai Premium
 http://b2everyrai-lh.akamaihd.net/i/raipremium_1@181837/master.m3u8
@@ -333,16 +333,16 @@ http://wma02.fluidstream.net/StudioRMM/livestream/playlist.m3u8?fluxustv.m3u8
 https://str-2.mediabay.tv/RTTV/playlist.m3u8?token=7baedcf04d98a361dd1e2152743b1a7f554e9fec-18f967055a64889e5a660c3ce83cb6c1-1566594086-1566583286
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SAuAcpv.png" group-title="",RTC Quarta Rete
 http://msh0232.stream.seeweb.it:1935/live/stream012.sdp/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/IZtIFM2.png" group-title="",RTC Telecalabria (Opt-1)
-https://w1.mediastreaming.it/calabriachannel/livestream/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.telecalabria.it/logoRTCnew.jpg" group-title="",RTC Telecalabria (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.telecalabria.it/logoRTCnew.jpg" group-title="",RTC Telecalabria
 http://fl1.mediastreaming.it:1935/calabriachannel/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",RTL 102.5 TV (Opt-1)
-http://rtl-radio-stream-thron.akamaized.net/live-video/video1/video1/chunklist_b2296000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Vmxfdmy.png" group-title="",RTL 102.5 TV (Opt-2)
-https://rtl-radio-stream-thron.akamaized.net/live-video/video1/ngrp:video1/chunklist_b1196000.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/529.png" group-title="",RTL 102.5 TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/IZtIFM2.png" group-title="",RTC Telecalabria
+https://w1.mediastreaming.it/calabriachannel/livestream/playlist.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/529.png" group-title="",RTL 102.5 TV
 http://rtl-radio-stream-thron.akamaized.net/live-video/video1/ngrp:video1/chunklist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",RTL 102.5 TV
+http://rtl-radio-stream-thron.akamaized.net/live-video/video1/video1/chunklist_b2296000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Vmxfdmy.png" group-title="",RTL 102.5 TV
+https://rtl-radio-stream-thron.akamaized.net/live-video/video1/ngrp:video1/chunklist_b1196000.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/it/thumb/8/86/Logo_Radio_Televisione_Peloritana.svg/1200px-Logo_Radio_Televisione_Peloritana.svg.png" group-title="",RTP
 https://flash2.xdevel.com/rtptv/rtptv/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ZmpQGTr.png" group-title="",RTR 99 TV
@@ -365,16 +365,16 @@ https://1.ip2stream.icu/live/sky_cinema_24_hd/playlist.m3u8
 https://1.ip2stream.icu/live/sky_cinema_family_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RPXusvS.png" group-title="",Sophia TV
 https://www.onairport.live/sophiatv-it-live/livestream_low/chunklist_w217998957.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",SporTVL (Opt-1)
-https://dcunilive36-lh.akamaihd.net/i/dclive_1@662153/master.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",SporTVL (Opt-2)
-https://dcunilive36-lh.akamaihd.net/i/dclive_1@662153/index_150_av-p.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",SporTVL (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",SporTVL
 http://dcunilive36-lh.akamaihd.net/i/dclive_1@662153/index_150_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Studio 100 (Opt-1)
-http://wms.shared.streamshow.it:1935/studio100ta/studio100ta/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Studio 100 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",SporTVL
+https://dcunilive36-lh.akamaihd.net/i/dclive_1@662153/index_150_av-p.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",SporTVL
+https://dcunilive36-lh.akamaihd.net/i/dclive_1@662153/master.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Studio 100
 http://wms.shared.streamshow.it/studio100ta/studio100ta/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Studio 100
+http://wms.shared.streamshow.it:1935/studio100ta/studio100ta/playlist.m3u8
 #EXTINF:-1 tvg-id="Super IT" tvg-name="Super IT" tvg-logo="" group-title="",Super
 http://wms.shared.streamshow.it:1935/supertv/supertv/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H3uItqg.png" group-title="",Super J TV
@@ -391,10 +391,10 @@ http://live.kronopress.com:1935/mediaone_live/teleone/playlist.m3u8?fluxustv.m3u
 https://58d921499d3d3.streamlock.net/Teleblu/livestream/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Telechiara
 http://fms.tvavicenza.it:1935/telechiara/diretta/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.telecitta.tv/wp-content/uploads/2017/01/telecitta-logo.jpg" group-title="",Telecitta (Opt-1)
-http://213.187.12.18:80/live/tv1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/bPFcGBW.png" group-title="",Telecitta (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/bPFcGBW.png" group-title="",Telecitta
 http://213.187.12.18/live/tv1.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.telecitta.tv/wp-content/uploads/2017/01/telecitta-logo.jpg" group-title="",Telecitta
+http://213.187.12.18:80/live/tv1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://beyondprod.it/images/telefriuli_positivo.jpg" group-title="",Telefriuli
 http://or01.top-ix.org:1935/streamtech/telefriuli/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/E68cSgK.png" group-title="",Telegenova
@@ -409,26 +409,26 @@ http://185.202.128.1:1935/TelemoliseStream/telemoliseTV.stream_tlm/playlist.m3u8
 http://wms.shared.streamshow.it/telemonteneve/telemonteneve/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TeleMonteve 3
 http://wms.shared.streamshow.it/telemonteneve3/telemonteneve3/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Woq6TJo.png" group-title="",TeleNordest (Opt-1)
-https://59d7d6f47d7fc.streamlock.net/telenord/telenord/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Woq6TJo.png" group-title="",TeleNordest (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Woq6TJo.png" group-title="",TeleNordest
 http://wms.shared.streamshow.it/telenord/telenord/chunklist_w299272332.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Woq6TJo.png" group-title="",TeleNordest
+https://59d7d6f47d7fc.streamlock.net/telenord/telenord/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.teleonda.it/wp-content/uploads/2019/05/cropped-Teleonda_antennasud_live_png-1.png" group-title="",Teleonda
 https://59bb40cf810aa.streamlock.net:4443/teleonda/teleonda/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TelePavia (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TelePavia
 http://wms.shared.streamshow.it/telepavia/mp4:telepavia/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TelePavia (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TelePavia
 http://wms.shared.streamshow.it/telepavia/telepavia/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TelePavia (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TelePavia
 http://wms.shared.streamshow.it:1935/telepavia/telepavia/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.saladellamemoriaheysel.it/IMMAGINI/Logo_Tele_Quattro.png" group-title="",TeleQuattro
 http://wms.shared.streamshow.it/telequattro/telequattro/chunklist_w352656972.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/NmvOzhg.png" group-title="",TeleRama
 https://58d921499d3d3.streamlock.net/TeleRama/livestream/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Teleromagna (Opt-1)
-http://livetr.teleromagna.it/teleromagna/live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Teleromagna (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Teleromagna
 http://livetr.teleromagna.it/sport/live/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Teleromagna
+http://livetr.teleromagna.it/teleromagna/live/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/U1BjkEl.png" group-title="",TeleTerni
 https://diretta.teleterni.it/live/stream_src.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.teletricolore.it/wp-content/uploads/2018/02/logo.png" group-title="",Teletricolore
@@ -457,9 +457,9 @@ http://streaming126.trgmedia.it/filestream/livestreamHD.m3u8?fluxustv.m3u8
 http://w1.streamingmedia.it:1935/trmh24/live/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xnXdUjz.png" group-title="",TSD TV Arezzo
 http://dcunilive20-lh.akamaihd.net/i/dclive_1@195975/master.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TSN Livigno (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TSN Livigno
 http://wms.shared.streamshow.it/tsn2/tsn2/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TSN Livigno (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TSN Livigno
 http://wms.shared.streamshow.it:1935/tsn2/tsn2/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TSN Tele Sondrio News
 http://wms.shared.streamshow.it/tsn/tsn_mobile/playlist.m3u8
@@ -467,11 +467,11 @@ http://wms.shared.streamshow.it/tsn/tsn_mobile/playlist.m3u8
 http://tvcampane1.srfms.com:1935/tvcampane1/livestream/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/154AQjl.png" group-title="",TV Qui (Modena)
 https://59d7d6f47d7fc.streamlock.net/tvqui/tvqui/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="TV2000 IT" tvg-name="TV2000 IT" tvg-logo="https://upload.wikimedia.org/wikipedia/it/thumb/0/0d/Logo_tv2000_2015.svg/1280px-Logo_tv2000_2015.svg.png" group-title="",TV2000 (Opt-1)
-http://mi1.wz.tv2000.it/tv2000_alfa.m3u8
-#EXTINF:-1 tvg-id="TV2000 IT" tvg-name="TV2000 IT" tvg-logo="" group-title="",TV2000 (Opt-2)
+#EXTINF:-1 tvg-id="TV2000 IT" tvg-name="TV2000 IT" tvg-logo="" group-title="",TV2000
 http://cld01ibi16.wz.tv2000.it/tv2000_alfa.m3u8
-#EXTINF:-1 tvg-id="TV2000 IT" tvg-name="TV2000 IT" tvg-logo="https://i.imgur.com/C5FuJmG.png" group-title="",TV2000 (Opt-3)
+#EXTINF:-1 tvg-id="TV2000 IT" tvg-name="TV2000 IT" tvg-logo="https://upload.wikimedia.org/wikipedia/it/thumb/0/0d/Logo_tv2000_2015.svg/1280px-Logo_tv2000_2015.svg.png" group-title="",TV2000
+http://mi1.wz.tv2000.it/tv2000_alfa.m3u8
+#EXTINF:-1 tvg-id="TV2000 IT" tvg-name="TV2000 IT" tvg-logo="https://i.imgur.com/C5FuJmG.png" group-title="",TV2000
 http://mi1.wz.tv2000.it:80/tv2000_alfa.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/CM1bQ1I.png" group-title="",TV7 Benevento
 http://streaming.senecadot.com/live/flv:tv7.sdp/playlist.m3u8?fluxustv.m3u8
@@ -485,9 +485,9 @@ https://dcunilive36-lh.akamaihd.net/i/dclive_1@661035/master.m3u8
 http://player.adobemediaserver.it/speedweb-hls-live/livepkgr/_definst_/liveevent/livestream.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVRS
 http://wms.shared.streamshow.it:1935/tvrs/tvrs/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Vera TV (Marche) (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Vera TV (Marche)
 http://wms.shared.streamshow.it/veratv/veratv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/kXDdx0h.png" group-title="",Vera TV Marche (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/kXDdx0h.png" group-title="",Vera TV Marche
 http://wms.shared.streamshow.it:1935/veratv/veratv/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/94/VH1_logonew.svg/440px-VH1_logonew.svg.png" group-title="",VH1
 https://content.uplynk.com/channel/36953f5b6546464590d2fcd954bc89cf.m3u8?fluxustv.m3u8
@@ -497,9 +497,9 @@ http://wms.shared.streamshow.it:80/lucaniatv/lucaniatv/playlist.m3u8
 http://wms.shared.streamshow.it:80/videocalabria/videocalabria/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Video Mediterraneo
 http://streaming.ermeslink.com:88/hlsme/vmstream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Z5NeYwu.png" group-title="",Videolina  (Sardegna) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Z5NeYwu.png" group-title="",Videolina  (Sardegna)
 http://livestreaming.videolina.it/live/Videolina/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.dinamobasket.com/sites/default/files/videolina2012_tr.png" group-title="",Videolina (Sardegna) (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.dinamobasket.com/sites/default/files/videolina2012_tr.png" group-title="",Videolina (Sardegna)
 http://livestreaming.videolina.it/live/Videolina/chunklist_w523418370.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AJAYgyN.png" group-title="",Videonovara
 http://sb.top-ix.org/avtv04/_definst_/streaming/manifest.m3u8?fluxustv.m3u8
diff --git a/channels/jo.m3u b/channels/jo.m3u
index 7817bebe8..95426dd70 100644
--- a/channels/jo.m3u
+++ b/channels/jo.m3u
@@ -1,11 +1,11 @@
 #EXTM3U x-tvg-url="http://195.154.221.171/epg/guidearab.xml.gz"
-#EXTINF:-1 tvg-id="Jordan Sports ARB" tvg-name="Jordan Sports ARB" tvg-logo="https://i.imgur.com/Plcqlr7.jpg" group-title="Sport",Jordan Sport TV (Opt-1)
-http://stream.joinvisions.net:1935/jorlive/sport/playlist.m3u8?DVR
-#EXTINF:-1 tvg-id="Jordan Sports ARB" tvg-name="Jordan Sports ARB" tvg-logo="https://i.imgur.com/Plcqlr7.jpg" group-title="Sport",Jordan Sport TV (Opt-2)
+#EXTINF:-1 tvg-id="Jordan Sports ARB" tvg-name="Jordan Sports ARB" tvg-logo="https://i.imgur.com/Plcqlr7.jpg" group-title="Sport",Jordan Sport TV
 http://stream.joinvisions.net:1935/Jordantv/Jordan_Sport/gmswf.m3u8?DVR
-#EXTINF:-1 tvg-id="Jordan ARB" tvg-name="Jordan ARB" tvg-logo="https://i.imgur.com/siAiiws.jpg" group-title="",Jordan TV (Opt-1)
+#EXTINF:-1 tvg-id="Jordan Sports ARB" tvg-name="Jordan Sports ARB" tvg-logo="https://i.imgur.com/Plcqlr7.jpg" group-title="Sport",Jordan Sport TV
+http://stream.joinvisions.net:1935/jorlive/sport/playlist.m3u8?DVR
+#EXTINF:-1 tvg-id="Jordan ARB" tvg-name="Jordan ARB" tvg-logo="https://i.imgur.com/siAiiws.jpg" group-title="",Jordan TV
 http://livecdnh2.tvanywhere.ae/hls/jordan/04.m3u8
-#EXTINF:-1 tvg-id="Jordan ARB" tvg-name="Jordan ARB" tvg-logo="https://i.imgur.com/siAiiws.jpg" group-title="",Jordan TV (Opt-2)
+#EXTINF:-1 tvg-id="Jordan ARB" tvg-name="Jordan ARB" tvg-logo="https://i.imgur.com/siAiiws.jpg" group-title="",Jordan TV
 http://stream.joinvisions.net:1935/jorlive/jrtv/playlist.m3u8?DVR
 #EXTINF:-1 tvg-id="Roya TV ARB" tvg-name="Roya TV ARB" tvg-logo="https://www.roya.tv/img/royatv/royaTvLogo.png" group-title="",Ro'ya TV
 https://roya-live.ercdn.net/roya/roya.m3u8
diff --git a/channels/jp.m3u b/channels/jp.m3u
index bd82d298d..eeae62f29 100644
--- a/channels/jp.m3u
+++ b/channels/jp.m3u
@@ -7,12 +7,12 @@ http://192.240.127.34:1935/live/cs11.stream/play.m3u8
 http://cgntv-glive.ofsdelivery.net/live/_definst_/cgntv_jp/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.himawari.co.jp/wp-content/uploads/channel_logo_cs_261ch.jpg" group-title="",Family Gekijo
 http://192.240.127.34:1935/live/cs11.stream/playlist.m3u8?wowzasessionid=2132394220
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/f/f5/History_Logo.svg/300px-History_Logo.svg.png" group-title="",History Channel (Opt-1)
-http://192.240.127.34:1935/live/cs14.stream/playlist.m3u8?wowzasessionid=1203854395
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",History Channel (Opt-2)
-http://192.240.127.34:1935/live/cs14.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://jp.history.com/wp-content/themes/historychannel/cmn/img/logo.png" group-title="",History Channel (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://jp.history.com/wp-content/themes/historychannel/cmn/img/logo.png" group-title="",History Channel
 http://192.240.127.34:1935/live/cs14.stream/play.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",History Channel
+http://192.240.127.34:1935/live/cs14.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/f/f5/History_Logo.svg/300px-History_Logo.svg.png" group-title="",History Channel
+http://192.240.127.34:1935/live/cs14.stream/playlist.m3u8?wowzasessionid=1203854395
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",JAPAN MOVIE
 http://192.240.127.34:1935/live/cs19.stream/play.m3u8?wowzasessionid=708726640
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Japan Satellite Theater
@@ -29,9 +29,9 @@ http://movie.mcas.jp/mcas/gm2_2/chunklist.m3u8
 http://192.240.127.34:1935/live/cs19.stream/playlist.m3u8?wowzasessionid=1566329228
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/tYZz5CC.png" group-title="",WeatherNews
 http://movie.mcas.jp/mcas/smil:wn1.smil/chunklist_b1800000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.starcat.co.jp/ch/wp-content/uploads/2017/10/6-2.jpg" group-title="Movies",WOWOWシネマ (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.starcat.co.jp/ch/wp-content/uploads/2017/10/6-2.jpg" group-title="Movies",WOWOWシネマ
 http://192.240.127.34:1935/live/cs27.stream/playlist.m3u8?wowzasessionid=1300220279
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",WOWOWシネマ (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",WOWOWシネマ
 http://192.240.127.34:1935/live/cs27.stream/playlist.m3u8?wowzasessionid=1876239733
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/c/c4/WNI-logo.png" group-title="",ウェザーニュース
 http://movie.mcas.jp/mcas/wn1_2/master.m3u8
diff --git a/channels/kg.m3u b/channels/kg.m3u
index 22249bb60..ceb2d9075 100644
--- a/channels/kg.m3u
+++ b/channels/kg.m3u
@@ -1,21 +1,21 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/nav/ktrk.png" group-title="",КТРК (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/nav/ktrk.png" group-title="",КТРК
 http://onlinetv.ktrk.kg:1935/live/myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/nav/ktrk.png" group-title="",КТРК (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/nav/ktrk.png" group-title="",КТРК
 https://str-4.mediabay.tv/KTRK/playlist.m3u8?token=1c40fc5c814b2ae79505397ad965f46906e15f1a-ecfe8b97366ee4c6eb0a3ea31f432cf9-1566592024-1566581224
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/nav/alatoo.png" group-title="",КТРК Ала-Тоо 24 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/nav/alatoo.png" group-title="",КТРК Ала-Тоо 24
 http://onlinetv.ktrk.kg:1935/live/myStream3/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/nav/alatoo.png" group-title="",КТРК Ала-Тоо 24 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/nav/alatoo.png" group-title="",КТРК Ала-Тоо 24
 https://str-4.mediabay.tv/KTRK-Ala-too/playlist.m3u8?token=199b33eccbd21ded4da14fe34f1db2a3ad2a5afb-f418c83707159b18f21cc77288c5efff-1566592233-1566581433
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/nav/balastan.png" group-title="",КТРК Баластан (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/nav/balastan.png" group-title="",КТРК Баластан
 http://onlinetv.ktrk.kg:1935/live/myStream6/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/nav/balastan.png" group-title="",КТРК Баластан (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/nav/balastan.png" group-title="",КТРК Баластан
 https://str-4.mediabay.tv/KTRK-Balastan/playlist.m3u8?token=9926634767ab26cfa3a3a7cc53b4aad10b3ad0a5-d82fc0d5182763552efc013bb47b8b18-1566592338-1566581538
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",КТРК Маданият
 https://str-3.mediabay.tv/KTRK-Madaniyat/playlist.m3u8?token=5071cde051057adc964652f07bb253b30d465e59-692e37a5fac7762fee88504fecc3ce61-1566592171-1566581371
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/small/music.png" group-title="Music",КТРК Музыка (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/small/music.png" group-title="Music",КТРК Музыка
 http://onlinetv.ktrk.kg:1935/live/myStream2/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/small/music.png" group-title="Music",КТРК Музыка (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/small/music.png" group-title="Music",КТРК Музыка
 https://str-3.mediabay.tv/KTRK-Muzika/playlist.m3u8?token=df176e3222a9b0ad670f670605bb9f9725d39265-c8e74fe4efd9db17717aac5e5fd26d8a-1566592128-1566581328
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ktrk.kg/images/channels/nav/sport.png" group-title="Sport",КТРК Спорт
 http://onlinetv.ktrk.kg:1935/live/myStream4/playlist.m3u8
diff --git a/channels/kn.m3u b/channels/kn.m3u
index 2a43f681d..770365462 100644
--- a/channels/kn.m3u
+++ b/channels/kn.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RURzxJj.png" group-title="",ZIZ TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RURzxJj.png" group-title="",ZIZ TV
 http://162.244.81.111:1937/liveTrans/livestream_360p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://zizonline.com/wp-content/uploads/2016/11/ziz_logo.png" group-title="",ZIZ TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://zizonline.com/wp-content/uploads/2016/11/ziz_logo.png" group-title="",ZIZ TV
 http://162.244.81.111:1937/liveTrans/livestream_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ZIZ TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ZIZ TV
 https://593fcf545b0c5.streamlock.net/liveTrans/ngrp:livestream_all/playlist.m3u8
diff --git a/channels/kr.m3u b/channels/kr.m3u
index 1b649b017..eabfe15d7 100644
--- a/channels/kr.m3u
+++ b/channels/kr.m3u
@@ -7,9 +7,9 @@ http://122.129.115.21:1935/edgedol/_definst_/tao114/playlist.m3u8
 http://amdlive.ctnd.com.edgesuite.net/arirang_1ch/smil:arirang_1ch.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://s.kaskus.id/r480x480/images/fjb/2017/09/26/tmp_phpwqzg7j_3528521_1506393197.jpg" group-title="",Arirang HD
 http://amdlive-ch01.ctnd.com.edgesuite.net/arirang_1ch/smil:arirang_1ch.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/B6vXfKu.png" group-title="",CBS (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/B6vXfKu.png" group-title="",CBS
 http://cbs-live.gscdn.com/cbs-live/cbs-live.stream/hasbahca.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/B6vXfKu.png" group-title="",CBS (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/B6vXfKu.png" group-title="",CBS
 http://cbs-live.gscdn.com:1935/cbs-live/cbs-live.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",CGNTV
 http://cgntv-glive.ofsdelivery.net/live/_definst_/cgntv_kr02/chunklist.m3u8
@@ -19,39 +19,39 @@ http://122.129.115.21:1935/edgedol/_definst_/tao103/playlist.m3u8
 http://122.129.115.21:1935/edgedol/_definst_/tao136/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/nz/DisneyJunior.nz.png" group-title="",Disney Jr 한국어
 http://122.129.115.21:1935/edgedol/_definst_/tao112/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/B6vXfKu.png" group-title="",EBS (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/B6vXfKu.png" group-title="",EBS
 http://ebsonair.ebs.co.kr:1935/groundwavefamilypc/familypc1m/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/8/8b/Channels_ebs1.png" group-title="",EBS 1 (Opt-1)
-http://ebsonair.ebs.co.kr/groundwavefamilypc/familypc1m/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",EBS 1 (Opt-1)
-http://ebsonair.ebs.co.kr:1935/ebs1familypc/familypc1m/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/8/8b/Channels_ebs1.png" group-title="",EBS 1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/8/8b/Channels_ebs1.png" group-title="",EBS 1
 http://ebsonair.ebs.co.kr/groundwavefamilypc/familypc1m/playlist.m3u
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/s1y2zoe.png" group-title="",EBS 1 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/8/8b/Channels_ebs1.png" group-title="",EBS 1
+http://ebsonair.ebs.co.kr/groundwavefamilypc/familypc1m/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",EBS 1
+http://ebsonair.ebs.co.kr:1935/ebs1familypc/familypc1m/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/s1y2zoe.png" group-title="",EBS 1
 http://ebsonair.ebs.co.kr:1935/groundwavefamilypc/familypc1m/chunklist_w1081857294.m3u8?time=1454375113788
-#EXTINF:-1 tvg-id="" tvg-name="EBS 2" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/49/EBS_Logo.svg/1200px-EBS_Logo.svg.png" group-title="Entertainment",EBS 2 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="EBS 2" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/49/EBS_Logo.svg/1200px-EBS_Logo.svg.png" group-title="Entertainment",EBS 2
 http://ebsonair.ebs.co.kr/ebs2familypc/familypc1m/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/B6vXfKu.png" group-title="",EBS 2 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/B6vXfKu.png" group-title="",EBS 2
 http://ebsonair.ebs.co.kr:1935/ebs2familypc/familypc1m/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",EBS Kids
-http://ebsonair.ebs.co.kr:1935/ebsufamilypc/familypc1m/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",EBS Kids (Opt-1)
 http://bit.ly/2NFCRjg
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/B6vXfKu.png" group-title="",EBS Kids (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",EBS Kids
+http://ebsonair.ebs.co.kr:1935/ebsufamilypc/familypc1m/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/B6vXfKu.png" group-title="",EBS Kids
 http://ebsonair.ebs.co.kr:1935/ebsutablet500k/tablet500k/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/B6vXfKu.png" group-title="",EBS+1
 http://ebsonair.ebs.co.kr:1935/plus1tablet500k/tablet500k/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",EBS+2
 http://110.10.122.111/plus2familypc/_definst_/familypc1m/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/B6vXfKu.png" group-title="",EBS+2 (Opt-1)
-http://ebsonair.ebs.co.kr:1935/plus2tablet500k/tablet500k/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",EBS+2 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",EBS+2
 http://ebsonair.ebs.co.kr:1935/plus2familypc/familypc1m/chunklist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/B6vXfKu.png" group-title="",EBS+2
+http://ebsonair.ebs.co.kr:1935/plus2tablet500k/tablet500k/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",EBSe
 http://ebsonair.ebs.co.kr:1935/plus3familypc/familypc1m/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",EBSi (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",EBSi
 http://58.229.187.43/plus1familypc/_definst_/familypc1m/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",EBSi (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",EBSi
 http://ebsonair.ebs.co.kr:1935/plus1familypc/familypc1m/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ESB1
 http://ebsonair.ebs.co.kr:1935/groundwavefamilypc/familypc1m/chunklist.m3u8
@@ -67,27 +67,27 @@ http://122.129.115.21:1935/edgedol/_definst_/tao106/playlist.m3u8
 http://smart.igtb.co.kr:1935/live/stream.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://image.jtbcgolf.joins.com/main/151231_h_top_logo.png" group-title="Sport",JTBC Golf
 http://122.129.115.21:1935/edgedol/_definst_/tao129/chunklist_w1957069897.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="K+" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/9/92/Kplus_logo.png/revision/latest?cb=20170304052927" group-title="",K+ (Opt-1)
-http://210.210.155.35/uq2663/h/h08/index1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://s.republika.co.id/uploads/images/inpicture_slide/k-di-k-vision-_140915173551-415.jpg" group-title="",K+ (Opt-2)
-http://45.126.83.51/uq2663/h/h08/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.postimg.cc/C53XtK5f/zaltv.png" group-title="",K+ (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.postimg.cc/C53XtK5f/zaltv.png" group-title="",K+
 http://210.210.155.35/uq2663/h/h08/01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.astro.com.my/astro-go-channels/images/k-entertainment-logo.png" group-title="",K+ (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.astro.com.my/astro-go-channels/images/k-entertainment-logo.png" group-title="",K+
 http://210.210.155.35/uq2663/h/h08/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://astrocontent.s3.amazonaws.com/Images/ChannelLogo/aotg/k-plus/pos/k-plus_300.png" group-title="",K+ (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="K+" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/9/92/Kplus_logo.png/revision/latest?cb=20170304052927" group-title="",K+
+http://210.210.155.35/uq2663/h/h08/index1.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://astrocontent.s3.amazonaws.com/Images/ChannelLogo/aotg/k-plus/pos/k-plus_300.png" group-title="",K+
 http://210.210.155.35/uq2663/h/h08/index2.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://s.republika.co.id/uploads/images/inpicture_slide/k-di-k-vision-_140915173551-415.jpg" group-title="",K+
+http://45.126.83.51/uq2663/h/h08/index.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/2/27/KBS_N_Sports.png" group-title="",KBS N Sports
 http://122.129.115.21:1935/edgedol/_definst_/tao123/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KBS1
 http://122.129.115.21:1935/edgedol/_definst_/tao107/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KBS2
 http://122.129.115.21:1935/edgedol/_definst_/tao108/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Korea TV [360p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Korea TV
 http://218.38.152.69:1935/da_live/72136989/mp4:ch001/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Korea:KBS LIVE
 http://kbs-dokdo.gscdn.com/dokdo_300/_definst_/dokdo_300.stream/chunklist.m3u8?wowzasessionid=179252988
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",M Net (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",M Net
 http://122.129.115.21:1935/edgedol/_definst_/tao101/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://img.imbc.com/commons/2018/image/main/mbc-logo.png" group-title="",MBC
 http://122.129.115.21:1935/edgedol/_definst_/tao122/playlist.m3u8
diff --git a/channels/kw.m3u b/channels/kw.m3u
index 71df2eb2e..788c9bee6 100644
--- a/channels/kw.m3u
+++ b/channels/kw.m3u
@@ -5,61 +5,61 @@ http://213.162.202.9:8000/play/a02c/index.m3u8
 https://svs.itworkscdn.net/ktvpluslive/smil:kplus.smil/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.fadak.tv/style_img/fadak%20web%20banner.png" group-title="",Al-Shahed TV
 http://213.162.202.9:8000/play/a022/index.m3u8
-#EXTINF:-1 tvg-id="AL Rai ARB" tvg-name="AL Rai ARB" tvg-logo="http://f.alrai.tv/TV/Programs/60_Alrai_Tv21_-__RT655x0-_OS492x240-_RD492x240-.png" group-title="",Alrai TV (Opt-1)
+#EXTINF:-1 tvg-id="AL Rai ARB" tvg-name="AL Rai ARB" tvg-logo="http://f.alrai.tv/TV/Programs/60_Alrai_Tv21_-__RT655x0-_OS492x240-_RD492x240-.png" group-title="",Alrai TV
 http://stream02.fasttelco.net/4/pub/asset/28/streams.m3u8
-#EXTINF:-1 tvg-id="AL Rai ARB" tvg-name="AL Rai ARB" tvg-logo="http://imageswoapi.whatsonindia.com/WhatsOnTV/images/Applicationchannellogo/medium/10000000008040000.png" group-title="",Alrai TV (Opt-2)
+#EXTINF:-1 tvg-id="AL Rai ARB" tvg-name="AL Rai ARB" tvg-logo="http://imageswoapi.whatsonindia.com/WhatsOnTV/images/Applicationchannellogo/medium/10000000008040000.png" group-title="",Alrai TV
 http://stream02.fasttelco.net/4/pub/asset/28/streams.m3u8?v=1053886998
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Funoon TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Funoon TV
 http://livecdnh3.tvanywhere.ae/hls/funoon/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/3/3b/Tv_funoon_tv.png" group-title="",Funoon TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/3/3b/Tv_funoon_tv.png" group-title="",Funoon TV
 http://livecdnh3.tvanywhere.ae:80/hls/funoon/04.m3u8
-#EXTINF:-1 tvg-id="KTV 1 ARB" tvg-name="KTV 1 ARB" tvg-logo="http://www.freeetv.com/images/03_logo/KTV1_Kuwait.jpg" group-title="",KTV 1 (Opt-1)
+#EXTINF:-1 tvg-id="KTV 1 ARB" tvg-name="KTV 1 ARB" tvg-logo="http://www.freeetv.com/images/03_logo/KTV1_Kuwait.jpg" group-title="",KTV 1
 http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv1
-#EXTINF:-1 tvg-id="KTV 1 ARB" tvg-name="KTV 1 ARB" tvg-logo="http://imageswoapi.whatsonindia.com/WhatsOnTV/images/Applicationchannellogo/medium/9pmM8BRc.png" group-title="",KTV 1 (Opt-2)
+#EXTINF:-1 tvg-id="KTV 1 ARB" tvg-name="KTV 1 ARB" tvg-logo="http://imageswoapi.whatsonindia.com/WhatsOnTV/images/Applicationchannellogo/medium/9pmM8BRc.png" group-title="",KTV 1
 https://svs.itworkscdn.net/ktv1live/ktv1.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="KTV 2 ARB" tvg-name="KTV 2 ARB" tvg-logo="http://www.freeetv.com/images/03_logo/ktv2_Kuwait.jpg" group-title="",KTV 2 (Opt-1)
-http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv2
-#EXTINF:-1 tvg-id="KTV 2 ARB" tvg-name="KTV 2 ARB" tvg-logo="http://imageswoapi.whatsonindia.com/WhatsOnTV/images/Applicationchannellogo/medium/10000000021130000.png" group-title="",KTV 2 (Opt-2)
-https://svs.itworkscdn.net/ktv2live/ktv2.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="KTV 2 ARB" tvg-name="KTV 2 ARB" tvg-logo="http://content.osn.com/bob/745x419/KT2.jpg" group-title="",KTV 2 (Opt-3)
+#EXTINF:-1 tvg-id="KTV 2 ARB" tvg-name="KTV 2 ARB" tvg-logo="http://content.osn.com/bob/745x419/KT2.jpg" group-title="",KTV 2
 http://109.236.92.216:9090/Kuwait2/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Al Majlis (Opt-1)
-https://svs.itworkscdn.net/ktvalmajlislive/kalmajlis.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i4.yhk0.net/cha/kw/almajlis-95x41.gif" group-title="",KTV Al Majlis (Opt-2)
+#EXTINF:-1 tvg-id="KTV 2 ARB" tvg-name="KTV 2 ARB" tvg-logo="http://www.freeetv.com/images/03_logo/ktv2_Kuwait.jpg" group-title="",KTV 2
+http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv2
+#EXTINF:-1 tvg-id="KTV 2 ARB" tvg-name="KTV 2 ARB" tvg-logo="http://imageswoapi.whatsonindia.com/WhatsOnTV/images/Applicationchannellogo/medium/10000000021130000.png" group-title="",KTV 2
+https://svs.itworkscdn.net/ktv2live/ktv2.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i4.yhk0.net/cha/kw/almajlis-95x41.gif" group-title="",KTV Al Majlis
 http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv7
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Al Majlis (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Al Majlis
+https://svs.itworkscdn.net/ktvalmajlislive/kalmajlis.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Al Majlis
 https://svs.itworkscdn.net/ktvalmajlislive/smil:kalmajlis.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Arabe (Opt-1)
-https://svs.itworkscdn.net/ktvarabelive/karabe.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.osn.com/bob/745x419/KTA.jpg" group-title="",KTV Arabe (Opt-2)
-http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv6
-#EXTINF:-1 tvg-id="" tvg-name="KTV" tvg-logo="" group-title="",KTV Arabe (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="KTV" tvg-logo="" group-title="",KTV Arabe
 http://www.elahmad.com/tv/m3u8/ktv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Arabe (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.osn.com/bob/745x419/KTA.jpg" group-title="",KTV Arabe
+http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv6
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Arabe
+https://svs.itworkscdn.net/ktvarabelive/karabe.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Arabe
 https://svs.itworkscdn.net/ktvarabelive/smil:karabe.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i5.satexpat.com/cha/kw/ktv_ethra_95x94.gif" group-title="",KTV Ethraa (Opt-1)
-https://svs.itworkscdn.net/ktvethraalive/smil:kethraa.smil/chunklist_b2400000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Ethraa (Opt-2)
-https://svs.itworkscdn.net/ktvethraalive/kethraa.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i5.satexpat.com/cha/kw/ktv_ethra_95x94.gif" group-title="",KTV Ethraa (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i5.satexpat.com/cha/kw/ktv_ethra_95x94.gif" group-title="",KTV Ethraa
 http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv5
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Ethraa (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Ethraa
+https://svs.itworkscdn.net/ktvethraalive/kethraa.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Ethraa
 https://svs.itworkscdn.net/ktvethraalive/smil:kethraa.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Kids",KTV Kids (Opt-1)
-https://svs.itworkscdn.net/ktvsportspluslive/ksportsplus.smil/gmswf.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i5.satexpat.com/cha/kw/ktv-kids-95x77.gif" group-title="Kids",KTV Kids (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i5.satexpat.com/cha/kw/ktv_ethra_95x94.gif" group-title="",KTV Ethraa
+https://svs.itworkscdn.net/ktvethraalive/smil:kethraa.smil/chunklist_b2400000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i5.satexpat.com/cha/kw/ktv-kids-95x77.gif" group-title="Kids",KTV Kids
 http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv4
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Kids",KTV Kids (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Kids",KTV Kids
+https://svs.itworkscdn.net/ktvsportspluslive/ksportsplus.smil/gmswf.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Kids",KTV Kids
 https://svs.itworkscdn.net/ktvsportspluslive/smil:ksportsplus.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.1arablive.com/livetv/assets/images/1536610958.png" group-title="",KTV Plus (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.1arablive.com/livetv/assets/images/1536610958.png" group-title="",KTV Plus
 http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.1arablive.com/livetv/assets/images/1536610958.png" group-title="",KTV Plus (Opt-2)
-https://svs.itworkscdn.net/ktvpluslive/smil:kplus.smil/chunklist_b2400000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Plus (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Plus
 https://svs.itworkscdn.net/ktvpluslive/kplus.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="KTV Sport ARB" tvg-name="KTV Sport ARB" tvg-logo="http://oklivetv.com/wp-content/uploads/2015/09/ktv3.jpg" group-title="Sport",KTV Sport (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.1arablive.com/livetv/assets/images/1536610958.png" group-title="",KTV Plus
+https://svs.itworkscdn.net/ktvpluslive/smil:kplus.smil/chunklist_b2400000.m3u8
+#EXTINF:-1 tvg-id="KTV Sport ARB" tvg-name="KTV Sport ARB" tvg-logo="http://oklivetv.com/wp-content/uploads/2015/09/ktv3.jpg" group-title="Sport",KTV Sport
 http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv3
-#EXTINF:-1 tvg-id="KTV Sport ARB" tvg-name="KTV Sport ARB" tvg-logo="http://www.goalzz.com/images/logo_sport/kuwaitsport.jpg" group-title="Sport",KTV Sport (Opt-2)
+#EXTINF:-1 tvg-id="KTV Sport ARB" tvg-name="KTV Sport ARB" tvg-logo="http://www.goalzz.com/images/logo_sport/kuwaitsport.jpg" group-title="Sport",KTV Sport
 https://svs.itworkscdn.net/ktvsportslive/ksports.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="KTV Sport ARB" tvg-name="KTV Sport ARB" tvg-logo="http://imageswoapi.whatsonindia.com/WhatsOnTV/images/Applicationchannellogo/medium/10000000025680000.png" group-title="Sport",KTV Sport (Opt-3)
+#EXTINF:-1 tvg-id="KTV Sport ARB" tvg-name="KTV Sport ARB" tvg-logo="http://imageswoapi.whatsonindia.com/WhatsOnTV/images/Applicationchannellogo/medium/10000000025680000.png" group-title="Sport",KTV Sport
 https://svs.itworkscdn.net/ktvsportslive/smil:ksports.smil/chunklist.m3u8
diff --git a/channels/kz.m3u b/channels/kz.m3u
index 8ca13e205..3c292a008 100644
--- a/channels/kz.m3u
+++ b/channels/kz.m3u
@@ -7,19 +7,19 @@ http://live-atameken.cdnvideo.ru/atameken/atameken_hq.sdp/playlist.m3u8
 http://onrez.kaztrk.kz/regional/pavlodartv/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://taraztv.kz/assets/regions/logo/jambyl.png" group-title="",Jambyl
 http://onrez.kaztrk.kz/regional/taraztv/index.m3u8
-#EXTINF:-1 tvg-id="kazakh-tv" tvg-name="Kazakh TV" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/9/92/Kazakh_tv_logo_png_1.png" group-title="",Kazakh TV (EN) (Opt-1)
-http://kazakhtvru.ultraiptv.com/live_en/playlist1/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="kazakh-tv" tvg-name="Kazakh TV" tvg-logo="" group-title="",Kazakh TV (EN) (Opt-2)
+#EXTINF:-1 tvg-id="kazakh-tv" tvg-name="Kazakh TV" tvg-logo="" group-title="",Kazakh TV (EN)
 http://212.8.233.150:8081/kazahtv/stream_en/playlist.m3u8
+#EXTINF:-1 tvg-id="kazakh-tv" tvg-name="Kazakh TV" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/9/92/Kazakh_tv_logo_png_1.png" group-title="",Kazakh TV (EN)
+http://kazakhtvru.ultraiptv.com/live_en/playlist1/index.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="kazakh-tv" tvg-name="Kazakh TV" tvg-logo="" group-title="",Kazakh TV (KG)
 http://212.8.233.150:8081/kazahtv/stream_kg/playlist.m3u8
-#EXTINF:-1 tvg-id="kazakh-tv" tvg-name="Kazakh TV" tvg-logo="" group-title="",Kazakh TV (KZ) (Opt-1)
+#EXTINF:-1 tvg-id="kazakh-tv" tvg-name="Kazakh TV" tvg-logo="" group-title="",Kazakh TV (KZ)
 http://212.8.233.150:8081/kazahtv/stream_kz/playlist.m3u8
-#EXTINF:-1 tvg-id="kazakh-tv" tvg-name="Kazakh TV" tvg-logo="" group-title="",Kazakh TV (KZ) (Opt-2)
+#EXTINF:-1 tvg-id="kazakh-tv" tvg-name="Kazakh TV" tvg-logo="" group-title="",Kazakh TV (KZ)
 https://str-2.mediabay.tv/Khabar/playlist.m3u8?token=6947ee4f1797891e48983b1747e1854b2e01b3fa-6b488393802a468c678ce192c6d0149d-1566591798-1566580998
-#EXTINF:-1 tvg-id="kazakh-tv" tvg-name="Kazakh TV" tvg-logo="" group-title="",Kazakh TV (RU) (Opt-1)
+#EXTINF:-1 tvg-id="kazakh-tv" tvg-name="Kazakh TV" tvg-logo="" group-title="",Kazakh TV (RU)
 http://212.8.233.150:8081/kazahtv/stream_ru/playlist.m3u8
-#EXTINF:-1 tvg-id="kazakh-tv" tvg-name="Kazakh TV" tvg-logo="" group-title="",Kazakh TV (RU) (Opt-2)
+#EXTINF:-1 tvg-id="kazakh-tv" tvg-name="Kazakh TV" tvg-logo="" group-title="",Kazakh TV (RU)
 http://kazakhtvru.ultraiptv.com/live_ru/playlist1/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://oraltv.kz/assets/regions/logo/aqjaiyq.png?v=1" group-title="",Oral
 http://onrez.kaztrk.kz/regional/oraltv/index.m3u8
@@ -39,9 +39,9 @@ http://195.49.213.56/ktklive/live.hq/playlist.m3u8
 http://89.218.30.37/ktklive/live.hq/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://mtrk.kz/wp-content/themes/mtrk/images/logo.png" group-title="",МТРК
 http://tv2.esilnet.com/hls/mtrk.m3u8
-#EXTINF:-1 tvg-id="novoe-televidenie" tvg-name="Новое телевидение" tvg-logo="" group-title="",Новое телевидение (Opt-1)
+#EXTINF:-1 tvg-id="novoe-televidenie" tvg-name="Новое телевидение" tvg-logo="" group-title="",Новое телевидение
 http://serv25.vintera.tv:8081/novoetv/nov_tv/playlist.m3u8
-#EXTINF:-1 tvg-id="novoe-televidenie" tvg-name="Новое телевидение" tvg-logo="" group-title="",Новое телевидение (Opt-2)
+#EXTINF:-1 tvg-id="novoe-televidenie" tvg-name="Новое телевидение" tvg-logo="" group-title="",Новое телевидение
 https://str-4.mediabay.tv/Novoe_TV/playlist.m3u8?token=64a7fa10c4b686ed0c29fb0e6c24421d68884010-1b0c93c5b000a6e66402bd747cab0c2a-1566591907-1566581107
 #EXTINF:-1 tvg-id="xabar24" tvg-name="Хабар 24" tvg-logo="https://iptvx.one/icn/xabar24.png" group-title="",Хабар 24
 http://serv30.vintera.tv:8081/habar/habar24/playlist.m3u8
diff --git a/channels/lb.m3u b/channels/lb.m3u
index 3efca1080..4e0ad26f7 100644
--- a/channels/lb.m3u
+++ b/channels/lb.m3u
@@ -1,9 +1,9 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://aghaniaghani.com/images/logo.png" group-title="",Aaghani
 http://109.236.92.216:9090/Aghani/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://d1k5w7mbrh6vq5.cloudfront.net/images/cache/38/d3/ff/38d3ff8bbb366efe85df293affd5e8f3.PNG" group-title="",Al Jadeed (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://d1k5w7mbrh6vq5.cloudfront.net/images/cache/38/d3/ff/38d3ff8bbb366efe85df293affd5e8f3.PNG" group-title="",Al Jadeed
 http://livecdnh3.tvanywhere.ae/hls/jadeed/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://d1k5w7mbrh6vq5.cloudfront.net/images/cache/38/d3/ff/38d3ff8bbb366efe85df293affd5e8f3.PNG" group-title="",Al Jadeed (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://d1k5w7mbrh6vq5.cloudfront.net/images/cache/38/d3/ff/38d3ff8bbb366efe85df293affd5e8f3.PNG" group-title="",Al Jadeed
 http://livecdnh3.tvanywhere.ae/hls/jadeed/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://cdnar.almayadeen.net/cdn/website/images/web-logo.png" group-title="",Al Mayadeen
 http://95.170.215.109:80/hls/m3u8/MAYADEEN-Backup.m3u8
@@ -11,12 +11,12 @@ http://95.170.215.109:80/hls/m3u8/MAYADEEN-Backup.m3u8
 http://livecdnh3.tvanywhere.ae/hls/jadeed/03.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Aljadeed HD 1080p
 http://livecdnh3.tvanywhere.ae/hls/jadeed/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://yt3.ggpht.com/-06mS0mwhzno/AAAAAAAAAAI/AAAAAAAAAAA/6K-Wn_N0h98/s900-c-k-no-mo-rj-c0xffffff/photo.jpg" group-title="",Future TV (Opt-1)
-http://futuretv.cdn.mangomolo.com/futuretv/smil:futuretv.smil/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://futuretvnetwork.com/images/logo.png" group-title="",Future TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://futuretvnetwork.com/images/logo.png" group-title="",Future TV
 http://futuretv.cdn.mangomolo.com/futuretv/smil:futuretv.smil/chunklist_b650000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Future TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Future TV
 http://futuretv.cdn.mangomolo.com/futuretv/smil:futuretv.smil/gmswf.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://yt3.ggpht.com/-06mS0mwhzno/AAAAAAAAAAI/AAAAAAAAAAA/6K-Wn_N0h98/s900-c-k-no-mo-rj-c0xffffff/photo.jpg" group-title="",Future TV
+http://futuretv.cdn.mangomolo.com/futuretv/smil:futuretv.smil/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.hawacom.tv/android-chrome-256x256.png" group-title="",Hawacom
 http://livecdnh3.tvanywhere.ae/hls/hawacom/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PTOeIjz.png" group-title="",LBC (New!)
@@ -29,12 +29,12 @@ http://livecdnh2.tvanywhere.ae/hls/lbc_int/03.m3u8
 http://livecdnh2.tvanywhere.ae/hls/lbc_int/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.ares-portal.com/wp-content/uploads/2017/09/plugin.video_.mtvlebanon-1320x743.png" group-title="",MTV Lebanon
 http://livecdnh3.tvanywhere.ae/hls/MTVLbnHD/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://nbntv.me/wp-content/uploads/2018/08/nbn-logo.jpg" group-title="",NBN (Opt-1)
-http://livecdnh1.tvanywhere.ae/hls/nbn/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://nbntv.me/wp-content/uploads/2018/08/nbn-logo.jpg" group-title="",NBN (Opt-2)
-http://livecdnh1.tvanywhere.ae/hls/nbn/05.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://nbntv.me/wp-content/uploads/2018/08/nbn-logo.jpg" group-title="",NBN (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://nbntv.me/wp-content/uploads/2018/08/nbn-logo.jpg" group-title="",NBN
 http://livecdnh1.tvanywhere.ae/hls/nbn/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://nbntv.me/wp-content/uploads/2018/08/nbn-logo.jpg" group-title="",NBN
+http://livecdnh1.tvanywhere.ae/hls/nbn/05.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://nbntv.me/wp-content/uploads/2018/08/nbn-logo.jpg" group-title="",NBN
+http://livecdnh1.tvanywhere.ae/hls/nbn/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",NOURSAT
 https://svs.itworkscdn.net/nour4satlive/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",NOURSAT Alshabab
@@ -49,11 +49,11 @@ https://svs.itworkscdn.net/nour9satlive/livestream/playlist.m3u8
 https://svs.itworkscdn.net/nour5satlive/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",NOURSAT Spirit
 https://svs.itworkscdn.net/nour6satlive/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://bookback.co/wp-content/uploads/2018/12/OTV-1.jpg" group-title="",OTV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://bookback.co/wp-content/uploads/2018/12/OTV-1.jpg" group-title="",OTV
 http://livecdnh2.tvanywhere.ae/hls/otv_leb/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://bookback.co/wp-content/uploads/2018/12/OTV-1.jpg" group-title="",OTV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://bookback.co/wp-content/uploads/2018/12/OTV-1.jpg" group-title="",OTV
 http://livecdnh2.tvanywhere.ae/hls/otv_leb/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",OTV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",OTV
 https://svs.itworkscdn.net/otvlebanonlive/otv.smil/chunklist_t64TFE=.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.teleliban.com.lb/images/telelogo.png" group-title="",Télé Liban
 http://213.162.202.9:8000/play/a00y/index.m3u8
diff --git a/channels/lv.m3u b/channels/lv.m3u
index c10a9e23b..4424aad7c 100644
--- a/channels/lv.m3u
+++ b/channels/lv.m3u
@@ -15,11 +15,11 @@ https://cdn2.tvplayhome.lt/live/eds/LNT_LV_SD/HLS_encr/LNT_LV_SD-audio_20001=960
 https://cdn2.tvplayhome.lt/live/eds/LTV1_LV_SD/HLS_encr/LTV1_LV_SD-audio_20001=96000-video=2200000.m3u8
 #EXTINF:-1 tvg-id="ltv7" tvg-name="LTV7" tvg-logo="https://ltv.lsm.lv/assets/channel/logo2.png" group-title="",LTV7
 https://cdn2.tvplayhome.lt/live/eds/LTV7_LV_SD/HLS_encr/LTV7_LV_SD-audio_20000=96000-video=2200000.m3u8
-#EXTINF:-1 tvg-id="re-tv" tvg-name="Re:TV Латвия" tvg-logo="http://www.retv.lv/wp-content/uploads/2017/03/logo-a-e1489505827441.png" group-title="",Re:TV (Opt-1)
+#EXTINF:-1 tvg-id="re-tv" tvg-name="Re:TV Латвия" tvg-logo="http://www.retv.lv/wp-content/uploads/2017/03/logo-a-e1489505827441.png" group-title="",Re:TV
 http://edge-telia1.tiesraides.lv/live/retv.lv.1_1/playlist.m3u8
-#EXTINF:-1 tvg-id="re-tv" tvg-name="Re:TV Латвия" tvg-logo="" group-title="",Re:TV (Opt-2)
+#EXTINF:-1 tvg-id="re-tv" tvg-name="Re:TV Латвия" tvg-logo="" group-title="",Re:TV
 http://edge-telia1.tiesraides.lv/live/retv.lv.1_1/playlist_b1825196.m3u8
-#EXTINF:-1 tvg-id="re-tv" tvg-name="Re:TV Латвия" tvg-logo="" group-title="",Re:TV (Opt-3)
+#EXTINF:-1 tvg-id="re-tv" tvg-name="Re:TV Латвия" tvg-logo="" group-title="",Re:TV
 http://edge-telia2.tiesraides.lv/live/retv.lv.1_1/playlist.m3u8
 #EXTINF:-1 tvg-id="tv3-lv" tvg-name="TV3 LV" tvg-logo="https://neskaties.lv/misc/tv3/logo.png" group-title="",TV3
 https://cdn2.tvplayhome.lt/live/eds/TV3_LV_SD/HLS_encr/TV3_LV_SD-audio_20001=96000-video=2200000.m3u8
@@ -29,7 +29,7 @@ https://cdn2.tvplayhome.lt/live/eds/TV6_LV_SD/HLS_encr/TV6_LV_SD-audio_20001=960
 http://player.tvnet.lv/stream/amlst:61659/chunklist_w1822312625_b528000_pd892000.m3u8
 #EXTINF:-1 tvg-id="multimania-lv" tvg-name="Мультимания LV" tvg-logo="https://kartina24.tv/images/news/multimania.png" group-title="",Мультимания
 http://82.193.71.93/MultimaniaLV/video.m3u8
-#EXTINF:-1 tvg-id="rentv-baltic" tvg-name="РенТВ Baltic" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/6b/Ren_tv_ru_baltic.png/106px-Ren_tv_ru_baltic.png" group-title="",Рен ТВ Baltic (Opt-1)
+#EXTINF:-1 tvg-id="rentv-baltic" tvg-name="РенТВ Baltic" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/6b/Ren_tv_ru_baltic.png/106px-Ren_tv_ru_baltic.png" group-title="",Рен ТВ Baltic
 http://ott-cdn.ucom.am/s85/04.m3u8
-#EXTINF:-1 tvg-id="rentv-baltic" tvg-name="РенТВ Baltic" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/6b/Ren_tv_ru_baltic.png/106px-Ren_tv_ru_baltic.png" group-title="",Рен ТВ Baltic (Opt-2)
+#EXTINF:-1 tvg-id="rentv-baltic" tvg-name="РенТВ Baltic" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/6b/Ren_tv_ru_baltic.png/106px-Ren_tv_ru_baltic.png" group-title="",Рен ТВ Baltic
 http://ott-cdn.ucom.am/s85/index.m3u8
diff --git a/channels/ly.m3u b/channels/ly.m3u
index 5b1d12508..cb3902580 100644
--- a/channels/ly.m3u
+++ b/channels/ly.m3u
@@ -1,15 +1,15 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/L8abziX.png" group-title="",Al Hadath
 http://starmena.ercdn.net/libya-alhadath/libya-alhadath.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/WI5hSK1.png" group-title="",Al Tanasuh TV (LY) (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/WI5hSK1.png" group-title="",Al Tanasuh TV (LY)
 http://m.live.net.sa:1935/m/ngrp:tanasuhtv_all/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/WI5hSK1.png" group-title="",Al Tanasuh TV (LY) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/WI5hSK1.png" group-title="",Al Tanasuh TV (LY)
 http://m.live.net.sa:1935/m/tanasuhtv/chunklist_w2048734625.m3u8?v=2545014476
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/mzwdt39.jpg" group-title="",Libya 218 News
 http://95.85.47.43/libya218news/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9u9mApw.png" group-title="",Libya's Channel (Opt-1)
-https://master.starmena-cloud.com/hls/libyas.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9u9mApw.png" group-title="",Libya's Channel (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9u9mApw.png" group-title="",Libya's Channel
 http://1599780955@starmena.ercdn.net/libyaschannel/libyaschannel.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9u9mApw.png" group-title="",Libya's Channel
+https://master.starmena-cloud.com/hls/libyas.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/U1ZJ9Av.png" group-title="",Tanasuh TV
 http://m.live.net.sa:1935/m/tanasuhtv/playlist.m3u8
diff --git a/channels/ma.m3u b/channels/ma.m3u
index c89df1b0f..1b063202a 100644
--- a/channels/ma.m3u
+++ b/channels/ma.m3u
@@ -1,9 +1,9 @@
 #EXTM3U x-tvg-url="http://195.154.221.171/epg/guidearab.xml.gz"
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",2M
 http://www.elahmad.com/tv/m3u8/elahmad_jyrh8.m3u8?id=maroc2
-#EXTINF:-1 tvg-id="2M Monde ARB" tvg-name="2M Monde ARB" tvg-logo="https://i.imgur.com/eE1SdyA.png" group-title="",2M Monde (Opt-1)
+#EXTINF:-1 tvg-id="2M Monde ARB" tvg-name="2M Monde ARB" tvg-logo="https://i.imgur.com/eE1SdyA.png" group-title="",2M Monde
 http://livecdnh2.tvanywhere.ae/hls/2m_maroc/04.m3u8
-#EXTINF:-1 tvg-id="2M Monde ARB" tvg-name="2M Monde ARB" tvg-logo="https://i.imgur.com/eE1SdyA.png" group-title="",2M Monde (Opt-2)
+#EXTINF:-1 tvg-id="2M Monde ARB" tvg-name="2M Monde ARB" tvg-logo="https://i.imgur.com/eE1SdyA.png" group-title="",2M Monde
 https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/2m_monde/hls_video_ts/2m_monde.m3u8
 #EXTINF:-1 tvg-id="Al Aoula Tv ARB" tvg-name="Al Aoula Tv ARB" tvg-logo="http://imageswoapi.whatsonindia.com/WhatsOnTV/images/Applicationchannellogo/medium/10000000016650000.png" group-title="",Al Aoula
 http://cdn-hls.globecast.tv/live/ramdisk/al_aoula_inter/hls_snrt/index.m3u8
@@ -17,14 +17,14 @@ http://cdnamd-hls-globecast.akamaized.net/live/ramdisk/al_maghribia_snrt/hls_snr
 http://cdnamd-hls-globecast.akamaized.net/live/ramdisk/arrabiaa/hls_snrt/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AR-RIADIA
 http://cdnamd-hls-globecast.akamaized.net/live/ramdisk/arriadia/hls_snrt/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.fraja-maroc.net/TV/img/img28.jpg" group-title="",Arrabia (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.fraja-maroc.net/TV/img/img28.jpg" group-title="",Arrabia
 http://cdn-hls.globecast.tv/live/ramdisk/arrabiaa/hls_snrt/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/R8jSVoz.png" group-title="",Arrabia (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/R8jSVoz.png" group-title="",Arrabia
 https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/arrabiaa/hls_snrt/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Arryadia (Opt-1)
-http://www.elahmad.com/tv/m3u8/maroc.m3u8?id=arriadia
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://snrtlive.ma/sites/all/themes/snrtlive/images/arriyadia.png" group-title="",Arryadia (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://snrtlive.ma/sites/all/themes/snrtlive/images/arriyadia.png" group-title="",Arryadia
 http://cdn-hls.globecast.tv/live/ramdisk/arriadia/hls_snrt/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Arryadia
+http://www.elahmad.com/tv/m3u8/maroc.m3u8?id=arriadia
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AS-SADISSA
 http://cdnamd-hls-globecast.akamaized.net/live/ramdisk/assadissa/hls_snrt/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://snrtlive.ma/sites/all/themes/snrtlive/images/assadissax2.png" group-title="",Assadissa
@@ -39,7 +39,7 @@ http://cdn-hls.globecast.tv/live/ramdisk/al_aoula_laayoune/hls_snrt/index.m3u8
 http://streaming.medi1tv.com/live/Medi1tvmaghreb.sdp/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Tamazight TV
 http://cdn-hls.globecast.tv/live/ramdisk/tamazight_tv8_snrt/hls_snrt/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7sibv0t.png" group-title="",Télé Maroc (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7sibv0t.png" group-title="",Télé Maroc
 http://api.new.livestream.com/accounts/27130247/events/8196478/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7sibv0t.png" group-title="",Télé Maroc(Opt-2)
 http://213.162.202.9:8000/play/a02a/index.m3u8
diff --git a/channels/mc.m3u b/channels/mc.m3u
index 7dab575bc..9efd37313 100644
--- a/channels/mc.m3u
+++ b/channels/mc.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://monacoinfo.com/wp-content/themes/monacoinfo/assets/img/monacoinfo.png" group-title="",Monaco Info (Opt-1)
-http://46.105.34.238/liveevent.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.monacochannel.mc/var/monaco/storage/images/media/monaco-channel/icones-chaines/logo-monaco-info-2018/5096065-2-fre-FR/Logo-Monaco-Info-2018_40x40.png" group-title="",Monaco Info (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.monacochannel.mc/var/monaco/storage/images/media/monaco-channel/icones-chaines/logo-monaco-info-2018/5096065-2-fre-FR/Logo-Monaco-Info-2018_40x40.png" group-title="",Monaco Info
 http://46.105.34.238/hls-live/livepkgr/_definst_/liveevent/livestream3.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://monacoinfo.com/wp-content/themes/monacoinfo/assets/img/monacoinfo.png" group-title="",Monaco Info
+http://46.105.34.238/liveevent.m3u8
diff --git a/channels/md.m3u b/channels/md.m3u
index 1395492e1..0d67b15d7 100644
--- a/channels/md.m3u
+++ b/channels/md.m3u
@@ -9,31 +9,31 @@ http://canalregional.md/tv/live/canalregional.m3u8
 https://hls.drochia.tv/tv/web.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Z27Eyqv.jpg" group-title="",Elita TV
 http://46.55.111.242:8080/Rezina.m3u8
-#EXTINF:-1 tvg-id="moldova-1" tvg-name="Moldova 1" tvg-logo="https://i.imgur.com/oQzs720.png" group-title="",Moldova 1 (Opt-1)
-http://live.trm.md:1935/live/MoldovaUnu1/playlist.m3u8
-#EXTINF:-1 tvg-id="moldova-1" tvg-name="Moldova 1" tvg-logo="https://i.imgur.com/oQzs720.png" group-title="",Moldova 1 (Opt-2)
-http://live.trm.md:1935/live/M1Mlive/playlist.m3u8
-#EXTINF:-1 tvg-id="moldova-1" tvg-name="Moldova 1" tvg-logo="https://i.imgur.com/oQzs720.png" group-title="",Moldova 1 (Opt-3)
+#EXTINF:-1 tvg-id="moldova-1" tvg-name="Moldova 1" tvg-logo="https://i.imgur.com/oQzs720.png" group-title="",Moldova 1
 http://212.0.209.209:1935/live/MoldovaUnu1/playlist.m3u8
+#EXTINF:-1 tvg-id="moldova-1" tvg-name="Moldova 1" tvg-logo="https://i.imgur.com/oQzs720.png" group-title="",Moldova 1
+http://live.trm.md:1935/live/M1Mlive/playlist.m3u8
+#EXTINF:-1 tvg-id="moldova-1" tvg-name="Moldova 1" tvg-logo="https://i.imgur.com/oQzs720.png" group-title="",Moldova 1
+http://live.trm.md:1935/live/MoldovaUnu1/playlist.m3u8
 #EXTINF:-1 tvg-id="moldova-2" tvg-name="" tvg-logo="https://i.imgur.com/5wosu8b.png" group-title="",Moldova 2
 http://live.trm.md:1935/live/MoldovaDoi2/playlist.m3u8
 #EXTINF:-1 tvg-id="noroc-tv-md" tvg-name="Noroc TV Moldova" tvg-logo="https://i.imgur.com/39qL2Ht.png" group-title="",Noroc TV
 http://live.noroc.tv/hls/noroctv_chisinau.m3u8
 #EXTINF:-1 tvg-id="pro-tv-md" tvg-name="Pro TV Moldova" tvg-logo="https://i.imgur.com/P5jnLzn.png" group-title="",Pro TV
 http://hls.protv.md/hls/protv.m3u8
-#EXTINF:-1 tvg-id="publika-tv" tvg-name="Publika TV" tvg-logo="https://i.imgur.com/Hquii9k.jpg" group-title="",Publika TV (Opt-1)
+#EXTINF:-1 tvg-id="publika-tv" tvg-name="Publika TV" tvg-logo="https://i.imgur.com/Hquii9k.jpg" group-title="",Publika TV
 http://livebeta.publika.md/LIVE/P/1000.m3u8
-#EXTINF:-1 tvg-id="publika-tv" tvg-name="Publika TV" tvg-logo="https://i.imgur.com/Hquii9k.jpg" group-title="",Publika TV (Opt-2)
-http://livebeta.publika.md/LIVE/P/6810.m3u8
-#EXTINF:-1 tvg-id="publika-tv" tvg-name="Publika TV" tvg-logo="https://i.imgur.com/Hquii9k.jpg" group-title="",Publika TV (Opt-3)
+#EXTINF:-1 tvg-id="publika-tv" tvg-name="Publika TV" tvg-logo="https://i.imgur.com/Hquii9k.jpg" group-title="",Publika TV
 http://livebeta.publika.md/LIVE/P/1500.m3u8
+#EXTINF:-1 tvg-id="publika-tv" tvg-name="Publika TV" tvg-logo="https://i.imgur.com/Hquii9k.jpg" group-title="",Publika TV
+http://livebeta.publika.md/LIVE/P/6810.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FVldFIy.jpg" group-title="",Tele M
 http://webmobile.xdev.ro:81/tv16/playlist.m3u8
 #EXTINF:-1 tvg-id="tv8-md" tvg-name="TV8 Moldova" tvg-logo="https://i.imgur.com/zBCGb8j.jpg" group-title="",TV Balti
 http://77.89.199.174:81/hls/live2.m3u8
-#EXTINF:-1 tvg-id="tv8-md" tvg-name="TV8 Moldova" tvg-logo="https://i.imgur.com/lh9pFtN.jpg" group-title="",TV8 (Opt-1)
+#EXTINF:-1 tvg-id="tv8-md" tvg-name="TV8 Moldova" tvg-logo="https://i.imgur.com/lh9pFtN.jpg" group-title="",TV8
 http://live.cdn.tv8.md/TV7/tracks-v2a1/mono.m3u8
-#EXTINF:-1 tvg-id="tv8-md" tvg-name="TV8 Moldova" tvg-logo="https://i.imgur.com/lh9pFtN.jpg" group-title="",TV8 (Opt-2)
+#EXTINF:-1 tvg-id="tv8-md" tvg-name="TV8 Moldova" tvg-logo="https://i.imgur.com/lh9pFtN.jpg" group-title="",TV8
 http://live.cdn.tv8.md/TV7/video1.m3u8?token=1
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tvrmoldova.md/img/tvr-moldova-oriz-mic.png" group-title="",TVR Moldova
 http://89.136.209.26:1935/liveedge/TVRMOLDOVA.stream/playlist.m3u8
diff --git a/channels/mk.m3u b/channels/mk.m3u
index 58ef6daa2..ae827fe2f 100644
--- a/channels/mk.m3u
+++ b/channels/mk.m3u
@@ -9,7 +9,7 @@ http://190.2.154.72:8081/tvstanici/s1/playlist.m3u8
 http://skyfolk.mk/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/x6w1H3o.jpg" group-title="",Telma TV
 http://190.2.154.72:8081/tvstanici/4/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/C67vLVL.jpg" group-title="",TVPlus (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/C67vLVL.jpg" group-title="",TVPlus
 http://141.136.14.18/kanal1/kanal1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/C67vLVL.jpg" group-title="",TVPlus (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/C67vLVL.jpg" group-title="",TVPlus
 http://141.136.14.18/kanal1/kanal1_1500/index.m3u8
diff --git a/channels/mt.m3u b/channels/mt.m3u
index c2e408d42..535522d96 100644
--- a/channels/mt.m3u
+++ b/channels/mt.m3u
@@ -5,9 +5,9 @@ http://www.evoiptv.com/hlsdiscover/hlsdiscover.m3u8
 http://www.evoiptv.com/hlsdrama/hlsdrama.m3u8
 #EXTINF:-1 tvg-id="ITV Shopping-MLT" tvg-name="ITV Shopping-MLT" tvg-logo="https://i.imgur.com/oIlT2N9.png" group-title="",ITV Shopping Channel
 http://www.evoiptv.com/hlsitv/hlsitv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.evoiptv.com/evotv%20icons/MVTV.png" group-title="Music",MVTV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.evoiptv.com/evotv%20icons/MVTV.png" group-title="Music",MVTV
 http://www.evoiptv.com/hlsmvtv/hlsmvtv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XqyfAYX.png" group-title="Music",MVTV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XqyfAYX.png" group-title="Music",MVTV
 http://www.evoiptv.com/hlsmvtv/hlsmvtv.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="One TV-MLT" tvg-name="One TV-MLT" tvg-logo="https://i.imgur.com/5EzuLfj.png" group-title="",One TV
 http://api.new.livestream.com/accounts/18398100/events/ONELive/live.m3u8
diff --git a/channels/mx.m3u b/channels/mx.m3u
index 15985343b..6a648d0cd 100644
--- a/channels/mx.m3u
+++ b/channels/mx.m3u
@@ -1,23 +1,23 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/MeaSmiv.jpg" group-title="",15TV Sabinas (Opt-1)
-http://live.gvstream.net:554/e-tv-video/play.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://15tv.com.mx/archivos/2016/10/15-100x100.png" group-title="",15TV Sabinas (Opt-2)
-http://live.gvstream.net:1935/e-tv-video/play.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",15TV Sabinas (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",15TV Sabinas
 http://bit.ly/2O6t5rO
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://15tv.com.mx/archivos/2016/10/15-100x100.png" group-title="",15TV Sabinas
+http://live.gvstream.net:1935/e-tv-video/play.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/MeaSmiv.jpg" group-title="",15TV Sabinas
+http://live.gvstream.net:554/e-tv-video/play.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.adn40.mx/images/adn40.png" group-title="",ADN 40
 http://aztkhlslive3-i.akamaihd.net/hls/live/777407/adn40mx/master01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ALCARRIA TV [SPAIN]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Alcarria TV
 http://217.182.77.27/live/alcarriatv-livestream.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SY3a9yU.png" group-title="",Azteca Mas (Opt-1)
-https://aztecalive-lh.akamaihd.net/i/0qfv8evsp_1@458764/index_3_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SY3a9yU.png" group-title="",Azteca Mas (Opt-2)
-https://aztecalive-lh.akamaihd.net/i/0qfv8evsp_1@458764/index_3_av-p.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SY3a9yU.png" group-title="",Azteca Mas (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SY3a9yU.png" group-title="",Azteca Mas
 http://aztecalive-lh.akamaihd.net/i/0qfv8evsp_1@458764/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SY3a9yU.png" group-title="",Azteca Mas (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SY3a9yU.png" group-title="",Azteca Mas
 https://aztecalive-lh.akamaihd.net/i/0qfv8evsp_1@458764/index_3_av-b.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",BBLACK | SD (MX)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SY3a9yU.png" group-title="",Azteca Mas
+https://aztecalive-lh.akamaihd.net/i/0qfv8evsp_1@458764/index_3_av-p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SY3a9yU.png" group-title="",Azteca Mas
+https://aztecalive-lh.akamaihd.net/i/0qfv8evsp_1@458764/index_3_av-p.m3u8?sd=10&rebase=on
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",BBLACK
 http://ec.playmedia.fr/beblack/caribbean/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://vivotvhd.com/img/cha/4572.gifg" group-title="",C7 Cultura
 http://streamingcws20.com:1935/c7cultura/videoc7cultura/.m3u8
@@ -25,11 +25,11 @@ http://streamingcws20.com:1935/c7cultura/videoc7cultura/.m3u8
 http://streamingcws20.com:1935/c7noticias/videoc7noticias/chunklist_w1160890960.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canal 10
 http://stream2.dynalias.com:1935/live/tvlive1/chunklist_w1211325251.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vakdxny.jpg" group-title="",Canal 10 Cancún (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vakdxny.jpg" group-title="",Canal 10 Cancún
 http://stream2.dynalias.com:1935/live/tvlive1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vakdxny.jpg" group-title="",Canal 10 Cancún (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vakdxny.jpg" group-title="",Canal 10 Cancún
 http://stream2.dynalias.com:1935/live/tvlive1/playlist.m3u8?GrupoTopIptv
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",CANAL 15 Zacatecas [1080p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",CANAL 15 Zacatecas
 http://wowza.zuperdns.net:1935/zuperhosting.live.grupob.canal20zacatecas/smil:livestream.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/eFfX2fC.jpg" group-title="",Canal 4 Saltillo
 http://162.241.190.126:1935/live/canal4/playlist.m3u8
@@ -39,9 +39,9 @@ http://200.57.164.179:1935/canaliberoamericano1/mp4:live.mp4/chunklist_w12879624
 http://dl-scjn.scjn.gob.mx/scjn/scjn.mp4/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.mundomas.tv/wp-content/uploads/2017/03/logo1.png" group-title="",Canal Mundo+
 http://vcp1.myplaytv.com:1935/mundomas/mundomas/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/mx/CanalOnce.mx.png" group-title="",Canal Once (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/mx/CanalOnce.mx.png" group-title="",Canal Once
 http://live.canaloncelive.tv:1935/livepkgr2/smil:internacional.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://images.mi.tv/channels/mx_xeipn-canal-11_m.png" group-title="",Canal Once (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://images.mi.tv/channels/mx_xeipn-canal-11_m.png" group-title="",Canal Once
 https://180ce25c70.site.internapcdn.net/ryta_live/chunklist_b481072.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://prod-railsapp.s3.amazonaws.com/uploads/player/video_poster_image/165089/hfkEf2.png" group-title="",Capital 21
 http://23.227.189.81/ciudadtv/abr_ciudadtv/playlist.m3u8?GrupoTopIptv
@@ -53,46 +53,46 @@ https://5949aa132c8fb.streamlock.net:554/iptvbhtv/livebhtvtv/playlist.m3u8
 http://d3kr0d4mfjxpbv.cloudfront.net/p/SPAS_1920x1080_4000k.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/f/fa/Logo-ForoTV-2016.png/200px-Logo-ForoTV-2016.png" group-title="",Foro
 https://d2416wdkjdz9sf.cloudfront.net/forotv/forotvm_1280x720_2500k.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/QqDCsoS.png" group-title="",FOROtv (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/QqDCsoS.png" group-title="",FOROtv
 https://d2416wdkjdz9sf.cloudfront.net/forotv/forotvm.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/QqDCsoS.png" group-title="",FOROtv (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/QqDCsoS.png" group-title="",FOROtv
 https://d2416wdkjdz9sf.cloudfront.net/forotv/forotvm_1280x720_2500k.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hMtKE60.png" group-title="",Genesis TV
 http://201.144.184.98:1935/genesis/smil:television.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Jalisco TV
 http://streamingcws20.com:1935/c7cultura/videoc7cultura/.m3u8?DVR
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/d/d4/Milenio_Television.png" group-title="",Milenio TV (Opt-1)
-http://bcoveliveios-i.akamaihd.net:80/hls/live/201661/57828478001/milenio_center_512k@51752.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i0.wp.com/directostv.teleame.com/wp-content/uploads/2017/11/milenio-TV.png?fit=500%2C300" group-title="",Milenio TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i0.wp.com/directostv.teleame.com/wp-content/uploads/2017/11/milenio-TV.png?fit=500%2C300" group-title="",Milenio TV
 http://bcoveliveios-i.akamaihd.net/hls/live/201661/57828478001/milenio_center_512k@51752.m3u8?GrupoTopIptv
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/d/d4/Milenio_Television.png" group-title="",Milenio TV
+http://bcoveliveios-i.akamaihd.net:80/hls/live/201661/57828478001/milenio_center_512k@51752.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MONTE MARIA | SD (MX)
 http://162.212.176.51:1935/live/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/es/MTV.es.png" group-title="",MTV (Latinoamérica)
 http://161.0.157.5/PLTV/88888888/224/3221226825/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/5/5e/Multimedios_Television.png/250px-Multimedios_Television.png" group-title="",Multimedios (Opt-1)
-http://mdstrm.com:80/live-stream-playlist/57b4db886338448314449cfa.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://imgur.com/ajBGBm5.png" group-title="",Multimedios (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://imgur.com/ajBGBm5.png" group-title="",Multimedios
 http://mdstrm.com/live-stream-playlist/57b4db886338448314449cfa.m3u8?iptvgratis?chile.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/5/5e/Multimedios_Television.png/250px-Multimedios_Television.png" group-title="",Multimedios CDMX (Opt-1)
-http://mdstrm.com:80/live-stream-playlist/5b80728b0a2ea475ba2359a5.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Multimedios CDMX (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/5/5e/Multimedios_Television.png/250px-Multimedios_Television.png" group-title="",Multimedios
+http://mdstrm.com:80/live-stream-playlist/57b4db886338448314449cfa.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Multimedios CDMX
 http://mdstrm.com/live-stream-playlist/5b80728b0a2ea475ba2359a5.m3u8?ref=http://www.multimedios.com
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/5/5e/Multimedios_Television.png/250px-Multimedios_Television.png" group-title="",Multimedios CDMX
+http://mdstrm.com:80/live-stream-playlist/5b80728b0a2ea475ba2359a5.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/yr9M9Kj.png" group-title="",Multimedios Guadalajara
 https://mdstrm.com/live-stream-playlist/5c54d38ca392a5119bb0aa0d.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/yr9M9Kj.png" group-title="",Multimedios Laguna (Opt-1)
-https://mdstrm.com/live-stream-playlist/57bf686a61ff39e1085d43e1.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://imgur.com/ajBGBm5.png" group-title="",Multimedios Laguna (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://imgur.com/ajBGBm5.png" group-title="",Multimedios Laguna
 http://mdstrm.com/live-stream-playlist_1200/57bf686a61ff39e1085d43e1.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/yr9M9Kj.png" group-title="",Multimedios Laguna
+https://mdstrm.com/live-stream-playlist/57bf686a61ff39e1085d43e1.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/yr9M9Kj.png" group-title="",Multimedios Mexico City
 https://mdstrm.com/live-stream-playlist/5b80728b0a2ea475ba2359a5.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/yr9M9Kj.png" group-title="",Multimedios Monterrey (Opt-1)
-http://mdstrm.com/live-stream-playlist/57b4dbf5dbbfc8f16bb63ce1.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Multimedios Monterrey (Opt-2)
-http://mdstrm.com/live-stream-playlist/57b4dbf5dbbfc8f16bb63ce1.m3u8?ref=http://www.multimedios.com
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Multimedios Monterrey (Opt-3)
-http://mdstrm.com/live-stream-playlist_400/57b4dbf5dbbfc8f16bb63ce1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Multimedios Monterrey (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Multimedios Monterrey
 http://mdstrm.com/live-stream-playlist/57b4dbf5dbbfc8f16bb63ce1.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/yr9M9Kj.png" group-title="",Multimedios Monterrey
+http://mdstrm.com/live-stream-playlist/57b4dbf5dbbfc8f16bb63ce1.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Multimedios Monterrey
+http://mdstrm.com/live-stream-playlist/57b4dbf5dbbfc8f16bb63ce1.m3u8?ref=http://www.multimedios.com
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Multimedios Monterrey
+http://mdstrm.com/live-stream-playlist_400/57b4dbf5dbbfc8f16bb63ce1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MX: TELEFORMULA NEW
 http://wms30.tecnoxia.com/radiof/abr_radioftele/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",NUESTRA VISION NOTICIAS
@@ -119,10 +119,10 @@ http://streamingcws20.com:1935/sqcs/videosqcs/playlist.m3u8
 http://streamingcws20.com:1935/trecevision/videotrecevision/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Teleformula
 http://bit.ly/2Le41S2
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Telemar Campeche TV (Opt-1)
-http://wms.tecnoxia.com:1935/8006/8006/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Telemar Campeche TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Telemar Campeche TV
 http://wms.tecnoxia.com:1935/8006/8006/playlist.m3u
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Telemar Campeche TV
+http://wms.tecnoxia.com:1935/8006/8006/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Telemax
 http://s5.mexside.net:1935/telemax/telemax/.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0gL3FIN.png" group-title="",Teleritmo
@@ -137,9 +137,9 @@ http://api.new.livestream.com/accounts/27177136/events/8704166/live.m3u8
 https://5ca3e84a76d30.streamlock.net/gpacifico4/smil:mazatlan.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Ultra TV Aguascalientes
 http://bit.ly/2LDB26j
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Ultra TV Puebla (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Ultra TV Puebla
 http://bit.ly/2Lvh3dc
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/eZf7BPQ.png" group-title="",Ultra TV Puebla (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/eZf7BPQ.png" group-title="",Ultra TV Puebla
 https://180ce25c70.site.internapcdn.net/puebla_live/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/WxRpFPk.jpg" group-title="",Uno TV
 http://ooyalahd2-f.akamaihd.net/i/UnoTV01_delivery@122640/master.m3u8
diff --git a/channels/my.m3u b/channels/my.m3u
index ca5f6740a..0c02ecb1d 100644
--- a/channels/my.m3u
+++ b/channels/my.m3u
@@ -3,9 +3,9 @@
 http://rtmonenewsmobile.secureswiftcontent.com/Origin03/ngrp:RTM3/chunklist_b3696000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://1.bp.blogspot.com/_pZ5epwC9Ns0/S6otX4uJ0mI/AAAAAAAAAZQ/VlWmeBvI_1Q/s1600/Astro+Arena+-+New+Logo.jpg" group-title="",Astro Arena
 http://playbackn5.aotg-video.astro.com.my/CH1/master_ARENA_8.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dLzgBUj.png" group-title="",Astro Awani (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dLzgBUj.png" group-title="",Astro Awani
 http://playbackn13.aotg-video.astro.com.my/CH1/master_AWANI_8_04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dLzgBUj.png" group-title="",Astro Awani (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/dLzgBUj.png" group-title="",Astro Awani
 https://bcsecurelivehls-i.akamaihd.net/hls/live/722763/4508222217001/stream04/streamPlaylist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://astrocontent.s3.amazonaws.com/Images/ChannelLogo/Pos/110_300.png" group-title="",ASTRO HELLO
 http://playbackn20.aotg-video.astro.com.my/CH2/master_HELLO_8.m3u8
@@ -39,9 +39,9 @@ http://rtm1mobile.secureswiftcontent.com/Origin03/ngrp:RTM3/chunklist_b3696000.m
 http://rtm2mobile.secureswiftcontent.com/Origin02/ngrp:RTM2/chunklist_b3696000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/2/2b/Spacetoon_logo.png" group-title="",Spacetoon
 http://210.210.155.35/x6bnqe/s/s80/index2.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://4.bp.blogspot.com/-6pSBtNgrh5s/Wj9h7ZoApNI/AAAAAAAAJ2k/iauSGlk4KD8eoH05Ruyf3qiDRMAeeqGgACLcBGAs/s1600/tvikim.jpg" group-title="",TV Ikim (Opt-1)
-http://edge.vediostream.com:80/abr/tvikim/live/tvikim_360p/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://4.bp.blogspot.com/-6pSBtNgrh5s/Wj9h7ZoApNI/AAAAAAAAJ2k/iauSGlk4KD8eoH05Ruyf3qiDRMAeeqGgACLcBGAs/s1600/tvikim.jpg" group-title="",TV Ikim (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://4.bp.blogspot.com/-6pSBtNgrh5s/Wj9h7ZoApNI/AAAAAAAAJ2k/iauSGlk4KD8eoH05Ruyf3qiDRMAeeqGgACLcBGAs/s1600/tvikim.jpg" group-title="",TV Ikim
 http://edge.vediostream.com/abr/tvikim/live/tvikim_480p/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://4.bp.blogspot.com/-6pSBtNgrh5s/Wj9h7ZoApNI/AAAAAAAAJ2k/iauSGlk4KD8eoH05Ruyf3qiDRMAeeqGgACLcBGAs/s1600/tvikim.jpg" group-title="",TV Ikim (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://4.bp.blogspot.com/-6pSBtNgrh5s/Wj9h7ZoApNI/AAAAAAAAJ2k/iauSGlk4KD8eoH05Ruyf3qiDRMAeeqGgACLcBGAs/s1600/tvikim.jpg" group-title="",TV Ikim
+http://edge.vediostream.com:80/abr/tvikim/live/tvikim_360p/chunks.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://4.bp.blogspot.com/-6pSBtNgrh5s/Wj9h7ZoApNI/AAAAAAAAJ2k/iauSGlk4KD8eoH05Ruyf3qiDRMAeeqGgACLcBGAs/s1600/tvikim.jpg" group-title="",TV Ikim
 http://edge.vediostream.com:80/abr/tvikim/live/tvikim_source/chunks.m3u8
diff --git a/channels/mz.m3u b/channels/mz.m3u
index ae8884d52..53ba39e5d 100644
--- a/channels/mz.m3u
+++ b/channels/mz.m3u
@@ -5,7 +5,7 @@ http://196.28.226.121:1935/live/smil:Channel1.smil/chunklist_b714000_slpor.m3u8
 http://d2ktlibtvvj8vp.cloudfront.net/trace_toca/6/prog_index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5UIy5tD.png" group-title="",TV Maná Moçambique
 http://c3.manasat.com:1935/tvmz/tvmz3/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xy3p7tz.png" group-title="",TVM (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xy3p7tz.png" group-title="",TVM
 http://online.tvm.co.mz:1935/live/smil:Channel1.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://d2q0xv3544jvkb.cloudfront.net/images/programacao/novosb/TVM2-GERALW.jpg" group-title="",TVM Internacional
 http://196.28.226.121:1935/live/smil:Channel2.smil/chunklist_b714000_slpor.m3u8
diff --git a/channels/ni.m3u b/channels/ni.m3u
index f9964b97f..66587e6c3 100644
--- a/channels/ni.m3u
+++ b/channels/ni.m3u
@@ -5,12 +5,12 @@ http://138.117.4.70:8079/streams/d/Canal-10/playlist.m3u8
 http://138.117.4.70:8079/streams/d/Canal-11/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/6LjHgjX.png" group-title="",Canal 12
 http://138.117.4.70:8079/streams/d/Canal-12/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ewpAI0R.png" group-title="",Canal 2 (Opt-1)
-http://162.244.81.181:1935/live//Stream1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ewpAI0R.png" group-title="",Canal 2 (Opt-2)
-http://162.244.81.181:1935/live/Stream1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ewpAI0R.png" group-title="",Canal 2 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ewpAI0R.png" group-title="",Canal 2
 http://138.117.4.70:8079/streams/d/Canal-2/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ewpAI0R.png" group-title="",Canal 2
+http://162.244.81.181:1935/live//Stream1/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ewpAI0R.png" group-title="",Canal 2
+http://162.244.81.181:1935/live/Stream1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/WjL4f6u.png" group-title="",Canal 4
 http://138.117.4.70:8079/streams/d/Canal-4/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Ryp5dos.png" group-title="",Canal 6
diff --git a/channels/nl.m3u b/channels/nl.m3u
index 7d16e1c11..879774e36 100644
--- a/channels/nl.m3u
+++ b/channels/nl.m3u
@@ -37,9 +37,9 @@ http://cdn-hlm-1.streamnerd.nl/live/operator/playlist.m3u8
 https://dpp-qmusicnl-live.akamaized.net/streamx/QmusicNL.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wDB4Gd2.png" group-title="",Radio 10
 http://talparadiohls-i.akamaihd.net/hls/live/698637/VR-Radio10-1/Q5.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/sd7BX9H.png" group-title="",Radio 538 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/sd7BX9H.png" group-title="",Radio 538
 http://talparadiohls-i.akamaihd.net/hls/live/624107/VR-Radio538-1/Radio538Stream-Q2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/sd7BX9H.png" group-title="",Radio 538 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/sd7BX9H.png" group-title="",Radio 538
 http://talparadiohls-i.akamaihd.net/hls/live/624107/VR-Radio538-1/Radio538Stream-Q5.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/w8xWxeG.png" group-title="",Radio Beverwijk
 http://84.22.97.59:80/beverwijk/studio/playlist.m3u8
diff --git a/channels/nz.m3u b/channels/nz.m3u
index 9bf9d085d..6fa0daeed 100644
--- a/channels/nz.m3u
+++ b/channels/nz.m3u
@@ -1,21 +1,21 @@
 #EXTM3U x-tvg-url="http://i.mjh.nz/nzau/epg.xml.gz"
 #EXTINF:-1 tvg-id="tv.39" tvg-name="Firstlight" tvg-logo="https://i.imgur.com/2TKL6BX.png" group-title="",Firstlight TV
 http://streamer1.streamhost.org/salive/GMIFLNL/chunklist_w418539476.m3u8
-#EXTINF:-1 tvg-id="tv.13" tvg-name="Māori Television" tvg-logo="https://www.freeviewnz.tv/nonumbracoimages/ChannelsOpg/freeview-channel-logos-38.png" group-title="",Māori Television (Opt-1)
-https://bcsecurelivehls-i.akamaihd.net//hls/live/720612/1614493167001_1/master_iPad1080p.m3u8
-#EXTINF:-1 tvg-id="tv.13" tvg-name="Māori Television" tvg-logo="http://i.mjh.nz/nz/images/tv.13.png" group-title="",Māori Television (Opt-2)
+#EXTINF:-1 tvg-id="tv.13" tvg-name="Māori Television" tvg-logo="http://i.mjh.nz/nz/images/tv.13.png" group-title="",Māori Television
 http://i.mjh.nz/nz/tv.13.m3u8
-#EXTINF:-1 tvg-id="tv.18" tvg-name="Parliament TV" tvg-logo="https://i.imgur.com/VKc7BLC.png" group-title="Legislative",Parliament TV (Opt-1)
-http://streaming.kordia.net.nz/out/u/house_captionsVideo3.m3u8
-#EXTINF:-1 tvg-id="tv.18" tvg-name="Parliament TV" tvg-logo="https://s10.postimg.org/pfqoq4kkp/noi0mj.png" group-title="Legislative",Parliament TV (Opt-2)
-http://streaming.kordia.net.nz/out/u/ptv_houseaudio.m3u8
-#EXTINF:-1 tvg-id="tv.18" tvg-name="Parliament TV" tvg-logo="http://i.mjh.nz/nz/images/tv.18.png" group-title="Legislative",Parliament TV (Opt-3)
+#EXTINF:-1 tvg-id="tv.13" tvg-name="Māori Television" tvg-logo="https://www.freeviewnz.tv/nonumbracoimages/ChannelsOpg/freeview-channel-logos-38.png" group-title="",Māori Television
+https://bcsecurelivehls-i.akamaihd.net//hls/live/720612/1614493167001_1/master_iPad1080p.m3u8
+#EXTINF:-1 tvg-id="tv.18" tvg-name="Parliament TV" tvg-logo="http://i.mjh.nz/nz/images/tv.18.png" group-title="Legislative",Parliament TV
 http://i.mjh.nz/nz/tv.18.m3u8
+#EXTINF:-1 tvg-id="tv.18" tvg-name="Parliament TV" tvg-logo="https://i.imgur.com/VKc7BLC.png" group-title="Legislative",Parliament TV
+http://streaming.kordia.net.nz/out/u/house_captionsVideo3.m3u8
+#EXTINF:-1 tvg-id="tv.18" tvg-name="Parliament TV" tvg-logo="https://s10.postimg.org/pfqoq4kkp/noi0mj.png" group-title="Legislative",Parliament TV
+http://streaming.kordia.net.nz/out/u/ptv_houseaudio.m3u8
 #EXTINF:-1 tvg-id="tv.20" tvg-name="Te Reo" tvg-logo="http://i.mjh.nz/nz/images/tv.20.png" group-title="",Te Reo
 http://i.mjh.nz/nz/tv.20.m3u8
 #EXTINF:-1 tvg-id="tv.11" tvg-name="Three" tvg-logo="https://i.imgur.com/kcEdCpX.jpg" group-title="",Three
 http://mediaworks-i.akamaihd.net/hls/live/220435/3812193411001/3news_live/master.m3u8
-#EXTINF:-1 tvg-id="tv.45" tvg-name="TVSN Shopping" tvg-logo="http://iptv.matthuisman.nz/nz/images/freeviewnz.45.png" group-title="Shop",TVSN Shopping (Opt-1)
-http://tvsn-i.akamaihd.net/hls/live/261837/tvsn_nz/tvsn_nz_750.m3u8
-#EXTINF:-1 tvg-id="tv.45" tvg-name="TVSN Shopping" tvg-logo="http://i.mjh.nz/nz/images/tv.45.png" group-title="Shop",TVSN Shopping (Opt-2)
+#EXTINF:-1 tvg-id="tv.45" tvg-name="TVSN Shopping" tvg-logo="http://i.mjh.nz/nz/images/tv.45.png" group-title="Shop",TVSN Shopping
 http://i.mjh.nz/nz/tv.45.m3u8
+#EXTINF:-1 tvg-id="tv.45" tvg-name="TVSN Shopping" tvg-logo="http://iptv.matthuisman.nz/nz/images/freeviewnz.45.png" group-title="Shop",TVSN Shopping
+http://tvsn-i.akamaihd.net/hls/live/261837/tvsn_nz/tvsn_nz_750.m3u8
diff --git a/channels/om.m3u b/channels/om.m3u
index 9da7be73f..bf52659d1 100644
--- a/channels/om.m3u
+++ b/channels/om.m3u
@@ -1,17 +1,17 @@
 #EXTM3U x-tvg-url="http://195.154.221.171/epg/guidearab.xml.gz"
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H7D7dmK.png" group-title="",Al-Istiqama TV
 http://jmc-live.ercdn.net/alistiqama/alistiqama_576p.m3u8
-#EXTINF:-1 tvg-id="Oman Sport ARB" tvg-name="Oman Sport ARB" tvg-logo="https://i.imgur.com/Y4dfyeg.jpg" group-title="Sport",Oman Sport (Opt-1)
-http://www.elahmad.com/tv/m3u8/akamaihd.m3u8?id=oman_sport
-#EXTINF:-1 tvg-id="Oman Sport ARB" tvg-name="Oman Sport ARB" tvg-logo="https://i.imgur.com/Y4dfyeg.jpg" group-title="Sport",Oman Sport (Opt-2)
+#EXTINF:-1 tvg-id="Oman Sport ARB" tvg-name="Oman Sport ARB" tvg-logo="https://i.imgur.com/Y4dfyeg.jpg" group-title="Sport",Oman Sport
 http://38.96.148.35:1935/live/omantv02/chunklist.m3u8
-#EXTINF:-1 tvg-id="Oman Sport ARB" tvg-name="Oman Sport ARB" tvg-logo="https://i.imgur.com/Y4dfyeg.jpg" group-title="Sport",Oman Sport (Opt-3)
+#EXTINF:-1 tvg-id="Oman Sport ARB" tvg-name="Oman Sport ARB" tvg-logo="https://i.imgur.com/Y4dfyeg.jpg" group-title="Sport",Oman Sport
 http://38.96.148.35:1935/live/omantv02/playlist.m3u8
-#EXTINF:-1 tvg-id="Oman TV ARB" tvg-name="Oman TV ARB" tvg-logo="http://part.gov.om/part/images/omantv_general.png" group-title="",Oman TV (Opt-1)
+#EXTINF:-1 tvg-id="Oman Sport ARB" tvg-name="Oman Sport ARB" tvg-logo="https://i.imgur.com/Y4dfyeg.jpg" group-title="Sport",Oman Sport
+http://www.elahmad.com/tv/m3u8/akamaihd.m3u8?id=oman_sport
+#EXTINF:-1 tvg-id="Oman TV ARB" tvg-name="Oman TV ARB" tvg-logo="http://part.gov.om/part/images/omantv_general.png" group-title="",Oman TV
 http://38.96.148.35:1935/live/omantv01/chunklist.m3u8
-#EXTINF:-1 tvg-id="Oman TV ARB" tvg-name="Oman TV ARB" tvg-logo="http://imageswoapi.whatsonindia.com/WhatsOnTV/images/Applicationchannellogo/medium/10000000008570000.png" group-title="",Oman TV (Opt-2)
+#EXTINF:-1 tvg-id="Oman TV ARB" tvg-name="Oman TV ARB" tvg-logo="http://imageswoapi.whatsonindia.com/WhatsOnTV/images/Applicationchannellogo/medium/10000000008570000.png" group-title="",Oman TV
 http://38.96.148.35:1935/live/omantv01/playlist.m3u8
-#EXTINF:-1 tvg-id="Oman TV ARB" tvg-name="Oman TV ARB" tvg-logo="http://part.gov.om/part/images/oman_live.png" group-title="",Oman TV (Opt-3)
+#EXTINF:-1 tvg-id="Oman TV ARB" tvg-name="Oman TV ARB" tvg-logo="http://part.gov.om/part/images/oman_live.png" group-title="",Oman TV
 http://38.96.148.35:1935/live/omantv03/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://part.gov.om/part/images/cultural.png" group-title="",Oman TV Cultural
 http://38.96.148.35:1935/live/omantv04/chunklist.m3u8
diff --git a/channels/pa.m3u b/channels/pa.m3u
index ceeb5edc5..29250434d 100644
--- a/channels/pa.m3u
+++ b/channels/pa.m3u
@@ -3,9 +3,9 @@
 http://api.new.livestream.com/accounts/16199200/events/4590066/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/tUHkolc.png" group-title="Religious",Hosanna Vision
 https://1206618505.rsc.cdn77.org/LS-ATL-59020-1/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ikL5OOf.png" group-title="News",NEXtv (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ikL5OOf.png" group-title="News",NEXtv
 http://198.1.117.5:1935/live/livestream/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ikL5OOf.png" group-title="News",NEXtv (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ikL5OOf.png" group-title="News",NEXtv
 http://198.1.117.5:1935/live/livestream/chunklist_w1290911642.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/cDb58gY.png" group-title="",RPC
 https://medcomlivevideo.azureedge.net/medcom-stream/loteria-livetv/loteria-live/streamout-480p/chunks.m3u8
diff --git a/channels/pe.m3u b/channels/pe.m3u
index 1b282518a..139ab52b9 100644
--- a/channels/pe.m3u
+++ b/channels/pe.m3u
@@ -3,23 +3,23 @@
 https://ecdn-mediastream.cdn.mdstrm.com/live-stream-secure/5c51e67df4d3c6698b02bbee/publish/media_2500.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7I13BUc.png" group-title="",Antares TV SD
 http://173.192.105.252:1935/iptvantares/liveantarestv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7hP4nps.png" group-title="",BHtv (Opt-1)
-http://cdn2.ujjina.com:1935/iptvbhtv/livebhtvtv/playlist.m3u8?iptvgratis?chile.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7hP4nps.png" group-title="",BHtv (Opt-2)
-http://cdn2.ujjina.com:1935/iptvbhtv/livebhtvtv/media_w554966584.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7hP4nps.png" group-title="",BHtv (Opt-3)
-http://cdn1.ujjina.com:1935/iptvbhtv/livebhtvtv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7hP4nps.png" group-title="",BHtv (Opt-4)
-http://cdn2.ujjina.com:1935/iptvbhtv/livebhtvtv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7hP4nps.png" group-title="",BHtv (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7hP4nps.png" group-title="",BHtv
 http://cdn1.ujjina.com:1935/iptvbhtv/livebhtvtv/.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7hP4nps.png" group-title="",BHtv
+http://cdn1.ujjina.com:1935/iptvbhtv/livebhtvtv/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7hP4nps.png" group-title="",BHtv
+http://cdn2.ujjina.com:1935/iptvbhtv/livebhtvtv/media_w554966584.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7hP4nps.png" group-title="",BHtv
+http://cdn2.ujjina.com:1935/iptvbhtv/livebhtvtv/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7hP4nps.png" group-title="",BHtv
+http://cdn2.ujjina.com:1935/iptvbhtv/livebhtvtv/playlist.m3u8?iptvgratis?chile.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GkvYHDj.jpg" group-title="",Congreso TV
 http://stream.congreso.gob.pe/hls/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/cLItW9C.png" group-title="",CTC TV Cusco
 http://livestreamingperu.com:1935/ctctv/ctctv/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2mSwwpH.png" group-title="",Cultura 24 TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2mSwwpH.png" group-title="",Cultura 24 TV
 http://vs8.live.opencaster.com/cultura24/smil:cultura24/chunklist_w1710773429_b564000_sles.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ki7ZvDD.png" group-title="",Cultura 24 TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ki7ZvDD.png" group-title="",Cultura 24 TV
 http://vs8.live.opencaster.com/cultura24/smil:cultura24/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9wRwEYW.png" group-title="",CVision TV Musica
 http://v8.ciclano.io:1935/visionmusica/_definst_/visionmusica/playlist.m3u8
@@ -35,18 +35,18 @@ https://cdnhd.iblups.com/hls/ptv2.m3u8
 http://d2fxrfbiedz1tm.cloudfront.net/livepaxtv/smil:PC.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/QGD5z2b.png" group-title="",Radio Sanborja
 https://5949aa132c8fb.streamlock.net:554/iptvsanborja/livesanborjatv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PFu5tT7.png" group-title="",Top Latino TV (Opt-1)
-https://5cefcbf58ba2e.streamlock.net/livetv/latinoSD.stream/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PFu5tT7.png" group-title="",Top Latino TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PFu5tT7.png" group-title="",Top Latino TV
 http://173.236.60.186:1935/livetv/latinoSD.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PFu5tT7.png" group-title="",Top Latino TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PFu5tT7.png" group-title="",Top Latino TV
 http://online.radiodifusion.net:1935/livetv/latinoSD.stream/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PFu5tT7.png" group-title="",Top Latino TV (Opt-4)
-http://online.radiodifusion.net:1935/livetv/latinoSD.stream/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PFu5tT7.png" group-title="",Top Latino TV (Opt-5)
-http://online.radiodifusion.net:1935/livetv/latinoSD.stream/chunklist_w430979689.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PFu5tT7.png" group-title="",Top Latino TV (Opt-6)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PFu5tT7.png" group-title="",Top Latino TV
 http://online.radiodifusion.net:1935/livetv/latinoSD.stream/chunklist_w1282322208.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PFu5tT7.png" group-title="",Top Latino TV
+http://online.radiodifusion.net:1935/livetv/latinoSD.stream/chunklist_w430979689.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PFu5tT7.png" group-title="",Top Latino TV
+http://online.radiodifusion.net:1935/livetv/latinoSD.stream/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PFu5tT7.png" group-title="",Top Latino TV
+https://5cefcbf58ba2e.streamlock.net/livetv/latinoSD.stream/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qOIeK6F.jpg" group-title="",Turbo Mix
 http://167.114.116.212:1935/tvmb/turbomix/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/nmAlmX4.png" group-title="",TV Cosmos
diff --git a/channels/ph.m3u b/channels/ph.m3u
index 6c50e870f..7b74a6364 100644
--- a/channels/ph.m3u
+++ b/channels/ph.m3u
@@ -1,23 +1,27 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",5 (TV5)
-http://stream1.news5.ph/n5e/tv5_2/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",5 PLUS
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SlC7WYG.png" group-title="",5 PLUS
 http://stream1.news5.ph:1935/n5e/aksyon/chunklist_w1575736103.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.postimg.cc/C53XtK5f/zaltv.png" group-title="Kids",ANIPLUS
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/myuUvgO.jpg" group-title="Kids",ANIPLUS
 http://210.210.155.35/session/0d216142-f3f5-11e8-ab67-89df93dc8d44/dr9445/h/h02/01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AyqNnHj.png" group-title="News",CNN Philippines (Opt-1)
-http://df7lqp0btxdx2.cloudfront.net/11227_500.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AyqNnHj.png" group-title="News",CNN Phillippines (Opt-2)
-http://54.251.134.121:1935/live/15273.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Inquirer 990 Television
-https://d3cbe0gidjd4k2.cloudfront.net/channel_7/channel7/chunklist_w842017402.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Life TV Asia
-https://d3cbe0gidjd4k2.cloudfront.net/channel_6/channel6/chunklist_w1653262029.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Pilipinas HD
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PwUFKik.jpg" group-title="",Beam TV
 https://d3cbe0gidjd4k2.cloudfront.net/channel_5/channel5/chunklist_w1001324973.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Pop Life TV
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AyqNnHj.png" group-title="News",CNN Philippines
+http://df7lqp0btxdx2.cloudfront.net/11227_500.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AyqNnHj.png" group-title="News",CNN Phillippines
+http://54.251.134.121:1935/live/15273.sdp/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HSklqOj.jpg" group-title="",Inquirer 990 Television
+https://d3cbe0gidjd4k2.cloudfront.net/channel_7/channel7/chunklist_w842017402.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XgSxlpi.png" group-title="",INC TV
+http://churchrus2-lh.akamaihd.net/i/coctesting_1@57550/index_1500_av-p.m3u8?sd=10&rebase=on
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/nqwE9ij.jpg" group-title="",Life TV Asia
+https://d3cbe0gidjd4k2.cloudfront.net/channel_6/channel6/chunklist_w1653262029.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0fIfzW1.jpg" group-title="",Pop Life TV
 https://d3cbe0gidjd4k2.cloudfront.net/channel_2/channel2/chunklist_w1932655832.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Shop",Shop TV
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RUQASCU.png" group-title="Shop",Shop TV
 https://d3cbe0gidjd4k2.cloudfront.net/channel_1/channel1/chunklist_w743726554.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ylgQY9Y.png" group-title="",TV5
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ylgQY9Y.png" group-title="",TV5 (Opt-1)
 http://stream1.news5.ph/n5e/tv5_2/chunklist_w1942959991.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ylgQY9Y.png" group-title="",TV5 (Opt-2)
+http://stream1.news5.ph/n5e/tv5_2/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7OsxUER.png" group-title="",UNTV
+https://untv.mmdlive.lldns.net/untv/97cc8d2c46bd43b78e0b112761ab71fe/master.m3u8
diff --git a/channels/pk.m3u b/channels/pk.m3u
index 6e90406c8..af212d812 100644
--- a/channels/pk.m3u
+++ b/channels/pk.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/5/5b/92_News.jpg" group-title="",92 News (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/5/5b/92_News.jpg" group-title="",92 News
 http://92news.vdn.dstreamone.net/92newshd/92hd/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/5/5b/92_News.jpg" group-title="",92 News (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/5/5b/92_News.jpg" group-title="",92 News
 http://92news.vdn.dstreamone.net/92newshd/92hd_160p/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.afaqs.com/all/news/images/news_story_grfx/2016/11/49330/JK-24X7-News.jpg" group-title="",_24x7 News
 http://edge-ind.inapcdn.in:1935/device2/camera2.stream/chunklist.m3u8
@@ -19,25 +19,25 @@ http://imob.dunyanews.tv:1935/live/smil:stream.smil/playlist.m3u8
 http://streamer64.eboundservices.com/geo/geokahani_abr/geo/geokahani_master/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Geo News
 http://stream.jeem.tv/geo/geonews/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Geo TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Geo TV
 http://stream.jeem.tv/geo/geoentertainment/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Geo TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Geo TV
 http://streamer64.eboundservices.com/geo/geoentertainment_abr/geo/geoentertainment_master/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://kay2.tv/wp-content/uploads/2017/01/logo.png" group-title="",Kay2 TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://kay2.tv/wp-content/uploads/2017/01/logo.png" group-title="",Kay2 TV
 http://livecdnh1.tvanywhere.ae:80/hls/k2/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://kay2.tv/wp-content/uploads/2017/01/logo.png" group-title="",Kay2 TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://kay2.tv/wp-content/uploads/2017/01/logo.png" group-title="",Kay2 TV
 http://livecdnh1.tvanywhere.ae:80/hls/k2/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Kay2 TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Kay2 TV
 https://dcunilive36-lh.akamaihd.net/i/dclive_1@662109/index_150_av-p.m3u8?sd=6&rebase=on
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/8/85/Lahore_News_Logo_%28For_Tv_Screen%29.png/1200px-Lahore_News_Logo_%28For_Tv_Screen%29.pn" group-title="",Lahore News
 http://mlive.lahorenews.tv:1935/lahorelive/lnews_1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SBUPUNm.png" group-title="",Nazrana TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SBUPUNm.png" group-title="",Nazrana TV
 http://linear08hun-lh.akamaihd.net/i/nazrana_1@673935/index_2128_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SBUPUNm.png" group-title="",Nazrana TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SBUPUNm.png" group-title="",Nazrana TV
 http://linear08hun-lh.akamaihd.net/i/nazrana_1@673935/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",PTV Home (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",PTV Home
 http://67.231.248.131:1935/live/PTVhome/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.ptv.com.pk/user/assets/images/ptvLogos/ptvHomeLogo1.png" group-title="",PTV Home (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.ptv.com.pk/user/assets/images/ptvLogos/ptvHomeLogo1.png" group-title="",PTV Home
 http://67.231.248.131:1935/live/PTVhome/chunklist_w1961087555.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",PTV News
 http://67.231.248.131:1935/live/PTVnews/chunklist_w1281891626.m3u8
diff --git a/channels/pl.m3u b/channels/pl.m3u
index da02a5c6d..db4253b9c 100644
--- a/channels/pl.m3u
+++ b/channels/pl.m3u
@@ -13,16 +13,16 @@ http://stream.tvkujawy.pl:8080/live/broadcast.m3u8
 http://95.160.28.218:1935/pogranicze/myStream/chunks.m3u8
 #EXTINF:-1 tvg-id="TV Republika PL" tvg-name="TV Republika PL" tvg-logo="https://static.wirtualnemedia.pl/media/top/tvrepublika-2017logo655_1507554857.png" group-title="",Telewizja Republika
 https://ec08.luz1.cache.orange.pl/jupiter/o2-cl7/live/tvrepublika/live-tvrepublika-1700k.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.toruntv.pl/public/img/logo.png" group-title="",Telewizja Toruń (Opt-1)
-http://217.173.176.107:1935/live/ngrp:tvk.stream_mobile/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Telewizja Toruń (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Telewizja Toruń
 http://217.173.176.107:1935/live/ngrp:tvk.stream_all/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.toruntv.pl/public/img/logo.png" group-title="",Telewizja Toruń
+http://217.173.176.107:1935/live/ngrp:tvk.stream_mobile/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://wielkopolska.tv/wp-content/themes/tense-theme-master/assets/images/logo.png" group-title="",Telewizja Wielkopolska
 http://stream4.nadaje.com:15308/live/stream-1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/C6ckzHW.png" group-title="",Truso TV (Opt-1)
-http://95.160.28.218:1935/elblag/myStream_aac/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.truso.tv/data/wysiwig/images/logo1.png" group-title="",Truso TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.truso.tv/data/wysiwig/images/logo1.png" group-title="",Truso TV
 http://95.160.28.218:1935/elblag/myStream_aac/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/C6ckzHW.png" group-title="",Truso TV
+http://95.160.28.218:1935/elblag/myStream_aac/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TVT Zgorzelec
 http://gargoyle.tomkow.pl/hls/tvt.m3u8
 #EXTINF:-1 tvg-id="WTK PL" tvg-name="WTK PL" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/5/57/Wtk_logo_300x300.jpg/240px-Wtk_logo_300x300.jpg" group-title="",WTK
diff --git a/channels/pr.m3u b/channels/pr.m3u
index fe40a8423..88c8747a2 100644
--- a/channels/pr.m3u
+++ b/channels/pr.m3u
@@ -1,17 +1,17 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8xhrsCN.jpg" group-title="",Canal 13 Puerto Rico (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8xhrsCN.jpg" group-title="",Canal 13 Puerto Rico
 http://live247tv.com:1935/worodtcanal13/worodtcanal13/chunklist_w333080128.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8xhrsCN.jpg" group-title="",Canal 13 Puerto Rico (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/8xhrsCN.jpg" group-title="",Canal 13 Puerto Rico
 http://live247tv.com:1935/worodtcanal13/worodtcanal13/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/KlJnXF3.jpg" group-title="",CDM International
 https://59825a54e4454.streamlock.net:8443/marcos536/marcos536/chunklist_w815796812.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CDM TV (Opt-1)
-http://205.164.56.130:1935/marcos536/marcos536/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CDM TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CDM TV
 http://205.164.56.130:1935/marcos536/marcos536/chunklist_w191773249.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",TeleCadena SBN (Opt-1)
-http://ph1.ministeriotv.com:1936/48/smil:48.smil/chunklist_w258668948_b548000_sleng.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",TeleCadena SBN (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CDM TV
+http://205.164.56.130:1935/marcos536/marcos536/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",TeleCadena SBN
 http://ph1.ministeriotv.com:1936/48/smil:48.smil/chunklist_w250775975_b1564000_sleng.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",TeleCadena SBN
+http://ph1.ministeriotv.com:1936/48/smil:48.smil/chunklist_w258668948_b548000_sleng.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/IDCc36l.png" group-title="",WIPR
 http://api.new.livestream.com/accounts/16550960/events/8600941/live.m3u8
diff --git a/channels/ps.m3u b/channels/ps.m3u
index 913b0821b..878e3d97d 100644
--- a/channels/ps.m3u
+++ b/channels/ps.m3u
@@ -3,9 +3,9 @@
 http://htvajyal.mada.ps:8888/ajyal/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/EKGnd0S.png" group-title="",Al Mahd
 http://vstream3.hadara.ps:8081/Almahed/Almahed/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AlFajer AlJadeed TV 2 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AlFajer AlJadeed TV 2
 http://two.alfajertv.com:8081/AlfajertvHDTwo_web/web/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AlFajer AlJadeed TV 2 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AlFajer AlJadeed TV 2
 http://two.alfajertv.com:8081/AlfajertvHDTwo_web/web/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/uDX98CJ.jpg" group-title="",An-Najah Nbc
 http://htvpalsat.mada.ps:8888/najah/index.m3u8?v=1559311573
@@ -13,16 +13,16 @@ http://htvpalsat.mada.ps:8888/najah/index.m3u8?v=1559311573
 http://htvpalsat.mada.ps:8888/audeh/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ANSbicE.png" group-title="",Kolalnas
 http://htvmada.mada.ps:8888/kolalnas/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1DTp5hd.png" group-title="",Maan TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1DTp5hd.png" group-title="",Maan TV
 http://vstream2.hadara.ps:8081/MaanHD_web/web/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Maan TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Maan TV
 http://vstream3.hadara.ps:8081/MaanHD_web/web/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/PeIYCXs.jpg" group-title="",Marah FM
 http://vstream3.hadara.ps:8081/marahFM_web/web/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xi7DM2I.png" group-title="",MusawaChannel (Opt-1)
-http://vnczgbk-lh.akamaihd.net/i/test_1@525503/index_2000_av-p.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MusawaChannel (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MusawaChannel
 http://vnczgbk-lh.akamaihd.net/i/test_1@525503/index_2000_av-p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xi7DM2I.png" group-title="",MusawaChannel
+http://vnczgbk-lh.akamaihd.net/i/test_1@525503/index_2000_av-p.m3u8?sd=10&rebase=on
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/bYz6HUG.png" group-title="",Palestine Mubasher
 http://htvpalsat.mada.ps:8888/PBCLive/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/KcSgZg0.jpg" group-title="",Palestine Sattelite Channel
diff --git a/channels/pt.m3u b/channels/pt.m3u
index 0822feb62..ad2202f5a 100644
--- a/channels/pt.m3u
+++ b/channels/pt.m3u
@@ -1,22 +1,22 @@
 #EXTM3U x-tvg-url="http://195.154.221.171/epg/guideportugal.xml.gz"
-#EXTINF:-1 tvg-id="ARTV PT" tvg-name="ARTV PT" tvg-logo="http://directostv.teleame.com/wp-content/uploads/2016/04/ARTV-Canal-Parlamento.png" group-title="",ARtv (Opt-1)
-http://193.126.16.68:1935/livenlin4/2liveartvpub/chunklist_w30591610.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="ARTV PT" tvg-name="ARTV PT" tvg-logo="http://directostv.teleame.com/wp-content/uploads/2016/04/ARTV-Canal-Parlamento.png" group-title="",ARtv (Opt-2)
-http://193.126.16.68:1935/livenlin4/mp4:2liveartvpub/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="ARTV PT" tvg-name="ARTV PT" tvg-logo="https://www.meo.pt/PublishingImages/canais/artv.png" group-title="",ARtv (Opt-3)
+#EXTINF:-1 tvg-id="ARTV PT" tvg-name="ARTV PT" tvg-logo="https://www.meo.pt/PublishingImages/canais/artv.png" group-title="",ARtv
 http://193.126.16.68:1935/livenlin4/2liveartvpub/chunklist_w30591610.m3u8
-#EXTINF:-1 tvg-id="ARTV PT" tvg-name="ARTV PT" tvg-logo="http://51.255.196.214/Logos/KodiPortugal/ARTV.png" group-title="",ARtv (Opt-4)
+#EXTINF:-1 tvg-id="ARTV PT" tvg-name="ARTV PT" tvg-logo="http://directostv.teleame.com/wp-content/uploads/2016/04/ARTV-Canal-Parlamento.png" group-title="",ARtv
+http://193.126.16.68:1935/livenlin4/2liveartvpub/chunklist_w30591610.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="ARTV PT" tvg-name="ARTV PT" tvg-logo="http://51.255.196.214/Logos/KodiPortugal/ARTV.png" group-title="",ARtv
 http://193.126.16.68:1935/livenlin4/mp4:2liveartvpub/playlist.m3u8
-#EXTINF:-1 tvg-id="Caca Vision PT" tvg-name="Caca Vision PT" tvg-logo="https://i.imgur.com/3qB3JL7.png" group-title="",Caca Vision (Opt-1)
+#EXTINF:-1 tvg-id="ARTV PT" tvg-name="ARTV PT" tvg-logo="http://directostv.teleame.com/wp-content/uploads/2016/04/ARTV-Canal-Parlamento.png" group-title="",ARtv
+http://193.126.16.68:1935/livenlin4/mp4:2liveartvpub/playlist.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="Caca Vision PT" tvg-name="Caca Vision PT" tvg-logo="https://i.imgur.com/3qB3JL7.png" group-title="",Caca Vision
 https://cdn039.fractalmedia.es/hls/caz_pt_high.m3u8
-#EXTINF:-1 tvg-id="Caca Vision PT" tvg-name="Caca Vision PT" tvg-logo="https://i.imgur.com/3qB3JL7.png" group-title="",Caca Vision (Opt-2)
-https://cdn039.fractalmedia.es/hls/caz_pt_med.m3u8
-#EXTINF:-1 tvg-id="Caca Vision PT" tvg-name="Caca Vision PT" tvg-logo="https://i.imgur.com/3qB3JL7.png" group-title="",Caca Vision (Opt-3)
+#EXTINF:-1 tvg-id="Caca Vision PT" tvg-name="Caca Vision PT" tvg-logo="https://i.imgur.com/3qB3JL7.png" group-title="",Caca Vision
 https://cdn039.fractalmedia.es/hls/caz_pt_low.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/9/97/Canal180_logo.png" group-title="",Canal180 (Opt-1)
-http://noscdne.entrprise.tv:1935/live/canal180.stream/livestream.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/9/97/Canal180_logo.png" group-title="",Canal180 (Opt-2)
+#EXTINF:-1 tvg-id="Caca Vision PT" tvg-name="Caca Vision PT" tvg-logo="https://i.imgur.com/3qB3JL7.png" group-title="",Caca Vision
+https://cdn039.fractalmedia.es/hls/caz_pt_med.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/9/97/Canal180_logo.png" group-title="",Canal180
 http://noscdne.entrprise.tv:1935/live/canal180.stream/livestream.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/9/97/Canal180_logo.png" group-title="",Canal180
+http://noscdne.entrprise.tv:1935/live/canal180.stream/livestream.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://4.bp.blogspot.com/-yvBt5WYfG6c/Tzr83sXucuI/AAAAAAAAEbg/ZOSMhqFbbyM/s1600/RADIO_FM_O_DIA_RJ.png" group-title="",FM O Dia TV
 http://c2901-slbps-sambavideos.akamaized.net/livet/FMoDiaVideo_14d480346fa04ebcb4f03173f2dae707/ngrp:livestream/chunklist_b898304.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://kuriakos-cine.com/wp-content/uploads/2017/07/cropped-512x512_cine_v1-270x270.png" group-title="Movies",Kuriakos Cine
@@ -25,35 +25,35 @@ http://c2.manasat.com:1935/kcine/kcine3/FluxusTV.m3u8?fluxustv.m3u8
 http://c2.manasat.com:1935/kkids/kkids3/FluxusTV.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/q6K4S0N.png" group-title="Music",Kuriakos Music
 http://c2.manasat.com:1935/kmusic/kmusic3/FluxusTV.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.kuriakos-tv.com/img/logo@2x.png" group-title="",Kuriakos TV (Opt-1)
-http://195.22.11.11:1935/ktv/ktv1/TeamBlue.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/M5i4hfh.png" group-title="",Kuriakos TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/M5i4hfh.png" group-title="",Kuriakos TV
 http://195.22.11.11:1935/ktv/ktv1/FluxusTV.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.kuriakos-tv.com/img/logo@2x.png" group-title="",Kuriakos TV
+http://195.22.11.11:1935/ktv/ktv1/TeamBlue.m3u8
 #EXTINF:-1 tvg-id="Porto Canal PT" tvg-name="Porto Canal PT" tvg-logo="https://i.imgur.com/ATSmQeT.png" group-title="",Porto Canal
 https://streamer-a03.videos.sapo.pt/live/portocanal/chunklist_w1825121495.m3u8
-#EXTINF:-1 tvg-id="RTP 1 PT" tvg-name="RTP 1 PT" tvg-logo="http://media.rtp.pt/empresa/wp-content/uploads/sites/31/2015/07/thumb_rtp1_positivo.jpg" group-title="",RTP 1 (Opt-1)
+#EXTINF:-1 tvg-id="RTP 1 PT" tvg-name="RTP 1 PT" tvg-logo="http://media.rtp.pt/empresa/wp-content/uploads/sites/31/2015/07/thumb_rtp1_positivo.jpg" group-title="",RTP 1
 http://rtp-pull-live-h1bnxvdk20183-proprtp-app-wrtp.hls.adaptive.level3.net/liverepeater/rtp1_5ch5h264.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="RTP 1 PT" tvg-name="RTP 1 PT" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/7/7c/RTP.png" group-title="",RTP 1 (Opt-2)
+#EXTINF:-1 tvg-id="RTP 1 PT" tvg-name="RTP 1 PT" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/7/7c/RTP.png" group-title="",RTP 1
 https://streaming-live.rtp.pt/liverepeater/smil:rtp1.smil/chunklist_b640000_slpt.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="RTP 2 PT" tvg-name="RTP 2 PT" tvg-logo="http://media.rtp.pt/empresa/wp-content/uploads/sites/31/2016/05/thumb_rtp2_00.jpg" group-title="",RTP 2
 http://rtp-pull-live-h1bnxvdk20183-proprtp-app-wrtp.hls.adaptive.level3.net/liverepeater/rtp2_5ch3h264.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="RTP 3 PT" tvg-name="RTP 3 PT" tvg-logo="http://51.255.196.214/Logos/KodiPortugal/RTP3.png" group-title="",RTP 3
 http://rtp-pull-live-h1bnxvdk20183-proprtp-app-wrtp.hls.adaptive.level3.net/liverepeater/rtpn_5ch64h264.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="RTP Acores PT" tvg-name="RTP Acores PT" tvg-logo="https://static.iptv-epg.com/pt/RtpAcores.pt.png" group-title="",RTP Açores (Opt-1)
+#EXTINF:-1 tvg-id="RTP Acores PT" tvg-name="RTP Acores PT" tvg-logo="https://static.iptv-epg.com/pt/RtpAcores.pt.png" group-title="",RTP Açores
 http://rtp-pull-live-h1bnxvdk20183-proprtp-app-wrtp.hls.adaptive.level3.net/liverepeater/rtpacores_5rtpacores.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="RTP Acores PT" tvg-name="RTP Acores PT" tvg-logo="https://cdn-images.rtp.pt/common/img/channels/logos/color/horizontal/rtpacores.png" group-title="",RTP Açores (Opt-2)
+#EXTINF:-1 tvg-id="RTP Acores PT" tvg-name="RTP Acores PT" tvg-logo="https://cdn-images.rtp.pt/common/img/channels/logos/color/horizontal/rtpacores.png" group-title="",RTP Açores
 http://rtp-pull-live-h1bnxvdk20183-proprtp-app-wrtp.hls.adaptive.level3.net/liverepeater/rtpacores_5rtpacores.stream/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/pt/Rtp1.pt.png" group-title="",RTP Gravado
 http://210.210.155.35/qwr9ew/s/s38/index.m3u8
 #EXTINF:-1 tvg-id="RTP Internacional PT" tvg-name="RTP Internacional PT" tvg-logo="https://static.iptv-epg.com/pt/RTPInternacional.pt.png" group-title="",RTP Internacional
 http://rtp-pull-live-h1bnxvdk20183-proprtp-app-wrtp.hls.adaptive.level3.net:80/liverepeater/rtpi_5ch120h264.stream/playlist.pt.m3u8
-#EXTINF:-1 tvg-id="RTP Madeira PT" tvg-name="RTP Madeira PT" tvg-logo="https://static.iptv-epg.com/pt/RtpMadeira.pt.png" group-title="",RTP Madeira (Opt-1)
+#EXTINF:-1 tvg-id="RTP Madeira PT" tvg-name="RTP Madeira PT" tvg-logo="https://static.iptv-epg.com/pt/RtpMadeira.pt.png" group-title="",RTP Madeira
 http://rtp-pull-live-h1bnxvdk20183-proprtp-app-wrtp.hls.adaptive.level3.net/liverepeater/rtpmadeira_5ch1016h264H14.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="RTP Madeira PT" tvg-name="RTP Madeira PT" tvg-logo="https://upload.wikimedia.org/wikipedia/an/f/f0/RTP_Madeira.png" group-title="",RTP Madeira (Opt-2)
+#EXTINF:-1 tvg-id="RTP Madeira PT" tvg-name="RTP Madeira PT" tvg-logo="https://upload.wikimedia.org/wikipedia/an/f/f0/RTP_Madeira.png" group-title="",RTP Madeira
 http://rtp-pull-live-h1bnxvdk20183-proprtp-app-wrtp.hls.adaptive.level3.net/liverepeater/rtpmadeira_5ch1016h264H14.stream/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="RTP Memoria PT" tvg-name="RTP Memoria PT" tvg-logo="https://static.iptv-epg.com/pt/RtpMemoria.pt.png" group-title="",RTP Memória (Opt-1)
+#EXTINF:-1 tvg-id="RTP Memoria PT" tvg-name="RTP Memoria PT" tvg-logo="https://static.iptv-epg.com/pt/RtpMemoria.pt.png" group-title="",RTP Memória
 http://rtp-pull-live-h1bnxvdk20183-proprtp-app-wrtp.hls.adaptive.level3.net/liverepeater/rtpmem_5ch80h264.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="RTP Memoria PT" tvg-name="RTP Memoria PT" tvg-logo="http://directostv.teleame.com/wp-content/uploads/2016/04/RTP-Memoria.png" group-title="",RTP Memória (Opt-2)
+#EXTINF:-1 tvg-id="RTP Memoria PT" tvg-name="RTP Memoria PT" tvg-logo="http://directostv.teleame.com/wp-content/uploads/2016/04/RTP-Memoria.png" group-title="",RTP Memória
 http://rtp-pull-live-h1bnxvdk20183-proprtp-app-wrtp.hls.adaptive.level3.net/liverepeater/rtpmem_5ch80h264.stream/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="RTP Africa PT" tvg-name="RTP Africa PT" tvg-logo="https://static.iptv-epg.com/pt/RtpAfrica.pt.png" group-title="",RTP África
 http://rtp-pull-live-h1bnxvdk20183-proprtp-app-wrtp.hls.adaptive.level3.net/liverepeater/rtpafrica_5ch27h264.stream/playlist.m3u8
diff --git a/channels/qa.m3u b/channels/qa.m3u
index 9fc7ab9d3..86ded42e8 100644
--- a/channels/qa.m3u
+++ b/channels/qa.m3u
@@ -1,17 +1,17 @@
 #EXTM3U x-tvg-url="http://195.154.221.171/epg/guidearab.xml.gz"
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/o90fKsH.png" group-title="Sport",Al Kass Five (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/o90fKsH.png" group-title="Sport",Al Kass Five
 http://www.elahmad.com/tv/m3u8/alkass.m3u8?id=alkass5
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/o90fKsH.png" group-title="Sport",Al Kass Five (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/o90fKsH.png" group-title="Sport",Al Kass Five
 https://alkasmsl4.akamaized.net/hls/live/2003123/five/master570.m3u8
-#EXTINF:-1 tvg-id="Al Kass One ARB" tvg-name="Al Kass One ARB" tvg-logo="https://i.imgur.com/o90fKsH.png" group-title="Sport",Al Kass One (Opt-1)
+#EXTINF:-1 tvg-id="Al Kass One ARB" tvg-name="Al Kass One ARB" tvg-logo="https://i.imgur.com/o90fKsH.png" group-title="Sport",Al Kass One
 http://www.elahmad.com/tv/m3u8/alkass.m3u8?id=alkass1
-#EXTINF:-1 tvg-id="Al Kass One ARB" tvg-name="Al Kass One ARB" tvg-logo="https://i.imgur.com/o90fKsH.png" group-title="Sport",Al Kass One (Opt-2)
+#EXTINF:-1 tvg-id="Al Kass One ARB" tvg-name="Al Kass One ARB" tvg-logo="https://i.imgur.com/o90fKsH.png" group-title="Sport",Al Kass One
 https://alkasmsl4.akamaized.net/hls/live/2003123/alkassone1/master570.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/o90fKsH.png" group-title="Sport",Al Kass Online
 https://alkasmsl4.akamaized.net/hls/live/2003123/alkassOnlineZI/master570.m3u8
-#EXTINF:-1 tvg-id="Al Kass Two ARB" tvg-name="Al Kass Two ARB" tvg-logo="https://i.imgur.com/o90fKsH.png" group-title="Sport",Al Kass Two (Opt-1)
+#EXTINF:-1 tvg-id="Al Kass Two ARB" tvg-name="Al Kass Two ARB" tvg-logo="https://i.imgur.com/o90fKsH.png" group-title="Sport",Al Kass Two
 http://www.elahmad.com/tv/m3u8/alkass.m3u8?id=alkass2
-#EXTINF:-1 tvg-id="Al Kass Two ARB" tvg-name="Al Kass Two ARB" tvg-logo="https://i.imgur.com/o90fKsH.png" group-title="Sport",Al Kass Two (Opt-2)
+#EXTINF:-1 tvg-id="Al Kass Two ARB" tvg-name="Al Kass Two ARB" tvg-logo="https://i.imgur.com/o90fKsH.png" group-title="Sport",Al Kass Two
 https://alkasmsl4.akamaized.net/hls/live/2003123/alkasstwo/master570.m3u8
 #EXTINF:-1 tvg-id="Al Rayan ARB" tvg-name="Al Rayan ARB" tvg-logo="https://i.imgur.com/uQMoKXn.png" group-title="",Al Rayyan
 https://alrayyan1live.azureedge.net/alrayyan1/alrayyan1.smil/chunklist_b1428000.m3u8
diff --git a/channels/ro.m3u b/channels/ro.m3u
index 922aecf7c..6a72041fa 100644
--- a/channels/ro.m3u
+++ b/channels/ro.m3u
@@ -3,80 +3,80 @@
 https://edge126.rcs-rds.ro/utvedge/musicchannelhq.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="6 TV" tvg-logo="https://i.imgur.com/f5Ddkx2.png" group-title="",6 TV
 http://telekomtv-ro.akamaized.net/shls/LIVE$6TV/6.m3u8/Level(1677721)?start=LIVE&end=END
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/n9igzhr.png" group-title="",Actualitatea TV (Opt-1)
-http://webmobile.xdev.ro:81/tv4/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/n9igzhr.png" group-title="",Actualitatea TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/n9igzhr.png" group-title="",Actualitatea TV
 http://46.214.146.46:81/tv4/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/6PCCvYh.png" group-title="",Acum TV (Opt-1)
-http://webmobile.xdev.ro:81/tv9/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/6PCCvYh.png" group-title="",Acum TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/n9igzhr.png" group-title="",Actualitatea TV
+http://webmobile.xdev.ro:81/tv4/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/6PCCvYh.png" group-title="",Acum TV
 http://webmobile.xdev.ro:81/tv9/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/StJg6Pu.png" group-title="Religious",Alfa Omega TV (Opt-1)
-http://s5.alfaomega.tv:1935/alfaomega/smil:alfaomegatv/chunklist_w369018163_b780800.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/StJg6Pu.png" group-title="Religious",Alfa Omega TV (Opt-2)
-http://telekomtv-ro.akamaized.net/shls/LIVE$AlfaOmegaTV/6.m3u8/Level(1677721)?start=LIVE&end=END
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/StJg6Pu.png" group-title="Religious",Alfa Omega TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/6PCCvYh.png" group-title="",Acum TV
+http://webmobile.xdev.ro:81/tv9/playlist.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/StJg6Pu.png" group-title="Religious",Alfa Omega TV
 http://s5.alfaomega.tv:1935/alfaomega/alfaomega1.sdp/playlist.m3u8?wowzasessionid=1441530266&time=1463063123262
-#EXTINF:-1 tvg-id="" tvg-name="Alpha Media TV" tvg-logo="https://i.imgur.com/dmdcwC6.png" group-title="",Alpha Media TV (Opt-1)
-http://webmobile.xdev.ro:81/tv27/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="Alpha Media TV" tvg-logo="https://i.imgur.com/dmdcwC6.png" group-title="",Alpha Media TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/StJg6Pu.png" group-title="Religious",Alfa Omega TV
+http://s5.alfaomega.tv:1935/alfaomega/smil:alfaomegatv/chunklist_w369018163_b780800.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/StJg6Pu.png" group-title="Religious",Alfa Omega TV
+http://telekomtv-ro.akamaized.net/shls/LIVE$AlfaOmegaTV/6.m3u8/Level(1677721)?start=LIVE&end=END
+#EXTINF:-1 tvg-id="" tvg-name="Alpha Media TV" tvg-logo="https://i.imgur.com/dmdcwC6.png" group-title="",Alpha Media TV
 http://webmobile.xdev.ro:81/tv27/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="Alpha Media TV" tvg-logo="https://i.imgur.com/dmdcwC6.png" group-title="",Alpha Media TV
+http://webmobile.xdev.ro:81/tv27/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="Antena Comedy" tvg-logo="https://i.imgur.com/tH624pc.png" group-title="",Antena Comedy
 http://stream1.antenaplay.ro/live/smil:ComedyPlay.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="Antena Monden" tvg-logo="https://i.imgur.com/6R5TLlc.png" group-title="",Antena Monden
 http://stream1.antenaplay.ro/live/smil:AntenaMonden.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="B1 RO" tvg-name="B1 RO" tvg-logo="https://i.imgur.com/VQqgkzw.jpg" group-title="",B1 (Opt-1)
-http://stream.adunity.com/b1/b1_640-.m3u8
-#EXTINF:-1 tvg-id="B1 RO" tvg-name="B1 RO" tvg-logo="https://i.imgur.com/VQqgkzw.jpg" group-title="",B1 (Opt-2)
+#EXTINF:-1 tvg-id="B1 RO" tvg-name="B1 RO" tvg-logo="https://i.imgur.com/VQqgkzw.jpg" group-title="",B1
 http://stream.adunity.com/b1/b1.m3u8
+#EXTINF:-1 tvg-id="B1 RO" tvg-name="B1 RO" tvg-logo="https://i.imgur.com/VQqgkzw.jpg" group-title="",B1
+http://stream.adunity.com/b1/b1_640-.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5RcXm3M.png" group-title="",Bit TV
 http://46.214.146.46:81/tv2/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JZW1rg4.png" group-title="",BO CLASIC
 http://telekomtv-ro.akamaized.net/shls/LIVE$BollywoodClassic/6.m3u8/Level(1677721)?start=LIVE&end=END
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JZW1rg4.png" group-title="",BO TV
 http://telekomtv-ro.akamaized.net/shls/LIVE$BollywoodTVFilm/6.m3u8/Level(1677721)?start=LIVE&end=END
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7QHdiTO.png" group-title="",Bucovina TV (Opt-1)
-http://46.4.14.12:9999/btvsvlive/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7QHdiTO.png" group-title="",Bucovina TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7QHdiTO.png" group-title="",Bucovina TV
 http://46.4.14.12:9999/btvsvlive/btvsvlive/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7QHdiTO.png" group-title="",Bucovina TV
+http://46.4.14.12:9999/btvsvlive/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GeyE6to.png" group-title="",Bucuresti TV
 http://77.36.61.147/hls/channel3/bitrate4.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/BxUibFh.png" group-title="",Canal33
 https://fms-https1.mediadirect.ro/live3/_definst_/canal33.smil/playlist.m3u8?publisher=83
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hwdfJNU.png" group-title="",Columna
 http://77.36.61.147/hls/channel4/bitrate4.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AX5NsOv.jpg" group-title="Music",Credo TV (Opt-1)
-http://telekomtv-ro.akamaized.net/shls/LIVE$CredoTV/6.m3u8/Level(1677721)?start=LIVE&end=END
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AX5NsOv.jpg" group-title="Music",Credo TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AX5NsOv.jpg" group-title="Music",Credo TV
 http://cdn.credonet.tv:1935/ctv/smil:livecredo.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AX5NsOv.jpg" group-title="Music",Credo TV
+http://telekomtv-ro.akamaized.net/shls/LIVE$CredoTV/6.m3u8/Level(1677721)?start=LIVE&end=END
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XzChc5P.jpg" group-title="",Cromtel TV
 http://webmobile.xdev.ro:81/tv7/playlist.m3u8
 #EXTINF:-1 tvg-id="Digi World RO" tvg-name="Digi World RO" tvg-logo="https://i.imgur.com/I2BUats.png" group-title="",Digi World
 http://37.152.135.169:9002/play/a005/index.m3u8
-#EXTINF:-1 tvg-id="Digi24 RO" tvg-name="Digi24 RO" tvg-logo="https://i.imgur.com/MufRJgP.png" group-title="News",Digi24 (Opt-1)
-http://82.76.40.76/digi24edge/digi24.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="Digi24 RO" tvg-name="Digi24 RO" tvg-logo="https://i.imgur.com/MufRJgP.png" group-title="News",Digi24 (Opt-2)
-http://82.76.40.76/digi24edge/smil:digi24.smil/chunklist_w41349427_b2830400_sleng.m3u8
-#EXTINF:-1 tvg-id="Digi24 RO" tvg-name="Digi24 RO" tvg-logo="https://i.imgur.com/MufRJgP.png" group-title="News",Digi24 (Opt-3)
-http://82.76.40.76/digi24edge/digi24.smil/.m3u8
-#EXTINF:-1 tvg-id="Digi24 RO" tvg-name="Digi24 RO" tvg-logo="https://i.imgur.com/MufRJgP.png" group-title="News",Digi24 (Opt-4)
+#EXTINF:-1 tvg-id="Digi24 RO" tvg-name="Digi24 RO" tvg-logo="https://i.imgur.com/MufRJgP.png" group-title="News",Digi24
 http://81.196.0.126/digi24edge/digi24hdhqhls/index.m3u8
-#EXTINF:-1 tvg-id="Digi24 RO" tvg-name="Digi24 RO" tvg-logo="https://i.imgur.com/MufRJgP.png" group-title="News",Digi24 (Opt-5)
+#EXTINF:-1 tvg-id="Digi24 RO" tvg-name="Digi24 RO" tvg-logo="https://i.imgur.com/MufRJgP.png" group-title="News",Digi24
 http://81.196.0.126:80/digi24edge/digi24hdhqhls/index.m3u8
-#EXTINF:-1 tvg-id="Digi24 RO" tvg-name="Digi24 RO" tvg-logo="https://i.imgur.com/MufRJgP.png" group-title="News",Digi24 (Opt-6)
-http://82.76.40.76/digi24edge/digi24hdhqhls/index.m3u8
-#EXTINF:-1 tvg-id="Digi24 RO" tvg-name="Digi24 RO" tvg-logo="https://i.imgur.com/MufRJgP.png" group-title="News",Digi24 (Opt-7)
+#EXTINF:-1 tvg-id="Digi24 RO" tvg-name="Digi24 RO" tvg-logo="https://i.imgur.com/MufRJgP.png" group-title="News",Digi24
+http://82.76.40.76/digi24edge/digi24.smil/.m3u8
+#EXTINF:-1 tvg-id="Digi24 RO" tvg-name="Digi24 RO" tvg-logo="https://i.imgur.com/MufRJgP.png" group-title="News",Digi24
+http://82.76.40.76/digi24edge/digi24.smil/chunklist.m3u8
+#EXTINF:-1 tvg-id="Digi24 RO" tvg-name="Digi24 RO" tvg-logo="https://i.imgur.com/MufRJgP.png" group-title="News",Digi24
 http://82.76.40.76/digi24edge/digi24.smil/chunklist_w1778144118_b2830400_sleng.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/MufRJgP.png" group-title="News",Digi24 (Opt-8)
+#EXTINF:-1 tvg-id="Digi24 RO" tvg-name="Digi24 RO" tvg-logo="https://i.imgur.com/MufRJgP.png" group-title="News",Digi24
+http://82.76.40.76/digi24edge/digi24hdhqhls/index.m3u8
+#EXTINF:-1 tvg-id="Digi24 RO" tvg-name="Digi24 RO" tvg-logo="https://i.imgur.com/MufRJgP.png" group-title="News",Digi24
+http://82.76.40.76/digi24edge/smil:digi24.smil/chunklist_w41349427_b2830400_sleng.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/MufRJgP.png" group-title="News",Digi24
 http://edge76.rcs-rds.ro/digi24edge/smil:digi24.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Lmbmx3y.png" group-title="",Elita TV
 http://46.55.111.242:8080/Rezina.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xAmYapr.jpg" group-title="",Erdely TV
 http://telekomtv-ro.akamaized.net/shls/LIVE$ErdelyTV/6.m3u8/Level(1677721)?start=LIVE&end=END
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JK6Rypn.jpg" group-title="",Iasi TV Life (Opt-1)
-http://webmobile.xdev.ro:81/tv24/playlist.m3u8?time=1464028219168
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JK6Rypn.jpg" group-title="",Iasi TV Life (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JK6Rypn.jpg" group-title="",Iasi TV Life
 http://webmobile.xdev.ro:81/tv24/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JK6Rypn.jpg" group-title="",Iasi TV Life
+http://webmobile.xdev.ro:81/tv24/playlist.m3u8?time=1464028219168
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0j1matP.jpg" group-title="",Inedit
 http://telekomtv-ro.akamaized.net/shls/LIVE$IneditTV/6.m3u8/Level(1677721)?start=LIVE&end=END
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RiZA8Yu.png" group-title="",Info HD
@@ -99,10 +99,10 @@ https://vid.hls.protv.ro/pro2n/pro2_high/index.m3u8?1
 https://vid.hls.protv.ro/procineman/procinema_high/index.m3u8?1
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/WSnBNnC.png" group-title="",Pro Gold
 https://vid.hls.protv.ro/progoldn/progold_high/index.m3u8?1
-#EXTINF:-1 tvg-id="Pro TV RO" tvg-name="Pro TV RO" tvg-logo="https://i.imgur.com/FWM790Y.png" group-title="",Pro TV (Opt-1)
-https://vid.hls.protv.ro/protvhdn/protvhd_high/index.m3u8?1
-#EXTINF:-1 tvg-id="Pro TV RO" tvg-name="Pro TV RO" tvg-logo="https://i.imgur.com/FWM790Y.png" group-title="",Pro TV (Opt-2)
+#EXTINF:-1 tvg-id="Pro TV RO" tvg-name="Pro TV RO" tvg-logo="https://i.imgur.com/FWM790Y.png" group-title="",Pro TV
 http://stream1.protv.ro/news/stream:1.stream/chunklist_w1582750279.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="Pro TV RO" tvg-name="Pro TV RO" tvg-logo="https://i.imgur.com/FWM790Y.png" group-title="",Pro TV
+https://vid.hls.protv.ro/protvhdn/protvhd_high/index.m3u8?1
 #EXTINF:-1 tvg-id="" tvg-name="ProTV News" tvg-logo="https://i.imgur.com/Tx8sTbW.png" group-title="",Pro TV News
 http://vid.hls.protv.ro/protvnews/protvnews.m3u8?1
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iDDYzO5.png" group-title="Sport",Pro X
@@ -115,13 +115,13 @@ https://e6.myovn.com/s1/cache/radiozu/playlist.m3u8
 http://livestream.realitatea.net/livestream/liverealitatea.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/IIbNOx6.png" group-title="Music",Rock TV
 http://46.20.136.59/live3/_definst_/rocktv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3LdXQxm.png" group-title="",Somax TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3LdXQxm.png" group-title="",Somax TV
 http://webmobile.xdev.ro:81/tv12/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3LdXQxm.png" group-title="",Somax TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3LdXQxm.png" group-title="",Somax TV
 http://webmobile.xdev.ro:81/tv12/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="",Speranta TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="",Speranta TV
 http://amsix40.streamkit.tv/edge/_definst_/sperantatv_500/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="",Speranta TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="",Speranta TV
 http://telekomtv-ro.akamaized.net/shls/LIVE$SperantaTV/6.m3u8/Level(1677721)?start=LIVE&end=END
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1SapDQU.jpg" group-title="",Tezaur TV
 http://86.125.216.66:1935/live/_definst_/tezaurtv/playlist.m3u8
@@ -137,9 +137,9 @@ http://89.136.209.26:1935/liveedge/TVR3.stream/playlist.m3u8
 http://89.136.209.26:1935/liveedge/TVRCLUJ.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="TVR Craiova RO" tvg-name="TVR Craiova RO" tvg-logo="https://i.imgur.com/zFYfPjp.png" group-title="",TVR Craiova
 http://89.136.209.26:1935/liveedge/TVRCRAIOVA.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="TVR HD RO" tvg-name="TVR HD RO" tvg-logo="https://i.imgur.com/ouVOW2q.png" group-title="",TVR HD (Opt-1)
+#EXTINF:-1 tvg-id="TVR HD RO" tvg-name="TVR HD RO" tvg-logo="https://i.imgur.com/ouVOW2q.png" group-title="",TVR HD
 http://89.136.209.26:1935/liveedge/TVRHD.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="TVR HD RO" tvg-name="TVR HD RO" tvg-logo="https://i.imgur.com/ouVOW2q.png" group-title="",TVR HD (Opt-2)
+#EXTINF:-1 tvg-id="TVR HD RO" tvg-name="TVR HD RO" tvg-logo="https://i.imgur.com/ouVOW2q.png" group-title="",TVR HD
 http://89.136.209.26:1935/liveedge/TVRHD.stream/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="TVR Iasi RO" tvg-name="TVR Iasi RO" tvg-logo="https://i.imgur.com/zFYfPjp.png" group-title="",TVR Iasi
 http://82.208.151.107:8088/high/tvriasi/index.m3u8
@@ -147,15 +147,15 @@ http://82.208.151.107:8088/high/tvriasi/index.m3u8
 http://89.136.209.33:1935/liveorigin/TVRI.stream/chunklist.m3u8
 #EXTINF:-1 tvg-id="TVR Timisoara RO" tvg-name="TVR Timisoara RO" tvg-logo="https://i.imgur.com/EA98bRr.png" group-title="",TVR Timisoara
 http://89.136.209.26:1935/liveedge/TVRTIMISOARA.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="U TV RO" tvg-name="U TV RO" tvg-logo="https://i.imgur.com/n0fNQkb.png" group-title="Music",UTV (Opt-1)
-http://82.76.40.76:80/utvedge/utvlive/playlist.m3u8
-#EXTINF:-1 tvg-id="U TV RO" tvg-name="U TV RO" tvg-logo="https://i.imgur.com/n0fNQkb.png" group-title="Music",UTV (Opt-2)
-http://81.196.0.126:80/utvedge/utvlive/index.m3u8
-#EXTINF:-1 tvg-id="U TV RO" tvg-name="U TV RO" tvg-logo="https://i.imgur.com/n0fNQkb.png" group-title="Music",UTV (Opt-3)
+#EXTINF:-1 tvg-id="U TV RO" tvg-name="U TV RO" tvg-logo="https://i.imgur.com/n0fNQkb.png" group-title="Music",UTV
 http://81.196.0.126/utvedge/utvlive/playlist.m3u8
-#EXTINF:-1 tvg-id="U TV RO" tvg-name="U TV RO" tvg-logo="https://i.imgur.com/n0fNQkb.png" group-title="Music",UTV (Opt-4)
-http://81.196.0.126/utvedge/utvlivehls/chunklist_w1688658104.m3u8?iptvgratis?chile.m3u8
-#EXTINF:-1 tvg-id="U TV RO" tvg-name="U TV RO" tvg-logo="https://i.imgur.com/n0fNQkb.png" group-title="Music",UTV (Opt-5)
-http://edge76.rcs-rds.ro/utvedge/utvlivehls/playlist.m3u8
-#EXTINF:-1 tvg-id="U TV RO" tvg-name="U TV RO" tvg-logo="https://i.imgur.com/n0fNQkb.png" group-title="Music",UTV (Opt-6)
+#EXTINF:-1 tvg-id="U TV RO" tvg-name="U TV RO" tvg-logo="https://i.imgur.com/n0fNQkb.png" group-title="Music",UTV
 http://81.196.0.126/utvedge/utvlivehls/chunklist_w1688658104.m3u8?GrupoTopIptv
+#EXTINF:-1 tvg-id="U TV RO" tvg-name="U TV RO" tvg-logo="https://i.imgur.com/n0fNQkb.png" group-title="Music",UTV
+http://81.196.0.126/utvedge/utvlivehls/chunklist_w1688658104.m3u8?iptvgratis?chile.m3u8
+#EXTINF:-1 tvg-id="U TV RO" tvg-name="U TV RO" tvg-logo="https://i.imgur.com/n0fNQkb.png" group-title="Music",UTV
+http://81.196.0.126:80/utvedge/utvlive/index.m3u8
+#EXTINF:-1 tvg-id="U TV RO" tvg-name="U TV RO" tvg-logo="https://i.imgur.com/n0fNQkb.png" group-title="Music",UTV
+http://82.76.40.76:80/utvedge/utvlive/playlist.m3u8
+#EXTINF:-1 tvg-id="U TV RO" tvg-name="U TV RO" tvg-logo="https://i.imgur.com/n0fNQkb.png" group-title="Music",UTV
+http://edge76.rcs-rds.ro/utvedge/utvlivehls/playlist.m3u8
diff --git a/channels/ru.m3u b/channels/ru.m3u
index c2a468bcb..fa9ae99cc 100644
--- a/channels/ru.m3u
+++ b/channels/ru.m3u
@@ -1,85 +1,85 @@
 #EXTM3U x-tvg-url="https://iptvx.one/epg/epg.xml.gz"
-#EXTINF:-1 tvg-id="360-podmoskovie" tvg-name="360° Подмосковье" tvg-logo="https://gl.weburg.net/00/tv/channels/1/491/bigposter/7459394.png" group-title="General",360° (Opt-1)
-http://live-cdne13.cdnvideo.ru/cdne13/cdne13_new.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="360-podmoskovie" tvg-name="360° Подмосковье" tvg-logo="https://gl.weburg.net/00/tv/channels/1/491/bigposter/7459394.png" group-title="General",360° (Opt-2)
-https://strm.yandex.ru/kal/360tv/360tv0.m3u8
-#EXTINF:-1 tvg-id="360-podmoskovie" tvg-name="360° Подмосковье" tvg-logo="https://gl.weburg.net/00/tv/channels/1/491/bigposter/7459394.png" group-title="General",360° (Opt-3)
-http://video1.in-news.ru/360/index.m3u8
-#EXTINF:-1 tvg-id="360-podmoskovie" tvg-name="360° Подмосковье" tvg-logo="https://gl.weburg.net/00/tv/channels/1/491/bigposter/7459394.png" group-title="General",360° (Opt-4)
+#EXTINF:-1 tvg-id="360-podmoskovie" tvg-name="360° Подмосковье" tvg-logo="https://gl.weburg.net/00/tv/channels/1/491/bigposter/7459394.png" group-title="General",360°
 http://360tv-cdn.facecast.io/360/channel2/1.m3u8
+#EXTINF:-1 tvg-id="360-podmoskovie" tvg-name="360° Подмосковье" tvg-logo="https://gl.weburg.net/00/tv/channels/1/491/bigposter/7459394.png" group-title="General",360°
+http://live-cdne13.cdnvideo.ru/cdne13/cdne13_new.sdp/playlist.m3u8
+#EXTINF:-1 tvg-id="360-podmoskovie" tvg-name="360° Подмосковье" tvg-logo="https://gl.weburg.net/00/tv/channels/1/491/bigposter/7459394.png" group-title="General",360°
+http://video1.in-news.ru/360/index.m3u8
+#EXTINF:-1 tvg-id="360-podmoskovie" tvg-name="360° Подмосковье" tvg-logo="https://gl.weburg.net/00/tv/channels/1/491/bigposter/7459394.png" group-title="General",360°
+https://strm.yandex.ru/kal/360tv/360tv0.m3u8
 #EXTINF:-1 tvg-id="360-news" tvg-name="360° Новости" tvg-logo="https://ntvplus.tv/files/image/01/19/86/pp2.png" group-title="News",360° Новости
 http://360tv-cdn.facecast.io/360/channel1/1.m3u8
 #EXTINF:-1 tvg-id="lot-47" tvg-name="ЛОТ 47" tvg-logo="https://static.piter.tv/img/47channel/logo.png" group-title="Local",47 Канал
 http://194.190.88.34:1935/videowhisper/47channel_live_broadcast.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",7 Канал
 http://v1.proofix.ru/live-tv7/stream1/playlist.m3u8
-#EXTINF:-1 tvg-id="8kanal-ru" tvg-name="8 канал" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/8kanal_ru.jpg" group-title="Entertainment",8 Канал (Opt-1)
-http://v1.proofix.ru/live-tv8/stream1/playlist.m3u8
-#EXTINF:-1 tvg-id="8kanal-ru" tvg-name="8 канал" tvg-logo="http://tv8crimea.ru/wp-content/uploads/2017/11/1logo.png" group-title="Entertainment",8 Канал (Opt-2)
+#EXTINF:-1 tvg-id="8kanal-ru" tvg-name="8 канал" tvg-logo="http://tv8crimea.ru/wp-content/uploads/2017/11/1logo.png" group-title="Entertainment",8 Канал
 http://176.99.110.252/stream8/playlist.m3u8
-#EXTINF:-1 tvg-id="8kanal-krasnoyarsk" tvg-name="8 канал Красноярский край" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/8kanal_ru.jpg" group-title="Local",8 Канал (Красноярский край) (Opt-1)
+#EXTINF:-1 tvg-id="8kanal-ru" tvg-name="8 канал" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/8kanal_ru.jpg" group-title="Entertainment",8 Канал
+http://v1.proofix.ru/live-tv8/stream1/playlist.m3u8
+#EXTINF:-1 tvg-id="8kanal-krasnoyarsk" tvg-name="8 канал Красноярский край" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/8kanal_ru.jpg" group-title="Local",8 Канал (Красноярский край)
 http://80.65.18.213/perviy_molodeginyi_3100kb.m3u8
-#EXTINF:-1 tvg-id="8kanal-krasnoyarsk" tvg-name="8 канал Красноярский край" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/8kanal_ru.jpg" group-title="Local",8 Канал (Красноярский край) (Opt-2)
+#EXTINF:-1 tvg-id="8kanal-krasnoyarsk" tvg-name="8 канал Красноярский край" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/8kanal_ru.jpg" group-title="Local",8 Канал (Красноярский край)
 https://str-4.mediabay.tv/8TV_Krasnoyarsk/playlist.m3u8?token=bf39642040854d4ebd796a7e321be19548f770c4-46cb5ba8857d3a1d00a643b6310fdb2b-1566588394-1566577594
-#EXTINF:-1 tvg-id="amedia1" tvg-name="А1" tvg-logo="https://i.imgur.com/lXlwfyw.png" group-title="Movies",A1 (Opt-1)
+#EXTINF:-1 tvg-id="amedia1" tvg-name="А1" tvg-logo="https://i.imgur.com/lXlwfyw.png" group-title="Movies",A1
 http://92.43.140.249/s45/04.m3u8
-#EXTINF:-1 tvg-id="amedia1" tvg-name="А1" tvg-logo="https://i.imgur.com/lXlwfyw.png" group-title="Movies",A1 (Opt-2)
+#EXTINF:-1 tvg-id="amedia1" tvg-name="А1" tvg-logo="https://i.imgur.com/lXlwfyw.png" group-title="Movies",A1
 http://ott-cdn.ucom.am/s45/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="amedia2" tvg-name="А2" tvg-logo="https://i.imgur.com/GwQgT6X.png" group-title="Movies",A2 (Opt-1)
+#EXTINF:-1 tvg-id="amedia2" tvg-name="А2" tvg-logo="https://i.imgur.com/GwQgT6X.png" group-title="Movies",A2
 http://92.43.140.249/s33/04.m3u8
-#EXTINF:-1 tvg-id="amedia2" tvg-name="А2" tvg-logo="https://i.imgur.com/GwQgT6X.png" group-title="Movies",A2 (Opt-2)
+#EXTINF:-1 tvg-id="amedia2" tvg-name="А2" tvg-logo="https://i.imgur.com/GwQgT6X.png" group-title="Movies",A2
 http://ott-cdn.ucom.am/s33/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="acb-tv" tvg-name="ACB TV" tvg-logo="https://vignette.wikia.nocookie.net/tvpedia/images/5/5d/ACB_TV.svg/revision/latest/scale-to-width-down/150?cb=20171104164504&path-prefix=ru" group-title="Entertainment",ACB TV (Opt-1)
+#EXTINF:-1 tvg-id="acb-tv" tvg-name="ACB TV" tvg-logo="https://vignette.wikia.nocookie.net/tvpedia/images/5/5d/ACB_TV.svg/revision/latest/scale-to-width-down/150?cb=20171104164504&path-prefix=ru" group-title="Entertainment",ACB TV
 http://acbtv.vintera.tv:8081/acbtv/acbtv_stream/playlist.m3u8
-#EXTINF:-1 tvg-id="acb-tv" tvg-name="ACB TV" tvg-logo="https://vignette.wikia.nocookie.net/tvpedia/images/5/5d/ACB_TV.svg/revision/latest/scale-to-width-down/150?cb=20171104164504&path-prefix=ru" group-title="Entertainment",ACB TV (Opt-2)
+#EXTINF:-1 tvg-id="acb-tv" tvg-name="ACB TV" tvg-logo="https://vignette.wikia.nocookie.net/tvpedia/images/5/5d/ACB_TV.svg/revision/latest/scale-to-width-down/150?cb=20171104164504&path-prefix=ru" group-title="Entertainment",ACB TV
 https://strm.yandex.ru/kal/acb/acb0.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",Akudji
 http://stream1.cybergame.tv:8080/live/akudjio.m3u8
-#EXTINF:-1 tvg-id="amedia-premium" tvg-name="A HOME OF HBO 2" tvg-logo="https://vignette.wikia.nocookie.net/tvpedia/images/b/b7/Amedia_Premium_%282017%2C_%D0%B1%D0%B5%D0%B7_%D0%BD%D0%B0%D0%B4%D0%BF%D0%B8%D1%81%D0%B8%29.png/revision/latest?cb=20171001192456&path-prefix=ru" group-title="Movies",Amedia Premium (Opt-1)
-http://ott-cdn.ucom.am/s64/index.m3u8
-#EXTINF:-1 tvg-id="amedia-premium" tvg-name="A HOME OF HBO 2" tvg-logo="https://vignette.wikia.nocookie.net/tvpedia/images/b/b7/Amedia_Premium_%282017%2C_%D0%B1%D0%B5%D0%B7_%D0%BD%D0%B0%D0%B4%D0%BF%D0%B8%D1%81%D0%B8%29.png/revision/latest?cb=20171001192456&path-prefix=ru" group-title="Movies",Amedia Premium (Opt-2)
+#EXTINF:-1 tvg-id="amedia-premium" tvg-name="A HOME OF HBO 2" tvg-logo="https://vignette.wikia.nocookie.net/tvpedia/images/b/b7/Amedia_Premium_%282017%2C_%D0%B1%D0%B5%D0%B7_%D0%BD%D0%B0%D0%B4%D0%BF%D0%B8%D1%81%D0%B8%29.png/revision/latest?cb=20171001192456&path-prefix=ru" group-title="Movies",Amedia Premium
 http://92.43.140.249/s64/04.m3u8
-#EXTINF:-1 tvg-id="bridge-tv" tvg-name="Bridge TV" tvg-logo="https://i.imgur.com/L71iY9t.png" group-title="Music",Bridge TV (Opt-1)
+#EXTINF:-1 tvg-id="amedia-premium" tvg-name="A HOME OF HBO 2" tvg-logo="https://vignette.wikia.nocookie.net/tvpedia/images/b/b7/Amedia_Premium_%282017%2C_%D0%B1%D0%B5%D0%B7_%D0%BD%D0%B0%D0%B4%D0%BF%D0%B8%D1%81%D0%B8%29.png/revision/latest?cb=20171001192456&path-prefix=ru" group-title="Movies",Amedia Premium
+http://ott-cdn.ucom.am/s64/index.m3u8
+#EXTINF:-1 tvg-id="bridge-tv" tvg-name="Bridge TV" tvg-logo="https://i.imgur.com/L71iY9t.png" group-title="Music",Bridge TV
 http://ott-cdn.ucom.am/s34/04.m3u8
-#EXTINF:-1 tvg-id="bridge-tv" tvg-name="Bridge TV" tvg-logo="https://i.imgur.com/L71iY9t.png" group-title="Music",Bridge TV (Opt-2)
+#EXTINF:-1 tvg-id="bridge-tv" tvg-name="Bridge TV" tvg-logo="https://i.imgur.com/L71iY9t.png" group-title="Music",Bridge TV
 http://ott-cdn.ucom.am/s34/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GO1eZtc.png" group-title="",Brodilo TV
 http://brodilo.tv/channel.php
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Buy Home TV
 http://hls-edge.cdn.buy-home.tv/bhtvlive/_definst_/live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Kids",Cartoon Network (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Kids",Cartoon Network
 http://91.238.192.169/cartoonnetwork/tracks-v1a1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Kids",Cartoon Network (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Kids",Cartoon Network
 http://s1.only4.tv/802/video.m3u8?token=3KC9QUbdE7
-#EXTINF:-1 tvg-id="deutsche-welle-de" tvg-name="Deutsche Welle Deutsch" tvg-logo="https://iptvx.one/icn/dw.png" group-title="News",Deutsche Welle (Opt-1)
-https://strm.yandex.ru/kal/dw_supres/dw_supres0.m3u8
-#EXTINF:-1 tvg-id="deutsche-welle-de" tvg-name="Deutsche Welle Deutsch" tvg-logo="https://iptvx.one/icn/dw.png" group-title="News",Deutsche Welle (Opt-2)
+#EXTINF:-1 tvg-id="deutsche-welle-de" tvg-name="Deutsche Welle Deutsch" tvg-logo="https://iptvx.one/icn/dw.png" group-title="News",Deutsche Welle
 http://ott-cdn.ucom.am/s26/index.m3u8
-#EXTINF:-1 tvg-id="euronews" tvg-name="EuroNews" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/euronews.jpg" group-title="News",Euronews (Opt-1)
+#EXTINF:-1 tvg-id="deutsche-welle-de" tvg-name="Deutsche Welle Deutsch" tvg-logo="https://iptvx.one/icn/dw.png" group-title="News",Deutsche Welle
+https://strm.yandex.ru/kal/dw_supres/dw_supres0.m3u8
+#EXTINF:-1 tvg-id="euronews" tvg-name="EuroNews" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/euronews.jpg" group-title="News",Euronews
 http://evronovosti.mediacdn.ru/sr1/evronovosti/playlist.m3u8
-#EXTINF:-1 tvg-id="euronews" tvg-name="EuroNews" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/euronews.jpg" group-title="News",Euronews (Opt-2)
-https://strm.yandex.ru/kal/euronews_supres/euronews_supres0.m3u8
-#EXTINF:-1 tvg-id="euronews" tvg-name="EuroNews" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/46/Euronews_2016_logo.svg/1280px-Euronews_2016_logo.svg.png" group-title="News",Euronews (Opt-3)
+#EXTINF:-1 tvg-id="euronews" tvg-name="EuroNews" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/46/Euronews_2016_logo.svg/1280px-Euronews_2016_logo.svg.png" group-title="News",Euronews
 http://ott-cdn.ucom.am/s89/index.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="euronews" tvg-name="EuroNews" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/euronews.jpg" group-title="News",Euronews
+https://strm.yandex.ru/kal/euronews_supres/euronews_supres0.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/Eurosport1.uk.png" group-title="Sport",Eurosport 1 Россия
 http://212.112.101.69:8081/stream44/output.m3u8
-#EXTINF:-1 tvg-id="fastfunbox-hd" tvg-name="Fast&FunBox HD" tvg-logo="https://spiintl.com/data/files/kcfinderUploadDir/images/logo/fastandfunbox-logo.png" group-title="Sport",Fast & Fun Box Русский (Opt-1)
+#EXTINF:-1 tvg-id="fastfunbox-hd" tvg-name="Fast&FunBox HD" tvg-logo="https://spiintl.com/data/files/kcfinderUploadDir/images/logo/fastandfunbox-logo.png" group-title="Sport",Fast & Fun Box Русский
 http://ott-cdn.ucom.am/s79/04.m3u8
-#EXTINF:-1 tvg-id="fastfunbox-hd" tvg-name="Fast&FunBox HD" tvg-logo="https://spiintl.com/data/files/kcfinderUploadDir/images/logo/fastandfunbox-logo.png" group-title="Sport",Fast & Fun Box Русский (Opt-2)
+#EXTINF:-1 tvg-id="fastfunbox-hd" tvg-name="Fast&FunBox HD" tvg-logo="https://spiintl.com/data/files/kcfinderUploadDir/images/logo/fastandfunbox-logo.png" group-title="Sport",Fast & Fun Box Русский
 http://ott-cdn.ucom.am/s79/index.m3u8
 #EXTINF:-1 tvg-id="fine-living" tvg-name="Fine Living" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/e0/Fine_Living_logo.svg/1200px-Fine_Living_logo.svg.png" group-title="",Fine Living Россия
 http://ott-cdn.ucom.am/s51/04.m3u8
-#EXTINF:-1 tvg-id="food-network" tvg-name="Food Network" tvg-logo="https://iptvx.one/icn/food-network.png" group-title="Food",Food Network (Opt-1)
+#EXTINF:-1 tvg-id="food-network" tvg-name="Food Network" tvg-logo="https://iptvx.one/icn/food-network.png" group-title="Food",Food Network
 http://92.43.140.249/s18/04.m3u8
-#EXTINF:-1 tvg-id="food-network" tvg-name="Food Network" tvg-logo="https://static.iptv-epg.com/gb/FoodNetwork.uk.png" group-title="Food",Food Network (Opt-2)
+#EXTINF:-1 tvg-id="food-network" tvg-name="Food Network" tvg-logo="https://static.iptv-epg.com/gb/FoodNetwork.uk.png" group-title="Food",Food Network
 http://ott-cdn.ucom.am/s18/index.m3u8
 #EXTINF:-1 tvg-id="foxlife" tvg-name="Fox Life" tvg-logo="https://static.iptv-epg.com/ru/FoxLife.ru.png" group-title="",Fox Life
 http://sireclipsfoxru-vh.akamaihd.net/i/mpx/FIC_SIRE_Fox/831/336/Sneak_Peek~~111704~12~21~en~~1_ru_42787397,100_mp4_video_1920x0_4016000_primary_audio_6,099_mp4_video_1280x0_2432000_primary_audio_5,098_mp4_video_1280x0_1800000_primary_audio_4,097_mp4_video_960x0_1200000_primary_audio_3,096_mp4_video_640x0_568000_primary_audio_2,095_mp4_video_480x0_400000_primary_audio_1,.mp4.csmil/index_0_av.m3u8
-#EXTINF:-1 tvg-id="freshtv" tvg-name="Fresh TV" tvg-logo="https://i.imgur.com/Ju3mLgq.png" group-title="Music",Fresh TV (Opt-1)
-http://live.planeta-online.tv:1935/public/channel_4/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="freshtv" tvg-name="Fresh TV" tvg-logo="http://radiofresh.bg/i/logo.png" group-title="Music",Fresh TV (Opt-2)
+#EXTINF:-1 tvg-id="freshtv" tvg-name="Fresh TV" tvg-logo="http://radiofresh.bg/i/logo.png" group-title="Music",Fresh TV
 http://live.planeta-online.tv:1935/public/channel_4/playlist.m3u8
-#EXTINF:-1 tvg-id="freshtv" tvg-name="Fresh TV" tvg-logo="" group-title="Music",Fresh TV (Opt-3)
+#EXTINF:-1 tvg-id="freshtv" tvg-name="Fresh TV" tvg-logo="https://i.imgur.com/Ju3mLgq.png" group-title="Music",Fresh TV
+http://live.planeta-online.tv:1935/public/channel_4/playlist.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="freshtv" tvg-name="Fresh TV" tvg-logo="" group-title="Music",Fresh TV
 https://strm.yandex.ru/kal/fresh/fresh0.m3u8
 #EXTINF:-1 tvg-id="hd-media-3d" tvg-name="HD Медиа 3D" tvg-logo="http://hdmedia.ru/common/resources/images/logo_hdmedia3d.png" group-title="",HD Media 3D
 http://62.76.26.81:8081/hdmedia/hdmedia_3d/playlist.m3u8
@@ -99,27 +99,27 @@ https://strm.yandex.ru/kal/oceantv_supres/oceantv_supres0.m3u8
 http://ott-cdn.ucom.am/s63/04.m3u8
 #EXTINF:-1 tvg-id="rtg-tv" tvg-name="RTG TV" tvg-logo="https://gl.weburg.net/00/tv/channels/1/120/bigposter/591604.png" group-title="",RTG TV
 http://ott-cdn.ucom.am/s80/04.m3u8
-#EXTINF:-1 tvg-id="ru-tv" tvg-name="RU.TV" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/ru_tv_ru.jpg" group-title="Music",RU.TV (Opt-1)
-https://strm.yandex.ru/kal/rutv_cv/rutv_cv0.m3u8
-#EXTINF:-1 tvg-id="ru-tv" tvg-name="RU.TV" tvg-logo="http://ru.tv/upload/images/css/img/logo.png" group-title="Music",RU.TV (Opt-2)
+#EXTINF:-1 tvg-id="ru-tv" tvg-name="RU.TV" tvg-logo="http://ru.tv/upload/images/css/img/logo.png" group-title="Music",RU.TV
 https://rutv.gcdn.co/streams/1410_95/720n/index.m3u8
+#EXTINF:-1 tvg-id="ru-tv" tvg-name="RU.TV" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/ru_tv_ru.jpg" group-title="Music",RU.TV
+https://strm.yandex.ru/kal/rutv_cv/rutv_cv0.m3u8
 #EXTINF:-1 tvg-id="russian-musicbox" tvg-name="Russian MusicBox" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/russian_musicbox.jpg" group-title="Music",Russian Musicbox
 https://strm.yandex.ru/kal/rmbox/rmbox0.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/5/5d/Setanta-logo.jpg" group-title="Sport",Setanta Sports 1 (Opt-1)
-http://ott-cdn.ucom.am/s81/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/5/5d/Setanta-logo.jpg" group-title="Sport",Setanta Sports 1 (Opt-2)
-http://ott-cdn.ucom.am/s81/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/5/5d/Setanta-logo.jpg" group-title="Sport",Setanta Sports 1 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/5/5d/Setanta-logo.jpg" group-title="Sport",Setanta Sports 1
 http://92.43.140.204:80/s81/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/5/5d/Setanta-logo.jpg" group-title="Sport",Setanta Sports 1
+http://ott-cdn.ucom.am/s81/03.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/5/5d/Setanta-logo.jpg" group-title="Sport",Setanta Sports 1
+http://ott-cdn.ucom.am/s81/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Setanta Sports 2
 http://92.43.140.200/s82/04.m3u8
 #EXTINF:-1 tvg-id="shopping-live" tvg-name="Shopping Live" tvg-logo="" group-title="Shop",Shopping Live
 http://shoppinglive.mediacdn.ru/sr1/shoppinglive/playlist.m3u8
 #EXTINF:-1 tvg-id="sochi-live" tvg-name="Sochi Live" tvg-logo="https://sochilive.tv/sites/all/themes/sochilive/logo.png" group-title="",Sochi Live
 http://212.8.233.150:8081/sochi/sochi_stream/playlist.m3u8
-#EXTINF:-1 tvg-id="tiji" tvg-name="TiJi" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/tiji.jpg" group-title="Kids",TiJi (Opt-1)
+#EXTINF:-1 tvg-id="tiji" tvg-name="TiJi" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/tiji.jpg" group-title="Kids",TiJi
 http://92.43.140.249/s59/04.m3u8
-#EXTINF:-1 tvg-id="tiji" tvg-name="TiJi" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/tiji.jpg" group-title="Kids",TiJi (Opt-2)
+#EXTINF:-1 tvg-id="tiji" tvg-name="TiJi" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/tiji.jpg" group-title="Kids",TiJi
 http://ott-cdn.ucom.am/s59/index.m3u8
 #EXTINF:-1 tvg-id="tiop-shop-tv" tvg-name="Top Shop TV" tvg-logo="" group-title="Shop",Top Shop TV
 http://tv-topshop.netrack.ru/hls/topshop.m3u8
@@ -127,68 +127,68 @@ http://tv-topshop.netrack.ru/hls/topshop.m3u8
 http://rtmp.lovedrink.ru/hls/ch1.m3u8
 #EXTINF:-1 tvg-id="tv1000-action" tvg-name="TV1000 Action" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/viasat_tv1000_action_east.jpg" group-title="Movies",TV1000 Action
 http://ott-cdn.ucom.am/s91/index.m3u8
-#EXTINF:-1 tvg-id="tvmchannel" tvg-name="TVMChannel" tvg-logo="" group-title="Music",TVMChannel (Opt-1)
-https://strm.yandex.ru/kal/tvm_supres/tvm_supres0.m3u8
-#EXTINF:-1 tvg-id="tvmchannel" tvg-name="TVMChannel" tvg-logo="" group-title="Music",TVMChannel (Opt-2)
+#EXTINF:-1 tvg-id="tvmchannel" tvg-name="TVMChannel" tvg-logo="" group-title="Music",TVMChannel
 http://149.154.68.132:8081/HOLA/stream/playlist.m3u8
-#EXTINF:-1 tvg-id="tvmchannel" tvg-name="TVMChannel" tvg-logo="" group-title="Music",TVMChannel (Opt-3)
+#EXTINF:-1 tvg-id="tvmchannel" tvg-name="TVMChannel" tvg-logo="" group-title="Music",TVMChannel
 https://str-4.mediabay.tv/TVMChannel/playlist.m3u8?token=2ef4acf617a0cc3a9e91416db73e6d03c35fd9e7-9fdfe0b590d22cf61049fbd162551e89-1566590534-1566579734
-#EXTINF:-1 tvg-id="univer-tv" tvg-name="Univer TV" tvg-logo="" group-title="Local",Univer TV (Opt-1)
-http://cdn.universmotri.ru/live/mq.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="univer-tv" tvg-name="Univer TV" tvg-logo="" group-title="Local",Univer TV (Opt-2)
-http://cdn.universmotri.ru/live/smil:mbr.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="univer-tv" tvg-name="Univer TV" tvg-logo="" group-title="Local",Univer TV (Opt-3)
+#EXTINF:-1 tvg-id="tvmchannel" tvg-name="TVMChannel" tvg-logo="" group-title="Music",TVMChannel
+https://strm.yandex.ru/kal/tvm_supres/tvm_supres0.m3u8
+#EXTINF:-1 tvg-id="univer-tv" tvg-name="Univer TV" tvg-logo="" group-title="Local",Univer TV
 http://cdn.universmotri.ru/live/hq.sdp/playlist.m3u8
+#EXTINF:-1 tvg-id="univer-tv" tvg-name="Univer TV" tvg-logo="" group-title="Local",Univer TV
+http://cdn.universmotri.ru/live/mq.sdp/playlist.m3u8
+#EXTINF:-1 tvg-id="univer-tv" tvg-name="Univer TV" tvg-logo="" group-title="Local",Univer TV
+http://cdn.universmotri.ru/live/smil:mbr.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://prod-profile.pscp.tv/1lZKpYwRPRnjn/cc1b0983c5d435dc4d89887b54860f25-128.jpg" group-title="",VIVA Russia
 http://85.143.202.116/hls/viva.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://pp.userapi.com/c848628/v848628728/5fae5/qUqbanFdVqA.jpg" group-title="",АРИС 24
 http://serv25.vintera.tv:8081/test/aris/playlist.m3u8
-#EXTINF:-1 tvg-id="arxyz24" tvg-name="Архыз 24" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/0/05/LOGO_ARKHYZ24.tif/lossy-page1-1200px-LOGO_ARKHYZ24.tif.jpg" group-title="Local",Архыз 24 (Opt-1)
+#EXTINF:-1 tvg-id="arxyz24" tvg-name="Архыз 24" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/0/05/LOGO_ARKHYZ24.tif/lossy-page1-1200px-LOGO_ARKHYZ24.tif.jpg" group-title="Local",Архыз 24
 http://live.mediacdn.ru/sr1/arhis24/playlist.m3u8
-#EXTINF:-1 tvg-id="arxyz24" tvg-name="Архыз 24" tvg-logo="" group-title="Local",Архыз 24 (Opt-2)
+#EXTINF:-1 tvg-id="arxyz24" tvg-name="Архыз 24" tvg-logo="" group-title="Local",Архыз 24
 https://strm.yandex.ru/kal/arhyz24/arhyz240.m3u8
-#EXTINF:-1 tvg-id="astraxan24" tvg-name="Астрахань 24" tvg-logo="" group-title="Local",Астрахань 24 (Opt-1)
-https://strm.yandex.ru/kal/astrahan24/astrahan240.m3u8
-#EXTINF:-1 tvg-id="astraxan24" tvg-name="Астрахань 24" tvg-logo="" group-title="Local",Астрахань 24 (Opt-2)
-http://streaming.astrakhan.ru/astrakhan24/tracks-v3a1/index.m3u8
-#EXTINF:-1 tvg-id="astraxan24" tvg-name="Астрахань 24" tvg-logo="" group-title="Local",Астрахань 24 (Opt-3)
+#EXTINF:-1 tvg-id="astraxan24" tvg-name="Астрахань 24" tvg-logo="" group-title="Local",Астрахань 24
 http://streaming.astrakhan.ru/astrakhan24/index.m3u8
-#EXTINF:-1 tvg-id="astraxan24" tvg-name="Астрахань 24" tvg-logo="" group-title="Local",Астрахань 24 (Opt-4)
+#EXTINF:-1 tvg-id="astraxan24" tvg-name="Астрахань 24" tvg-logo="" group-title="Local",Астрахань 24
 http://streaming.astrakhan.ru/astrakhan24/tracks-v2a1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Астрахань.Ru Sport (Opt-1)
+#EXTINF:-1 tvg-id="astraxan24" tvg-name="Астрахань 24" tvg-logo="" group-title="Local",Астрахань 24
+http://streaming.astrakhan.ru/astrakhan24/tracks-v3a1/index.m3u8
+#EXTINF:-1 tvg-id="astraxan24" tvg-name="Астрахань 24" tvg-logo="" group-title="Local",Астрахань 24
+https://strm.yandex.ru/kal/astrahan24/astrahan240.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Астрахань.Ru Sport
 http://91.211.143.214/astrakhanrusporthd/tracks-v2a1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Астрахань.Ru Sport (Opt-2)
-http://streaming.astrakhan.ru/astrakhanrusporthd/tracks-v3a1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Астрахань.Ru Sport (Opt-3)
-http://streaming.astrakhan.ru/astrakhanrusporthd/tracks-v2a1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Астрахань.Ru Sport (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Астрахань.Ru Sport
 http://91.211.143.214/astrakhanrusporthd/tracks-v3a1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Астрахань.Ru Sport (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Астрахань.Ru Sport
 http://streaming.astrakhan.ru/astrakhanrusporthd/tracks-v1a1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Астрахань.Ru TV (Opt-1)
-http://streaming.astrakhan.ru/astrakhanrulivehd/tracks-v3a1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Астрахань.Ru TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Астрахань.Ru Sport
+http://streaming.astrakhan.ru/astrakhanrusporthd/tracks-v2a1/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Астрахань.Ru Sport
+http://streaming.astrakhan.ru/astrakhanrusporthd/tracks-v3a1/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Астрахань.Ru TV
 http://streaming.astrakhan.ru/astrakhanrulivehd/tracks-v1a1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Астрахань.Ru TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Астрахань.Ru TV
 http://streaming.astrakhan.ru/astrakhanrulivehd/tracks-v2a1/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Астрахань.Ru TV
+http://streaming.astrakhan.ru/astrakhanrulivehd/tracks-v3a1/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://atvmedia.ru/images/logo-header.png?v=01.384" group-title="Local",АТВ
 http://hls.atvmedia.ru/atv800.m3u8
 #EXTINF:-1 tvg-id="afontovo-kr" tvg-name="Афонтово Красноярск" tvg-logo="https://afontovo.ru/bitrix/templates/dvt.afontovo.ru/img.src/logo.png" group-title="Local",Афонтово (Красноярск)
 http://xstream.afontovo.ru/afontovo_sd.m3u8
 #EXTINF:-1 tvg-id="bars" tvg-name="Барс" tvg-logo="" group-title="Local",Барс (Иваново)
 http://iptv.barstv.ru/hls/stream1.m3u8
-#EXTINF:-1 tvg-id="bashkortostan24" tvg-name="Башкортостан 24" tvg-logo="https://gtrk.tv/sites/default/files/channels/mono/mono-b24.png" group-title="Local",Башкортостан 24 (Opt-1)
+#EXTINF:-1 tvg-id="bashkortostan24" tvg-name="Башкортостан 24" tvg-logo="https://gtrk.tv/sites/default/files/channels/mono/mono-b24.png" group-title="Local",Башкортостан 24
 http://live.gtrk.tv/720/b24-720.m3u8
-#EXTINF:-1 tvg-id="bashkortostan24" tvg-name="Башкортостан 24" tvg-logo="" group-title="Local",Башкортостан 24 (Opt-2)
+#EXTINF:-1 tvg-id="bashkortostan24" tvg-name="Башкортостан 24" tvg-logo="" group-title="Local",Башкортостан 24
 https://strm.yandex.ru/kal/bashkortostan24/bashkortostan240.m3u8
 #EXTINF:-1 tvg-id="belgorod24" tvg-name="Белгород 24" tvg-logo="" group-title="Local",Белгород 24
 http://belnovosti.cdn.easyhoster.ru:8080/stream.m3u8
 #EXTINF:-1 tvg-id="box-tv" tvg-name="Бокс ТВ" tvg-logo="https://iptvx.one/icn/box-tv.png" group-title="Sport",Бокс ТВ
 http://hls.boxingtvru.cdnvideo.ru/boxingtvru/smil:boxingtvru.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="bolshaya-azia" tvg-name="Большая Азия" tvg-logo="" group-title="",Большая Азия (Opt-1)
-https://strm.yandex.ru/kal/bigasia/bigasia0.m3u8
-#EXTINF:-1 tvg-id="bolshaya-azia" tvg-name="Большая Азия" tvg-logo="" group-title="",Большая Азия (Opt-2)
+#EXTINF:-1 tvg-id="bolshaya-azia" tvg-name="Большая Азия" tvg-logo="" group-title="",Большая Азия
 https://str-3.mediabay.tv/BigAsia/playlist.m3u8?token=bd715da92b3f6a04ccf8372294052977db959006-6eb5e0d8c16838f5e565afc3909f2730-1566588460-1566577660
+#EXTINF:-1 tvg-id="bolshaya-azia" tvg-name="Большая Азия" tvg-logo="" group-title="",Большая Азия
+https://strm.yandex.ru/kal/bigasia/bigasia0.m3u8
 #EXTINF:-1 tvg-id="vetta24" tvg-name="Ветта 24 Пермь" tvg-logo="" group-title="Local",Ветта 24 (Пермь)
 http://serv24.vintera.tv:8081/vetta/vetta_office/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Shop",Витрина ТВ
@@ -203,12 +203,12 @@ https://strm.yandex.ru/kal/volgograd1/volgograd10.m3u8
 http://flussonic.powernet.com.ru:8080/telekanal_internet/index.m3u8
 #EXTINF:-1 tvg-id="vsia-ufa" tvg-name="Вся Уфа" tvg-logo="" group-title="Local",Вся Уфа
 http://hls-mycdn0539860594.cdnvideo.ru/mycdn0539860594/allufaru2/playlist.m3u8
-#EXTINF:-1 tvg-id="grozny" tvg-name="Грозный" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/gtrk_groznyj.jpg" group-title="Local",Грозный (Opt-1)
-https://strm.yandex.ru/kal/grozny_supres/grozny_supres0.m3u8
-#EXTINF:-1 tvg-id="grozny" tvg-name="Грозный" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/gtrk_groznyj.jpg" group-title="Local",Грозный (Opt-2)
+#EXTINF:-1 tvg-id="grozny" tvg-name="Грозный" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/gtrk_groznyj.jpg" group-title="Local",Грозный
 http://live2.mediacdn.ru/sr1/grozny/playlist.m3u8
-#EXTINF:-1 tvg-id="grozny" tvg-name="Грозный" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/gtrk_groznyj.jpg" group-title="Local",Грозный (Opt-3)
+#EXTINF:-1 tvg-id="grozny" tvg-name="Грозный" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/gtrk_groznyj.jpg" group-title="Local",Грозный
 https://str-4.mediabay.tv/Grozniy/playlist.m3u8?token=c5b2fd6dd924587ea248d0f443250432db7ee5f5-591459f03417d55e4eeb515b93f699eb-1566589302-1566578502
+#EXTINF:-1 tvg-id="grozny" tvg-name="Грозный" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/gtrk_groznyj.jpg" group-title="Local",Грозный
+https://strm.yandex.ru/kal/grozny_supres/grozny_supres0.m3u8
 #EXTINF:-1 tvg-id="gubernia" tvg-name="Губерния" tvg-logo="" group-title="Local",Губерния
 https://str-3.mediabay.tv/GuberniaTV/playlist.m3u8?token=1b42d68673af007ff0fc9130f14712c893991554-a5d283a7fe9cc266bc69d66fd9a886b7-1566589934-1566579134
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Губерния (Воронеж)
@@ -223,37 +223,37 @@ https://strm.yandex.ru/kal/diving/diving0.m3u8
 http://ott-cdn.ucom.am/s95/04.m3u8
 #EXTINF:-1 tvg-id="evrasia" tvg-name="Евразия" tvg-logo="http://www.evrazia.tv/files/flash.jpg" group-title="",Евразия
 http://paideuma.tv:1941/live/Stream1/playlist.m3u8
-#EXTINF:-1 tvg-id="evrasia" tvg-name="Евразия" tvg-logo="http://eurasia.orsk.ru/images/bg.jpg" group-title="Local",Евразия (Орск) (Opt-1)
-http://infochhdcdn.trkeurasia.ru/orsk-infochhd/infochhd/playlist.m3u8
-#EXTINF:-1 tvg-id="evrasia" tvg-name="Евразия" tvg-logo="" group-title="Local",Евразия (Орск) (Opt-2)
+#EXTINF:-1 tvg-id="evrasia" tvg-name="Евразия" tvg-logo="" group-title="Local",Евразия (Орск)
 http://infochh.trkeurasia.ru/hlsinfoch/infochhd.m3u8
+#EXTINF:-1 tvg-id="evrasia" tvg-name="Евразия" tvg-logo="http://eurasia.orsk.ru/images/bg.jpg" group-title="Local",Евразия (Орск)
+http://infochhdcdn.trkeurasia.ru/orsk-infochhd/infochhd/playlist.m3u8
 #EXTINF:-1 tvg-id="eda-hd" tvg-name="Еда HD" tvg-logo="https://www.rabotnikitv.com/wp-content/uploads/2019/01/eda-300x182.jpg" group-title="Food",Еда Премиум
 http://now2.eaglecdn.com/stream/tveda_12/index.m3u8
-#EXTINF:-1 tvg-id="zhar-ptica" tvg-name="Жар Птица" tvg-logo="http://www.zhar-ptica.tv/sites/default/files/logo.png" group-title="Music",Жар Птица (Opt-1)
+#EXTINF:-1 tvg-id="zhar-ptica" tvg-name="Жар Птица" tvg-logo="http://www.zhar-ptica.tv/sites/default/files/logo.png" group-title="Music",Жар Птица
 http://streamer.rtcommufa.ru:1935/ptica/ptica1/playlist.m3u8
-#EXTINF:-1 tvg-id="zhar-ptica" tvg-name="Жар Птица" tvg-logo="" group-title="Music",Жар Птица (Opt-2)
+#EXTINF:-1 tvg-id="zhar-ptica" tvg-name="Жар Птица" tvg-logo="" group-title="Music",Жар Птица
 https://strm.yandex.ru/kal/firebird/firebird0.m3u8
-#EXTINF:-1 tvg-id="zagorodny" tvg-name="Загородный" tvg-logo="https://zagorodny.tv/assets/logos/logo_header-7c39baa677d9f4f64779509ab03ad2bb36a16323387e8c46583f1b0ea5cae4e2.png" group-title="",Загородный (Opt-1)
-http://ott-cdn.ucom.am/s31/index.m3u8
-#EXTINF:-1 tvg-id="zagorodny" tvg-name="Загородный" tvg-logo="https://zagorodny.tv/assets/logos/logo_header-7c39baa677d9f4f64779509ab03ad2bb36a16323387e8c46583f1b0ea5cae4e2.png" group-title="",Загородный (Opt-2)
+#EXTINF:-1 tvg-id="zagorodny" tvg-name="Загородный" tvg-logo="https://zagorodny.tv/assets/logos/logo_header-7c39baa677d9f4f64779509ab03ad2bb36a16323387e8c46583f1b0ea5cae4e2.png" group-title="",Загородный
 http://ott-cdn.ucom.am/s31/04.m3u8
+#EXTINF:-1 tvg-id="zagorodny" tvg-name="Загородный" tvg-logo="https://zagorodny.tv/assets/logos/logo_header-7c39baa677d9f4f64779509ab03ad2bb36a16323387e8c46583f1b0ea5cae4e2.png" group-title="",Загородный
+http://ott-cdn.ucom.am/s31/index.m3u8
+#EXTINF:-1 tvg-id="zvezda" tvg-name="Звезда" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/zvezda_telekanal.jpg" group-title="General",Звезда
+https://strm.yandex.ru/kal/zvezda_supres/zvezda_supres0.m3u8
 #EXTINF:-1 tvg-id="zvezda-pl7" tvg-name="Звезда +7" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/zvezda_telekanal.jpg" group-title="General",Звезда (+7)
 http://serv25.vintera.tv:8081/parad/patriot/playlist.m3u8
-#EXTINF:-1 tvg-id="zvezda" tvg-name="Звезда" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/zvezda_telekanal.jpg" group-title="General",Звезда (Opt-1)
-https://strm.yandex.ru/kal/zvezda_supres/zvezda_supres0.m3u8
-#EXTINF:-1 tvg-id="zdorovie" tvg-name="Здоровье" tvg-logo="http://tonus.tv/assets/logo-header-3bb4880f72ce2fc57cb090113c3b69e44445e8e45b3bd848a24647b9dc77d27c.png" group-title="",Здоровье (Opt-1)
-http://ott-cdn.ucom.am/s90/index.m3u8
-#EXTINF:-1 tvg-id="zdorovie" tvg-name="Здоровье" tvg-logo="http://tonus.tv/assets/logo-header-3bb4880f72ce2fc57cb090113c3b69e44445e8e45b3bd848a24647b9dc77d27c.png" group-title="",Здоровье (Opt-2)
+#EXTINF:-1 tvg-id="zdorovie" tvg-name="Здоровье" tvg-logo="http://tonus.tv/assets/logo-header-3bb4880f72ce2fc57cb090113c3b69e44445e8e45b3bd848a24647b9dc77d27c.png" group-title="",Здоровье
 http://ott-cdn.ucom.am/s90/04.m3u8
-#EXTINF:-1 tvg-id="zoo-tv" tvg-name="Зоо ТВ" tvg-logo="http://telezoo.tv/assets/logo-header-fa8e557e12d429725ba69778c1670b4db6311aba0084c93b39140acd973cdf94.png" group-title="Entertainment",Зоо ТВ (Opt-1)
+#EXTINF:-1 tvg-id="zdorovie" tvg-name="Здоровье" tvg-logo="http://tonus.tv/assets/logo-header-3bb4880f72ce2fc57cb090113c3b69e44445e8e45b3bd848a24647b9dc77d27c.png" group-title="",Здоровье
+http://ott-cdn.ucom.am/s90/index.m3u8
+#EXTINF:-1 tvg-id="zoo-tv" tvg-name="Зоо ТВ" tvg-logo="http://telezoo.tv/assets/logo-header-fa8e557e12d429725ba69778c1670b4db6311aba0084c93b39140acd973cdf94.png" group-title="Entertainment",Зоо ТВ
 http://92.43.140.249/s92/04.m3u8
-#EXTINF:-1 tvg-id="zoo-tv" tvg-name="Зоо ТВ" tvg-logo="http://telezoo.tv/assets/logo-header-fa8e557e12d429725ba69778c1670b4db6311aba0084c93b39140acd973cdf94.png" group-title="",Зоо ТВ (Opt-2)
-http://ott-cdn.ucom.am/s92/index.m3u8
-#EXTINF:-1 tvg-id="zoo-tv" tvg-name="Зоо ТВ" tvg-logo="http://telezoo.tv/assets/logo-header-fa8e557e12d429725ba69778c1670b4db6311aba0084c93b39140acd973cdf94.png" group-title="",Зоо ТВ (Opt-3)
+#EXTINF:-1 tvg-id="zoo-tv" tvg-name="Зоо ТВ" tvg-logo="http://telezoo.tv/assets/logo-header-fa8e557e12d429725ba69778c1670b4db6311aba0084c93b39140acd973cdf94.png" group-title="",Зоо ТВ
 http://ott-cdn.ucom.am/s92/04.m3u8
-#EXTINF:-1 tvg-id="izvestia" tvg-name="Известия" tvg-logo="https://iptvx.one/icn/izvestia.png" group-title="News",Известия (Opt-1)
+#EXTINF:-1 tvg-id="zoo-tv" tvg-name="Зоо ТВ" tvg-logo="http://telezoo.tv/assets/logo-header-fa8e557e12d429725ba69778c1670b4db6311aba0084c93b39140acd973cdf94.png" group-title="",Зоо ТВ
+http://ott-cdn.ucom.am/s92/index.m3u8
+#EXTINF:-1 tvg-id="izvestia" tvg-name="Известия" tvg-logo="https://iptvx.one/icn/izvestia.png" group-title="News",Известия
 http://hls-igi.cdnvideo.ru/igi/igi_hq/playlist.m3u8
-#EXTINF:-1 tvg-id="izvestia" tvg-name="Известия" tvg-logo="https://iptvx.one/icn/izvestia.png" group-title="News",Известия (Opt-2)
+#EXTINF:-1 tvg-id="izvestia" tvg-name="Известия" tvg-logo="https://iptvx.one/icn/izvestia.png" group-title="News",Известия
 http://hls-igi.cdnvideo.ru/igi/igi_sq/playlist.m3u8
 #EXTINF:-1 tvg-id="infokanal-sevastopol" tvg-name="Информационный Канал Севастополя" tvg-logo="http://online-red.com/images/tv/iks-tv.png" group-title="Local",ИКС ТВ (Севастополь)
 http://ikstv-htlive.cdn.ngenix.net/live/_definst_/ikstv/playlist.m3u8
@@ -269,15 +269,15 @@ http://hls.m-ten.ru:8080/hls/21/live.m3u8
 http://edge2.uk.kab.tv/rtplive/kabtv-rus-medium.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="kaleydoskop-tv" tvg-name="Калейдоскоп ТВ" tvg-logo="http://k-telecom.org/uploadedFiles/images/logo/k_logo_colorblack_RGB.jpg" group-title="",Калейдоскоп ТВ
 http://serv24.vintera.tv:8081/kaledoskop/kaledoskop/playlist.m3u8
-#EXTINF:-1 tvg-id="karapuz-tv" tvg-name="Карапуз ТВ" tvg-logo="https://iptvx.one/icn/karapuz-tv.png" group-title="Kids",Карапуз ТВ (Opt-1)
+#EXTINF:-1 tvg-id="karapuz-tv" tvg-name="Карапуз ТВ" tvg-logo="https://iptvx.one/icn/karapuz-tv.png" group-title="Kids",Карапуз ТВ
 http://online.karapuztv.ru/content/33418/index.m3u8
-#EXTINF:-1 tvg-id="karapuz-tv" tvg-name="Карапуз ТВ" tvg-logo="https://iptvx.one/icn/karapuz-tv.png" group-title="Kids",Карапуз ТВ (Opt-2)
+#EXTINF:-1 tvg-id="karapuz-tv" tvg-name="Карапуз ТВ" tvg-logo="https://iptvx.one/icn/karapuz-tv.png" group-title="Kids",Карапуз ТВ
 https://str-4.mediabay.tv/KarapuzTV/playlist.m3u8?token=e99fc72508a750267ff381d31dc21d7d56fc30ff-729ea2edfa8ae3ac11908057d8f15776-1566590149-1566579349
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.katun24.ru/bitrix/templates/k24/images/logo.png" group-title="Local",Катунь 24
 https://live.katun24.ru:8082/katun/katun/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/bG6kBxM.png" group-title="Local",Кварц ТВ  (Подольск) (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/bG6kBxM.png" group-title="Local",Кварц ТВ  (Подольск)
 http://109.94.1.3:8080/Infokanal/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Кварц ТВ (Подольск) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Кварц ТВ (Подольск)
 http://109.94.1.3:8080/Infokanal/video.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tv-russia.info/wp-content/uploads/2016/11/КиноМеню-HD-TVjyy-326x235.jpg" group-title="",КиноМеню HD
 http://62.76.26.81:8081/hdmedia/menu/playlist.m3u8
@@ -285,9 +285,9 @@ http://62.76.26.81:8081/hdmedia/menu/playlist.m3u8
 https://strm.yandex.ru/kal/kinoclassic/kinoclassic0.m3u8
 #EXTINF:-1 tvg-id="kinopokaz-hd2" tvg-name="Комедийное" tvg-logo="https://iptvx.one/icn/kinopokaz_hd2.png" group-title="Movies",Комедийное
 http://91.223.105.236:8081/hlsx/473/473.m3u8?id=1188&p=12326fa256d9bf86
-#EXTINF:-1 tvg-id="krasnaya-linia" tvg-name="Красная линия" tvg-logo="" group-title="General",Красная линия (Opt-1)
+#EXTINF:-1 tvg-id="krasnaya-linia" tvg-name="Красная линия" tvg-logo="" group-title="General",Красная линия
 http://kprf-htlive.cdn.ngenix.net/live/_definst_/stream_high/playlist.m3u8
-#EXTINF:-1 tvg-id="krasnaya-linia" tvg-name="Красная линия" tvg-logo="" group-title="General",Красная линия (Opt-2)
+#EXTINF:-1 tvg-id="krasnaya-linia" tvg-name="Красная линия" tvg-logo="" group-title="General",Красная линия
 https://str-3.mediabay.tv/Krasnaya_Liniya/playlist.m3u8?token=d25936c0f472d6f2ea85c165fcd0daa3cfb6fb2d-ccdf6c2ecfd09b2d70f582defa90aa12-1566589472-1566578672
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Краснодар
 https://str-2.mediabay.tv/Krasnodar/playlist.m3u8?token=4777535620772e9003f662be592d10b2a1c859aa-cfd97e815dc2ed9e88458c60e8184fac-1566590318-1566579518
@@ -297,13 +297,13 @@ http://hls-rictv.cdnvideo.ru/rictv/rictv.sdp/playlist.m3u8
 http://mr2live.1tvcrimea.ru:8080/24tvcrimea.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://ctc-kuzbass.ru/wp-content/uploads/2017/03/logo-color-wide_1080i_1.png" group-title="",Кузбасс 24
 http://serv30.vintera.tv:8081/sibirj/kuzbass24/playlist.m3u8
-#EXTINF:-1 tvg-id="ldpr-tv" tvg-name="ЛДПР ТВ" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (Opt-1)
+#EXTINF:-1 tvg-id="ldpr-tv" tvg-name="ЛДПР ТВ" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ
 http://46.46.143.222:1935/live/mp4:ldpr.stream_480p/playlist.m3u8
-#EXTINF:-1 tvg-id="ldpr-tv" tvg-name="ЛДПР ТВ" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ (Opt-2)
+#EXTINF:-1 tvg-id="ldpr-tv" tvg-name="ЛДПР ТВ" tvg-logo="https://iptvx.one/icn/ldpr-tv.png" group-title="General",ЛДПР ТВ
 http://46.46.143.222:1935/live/mp4:ldpr.stream_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="lipeckoe-vremia" tvg-name="Липецкое время" tvg-logo="" group-title="Local",Липецкое время (Opt-1)
+#EXTINF:-1 tvg-id="lipeckoe-vremia" tvg-name="Липецкое время" tvg-logo="" group-title="Local",Липецкое время
 http://serv25.vintera.tv:8081/liptime/liptime/playlist.m3u8
-#EXTINF:-1 tvg-id="lipeckoe-vremia" tvg-name="Липецкое время" tvg-logo="" group-title="Local",Липецкое время (Opt-2)
+#EXTINF:-1 tvg-id="lipeckoe-vremia" tvg-name="Липецкое время" tvg-logo="" group-title="Local",Липецкое время
 https://strm.yandex.ru/kal/lipetcktime_supres/lipetcktime_supres0.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.litclub.tv/images/pero.png" group-title="",ЛитКлуб ТВ Проза
 http://hls-rossp.cdnvideo.ru/hls/5ace67f0dc96bf0a90d8a2b6.m3u8
@@ -311,24 +311,24 @@ http://hls-rossp.cdnvideo.ru/hls/5ace67f0dc96bf0a90d8a2b6.m3u8
 http://hls-rossp.cdnvideo.ru/hls/5ace6814e563f22e4ddc1f43.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.litclub.tv/images/pero.png" group-title="",ЛитКлуб ТВ Стихи
 http://hls-rossp.cdnvideo.ru/hls/5aac88ffdc96bf05a7f78898.m3u8
-#EXTINF:-1 tvg-id="luch" tvg-name="ТРК Луч" tvg-logo="" group-title="Local",Луч (Пуровск) (Opt-1)
-http://live.trk-luch.ru/hls/live_mid.m3u8
-#EXTINF:-1 tvg-id="luch" tvg-name="ТРК Луч" tvg-logo="http://trk-luch.ru.opt-images.1c-bitrix-cdn.ru/bitrix/templates/.default/static/images/logo.png" group-title="Local",Луч (Пуровск) (Opt-2)
+#EXTINF:-1 tvg-id="luch" tvg-name="ТРК Луч" tvg-logo="http://trk-luch.ru.opt-images.1c-bitrix-cdn.ru/bitrix/templates/.default/static/images/logo.png" group-title="Local",Луч (Пуровск)
 http://live.trk-luch.ru/hls/live_hi.m3u8
-#EXTINF:-1 tvg-id="lubimoe-tv" tvg-name="Любимое.ТВ" tvg-logo="" group-title="Kids",Любимое.ТВ (Opt-1)
-https://strm.yandex.ru/kal/lovedtv/lovedtv0.m3u8
-#EXTINF:-1 tvg-id="lubimoe-tv" tvg-name="Любимое.ТВ" tvg-logo="" group-title="Kids",Любимое.ТВ (Opt-2)
+#EXTINF:-1 tvg-id="luch" tvg-name="ТРК Луч" tvg-logo="" group-title="Local",Луч (Пуровск)
+http://live.trk-luch.ru/hls/live_mid.m3u8
+#EXTINF:-1 tvg-id="lubimoe-tv" tvg-name="Любимое.ТВ" tvg-logo="" group-title="Kids",Любимое.ТВ
 http://live.planeta-online.tv:1935/public/channel_6/playlist.m3u8
-#EXTINF:-1 tvg-id="mama" tvg-name="Мама" tvg-logo="https://iptvx.one/icn/mama.png" group-title="Kids",Мама (Opt-1)
+#EXTINF:-1 tvg-id="lubimoe-tv" tvg-name="Любимое.ТВ" tvg-logo="" group-title="Kids",Любимое.ТВ
+https://strm.yandex.ru/kal/lovedtv/lovedtv0.m3u8
+#EXTINF:-1 tvg-id="mama" tvg-name="Мама" tvg-logo="https://iptvx.one/icn/mama.png" group-title="Kids",Мама
 http://92.43.140.249/s77/04.m3u8
-#EXTINF:-1 tvg-id="mama" tvg-name="Мама" tvg-logo="http://ladamedia.ru/site/upload/mama(1).jpg" group-title="Kids",Мама (Opt-2)
+#EXTINF:-1 tvg-id="mama" tvg-name="Мама" tvg-logo="http://ladamedia.ru/site/upload/mama(1).jpg" group-title="Kids",Мама
 http://ott-cdn.ucom.am/s77/index.m3u8
-#EXTINF:-1 tvg-id="match-tv" tvg-name="Матч! HD" tvg-logo="https://iptvx.one/icn/match.png" group-title="Sport",Матч ТВ (Opt-1)
+#EXTINF:-1 tvg-id="match-tv" tvg-name="Матч! HD" tvg-logo="https://iptvx.one/icn/match.png" group-title="Sport",Матч ТВ
 http://176.114.16.54:80/match/index.m3u8
-#EXTINF:-1 tvg-id="match-tv" tvg-name="Матч! HD" tvg-logo="https://iptvx.one/icn/match.png" group-title="Sport",Матч ТВ (Opt-2)
-http://uiptv.do.am/1ufc/000000003/playlist.m3u8
-#EXTINF:-1 tvg-id="match-tv" tvg-name="Матч! HD" tvg-logo="https://iptvx.one/icn/match.png" group-title="Sport",Матч ТВ (Opt-3)
+#EXTINF:-1 tvg-id="match-tv" tvg-name="Матч! HD" tvg-logo="https://iptvx.one/icn/match.png" group-title="Sport",Матч ТВ
 http://s1.only4.tv/2204/video.m3u8?token=3KC9QUbdE7
+#EXTINF:-1 tvg-id="match-tv" tvg-name="Матч! HD" tvg-logo="https://iptvx.one/icn/match.png" group-title="Sport",Матч ТВ
+http://uiptv.do.am/1ufc/000000003/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Матч! Арена
 http://s1.only4.tv/1301/video.m3u8?token=3KC9QUbdE7
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Матч! Боец
@@ -339,9 +339,9 @@ http://s1.only4.tv/1303/video.m3u8?token=3KC9QUbdE7
 http://s1.only4.tv/1403/video.m3u8?token=3KC9QUbdE7
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Матч! Футбол 1
 http://s1.only4.tv/14105/video.m3u8?token=3KC9QUbdE7
-#EXTINF:-1 tvg-id="match-football2" tvg-name="Матч! Футбол 2" tvg-logo="https://iptvx.one/icn/match-football-2.png" group-title="Sport",Матч! Футбол 2 (Opt-1)
+#EXTINF:-1 tvg-id="match-football2" tvg-name="Матч! Футбол 2" tvg-logo="https://iptvx.one/icn/match-football-2.png" group-title="Sport",Матч! Футбол 2
 http://persik.by/stream/3477/395381/10217.m3u8
-#EXTINF:-1 tvg-id="match-football2" tvg-name="Матч! Футбол 2" tvg-logo="https://iptvx.one/icn/match-football-2.png" group-title="Sport",Матч! Футбол 2 (Opt-2)
+#EXTINF:-1 tvg-id="match-football2" tvg-name="Матч! Футбол 2" tvg-logo="https://iptvx.one/icn/match-football-2.png" group-title="Sport",Матч! Футбол 2
 http://s1.only4.tv/1401/video.m3u8?token=3KC9QUbdE7
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Матч! Футбол 3
 http://s1.only4.tv/1402/video.m3u8?token=3KC9QUbdE7
@@ -349,15 +349,15 @@ http://s1.only4.tv/1402/video.m3u8?token=3KC9QUbdE7
 http://212.77.128.179:8089/www_mezhdunet/mezhdunet/playlist.m3u8
 #EXTINF:-1 tvg-id="mig-tv-noyabrsk" tvg-name="Миг ТВ Ноябрьск" tvg-logo="https://tvmig.ru/local/templates/mig_chili/images/u198.png" group-title="",Миг ТВ (Ноябрьск)
 http://live-migtv.cdnvideo.ru/migtv/migtv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="ministerstvo-idey" tvg-name="Министерство идей" tvg-logo="" group-title="Entertainment",Министерство идей (Opt-1)
+#EXTINF:-1 tvg-id="ministerstvo-idey" tvg-name="Министерство идей" tvg-logo="" group-title="Entertainment",Министерство идей
 http://live-minidey.cdnvideo.ru/minidey/minidey.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="ministerstvo-idey" tvg-name="Министерство идей" tvg-logo="" group-title="Entertainment",Министерство идей (Opt-2)
+#EXTINF:-1 tvg-id="ministerstvo-idey" tvg-name="Министерство идей" tvg-logo="" group-title="Entertainment",Министерство идей
 https://str-4.mediabay.tv/Min-idey/playlist.m3u8?token=19b687bd9e7ad5055402d97859b9b33284b33e97-02a428d395078358a92e4b7948ff4e51-1566589339-1566578539
 #EXTINF:-1 tvg-id="mir" tvg-name="Мир" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/mir_ru.jpg" group-title="General",Мир
 http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv_2500/playlist.m3u8
-#EXTINF:-1 tvg-id="mir-pl4" tvg-name="Мир +4" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/mir_ru.jpg" group-title="General",Мир (+4) (Opt-1)
+#EXTINF:-1 tvg-id="mir-pl4" tvg-name="Мир +4" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/mir_ru.jpg" group-title="General",Мир (+4)
 http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv3_2500/chunklist.m3u8
-#EXTINF:-1 tvg-id="mir-pl4" tvg-name="Мир +4" tvg-logo="https://i.imgur.com/CrFWXTD.png" group-title="",Мир (+4) (Opt-2)
+#EXTINF:-1 tvg-id="mir-pl4" tvg-name="Мир +4" tvg-logo="https://i.imgur.com/CrFWXTD.png" group-title="",Мир (+4)
 http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv3_2500/playlist.m3u8
 #EXTINF:-1 tvg-id="mir-24" tvg-name="Мир 24" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/mir_24_ru.jpg" group-title="News",Мир 24
 http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mir24_2500/playlist.m3u8
@@ -373,33 +373,33 @@ https://strm.yandex.ru/kal/msk24_supres/msk24_supres0.m3u8
 http://retc.educom.ru/mosobrtv/tv1/index.m3u8
 #EXTINF:-1 tvg-id="mtv-volgograd" tvg-name="МТВ Волгоград" tvg-logo="http://xn--b1ats.xn--80asehdb/img/logo.png" group-title="Local",МТВ (Волгоград)
 http://hls.volgograd1vtv.cdnvideo.ru/volgograd1vtv/volgograd1vtv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="muztv" tvg-name="Муз-ТВ" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/b/bf/%D0%9C%D1%83%D0%B7-%D0%A2%D0%92_12.png" group-title="Music",Муз-ТВ (Opt-1)
-http://ott-cdn.ucom.am/s28/index.m3u8
-#EXTINF:-1 tvg-id="muztv" tvg-name="Муз-ТВ" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/b/bf/%D0%9C%D1%83%D0%B7-%D0%A2%D0%92_12.png" group-title="Music",Муз-ТВ (Opt-2)
+#EXTINF:-1 tvg-id="muztv" tvg-name="Муз-ТВ" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/b/bf/%D0%9C%D1%83%D0%B7-%D0%A2%D0%92_12.png" group-title="Music",Муз-ТВ
 http://ott-cdn.ucom.am/s28/04.m3u8
-#EXTINF:-1 tvg-id="muztv" tvg-name="Муз-ТВ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/muz_tv.jpg" group-title="Music",Муз-ТВ (Opt-3)
+#EXTINF:-1 tvg-id="muztv" tvg-name="Муз-ТВ" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/b/bf/%D0%9C%D1%83%D0%B7-%D0%A2%D0%92_12.png" group-title="Music",Муз-ТВ
+http://ott-cdn.ucom.am/s28/index.m3u8
+#EXTINF:-1 tvg-id="muztv" tvg-name="Муз-ТВ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/muz_tv.jpg" group-title="Music",Муз-ТВ
 https://strm.yandex.ru/kal/muztv_supres/muztv_supres0.m3u8
-#EXTINF:-1 tvg-id="muzsoyuz" tvg-name="МузСоюз" tvg-logo="" group-title="Music",МузСоюз (Opt-1)
+#EXTINF:-1 tvg-id="muzsoyuz" tvg-name="МузСоюз" tvg-logo="" group-title="Music",МузСоюз
 http://hls.tvsoyuz.cdnvideo.ru/tvsoyuz2/muzsoyuz.6fw0-58xp-acts-esy0/chunklist.m3u8
-#EXTINF:-1 tvg-id="muzsoyuz" tvg-name="МузСоюз" tvg-logo="" group-title="Music",МузСоюз (Opt-2)
+#EXTINF:-1 tvg-id="muzsoyuz" tvg-name="МузСоюз" tvg-logo="" group-title="Music",МузСоюз
 https://str-3.mediabay.tv/MuzSoyuz/playlist.m3u8?token=010a8c5b773b16ab27c6e886d401848d28f29bb7-d0f33c6eb5b4d2dae576a9531bbcd9eb-1566590397-1566579597
-#EXTINF:-1 tvg-id="mult" tvg-name="Мульт" tvg-logo="http://kt.kg/upload/medialibrary/802/ozkqyoc/0orqjt.jpg" group-title="Kids",Мульт (Opt-1)
+#EXTINF:-1 tvg-id="mult" tvg-name="Мульт" tvg-logo="http://kt.kg/upload/medialibrary/802/ozkqyoc/0orqjt.jpg" group-title="Kids",Мульт
 http://92.43.140.249/s58/04.m3u8
-#EXTINF:-1 tvg-id="mult" tvg-name="Мульт" tvg-logo="http://kt.kg/upload/medialibrary/802/ozkqyoc/0orqjt.jpg" group-title="Kids",Мульт (Opt-2)
-http://ott-cdn.ucom.am/s58/index.m3u8
-#EXTINF:-1 tvg-id="mult" tvg-name="Мульт" tvg-logo="https://iptv.live/images/logo/channel/crops/0f9f2d92c2583ef952556e1f382d0974.png" group-title="Kids",Мульт (Opt-3)
+#EXTINF:-1 tvg-id="mult" tvg-name="Мульт" tvg-logo="https://iptv.live/images/logo/channel/crops/0f9f2d92c2583ef952556e1f382d0974.png" group-title="Kids",Мульт
 http://ott-cdn.ucom.am/s58/04.m3u8
-#EXTINF:-1 tvg-id="nadezhda" tvg-name="Надежда" tvg-logo="https://hopetv.ru/wp-content/themes/hope.ua/public/img/header-hopeLogo.png" group-title="Religious",Надежда (Opt-1)
-http://tvhope.cdnvideo.ru/tvhope-pull/tvhope_1/playlist.m3u8
-#EXTINF:-1 tvg-id="nadezhda" tvg-name="Надежда" tvg-logo="" group-title="Religious",Надежда (Opt-2)
+#EXTINF:-1 tvg-id="mult" tvg-name="Мульт" tvg-logo="http://kt.kg/upload/medialibrary/802/ozkqyoc/0orqjt.jpg" group-title="Kids",Мульт
+http://ott-cdn.ucom.am/s58/index.m3u8
+#EXTINF:-1 tvg-id="nadezhda" tvg-name="Надежда" tvg-logo="" group-title="Religious",Надежда
 http://live-tvhope.cdnvideo.ru/tvhope-pull/tvhope_1/playlist.m3u8
-#EXTINF:-1 tvg-id="nadezhda" tvg-name="Надежда" tvg-logo="" group-title="Religious",Надежда (Opt-3)
+#EXTINF:-1 tvg-id="nadezhda" tvg-name="Надежда" tvg-logo="https://hopetv.ru/wp-content/themes/hope.ua/public/img/header-hopeLogo.png" group-title="Religious",Надежда
+http://tvhope.cdnvideo.ru/tvhope-pull/tvhope_1/playlist.m3u8
+#EXTINF:-1 tvg-id="nadezhda" tvg-name="Надежда" tvg-logo="" group-title="Religious",Надежда
 https://str-3.mediabay.tv/HopeTV/playlist.m3u8?token=a85ac953cd11f137df0967686bf3b19a6a238e1e-b14ce2565ad433970657b93d2f8b4283-1566590484-1566579684
 #EXTINF:-1 tvg-id="nastoyaschee-vremia" tvg-name="Настоящее время HD" tvg-logo="https://iptvx.one/icn/nastoiaschee-vremia.png" group-title="News",Настоящее время
 http://rfe-lh.akamaihd.net/i/rfe_tvmc5@383630/master.m3u8
-#EXTINF:-1 tvg-id="nauka-20" tvg-name="Наука 2.0" tvg-logo="https://upload.wikimedia.org/wikipedia/uk/thumb/2/29/TV_Nauka_2.0.svg/220px-TV_Nauka_2.0.svg.png" group-title="Education",Наука 2.0 (Opt-1)
+#EXTINF:-1 tvg-id="nauka-20" tvg-name="Наука 2.0" tvg-logo="https://upload.wikimedia.org/wikipedia/uk/thumb/2/29/TV_Nauka_2.0.svg/220px-TV_Nauka_2.0.svg.png" group-title="Education",Наука 2.0
 http://ott-cdn.ucom.am/s98/04.m3u8
-#EXTINF:-1 tvg-id="nauka-20" tvg-name="Наука 2.0" tvg-logo="https://iptvx.one/icn/nauka-20.png" group-title="Education",Наука 2.0 (Opt-2)
+#EXTINF:-1 tvg-id="nauka-20" tvg-name="Наука 2.0" tvg-logo="https://iptvx.one/icn/nauka-20.png" group-title="Education",Наука 2.0
 http://ott-cdn.ucom.am/s98/index.m3u8
 #EXTINF:-1 tvg-id="nash-dom" tvg-name="Наш дом" tvg-logo="https://pp.userapi.com/c5200/g33405934/a_1fa4a8a6.jpg" group-title="",Наш дом
 http://85.234.33.60/stream/c11.m3u8
@@ -413,35 +413,35 @@ http://vod.tv7.fi:1935/tv7-ru/_definst_/smil:tv7-ru.smil/playlist.m3u8
 https://strm.yandex.ru/kal/unknownplanet/unknownplanet0.m3u8
 #EXTINF:-1 tvg-id="nika-tv" tvg-name="Ника ТВ" tvg-logo="https://nikatv.ru/public/img/logo2.png" group-title="",Ника ТВ
 http://live-nikatv.cdnvideo.ru/nikatv/nikatv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="novy-mir" tvg-name="Новый мир" tvg-logo="" group-title="General",Новый мир (Opt-1)
-http://stream.studio360.tv/nw/nw_576p/playlist.m3u8
-#EXTINF:-1 tvg-id="novy-mir" tvg-name="Новый мир" tvg-logo="" group-title="General",Новый мир (Opt-2)
+#EXTINF:-1 tvg-id="novy-mir" tvg-name="Новый мир" tvg-logo="" group-title="General",Новый мир
 http://persik.by/stream/8682/252987/10231.m3u8
+#EXTINF:-1 tvg-id="novy-mir" tvg-name="Новый мир" tvg-logo="" group-title="General",Новый мир
+http://stream.studio360.tv/nw/nw_576p/playlist.m3u8
 #EXTINF:-1 tvg-id="noyabrsk24" tvg-name="Ноябрьск 24" tvg-logo="" group-title="Local",Ноябрьск 24
 https://strm.yandex.ru/kal/noyabrsk24/noyabrsk240.m3u8
-#EXTINF:-1 tvg-id="nst" tvg-name="НСТ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/nastoyashee_strashnoe_tv.jpg" group-title="Movies",НСТ (Opt-1)
+#EXTINF:-1 tvg-id="nst" tvg-name="НСТ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/nastoyashee_strashnoe_tv.jpg" group-title="Movies",НСТ
 http://92.43.140.249/s87/04.m3u8
-#EXTINF:-1 tvg-id="nst" tvg-name="НСТ" tvg-logo="http://strashnoe.tv/images/logo.png" group-title="Movies",НСТ (Opt-2)
+#EXTINF:-1 tvg-id="nst" tvg-name="НСТ" tvg-logo="http://strashnoe.tv/images/logo.png" group-title="Movies",НСТ
 http://ott-cdn.ucom.am/s87/04.m3u8
-#EXTINF:-1 tvg-id="nst" tvg-name="НСТ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/nastoyashee_strashnoe_tv.jpg" group-title="Movies",НСТ (Opt-3)
+#EXTINF:-1 tvg-id="nst" tvg-name="НСТ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/nastoyashee_strashnoe_tv.jpg" group-title="Movies",НСТ
 http://ott-cdn.ucom.am/s87/index.m3u8
-#EXTINF:-1 tvg-id="ntv-mir" tvg-name="НТВ-Мир" tvg-logo="http://www.ntvmir.ntv.ru/img/rus/logo-mir.gif" group-title="General",НТВ-Мир (Opt-1)
+#EXTINF:-1 tvg-id="ntv-mir" tvg-name="НТВ-Мир" tvg-logo="http://www.ntvmir.ntv.ru/img/rus/logo-mir.gif" group-title="General",НТВ-Мир
 http://ott-cdn.ucom.am/s17/04.m3u8
-#EXTINF:-1 tvg-id="ntv-mir" tvg-name="НТВ-Мир" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/ntv_world_ru.jpg" group-title="General",НТВ-Мир (Opt-2)
+#EXTINF:-1 tvg-id="ntv-mir" tvg-name="НТВ-Мир" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/ntv_world_ru.jpg" group-title="General",НТВ-Мир
 http://ott-cdn.ucom.am/s17/index.m3u8
-#EXTINF:-1 tvg-id="ntm" tvg-name="НТМ" tvg-logo="" group-title="Local",НТМ (Мордовия) (Opt-1)
+#EXTINF:-1 tvg-id="ntm" tvg-name="НТМ" tvg-logo="" group-title="Local",НТМ (Мордовия)
 http://live-ntm13.cdnvideo.ru/ntm13/smil:ntm13.smil/chunklist_b3128000.m3u8
-#EXTINF:-1 tvg-id="ntm" tvg-name="НТМ" tvg-logo="http://saransk-tv.ru/assets/images/slider/170321-pic-01.jpg" group-title="Local",НТМ (Мордовия) (Opt-2)
+#EXTINF:-1 tvg-id="ntm" tvg-name="НТМ" tvg-logo="http://saransk-tv.ru/assets/images/slider/170321-pic-01.jpg" group-title="Local",НТМ (Мордовия)
 http://live-ntm13.cdnvideo.ru/ntm13/smil:ntm13.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="ntm" tvg-name="НТМ" tvg-logo="http://saransk-tv.ru/assets/images/slider/170321-pic-01.jpg" group-title="Local",НТМ (Мордовия) (Opt-3)
+#EXTINF:-1 tvg-id="ntm" tvg-name="НТМ" tvg-logo="http://saransk-tv.ru/assets/images/slider/170321-pic-01.jpg" group-title="Local",НТМ (Мордовия)
 https://str-2.mediabay.tv/NTM/playlist.m3u8?token=1ef4fba5c50212d4acc8464b069d3c0479431935-7ffae9695166c2ec332d842c7549bf75-1566588525-1566577725
-#EXTINF:-1 tvg-id="ntrk-ingushetia" tvg-name="НТРК Ингушетия" tvg-logo="" group-title="Local",НТРК Ингушетия (Opt-1)
+#EXTINF:-1 tvg-id="ntrk-ingushetia" tvg-name="НТРК Ингушетия" tvg-logo="" group-title="Local",НТРК Ингушетия
 http://live-ntk.cdnvideo.ru/ntk-publish/ntk.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="ntrk-ingushetia" tvg-name="НТРК Ингушетия" tvg-logo="" group-title="Local",НТРК Ингушетия (Opt-2)
+#EXTINF:-1 tvg-id="ntrk-ingushetia" tvg-name="НТРК Ингушетия" tvg-logo="" group-title="Local",НТРК Ингушетия
 https://str-2.mediabay.tv/Ingushetia/playlist.m3u8?token=f32a8d2db6b53837cefb15f1e7ee0208c9c1a945-17aa761c3b6eaca7790a713b2a3667f8-1566590280-1566579480
-#EXTINF:-1 tvg-id="o2tv" tvg-name="О2ТВ" tvg-logo="" group-title="",О2ТВ (Opt-1)
+#EXTINF:-1 tvg-id="o2tv" tvg-name="О2ТВ" tvg-logo="" group-title="",О2ТВ
 https://strm.yandex.ru/kal/o2/o20.m3u8
-#EXTINF:-1 tvg-id="o2tv" tvg-name="О2ТВ" tvg-logo="https://ustanovca-tricorol-tv.ru/wp-content/uploads/2017/12/o-tv.png" group-title="",О2ТВ (Opt-2)
+#EXTINF:-1 tvg-id="o2tv" tvg-name="О2ТВ" tvg-logo="https://ustanovca-tricorol-tv.ru/wp-content/uploads/2017/12/o-tv.png" group-title="",О2ТВ
 https://strm.yandex.ru/kal/o2/o20_169_480p.json/index-v1-a1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Общественное Независимое Телевидение
 http://85.238.112.40:8810/hls_sec/239.33.75.33-.m3u8
@@ -451,159 +451,159 @@ http://185.18.4.16/live/3m/playlist.m3u8
 http://now03.eaglecdn.com/stream_transcoded_720/irystontv_irystontvstream1_hi/index.m3u8
 #EXTINF:-1 tvg-id="otv24" tvg-name="ОТВ 24" tvg-logo="" group-title="News",ОТВ 24
 https://strm.yandex.ru/kal/otv24/otv240.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Открытый (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Открытый
 http://hls.opentv.online/7200k/open_7200k.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ixATz1J.png" group-title="Music",Открытый (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ixATz1J.png" group-title="Music",Открытый
 http://hls.opentv.online/7200k/open_7200k.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="otr" tvg-name="ОТР" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/OTR_2013_logo.svg/330px-OTR_2013_logo.svg.png" group-title="General",ОТР (Opt-1)
+#EXTINF:-1 tvg-id="otr" tvg-name="ОТР" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/OTR_2013_logo.svg/330px-OTR_2013_logo.svg.png" group-title="General",ОТР
 http://live-otronline.cdnvideo.ru/otr-decklink/otr/playlist.m3u8
-#EXTINF:-1 tvg-id="otr" tvg-name="ОТР" tvg-logo="https://iptvx.one/icn/otr_ru.png" group-title="General",ОТР (Opt-2)
+#EXTINF:-1 tvg-id="otr" tvg-name="ОТР" tvg-logo="https://iptvx.one/icn/otr_ru.png" group-title="General",ОТР
 http://uiptv.do.am/1ufc/000000008/playlist.m3u8
 #EXTINF:-1 tvg-id="ots" tvg-name="ОТС" tvg-logo="" group-title="Local",ОТС
 https://strm.yandex.ru/kal/otstv/otstv0.m3u8
-#EXTINF:-1 tvg-id="oxotnik-i-rybolov" tvg-name="Охотник и рыболов" tvg-logo="" group-title="Hobby",Охотник и рыболов (Opt-1)
+#EXTINF:-1 tvg-id="oxotnik-i-rybolov" tvg-name="Охотник и рыболов" tvg-logo="" group-title="Hobby",Охотник и рыболов
 http://92.43.140.249/s55/04.m3u8
-#EXTINF:-1 tvg-id="oxotnik-i-rybolov" tvg-name="Охотник и рыболов" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/OTR_2013_logo.svg/330px-OTR_2013_logo.svg.png" group-title="Hobby",Охотник и рыболов (Opt-2)
-http://ott-cdn.ucom.am/s55/index.m3u8
-#EXTINF:-1 tvg-id="oxotnik-i-rybolov" tvg-name="Охотник и рыболов" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/OTR_2013_logo.svg/330px-OTR_2013_logo.svg.png" group-title="Hobby",Охотник и рыболов (Opt-3)
+#EXTINF:-1 tvg-id="oxotnik-i-rybolov" tvg-name="Охотник и рыболов" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/OTR_2013_logo.svg/330px-OTR_2013_logo.svg.png" group-title="Hobby",Охотник и рыболов
 http://ott-cdn.ucom.am/s55/04.m3u8
-#EXTINF:-1 tvg-id="oxotnik-i-rybolov-hd" tvg-name="Охотник и рыболов HD" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/OTR_2013_logo.svg/330px-OTR_2013_logo.svg.png" group-title="Hobby",Охотник и рыболов HD (Opt-1)
+#EXTINF:-1 tvg-id="oxotnik-i-rybolov" tvg-name="Охотник и рыболов" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/OTR_2013_logo.svg/330px-OTR_2013_logo.svg.png" group-title="Hobby",Охотник и рыболов
+http://ott-cdn.ucom.am/s55/index.m3u8
+#EXTINF:-1 tvg-id="oxotnik-i-rybolov-hd" tvg-name="Охотник и рыболов HD" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/OTR_2013_logo.svg/330px-OTR_2013_logo.svg.png" group-title="Hobby",Охотник и рыболов HD
 http://ott-cdn.ucom.am/s62/04.m3u8
-#EXTINF:-1 tvg-id="oxotnik-i-rybolov-hd" tvg-name="Охотник и рыболов HD" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/OTR_2013_logo.svg/330px-OTR_2013_logo.svg.png" group-title="Hobby",Охотник и рыболов HD (Opt-2)
+#EXTINF:-1 tvg-id="oxotnik-i-rybolov-hd" tvg-name="Охотник и рыболов HD" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/OTR_2013_logo.svg/330px-OTR_2013_logo.svg.png" group-title="Hobby",Охотник и рыболов HD
 http://ott-cdn.ucom.am/s62/index.m3u8
 #EXTINF:-1 tvg-id="oxotnik-i-rybolov-int" tvg-name="Охотник и Рыболов Международный" tvg-logo="" group-title="Hobby",Охотник и Рыболов Международный
 https://strm.yandex.ru/kal/ohotnik/ohotnik0.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iW5vhkb.png" group-title="General",Первый канал
 https://str-2.mediabay.tv/ORT/playlist.m3u8?token=a468fd4b0634e1a465cc36217bdefad5d90ff04b-140e0a1216550ef0f90334f3d4ab86f9-1566588654-1566577854
-#EXTINF:-1 tvg-id="pervy-kanal-csi" tvg-name="Первый канал СНГ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/perviy_1_kanal.jpg" group-title="General",Первый канал (СНГ) (Opt-1)
-http://ott-cdn.ucom.am/s14/index.m3u8
-#EXTINF:-1 tvg-id="pervy-kanal-csi" tvg-name="Первый канал СНГ" tvg-logo="https://i.imgur.com/iW5vhkb.png" group-title="General",Первый канал (СНГ) (Opt-2)
+#EXTINF:-1 tvg-id="pervy-kanal-csi" tvg-name="Первый канал СНГ" tvg-logo="https://i.imgur.com/iW5vhkb.png" group-title="General",Первый канал (СНГ)
 http://ott-cdn.ucom.am/s14/04.m3u8
+#EXTINF:-1 tvg-id="pervy-kanal-csi" tvg-name="Первый канал СНГ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/perviy_1_kanal.jpg" group-title="General",Первый канал (СНГ)
+http://ott-cdn.ucom.am/s14/index.m3u8
 #EXTINF:-1 tvg-id="pervy-krymsky" tvg-name="Первый крымский" tvg-logo="http://1tvcrimea.ru/assets/images/live_1tvcrimea.png" group-title="",Первый крымский
 http://mrlive.1tvcrimea.ru:8080/1tvcrimea.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Первый Тульский
 https://str-4.mediabay.tv/Tulskiy1/playlist.m3u8?token=29ae84edf4780d963e06c443b5f34d71a0d6d680-cec7ae9a0e1fa71f556f6cda07b4f26b-1566589376-1566578576
-#EXTINF:-1 tvg-id="pobeda" tvg-name="Победа" tvg-logo="https://iptvx.one/icn/pobeda.png" group-title="Entertainment",Победа (Opt-1)
+#EXTINF:-1 tvg-id="pobeda" tvg-name="Победа" tvg-logo="https://iptvx.one/icn/pobeda.png" group-title="Entertainment",Победа
 http://92.43.140.249/s47/04.m3u8
-#EXTINF:-1 tvg-id="pobeda" tvg-name="Победа" tvg-logo="https://iptvx.one/icn/pobeda.png" group-title="Entertainment",Победа (Opt-2)
+#EXTINF:-1 tvg-id="pobeda" tvg-name="Победа" tvg-logo="https://iptvx.one/icn/pobeda.png" group-title="Entertainment",Победа
 http://ott-cdn.ucom.am/s47/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",Премьера TV
 http://live.planeta-online.tv:1935/public/channel_5/playlist.m3u8
-#EXTINF:-1 tvg-id="prikluchenia-hd" tvg-name="Приключения HD" tvg-logo="" group-title="Travel",Приключения HD (Opt-1)
+#EXTINF:-1 tvg-id="prikluchenia-hd" tvg-name="Приключения HD" tvg-logo="" group-title="Travel",Приключения HD
 http://ott-cdn.ucom.am/s99/04.m3u8
-#EXTINF:-1 tvg-id="prikluchenia-hd" tvg-name="Приключения HD" tvg-logo="https://upload.wikimedia.org/wikipedia/ru/thumb/8/8d/PriklucheniaHDLogo2017.png/1200px-PriklucheniaHDLogo2017.png" group-title="Travel",Приключения HD (Opt-2)
+#EXTINF:-1 tvg-id="prikluchenia-hd" tvg-name="Приключения HD" tvg-logo="https://upload.wikimedia.org/wikipedia/ru/thumb/8/8d/PriklucheniaHDLogo2017.png/1200px-PriklucheniaHDLogo2017.png" group-title="Travel",Приключения HD
 http://ott-cdn.ucom.am/s99/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Business",Про Бизнес
 https://str-2.mediabay.tv/ProBusiness/playlist.m3u8?token=58982bf6a4f8b9103d66684c730be2a27a52ff4b-38921e9d90a4f18de1101f20c9c4da1b-1566588576-1566577776
 #EXTINF:-1 tvg-id="prodvizhenie" tvg-name="Продвижение" tvg-logo="" group-title="",Продвижение
 https://strm.yandex.ru/kal/prodvizheniye/prodvizheniye0.m3u8
-#EXTINF:-1 tvg-id="piatnica-pl2" tvg-name="Пятница +2" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a8/%D0%9F%D1%8F%D1%82%D0%BD%D0%B8%D1%86%D0%B0_%28%D1%81_2013%29.svg/1200px-%D0%9F%D1%8F%D1%82%D0%BD%D0%B8%D1%86%D0%B0_%28%D1%81_2013%29.svg.png" group-title="",Пятница! (+2) (Opt-1)
-http://ott-cdn.ucom.am/s50/index.m3u8
-#EXTINF:-1 tvg-id="piatnica-pl2" tvg-name="Пятница +2" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a8/%D0%9F%D1%8F%D1%82%D0%BD%D0%B8%D1%86%D0%B0_%28%D1%81_2013%29.svg/1200px-%D0%9F%D1%8F%D1%82%D0%BD%D0%B8%D1%86%D0%B0_%28%D1%81_2013%29.svg.png" group-title="",Пятница! (+2) (Opt-2)
+#EXTINF:-1 tvg-id="piatnica-pl2" tvg-name="Пятница +2" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a8/%D0%9F%D1%8F%D1%82%D0%BD%D0%B8%D1%86%D0%B0_%28%D1%81_2013%29.svg/1200px-%D0%9F%D1%8F%D1%82%D0%BD%D0%B8%D1%86%D0%B0_%28%D1%81_2013%29.svg.png" group-title="",Пятница! (+2)
 http://ott-cdn.ucom.am/s50/04.m3u8
+#EXTINF:-1 tvg-id="piatnica-pl2" tvg-name="Пятница +2" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a8/%D0%9F%D1%8F%D1%82%D0%BD%D0%B8%D1%86%D0%B0_%28%D1%81_2013%29.svg/1200px-%D0%9F%D1%8F%D1%82%D0%BD%D0%B8%D1%86%D0%B0_%28%D1%81_2013%29.svg.png" group-title="",Пятница! (+2)
+http://ott-cdn.ucom.am/s50/index.m3u8
 #EXTINF:-1 tvg-id="pes-i-ko" tvg-name="Пес и Ко" tvg-logo="" group-title="Entertainment",Пёс и Ко
 https://strm.yandex.ru/kal/pesiko_supres/pesiko_supres0.m3u8
-#EXTINF:-1 tvg-id="radio-shanson" tvg-name="Радио Шансон" tvg-logo="http://lion-tv.com/uploads/posts/2016-09/1472964269_178.png" group-title="Music",Радио Шансон (Opt-1)
+#EXTINF:-1 tvg-id="radio-shanson" tvg-name="Радио Шансон" tvg-logo="http://lion-tv.com/uploads/posts/2016-09/1472964269_178.png" group-title="Music",Радио Шансон
 http://chanson-video.hostingradio.ru:8080/hls/chansonabr/live.m3u8
-#EXTINF:-1 tvg-id="radio-shanson" tvg-name="Радио Шансон" tvg-logo="" group-title="Music",Радио Шансон (Opt-2)
+#EXTINF:-1 tvg-id="radio-shanson" tvg-name="Радио Шансон" tvg-logo="" group-title="Music",Радио Шансон
 http://chanson-video.hostingradio.ru:8080/hls/chansonabr/live_hiq/index.m3u8
-#EXTINF:-1 tvg-id="ratnik" tvg-name="Ратник" tvg-logo="" group-title="Entertainment",Ратник (Opt-1)
+#EXTINF:-1 tvg-id="ratnik" tvg-name="Ратник" tvg-logo="" group-title="Entertainment",Ратник
 http://live-ratnik.cdnvideo.ru/ratnik/ratnik.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="ratnik" tvg-name="Ратник" tvg-logo="" group-title="Entertainment",Ратник (Opt-2)
+#EXTINF:-1 tvg-id="ratnik" tvg-name="Ратник" tvg-logo="" group-title="Entertainment",Ратник
 http://online-video.rbc.ru/online/rbctv.m3u8
-#EXTINF:-1 tvg-id="rbk" tvg-name="РБК" tvg-logo="https://s.rbk.ru/v10_rbcnews_static/current/images/rbc-share.png" group-title="Business",РБК (Opt-1)
-http://93.91.113.8:88/RBK/index.m3u8
-#EXTINF:-1 tvg-id="rbk" tvg-name="РБК" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rbk_tv_ru.jpg" group-title="Business",РБК (Opt-2)
-https://strm.yandex.ru/kal/rbc_supres/rbc_supres0.m3u8
-#EXTINF:-1 tvg-id="rbk" tvg-name="РБК" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rbk_tv_ru.jpg" group-title="Business",РБК (Opt-3)
+#EXTINF:-1 tvg-id="rbk" tvg-name="РБК" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rbk_tv_ru.jpg" group-title="Business",РБК
 http://92.50.128.180/utv/1358/index.m3u8
-#EXTINF:-1 tvg-id="rbk" tvg-name="РБК" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rbk_tv_ru.jpg" group-title="Business",РБК (Opt-4)
-http://live-ekbrbc.cdnvideo.ru/ekbrbc/ekbrbc/playlist.m3u8
-#EXTINF:-1 tvg-id="rbk" tvg-name="РБК" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rbk_tv_ru.jpg" group-title="Business",РБК (Opt-5)
-http://online.video.rbc.ru/online/rbctv_576p/index.m3u8
-#EXTINF:-1 tvg-id="rbk" tvg-name="РБК" tvg-logo="http://145.239.78.42/logos/rbk.png" group-title="Business",РБК (Opt-6)
+#EXTINF:-1 tvg-id="rbk" tvg-name="РБК" tvg-logo="https://s.rbk.ru/v10_rbcnews_static/current/images/rbc-share.png" group-title="Business",РБК
+http://93.91.113.8:88/RBK/index.m3u8
+#EXTINF:-1 tvg-id="rbk" tvg-name="РБК" tvg-logo="http://145.239.78.42/logos/rbk.png" group-title="Business",РБК
 http://e6.online.video.rbc.ru/online2/rbctv_480p/index.m3u8
-#EXTINF:-1 tvg-id="rbk" tvg-name="РБК" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rbk_tv_ru.jpg" group-title="Business",РБК (Opt-7)
-http://ott-cdn.ucom.am/s36/index.m3u8
-#EXTINF:-1 tvg-id="rbk" tvg-name="РБК" tvg-logo="http://www.livenewsbox.com/wp-content/uploads/2015/05/RBC-TV1.jpg" group-title="Business",РБК (Opt-8)
+#EXTINF:-1 tvg-id="rbk" tvg-name="РБК" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rbk_tv_ru.jpg" group-title="Business",РБК
+http://live-ekbrbc.cdnvideo.ru/ekbrbc/ekbrbc/playlist.m3u8
+#EXTINF:-1 tvg-id="rbk" tvg-name="РБК" tvg-logo="http://www.livenewsbox.com/wp-content/uploads/2015/05/RBC-TV1.jpg" group-title="Business",РБК
 http://online.video.rbc.ru/online/rbctv_480p/index.m3u8
+#EXTINF:-1 tvg-id="rbk" tvg-name="РБК" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rbk_tv_ru.jpg" group-title="Business",РБК
+http://online.video.rbc.ru/online/rbctv_576p/index.m3u8
+#EXTINF:-1 tvg-id="rbk" tvg-name="РБК" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rbk_tv_ru.jpg" group-title="Business",РБК
+http://ott-cdn.ucom.am/s36/index.m3u8
+#EXTINF:-1 tvg-id="rbk" tvg-name="РБК" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rbk_tv_ru.jpg" group-title="Business",РБК
+https://strm.yandex.ru/kal/rbc_supres/rbc_supres0.m3u8
 #EXTINF:-1 tvg-id="rgvk-dagestan" tvg-name="РГВК Дагестан" tvg-logo="http://www.rgvktv.ru/templates/gk_gamenews/images/logo.png" group-title="",РГВК Дагестан
 http://dagestan.mediacdn.ru/cdn/dagestan/tracks-v3a1/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Регион 29 (Архангельск)
 http://live-atkmedia.cdnvideo.ru/atkmedia/atkmedia/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",Релакс TV
 http://live.planeta-online.tv:1935/public/channel_3/playlist.m3u8
-#EXTINF:-1 tvg-id="rentv" tvg-name="Рен ТВ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/ren_tv.jpg" group-title="General",Рен ТВ (Opt-1)
-http://ott-cdn.ucom.am/s85/index.m3u8
-#EXTINF:-1 tvg-id="rentv" tvg-name="Рен ТВ" tvg-logo="https://upload.wikimedia.org/wikipedia/en/3/3c/REN_TV_logo_2015.png" group-title="General",Рен ТВ (Opt-2)
+#EXTINF:-1 tvg-id="rentv" tvg-name="Рен ТВ" tvg-logo="https://upload.wikimedia.org/wikipedia/en/3/3c/REN_TV_logo_2015.png" group-title="General",Рен ТВ
 http://ott-cdn.ucom.am/s85/04.m3u8
-#EXTINF:-1 tvg-id="rzhd-tv" tvg-name="РЖД ТВ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rzd_russian_railways.jpg" group-title="",РЖД ТВ (Opt-1)
-http://hls.tva.cdnvideo.ru/tva/tvahd.sdp/chunklist.m3u8
-#EXTINF:-1 tvg-id="rzhd-tv" tvg-name="РЖД ТВ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rzd_russian_railways.jpg" group-title="",РЖД ТВ (Opt-2)
+#EXTINF:-1 tvg-id="rentv" tvg-name="Рен ТВ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/ren_tv.jpg" group-title="General",Рен ТВ
+http://ott-cdn.ucom.am/s85/index.m3u8
+#EXTINF:-1 tvg-id="rzhd-tv" tvg-name="РЖД ТВ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rzd_russian_railways.jpg" group-title="",РЖД ТВ
 http://hls.tva.cdnvideo.ru/tva/tva.sdp/playlist.m3u8
+#EXTINF:-1 tvg-id="rzhd-tv" tvg-name="РЖД ТВ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rzd_russian_railways.jpg" group-title="",РЖД ТВ
+http://hls.tva.cdnvideo.ru/tva/tvahd.sdp/chunklist.m3u8
+#EXTINF:-1 tvg-id="rossia1" tvg-name="Россия" tvg-logo="https://webarmen.com/my/iptv/uploads/icon/1.png" group-title="General",Россия 1
+http://a3569458063-s26881.cdn.ngenix.net/hls/russia_hd/playlist_4.m3u8
+#EXTINF:-1 tvg-id="rossia1" tvg-name="Россия" tvg-logo="https://cdn-st1.rtr-vesti.ru/lrt_cdn/i/logo/ch-logo-1.png" group-title="General",Россия 1
+http://chgtrk.ru/pl/stream/hls/R1_360p/index.m3u8
+#EXTINF:-1 tvg-id="rossia1" tvg-name="Россия" tvg-logo="http://fanat.tv/images/tv/rossiya-1.png" group-title="General",Россия 1
+http://www.vradio.ru/hls/russia-1-live-2000/index.m3u8
 #EXTINF:-1 tvg-id="rossia1-pl6" tvg-name="Россия 1 +6" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rossiya_1.jpg" group-title="General",Россия 1 (+6)
 http://tv-online.gtrkchita.ru:8080/hls/r1-chita_360p.m3u8
-#EXTINF:-1 tvg-id="rossia1" tvg-name="Россия" tvg-logo="https://webarmen.com/my/iptv/uploads/icon/1.png" group-title="General",Россия 1 (Opt-1)
-http://a3569458063-s26881.cdn.ngenix.net/hls/russia_hd/playlist_4.m3u8
-#EXTINF:-1 tvg-id="rossia1" tvg-name="Россия" tvg-logo="https://cdn-st1.rtr-vesti.ru/lrt_cdn/i/logo/ch-logo-1.png" group-title="General",Россия 1 (Opt-2)
-http://chgtrk.ru/pl/stream/hls/R1_360p/index.m3u8
-#EXTINF:-1 tvg-id="rossia1" tvg-name="Россия" tvg-logo="http://fanat.tv/images/tv/rossiya-1.png" group-title="General",Россия 1 (Opt-3)
-http://www.vradio.ru/hls/russia-1-live-2000/index.m3u8
-#EXTINF:-1 tvg-id="rossia-24" tvg-name="Россия 24" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rossiya_24.jpg" group-title="News",Россия 24 (Opt-1)
-http://uiptv.do.am/1ufc/000000006/playlist.m3u8
-#EXTINF:-1 tvg-id="rossia-24" tvg-name="Россия 24" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rossiya_24.jpg" group-title="News",Россия 24 (Opt-2)
+#EXTINF:-1 tvg-id="rossia-24" tvg-name="Россия 24" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rossiya_24.jpg" group-title="News",Россия 24
 http://92.43.140.249/s21/04.m3u8
-#EXTINF:-1 tvg-id="rossia-24" tvg-name="Россия 24" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rossiya_24.jpg" group-title="News",Россия 24 (Opt-3)
+#EXTINF:-1 tvg-id="rossia-24" tvg-name="Россия 24" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rossiya_24.jpg" group-title="News",Россия 24
 http://ott-cdn.ucom.am/s21/index.m3u8
-#EXTINF:-1 tvg-id="rossia-24" tvg-name="Россия 24" tvg-logo="http://fanat.tv/images/tv/rossiya-24.png" group-title="News",Россия 24 (Opt-4)
+#EXTINF:-1 tvg-id="rossia-24" tvg-name="Россия 24" tvg-logo="http://fanat.tv/images/tv/rossiya-24.png" group-title="News",Россия 24
 http://tv-online.gtrkchita.ru:8080/hls/r24-chita_360p.m3u8
-#EXTINF:-1 tvg-id="rossia-24" tvg-name="Россия 24" tvg-logo="http://fanat.tv/images/tv/rossiya-24.png" group-title="News",Россия 24 (Opt-5)
+#EXTINF:-1 tvg-id="rossia-24" tvg-name="Россия 24" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rossiya_24.jpg" group-title="News",Россия 24
+http://uiptv.do.am/1ufc/000000006/playlist.m3u8
+#EXTINF:-1 tvg-id="rossia-24" tvg-name="Россия 24" tvg-logo="http://fanat.tv/images/tv/rossiya-24.png" group-title="News",Россия 24
 https://str-3.mediabay.tv/Russia24/playlist.m3u8?token=89a108b1907b38190399e283dcb2b82f357ede36-ca8b65e4aabd9309bef417e72cabe4bc-1566589208-1566578408
-#EXTINF:-1 tvg-id="rossia-k" tvg-name="Россия К" tvg-logo="" group-title="",Россия К (Opt-1)
-http://uiptv.do.am/1ufc/000000005/playlist.m3u8
-#EXTINF:-1 tvg-id="rossia-k" tvg-name="Россия К" tvg-logo="http://fanat.tv/images/tv/rossiya-k.png" group-title="",Россия К (Opt-2)
+#EXTINF:-1 tvg-id="rossia-k" tvg-name="Россия К" tvg-logo="http://fanat.tv/images/tv/rossiya-k.png" group-title="",Россия К
 http://a3569458063-s26881.cdn.ngenix.net/live/smil:russiak.smil/chunklist_b1600000.m3u8
-#EXTINF:-1 tvg-id="rossia-k" tvg-name="Россия К" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rossiya_kultura.jpg" group-title="",Россия К (Opt-3)
+#EXTINF:-1 tvg-id="rossia-k" tvg-name="Россия К" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/rossiya_kultura.jpg" group-title="",Россия К
 http://ott-cdn.ucom.am/s16/index.m3u8
+#EXTINF:-1 tvg-id="rossia-k" tvg-name="Россия К" tvg-logo="" group-title="",Россия К
+http://uiptv.do.am/1ufc/000000005/playlist.m3u8
 #EXTINF:-1 tvg-id="russkaya-noch" tvg-name="Русская ночь" tvg-logo="https://iptvx.one/icn/russkaya-noch.png" group-title="XXX",Русская ночь
 http://46.32.68.167/s/live/708/86.169.51.136/0/0.m3u8
 #EXTINF:-1 tvg-id="russky-sever" tvg-name="Русский Север" tvg-logo="" group-title="Local",Русский Север (Вологда)
 http://rusevertv.ru/576/rs_crf28_.m3u8
-#EXTINF:-1 tvg-id="ryzhy" tvg-name="Рыжий" tvg-logo="http://ryzhiy.tv/assets/logo-header-7bc8b56496d769e22e7ace3b711e3c5825145f5feb03b4153d235d3459ed4998.png" group-title="Kids",Рыжий (Opt-1)
+#EXTINF:-1 tvg-id="ryzhy" tvg-name="Рыжий" tvg-logo="http://ryzhiy.tv/assets/logo-header-7bc8b56496d769e22e7ace3b711e3c5825145f5feb03b4153d235d3459ed4998.png" group-title="Kids",Рыжий
 http://ott-cdn.ucom.am/s57/04.m3u8
-#EXTINF:-1 tvg-id="ryzhy" tvg-name="Рыжий" tvg-logo="" group-title="Kids",Рыжий (Opt-2)
+#EXTINF:-1 tvg-id="ryzhy" tvg-name="Рыжий" tvg-logo="" group-title="Kids",Рыжий
 http://ott-cdn.ucom.am/s57/index.m3u8
 #EXTINF:-1 tvg-id="s1-surgut" tvg-name="С1 Сургут" tvg-logo="https://sitv.ru/img/stv-news/111111/S1_logo.jpg" group-title="Local",С1 (Сургут)
 https://sitv.ru/hls/stv1024.m3u8
-#EXTINF:-1 tvg-id="saratov-24" tvg-name="Саратов 24" tvg-logo="" group-title="Local",Саратов 24 (Opt-1)
+#EXTINF:-1 tvg-id="saratov-24" tvg-name="Саратов 24" tvg-logo="" group-title="Local",Саратов 24
 http://46.165.235.6:8083/hls/saratov24/index.m3u8
-#EXTINF:-1 tvg-id="saratov-24" tvg-name="Саратов 24" tvg-logo="" group-title="Local",Саратов 24 (Opt-2)
-https://strm.yandex.ru/kal/saratov24_supres/saratov24_supres0.m3u8
-#EXTINF:-1 tvg-id="saratov-24" tvg-name="Саратов 24" tvg-logo="" group-title="Local",Саратов 24 (Opt-3)
+#EXTINF:-1 tvg-id="saratov-24" tvg-name="Саратов 24" tvg-logo="" group-title="Local",Саратов 24
 https://str-2.mediabay.tv/Saratov24/playlist.m3u8?token=af364d18bd6c402805b941534637c94e43ce32fe-5e12f32245508422bb17417bd0519014-1566589433-1566578633
-#EXTINF:-1 tvg-id="sarafan" tvg-name="Сарафан" tvg-logo="http://sarafan-tv.ru/upload/medialibrary/44c/Glavnaya_banner_logo.jpg" group-title="",Сарафан (Opt-1)
+#EXTINF:-1 tvg-id="saratov-24" tvg-name="Саратов 24" tvg-logo="" group-title="Local",Саратов 24
+https://strm.yandex.ru/kal/saratov24_supres/saratov24_supres0.m3u8
+#EXTINF:-1 tvg-id="sarafan" tvg-name="Сарафан" tvg-logo="http://sarafan-tv.ru/upload/medialibrary/44c/Glavnaya_banner_logo.jpg" group-title="",Сарафан
 http://ott-cdn.ucom.am/s38/04.m3u8
-#EXTINF:-1 tvg-id="sarafan" tvg-name="Сарафан" tvg-logo="http://sarafan-tv.ru/upload/medialibrary/44c/Glavnaya_banner_logo.jpg" group-title="",Сарафан (Opt-2)
+#EXTINF:-1 tvg-id="sarafan" tvg-name="Сарафан" tvg-logo="http://sarafan-tv.ru/upload/medialibrary/44c/Glavnaya_banner_logo.jpg" group-title="",Сарафан
 http://ott-cdn.ucom.am/s38/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://lime-tv.ru/uploads/posts/2018-06/thumbs/1529009151_sgdf24.png" group-title="Local",СГДФ 24 (Свердлов)
 http://live.sgdf24.cdnvideo.ru/sgdf24/sgdf24.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="sever" tvg-name="Север" tvg-logo="" group-title="Local",Север (Нарьян-Мар) (Opt-1)
-http://live2.mediacdn.ru/sr1/sever/playlist.m3u8
-#EXTINF:-1 tvg-id="sever" tvg-name="Север" tvg-logo="" group-title="Local",Север (Нарьян-Мар) (Opt-2)
-http://live2.mediacdn.ru/sr1/sever-mobile/playlist.m3u8
-#EXTINF:-1 tvg-id="sever" tvg-name="Север" tvg-logo="http://www.visitnao.ru/upload/iblock/1c0/1c0bd0c468ce71c2c0deab8ee728440a.png" group-title="Local",Север (Нарьян-Мар) (Opt-3)
+#EXTINF:-1 tvg-id="sever" tvg-name="Север" tvg-logo="http://www.visitnao.ru/upload/iblock/1c0/1c0bd0c468ce71c2c0deab8ee728440a.png" group-title="Local",Север (Нарьян-Мар)
 http://live.mediacdn.ru:80/sr1/sever/playlist.m3u8
-#EXTINF:-1 tvg-id="sever" tvg-name="Север" tvg-logo="http://www.visitnao.ru/upload/iblock/1c0/1c0bd0c468ce71c2c0deab8ee728440a.png" group-title="Local",Север (Нарьян-Мар) (Opt-4)
+#EXTINF:-1 tvg-id="sever" tvg-name="Север" tvg-logo="" group-title="Local",Север (Нарьян-Мар)
+http://live2.mediacdn.ru/sr1/sever-mobile/playlist.m3u8
+#EXTINF:-1 tvg-id="sever" tvg-name="Север" tvg-logo="" group-title="Local",Север (Нарьян-Мар)
+http://live2.mediacdn.ru/sr1/sever/playlist.m3u8
+#EXTINF:-1 tvg-id="sever" tvg-name="Север" tvg-logo="http://www.visitnao.ru/upload/iblock/1c0/1c0bd0c468ce71c2c0deab8ee728440a.png" group-title="Local",Север (Нарьян-Мар)
 https://str-3.mediabay.tv/SeverTV/playlist.m3u8?token=dc5e7cbb7b47de57e60fc79994e3c98c94f09a56-32ae62700a05f97e0ae4228a0c6887c5-1566589741-1566578941
-#EXTINF:-1 tvg-id="sila" tvg-name="Сила" tvg-logo="" group-title="Sport",Сила (Opt-1)
+#EXTINF:-1 tvg-id="sila" tvg-name="Сила" tvg-logo="" group-title="Sport",Сила
 http://gcore.silatv.ru/streams/3431_1488/480n/index.m3u8
-#EXTINF:-1 tvg-id="sila" tvg-name="Сила" tvg-logo="" group-title="Sport",Сила (Opt-2)
-https://gcore.silatv.ru/streams/3431_1488/720n/index.m3u8
-#EXTINF:-1 tvg-id="sila" tvg-name="Сила" tvg-logo="" group-title="Sport",Сила (Opt-3)
+#EXTINF:-1 tvg-id="sila" tvg-name="Сила" tvg-logo="" group-title="Sport",Сила
 https://gcore.silatv.ru/streams/3431_1488/1080n/index.m3u8
-#EXTINF:-1 tvg-id="sinergia-tv" tvg-name="Синергия ТВ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/synergy_tv_ru.jpg" group-title="Business",Синергия ТВ (Opt-1)
+#EXTINF:-1 tvg-id="sila" tvg-name="Сила" tvg-logo="" group-title="Sport",Сила
+https://gcore.silatv.ru/streams/3431_1488/720n/index.m3u8
+#EXTINF:-1 tvg-id="sinergia-tv" tvg-name="Синергия ТВ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/synergy_tv_ru.jpg" group-title="Business",Синергия ТВ
 http://live-synergytv.cdnvideo.ru/synergytv/synergytv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="sinergia-tv" tvg-name="Синергия ТВ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/synergy_tv_ru.jpg" group-title="Business",Синергия ТВ (Opt-2)
+#EXTINF:-1 tvg-id="sinergia-tv" tvg-name="Синергия ТВ" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/synergy_tv_ru.jpg" group-title="Business",Синергия ТВ
 https://str-3.mediabay.tv/SynergyTV/playlist.m3u8?token=8cb7e7d2cd80b07a19cdc0c6f445eebd93e58faa-ea7ecbcb72cc435a53ae38ba7c15acdf-1566589702-1566578902
 #EXTINF:-1 tvg-id="skazki-zayki" tvg-name="Сказки Зайки" tvg-logo="https://pp.userapi.com/c605926/v605926465/5557/g0bL-ADWjOI.jpg" group-title="",Сказки Зайки
 http://skazki.vintera.tv:8081/skazki/zaj/playlist.m3u8
@@ -611,20 +611,20 @@ http://skazki.vintera.tv:8081/skazki/zaj/playlist.m3u8
 http://62.32.67.187:1935/WEB_Smilik/Smilik.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="solnechnogoskoetv" tvg-name="Солнечногорское TV" tvg-logo="https://solntv.ru/images/stv-logo-hq.png" group-title="Local",Солнечногорское TV
 http://hls.solntv.cdnvideo.ru/solntv/solntv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="soyuz" tvg-name="Союз" tvg-logo="https://tv-soyuz.ru/static/img/logo.png" group-title="Religious",Союз (Opt-1)
+#EXTINF:-1 tvg-id="soyuz" tvg-name="Союз" tvg-logo="https://tv-soyuz.ru/static/img/logo.png" group-title="Religious",Союз
 http://tvsoyuz.cdnvideo.ru/tvsoyuz/soyuz/playlist.m3u8
-#EXTINF:-1 tvg-id="soyuz" tvg-name="Союз" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/soyuz.jpg" group-title="Religious",Союз (Opt-2)
-https://strm.yandex.ru/kal/soyuz_supres/soyuz_supres0.m3u8
-#EXTINF:-1 tvg-id="soyuz" tvg-name="Союз" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/soyuz.jpg" group-title="Religious",Союз (Opt-3)
+#EXTINF:-1 tvg-id="soyuz" tvg-name="Союз" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/soyuz.jpg" group-title="Religious",Союз
 https://str-4.mediabay.tv/Soyuz/playlist.m3u8?token=83936ee4649ee0d2ef4780ca4c65c47564550ac2-7c399099ef4bd9e17381a672a599df06-1566590365-1566579565
-#EXTINF:-1 tvg-id="start" tvg-name="Старт" tvg-logo="" group-title="Sport",Старт (Opt-1)
-https://strm.yandex.ru/kal/start/start0_169_480p.json/index-v1-a1.m3u8
-#EXTINF:-1 tvg-id="start" tvg-name="Старт" tvg-logo="" group-title="Sport",Старт (Opt-2)
-https://strm.yandex.ru/kal/start/start0_169_1080p.json/index-v1-a1.m3u8
-#EXTINF:-1 tvg-id="start" tvg-name="Старт" tvg-logo="" group-title="Sport",Старт (Opt-3)
-https://strm.yandex.ru/kal/start/start0_169_720p.json/index-v1-a1.m3u8
-#EXTINF:-1 tvg-id="start" tvg-name="Старт" tvg-logo="" group-title="Sport",Старт (Opt-4)
+#EXTINF:-1 tvg-id="soyuz" tvg-name="Союз" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/soyuz.jpg" group-title="Religious",Союз
+https://strm.yandex.ru/kal/soyuz_supres/soyuz_supres0.m3u8
+#EXTINF:-1 tvg-id="start" tvg-name="Старт" tvg-logo="" group-title="Sport",Старт
 https://strm.yandex.ru/kal/start/start0.m3u8
+#EXTINF:-1 tvg-id="start" tvg-name="Старт" tvg-logo="" group-title="Sport",Старт
+https://strm.yandex.ru/kal/start/start0_169_1080p.json/index-v1-a1.m3u8
+#EXTINF:-1 tvg-id="start" tvg-name="Старт" tvg-logo="" group-title="Sport",Старт
+https://strm.yandex.ru/kal/start/start0_169_480p.json/index-v1-a1.m3u8
+#EXTINF:-1 tvg-id="start" tvg-name="Старт" tvg-logo="" group-title="Sport",Старт
+https://strm.yandex.ru/kal/start/start0_169_720p.json/index-v1-a1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Страна FM
 http://live.stranafm.cdnvideo.ru/stranafm/stranafm_hd.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="surgut-24" tvg-name="Сургут 24" tvg-logo="http://online-red.com/images/tv/surgut-24.png" group-title="Local",Сургут 24
@@ -645,21 +645,21 @@ https://strm.yandex.ru/kal/tdk_supres/tdk_supres0.m3u8
 https://sitv.ru/hls/s861024.m3u8
 #EXTINF:-1 tvg-id="telekafe" tvg-name="Телекафе" tvg-logo="https://www.telecafe.ru/images/logo-site.png" group-title="",Телекафе
 http://ott-cdn.ucom.am/s56/04.m3u8
-#EXTINF:-1 tvg-id="texno-24" tvg-name="Техно 24" tvg-logo="https://i.imgur.com/5zAk3hi.png" group-title="",Техно 24 (Opt-1)
-http://ott-cdn.ucom.am/s68/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="texno-24" tvg-name="Техно 24" tvg-logo="https://iptvx.one/icn/texno-24.png" group-title="",Техно 24 (Opt-2)
+#EXTINF:-1 tvg-id="texno-24" tvg-name="Техно 24" tvg-logo="https://iptvx.one/icn/texno-24.png" group-title="",Техно 24
 http://92.43.140.249/s68/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://webarmen.com/my/iptv/uploads/icon/55.png" group-title="Entertainment",ТНТ (Opt-1)
-http://uiptv.do.am/1ufc/106596187/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/tnt_ru.jpg" group-title="Entertainment",ТНТ (Opt-2)
+#EXTINF:-1 tvg-id="texno-24" tvg-name="Техно 24" tvg-logo="https://i.imgur.com/5zAk3hi.png" group-title="",Техно 24
+http://ott-cdn.ucom.am/s68/index.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/tnt_ru.jpg" group-title="Entertainment",ТНТ
 http://ott-cdn.ucom.am/s19/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://webarmen.com/my/iptv/uploads/icon/55.png" group-title="Entertainment",ТНТ
+http://uiptv.do.am/1ufc/106596187/playlist.m3u8
 #EXTINF:-1 tvg-id="tnt-int-cis" tvg-name="ТНТ-International (СНГ)" tvg-logo="https://i.imgur.com/LqmmkNs.png" group-title="",ТНТ-International (СНГ)
 http://ott-cdn.ucom.am/s19/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://ladamedia.ru/site/upload/lBPQBGJZ1hc.jpg" group-title="Local",Тольятти 24
 http://91.234.108.26/hls-live/livepkgr/_definst_/liveevent1/vazlivestream1.m3u8
-#EXTINF:-1 tvg-id="tochka-tv" tvg-name="Точка" tvg-logo="http://i.otzovik.com/objects/b/510000/502811.png" group-title="",Точка (Opt-1)
+#EXTINF:-1 tvg-id="tochka-tv" tvg-name="Точка" tvg-logo="http://i.otzovik.com/objects/b/510000/502811.png" group-title="",Точка
 http://serv24.vintera.tv:8081/tochka/tochkatv/playlist.m3u8
-#EXTINF:-1 tvg-id="tochka-tv" tvg-name="Точка" tvg-logo="http://i.otzovik.com/objects/b/510000/502811.png" group-title="",Точка (Opt-2)
+#EXTINF:-1 tvg-id="tochka-tv" tvg-name="Точка" tvg-logo="http://i.otzovik.com/objects/b/510000/502811.png" group-title="",Точка
 https://str-2.mediabay.tv/TochkaTV/playlist.m3u8?token=a33cd1f57be0cc8f926828a45b6e4ce7de4a14ee-f4109a5eadb90e926a6a18914e4b3e9b-1566590429-1566579629
 #EXTINF:-1 tvg-id="tri-angela" tvg-name="Три Ангела" tvg-logo="https://www.3angels.ru/assets/img/themes/logo-menu.png" group-title="",Три Ангела
 http://hls.tv.3angels.ru/stream/HQ.m3u8
@@ -675,38 +675,38 @@ http://hls-myudm.cdnvideo.ru/myudm-live/myudm.sdp/playlist.m3u8
 http://live-urfo24.cdnvideo.ru/urfo24/urfo24.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="uspex" tvg-name="Успех" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/uspeh.jpg" group-title="Business",Успех
 https://strm.yandex.ru/kal/uspehtv_supres/uspehtv_supres0.m3u8
-#EXTINF:-1 tvg-id="football-ru" tvg-name="Футбол" tvg-logo="http://www.football-tv.ru/wp-content/uploads/2017/11/logo-mini-1.png" group-title="Sport",Футбол (Opt-1)
+#EXTINF:-1 tvg-id="football-ru" tvg-name="Футбол" tvg-logo="http://www.football-tv.ru/wp-content/uploads/2017/11/logo-mini-1.png" group-title="Sport",Футбол
 http://ott-cdn.ucom.am/s41/04.m3u8
-#EXTINF:-1 tvg-id="football-ru" tvg-name="Футбол" tvg-logo="https://iptvx.one/icn/futbol.png" group-title="Sport",Футбол (Opt-2)
+#EXTINF:-1 tvg-id="football-ru" tvg-name="Футбол" tvg-logo="https://iptvx.one/icn/futbol.png" group-title="Sport",Футбол
 http://ott-cdn.ucom.am/s41/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.tildacdn.com/tild6230-3662-4537-a334-363564306535/Untitled-4.png" group-title="",Хузур ТВ
 http://hls-mycdn08724960135.cdnvideo.ru/mycdn08724960135/stream1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.tv-impulse.ru/images/impulse-logo.png" group-title="",Центр/Импульс
 https://s30160.cdn.ngenix.net/live/impulse-live/playlist.m3u8
-#EXTINF:-1 tvg-id="centralnoye-tv" tvg-name="ЦТ" tvg-logo="" group-title="",Центральное телевидение (Opt-1)
-http://ott-cdn.ucom.am/s20/index.m3u8
-#EXTINF:-1 tvg-id="centralnoye-tv" tvg-name="ЦТ" tvg-logo="https://www.cableman.ru/sites/default/files/ctv.png" group-title="",Центральное телевидение (Opt-2)
+#EXTINF:-1 tvg-id="centralnoye-tv" tvg-name="ЦТ" tvg-logo="https://www.cableman.ru/sites/default/files/ctv.png" group-title="",Центральное телевидение
 http://ott-cdn.ucom.am/s20/04.m3u8
-#EXTINF:-1 tvg-id="shanson-tv" tvg-name="Шансон-TB" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/shanson_tv.jpg" group-title="Music",Шансон-ТВ (Opt-1)
-http://hls.shansontv.cdnvideo.ru/shansontv/shansontv_hq.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="shanson-tv" tvg-name="Шансон-TB" tvg-logo="https://www.shanson.tv/image/logo_160120.png" group-title="Music",Шансон-ТВ (Opt-2)
-http://hls.shansontv.cdnvideo.ru/shansontv/shansontv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="shanson-tv" tvg-name="Шансон-TB" tvg-logo="https://www.shanson.tv/image/logo_160120.png" group-title="Music",Шансон-ТВ (Opt-3)
-https://hls-shansontv.cdnvideo.ru/shansontv/smil:shansontv.smil/chunklist_b1996000.m3u8?hls_proxy_host=pub1.rtmp.s01.l.shansontv
-#EXTINF:-1 tvg-id="shanson-tv" tvg-name="Шансон-TB" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/shanson_tv.jpg" group-title="Music",Шансон-ТВ (Opt-4)
+#EXTINF:-1 tvg-id="centralnoye-tv" tvg-name="ЦТ" tvg-logo="" group-title="",Центральное телевидение
+http://ott-cdn.ucom.am/s20/index.m3u8
+#EXTINF:-1 tvg-id="shanson-tv" tvg-name="Шансон-TB" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/shanson_tv.jpg" group-title="Music",Шансон-ТВ
 http://hls.shansontv.cdnvideo.ru/shansontv/shansontv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="shanson-tv" tvg-name="Шансон-TB" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/shanson_tv.jpg" group-title="Music",Шансон-ТВ (Opt-5)
+#EXTINF:-1 tvg-id="shanson-tv" tvg-name="Шансон-TB" tvg-logo="https://www.shanson.tv/image/logo_160120.png" group-title="Music",Шансон-ТВ
+http://hls.shansontv.cdnvideo.ru/shansontv/shansontv.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="shanson-tv" tvg-name="Шансон-TB" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/shanson_tv.jpg" group-title="Music",Шансон-ТВ
+http://hls.shansontv.cdnvideo.ru/shansontv/shansontv_hq.sdp/playlist.m3u8
+#EXTINF:-1 tvg-id="shanson-tv" tvg-name="Шансон-TB" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/shanson_tv.jpg" group-title="Music",Шансон-ТВ
 http://hls.shansontv.cdnvideo.ru/shansontv/smil:shansontv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="shanson-tv" tvg-name="Шансон-TB" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/shanson_tv.jpg" group-title="Music",Шансон-ТВ (Opt-6)
+#EXTINF:-1 tvg-id="shanson-tv" tvg-name="Шансон-TB" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/shanson_tv.jpg" group-title="Music",Шансон-ТВ
 http://ott-cdn.ucom.am/s43/index.m3u8
+#EXTINF:-1 tvg-id="shanson-tv" tvg-name="Шансон-TB" tvg-logo="https://www.shanson.tv/image/logo_160120.png" group-title="Music",Шансон-ТВ
+https://hls-shansontv.cdnvideo.ru/shansontv/smil:shansontv.smil/chunklist_b1996000.m3u8?hls_proxy_host=pub1.rtmp.s01.l.shansontv
 #EXTINF:-1 tvg-id="kinopokaz-hd1" tvg-name="Шокирующее" tvg-logo="https://iptvx.one/icn/shokiruyushchee.png" group-title="Movies",Шокирующее HD
 http://91.223.105.236:8081/hlsx/472/472.m3u8?id=1188&p=87e0c783e9b31451
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tv41.ru/images/00.png" group-title="Local",Щелковское ТВ
 http://stream0.tv41.ru/live.m3u8
-#EXTINF:-1 tvg-id="echotv" tvg-name="Эхо TV" tvg-logo="" group-title="Local",Эхо TV (Рязань) (Opt-1)
-https://strm.yandex.ru/kal/echotv_supres/echotv_supres0.m3u8
-#EXTINF:-1 tvg-id="echotv" tvg-name="Эхо TV" tvg-logo="" group-title="Local",Эхо TV (Рязань) (Opt-2)
+#EXTINF:-1 tvg-id="echotv" tvg-name="Эхо TV" tvg-logo="" group-title="Local",Эхо TV (Рязань)
 http://live-echotv.cdnvideo.ru/echotv/echotv.sdp/playlist.m3u8
+#EXTINF:-1 tvg-id="echotv" tvg-name="Эхо TV" tvg-logo="" group-title="Local",Эхо TV (Рязань)
+https://strm.yandex.ru/kal/echotv_supres/echotv_supres0.m3u8
 #EXTINF:-1 tvg-id="yuvelirochka" tvg-name="Ювелирочка" tvg-logo="" group-title="Shop",Ювелирочка
 http://live-uvelirochka.cdnvideo.ru/uvelirochka/uvelirochka/playlist.m3u8
 #EXTINF:-1 tvg-id="yugra" tvg-name="Югра" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/ugra_tv.jpg" group-title="Local",Югра
diff --git a/channels/rw.m3u b/channels/rw.m3u
index 806207ae7..9a1ab6373 100644
--- a/channels/rw.m3u
+++ b/channels/rw.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rba.co.rw/IMG/rtv_logo.png" group-title="",RTV Rwanda (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rba.co.rw/IMG/rtv_logo.png" group-title="",RTV Rwanda
 http://197.243.19.131:1935/rtv/rtv/chunklist_w2093872577.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rba.co.rw/IMG/rtv_logo.png" group-title="",RTV Rwanda (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rba.co.rw/IMG/rtv_logo.png" group-title="",RTV Rwanda
 https://5c46fa289c89f.streamlock.net/rtv/rtv/playlist.m3u8
diff --git a/channels/sa.m3u b/channels/sa.m3u
index 36390087a..1418e3602 100644
--- a/channels/sa.m3u
+++ b/channels/sa.m3u
@@ -1,14 +1,14 @@
 #EXTM3U x-tvg-url="http://195.154.221.171/epg/guidearab.xml.gz"
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.sba.sa/assets/uploads/2018/04/Image-87@2x.png" group-title="",Al Quran Al Kareem (Mecca) (Opt-1)
-http://livecdnh2.tvanywhere.ae/hls/quran/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://is2-ssl.mzstatic.com/image/thumb/Purple128/v4/6c/a2/56/6ca256b1-58a8-782c-7057-984a820945df/source/512x512bb.jpg" group-title="",Al Quran Al Kareem (Mecca) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://is2-ssl.mzstatic.com/image/thumb/Purple128/v4/6c/a2/56/6ca256b1-58a8-782c-7057-984a820945df/source/512x512bb.jpg" group-title="",Al Quran Al Kareem (Mecca)
 http://210.210.155.35/qwr9ew/s/s28/01.m3u8
-#EXTINF:-1 tvg-id="Saudi Sunnah ARB" tvg-name="Saudi Sunnah ARB" tvg-logo="http://www.sba.sa/assets/uploads/2018/04/Mask-Group-55@2x.png" group-title="",Al Sunnah (Medina) (Opt-1)
-http://livecdnh2.tvanywhere.ae/hls/sunnah/04.m3u8
-#EXTINF:-1 tvg-id="Saudi Sunnah ARB" tvg-name="Saudi Sunnah ARB" tvg-logo="http://www.sba.sa/assets/uploads/2018/04/Mask-Group-55@2x.png" group-title="",Al Sunnah (Medina) (Opt-2)
-http://m.live.net.sa:1935/live/sunnah/chunklist_w364295954.m3u8
-#EXTINF:-1 tvg-id="Saudi Sunnah ARB" tvg-name="Saudi Sunnah ARB" tvg-logo="https://i.ytimg.com/vi/fzpywHj4IXk/hqdefault_live.jpg" group-title="",Al Sunnah (Medina) (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.sba.sa/assets/uploads/2018/04/Image-87@2x.png" group-title="",Al Quran Al Kareem (Mecca)
+http://livecdnh2.tvanywhere.ae/hls/quran/04.m3u8
+#EXTINF:-1 tvg-id="Saudi Sunnah ARB" tvg-name="Saudi Sunnah ARB" tvg-logo="https://i.ytimg.com/vi/fzpywHj4IXk/hqdefault_live.jpg" group-title="",Al Sunnah (Medina)
 http://210.210.155.35/qwr9ew/s/s27/01.m3u8
+#EXTINF:-1 tvg-id="Saudi Sunnah ARB" tvg-name="Saudi Sunnah ARB" tvg-logo="http://www.sba.sa/assets/uploads/2018/04/Mask-Group-55@2x.png" group-title="",Al Sunnah (Medina)
+http://livecdnh2.tvanywhere.ae/hls/sunnah/04.m3u8
+#EXTINF:-1 tvg-id="Saudi Sunnah ARB" tvg-name="Saudi Sunnah ARB" tvg-logo="http://www.sba.sa/assets/uploads/2018/04/Mask-Group-55@2x.png" group-title="",Al Sunnah (Medina)
+http://m.live.net.sa:1935/live/sunnah/chunklist_w364295954.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Al Tanasuh TV
 http://m.live.net.sa:1935/m/tanasuhtv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/9/92/H2_TV_logo.svg/1200px-H2_TV_logo.svg.png" group-title="",H2
diff --git a/channels/sd.m3u b/channels/sd.m3u
index 82b6da809..5e6e1874d 100644
--- a/channels/sd.m3u
+++ b/channels/sd.m3u
@@ -7,7 +7,7 @@ http://africatv.live.net.sa:1935/live/africatv3/playlist.m3u
 http://livecdnh2.tvanywhere.ae/hls/blue_nile/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mahgoubsons.com/wp/wp-content/uploads/2018/04/S24_logo.png" group-title="",Sudan 24
 http://109.236.92.216:9090/Sudan24-M/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.livetvant.com/wp-content/uploads/2012/08/Tayba-TV-Sudan-live.jpg" group-title="",Tayba TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.livetvant.com/wp-content/uploads/2012/08/Tayba-TV-Sudan-live.jpg" group-title="",Tayba TV
 http://tayba.live.net.sa:1935/tayba/taybatv/chunklist_w1376954935.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.elahmad.com/tv/images/taybatv.jpg" group-title="",Tayba TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.elahmad.com/tv/images/taybatv.jpg" group-title="",Tayba TV
 http://tayba.live.net.sa:1935/tayba/taybatv/gmswf.m3u8
diff --git a/channels/se.m3u b/channels/se.m3u
index ad43279bd..b01069b64 100644
--- a/channels/se.m3u
+++ b/channels/se.m3u
@@ -7,10 +7,10 @@ https://httpcache0-03837-cachelive2.dna.qbrick.com/03837-cachelive2/smil:03837_t
 https://httpcache0-03837-cachelive2.dna.qbrick.com/03837-cachelive2/smil:03837_tx2_720p/chunklist_b3628000.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/pW6pPFF.jpg" group-title="Religious",Himlen TV7
 http://vod.tv7.fi:1935/tv7-se/_definst_/mp4:tv7-se.stream_360p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/p5ktCEA.jpg" group-title="Religious",Kanal 10 (Opt-1)
-http://cdn-kanal10.crossnet.net:1935/kanal10/mp4:mpegts.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/3255.png" group-title="Religious",Kanal 10 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/3255.png" group-title="Religious",Kanal 10
 http://cdn-kanal10.crossnet.net/kanal10/mpegts.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/p5ktCEA.jpg" group-title="Religious",Kanal 10
+http://cdn-kanal10.crossnet.net:1935/kanal10/mp4:mpegts.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/KAGE41l.jpg" group-title="",Malmö mediakanal
 https://edge-83-140-64-214-se-iponly-dcs.solidtango.com/edge/_8ynhbua3_/8ynhbua3/manifest.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Mol9GKz.jpg" group-title="",Västmanlands TV
diff --git a/channels/sg.m3u b/channels/sg.m3u
index d7cfc2fde..89b1da452 100644
--- a/channels/sg.m3u
+++ b/channels/sg.m3u
@@ -3,20 +3,20 @@
 https://dlau142f16b92.cloudfront.net/hls/ch5ctv/master02.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://images.mypadtv.com/hd8.jpg" group-title="",Channel 8
 https://d34e90s3s13i7n.cloudfront.net/hls/ch8ctv/master02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Channel NewsAsia [EN][432p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Channel NewsAsia
 https://drsh196ivjwe8.cloudfront.net/hls/cnai/03.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/f/ff/CH_U_2015.png" group-title="",Channel U
 https://d3inlz9elsutjl.cloudfront.net/hls/chuctv/master02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",CinemaWorld (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",CinemaWorld
 http://210.210.155.35/uq2663/h/h04/02.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://cinemaworld.asia/wp-content/themes/CinemaWorld/bootstrap/img/logo.png" group-title="Movies",CinemaWorld (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://cinemaworld.asia/wp-content/themes/CinemaWorld/bootstrap/img/logo.png" group-title="Movies",CinemaWorld
 http://45.126.83.51:443/uq2663/h/h04/01.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/8/83/CNA_new_logo.svg/1200px-CNA_new_logo.svg.png" group-title="",CNA
 http://210.210.155.35/uq2663/h/h29/01.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://miaomi-tv.com/Public/images/miao-mi-logo-color.png" group-title="",Miao Mi (Opt-1)
-https://d3kw4vhbdpgtqk.cloudfront.net/hls/miaomipcweb/prog_index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://miaomi-tv.com/Public/images/miao-mi-logo-color.png" group-title="",Miao Mi (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://miaomi-tv.com/Public/images/miao-mi-logo-color.png" group-title="",Miao Mi
 https://d3kw4vhbdpgtqk.cloudfront.net/hls/miaomipcweb/04.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://miaomi-tv.com/Public/images/miao-mi-logo-color.png" group-title="",Miao Mi
+https://d3kw4vhbdpgtqk.cloudfront.net/hls/miaomipcweb/prog_index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://video.toggle.sg/image/5307980/16x9/947/533/dbbd7193329f507087f2602c392e5fa6/BD/okto.png" group-title="",OKTO
 https://ddftztnzt6o79.cloudfront.net/hls/oktoctv/master02.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://video.toggle.sg/image/5249134/16x9/947/533/ab3079e30a8132181c2f1b056f814810/of/suria.png" group-title="",Suria
diff --git a/channels/sk.m3u b/channels/sk.m3u
index 46dba9042..84d582341 100644
--- a/channels/sk.m3u
+++ b/channels/sk.m3u
@@ -3,20 +3,20 @@
 http://livecdnh3.tvanywhere.ae/hls/duck/06.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hrhfs9p.png" group-title="Fashion",FashionTV Czech&Slovak
 http://lb.streaming.sk/fashiontv/stream/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wKJpGke.jpg" group-title="",JOJ (Opt-1)
-http://nn1.joj.sk/hls/joj-720.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GyoWsNb.png" group-title="",JOJ (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GyoWsNb.png" group-title="",JOJ
 http://nn.geo.joj.sk/hls/joj-540.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wKJpGke.jpg" group-title="",JOJ (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wKJpGke.jpg" group-title="",JOJ
 http://nn.geo.joj.sk/hls/joj-720.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GyoWsNb.png" group-title="",JOJ Family (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wKJpGke.jpg" group-title="",JOJ
+http://nn1.joj.sk/hls/joj-720.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GyoWsNb.png" group-title="",JOJ Family
 http://83.167.253.110:5000/live/joj_family_hd/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GyoWsNb.png" group-title="",JOJ Family (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GyoWsNb.png" group-title="",JOJ Family
 http://nn.geo.joj.sk/hls/family-360.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GyoWsNb.png" group-title="",JOJ Family (Opt-3)
-http://nn2.joj.sk/hls/family-540.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GyoWsNb.png" group-title="",JOJ Family (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GyoWsNb.png" group-title="",JOJ Family
 http://nn.geo.joj.sk/hls/family-540.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GyoWsNb.png" group-title="",JOJ Family
+http://nn2.joj.sk/hls/family-540.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ypZ4H5m.jpg" group-title="",Košice:dnes
 http://lb.streaming.sk/tvnasa/stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Rvy8Wdu.png" group-title="",Life.tv
@@ -25,49 +25,49 @@ http://86.110.233.68:1935/lifetv/lifetv.stream_360p/playlist.m3u8
 http://tv.geniusnet.sk:8081/localltv/pl.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/UGndszU.jpg" group-title="",Markiza
 http://213.151.233.20:8000/dna-5106-tv-pc/hls/4001v102.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Orange Sport (Opt-1)
-http://2ng.ru/31y
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/nbBdVPs.jpg" group-title="Sport",Orange Sport (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/nbBdVPs.jpg" group-title="Sport",Orange Sport
 http://213.151.233.20:8000/dna-6428-tv-pc/hls/4001v102.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Orange Sport
+http://2ng.ru/31y
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://tvoravia.sk/wp-content/uploads/thegem-logos/logo_798fb82d7e99c59716e3c6233e898800_1x.png" group-title="",Oravia
 http://ottst05.flexitv.sk/822-tv-pc.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1hKwMpt.png" group-title="",Plus (Opt-1)
-https://nova-live.ssl.cdn.cra.cz/channels/joj_plus/playlist/cze/live_hq.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1hKwMpt.png" group-title="",Plus (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1hKwMpt.png" group-title="",Plus
 https://nn.geo.joj.sk/live/hls/jojplus-540.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1hKwMpt.png" group-title="",Plus
+https://nova-live.ssl.cdn.cra.cz/channels/joj_plus/playlist/cze/live_hq.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GKBwOFF.jpg" group-title="",Raj TV
 http://ottst05.flexitv.sk/2827-tv-pc.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/oEokm8Y.png" group-title="",RTVS 1
 https://rtvslolive.akamaized.net/hls/live/584144/tv_slo1/slo1/r-playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/oEokm8Y.png" group-title="",RTVS 2
 https://rtvslolive.akamaized.net/hls/live/584144/tv_slo2/slo2/r-playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3w4SA3V.jpg" group-title="",Senzi TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3w4SA3V.jpg" group-title="",Senzi TV
 http://109.74.144.130/live/senzitest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3w4SA3V.jpg" group-title="",Senzi TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3w4SA3V.jpg" group-title="",Senzi TV
 http://109.74.144.130/live/senzitest/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Lh6Aua7.png" group-title="",TA3
 http://70.32.0.9:5000/live/43/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JeiED2h.jpg" group-title="",Televizia OSEM (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JeiED2h.jpg" group-title="",Televizia OSEM
 http://109.74.145.11:1935/tv8/mp4:tv8.stream_360p/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JeiED2h.jpg" group-title="",Televízia OSEM (Opt-1)
-http://109.74.145.11:1935/tv8/ngrp:tv8.stream_all/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JeiED2h.jpg" group-title="",Televízia OSEM (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JeiED2h.jpg" group-title="",Televízia OSEM
 http://109.74.145.11:1935/tv8/mp4:tv8.stream_360p/chunklist_w974670813.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/QQK4sJs.jpg" group-title="",TV Lux (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JeiED2h.jpg" group-title="",Televízia OSEM
+http://109.74.145.11:1935/tv8/ngrp:tv8.stream_all/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/QQK4sJs.jpg" group-title="",TV Lux
 http://live.tvlux.sk:1935/lux/lux.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/QQK4sJs.jpg" group-title="",TV Lux (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/QQK4sJs.jpg" group-title="",TV Lux
 http://live.tvlux.sk:1935/lux/lux.stream_360p/chunklist_w1295439472.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FzODljH.jpg" group-title="",TV Nitricka (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FzODljH.jpg" group-title="",TV Nitricka
 http://195.168.28.243/hls-live/livepkgr/_definst_/liveevent/livestream1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FzODljH.jpg" group-title="",TV Nitricka (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FzODljH.jpg" group-title="",TV Nitricka
 http://195.168.28.243/hls-live/livepkgr/_definst_/liveevent/livestream3.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/k4IK5OS.png" group-title="",TV Nové Zámky (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/k4IK5OS.png" group-title="",TV Nové Zámky
 http://s1.media-planet.sk:80/live/novezamky/BratuMarian.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/k4IK5OS.png" group-title="",TV Nové Zámky (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/k4IK5OS.png" group-title="",TV Nové Zámky
 http://s1.media-planet.sk:80/live/novezamky/lihattv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="TV Ružinov" tvg-logo="https://i.imgur.com/wmkg1FG.png" group-title="",TV Ružinov
 http://lb.streaming.sk/tvruzinov/stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/nRDWpNs.jpg" group-title="",Wau TV (Opt-1)
-https://nn.geo.joj.sk/live/wau-index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/nRDWpNs.jpg" group-title="",Wau TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/nRDWpNs.jpg" group-title="",Wau TV
 https://nn.geo.joj.sk/hls/wau-540.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/nRDWpNs.jpg" group-title="",Wau TV
+https://nn.geo.joj.sk/live/wau-index.m3u8?fluxustv.m3u8
diff --git a/channels/sy.m3u b/channels/sy.m3u
index 8051370f5..fbf6c54b8 100644
--- a/channels/sy.m3u
+++ b/channels/sy.m3u
@@ -11,20 +11,20 @@ https://svs.itworkscdn.net/orienttvlive/orienttv.smil/gmswf.m3u8
 http://82.137.248.16:1935/Souryana/stream20112018/chunklist_w821508526.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/21nT8uG.png" group-title="",Ronahi TV
 http://213.162.202.9:8000/play/a01g/index.m3u8
-#EXTINF:-1 tvg-id="Syria Drama ARB" tvg-name="Syria Drama ARB" tvg-logo="https://i.imgur.com/ynwRIN4.png" group-title="",RTV Drama (Opt-1)
+#EXTINF:-1 tvg-id="Syria Drama ARB" tvg-name="Syria Drama ARB" tvg-logo="https://i.imgur.com/ynwRIN4.png" group-title="",RTV Drama
 http://82.137.248.16:1935/Drama/stream20112018/playlist.m3u8
-#EXTINF:-1 tvg-id="Syria Drama ARB" tvg-name="Syria Drama ARB" tvg-logo="https://i.imgur.com/ynwRIN4.png" group-title="",RTV Drama (Opt-2)
+#EXTINF:-1 tvg-id="Syria Drama ARB" tvg-name="Syria Drama ARB" tvg-logo="https://i.imgur.com/ynwRIN4.png" group-title="",RTV Drama
 http://livecdnh2.tvanywhere.ae/hls/syria_drama/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/r38ZBLx.png" group-title="",RTV Education
 http://82.137.248.16:1935/SEdu/stream20112018/chunklist_w1551912453.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/JtRUPI1.png" group-title="",RTV Nour TV
 http://82.137.248.16:1935/Nour/stream20112018/chunklist_w1617542602.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ajsrKzA.png" group-title="",RTV Sat (Opt-1)
-http://www.elahmad.com/tv/m3u8/syriatv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ajsrKzA.png" group-title="",RTV Sat (Opt-2)
-http://www.elahmad.com/tv/m3u8/syriatv.m3u8?id=syria_news
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ajsrKzA.png" group-title="",RTV Sat (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ajsrKzA.png" group-title="",RTV Sat
 http://82.137.248.16:1935/Sat/stream20112018/playlist.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ajsrKzA.png" group-title="",RTV Sat
+http://www.elahmad.com/tv/m3u8/syriatv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ajsrKzA.png" group-title="",RTV Sat
+http://www.elahmad.com/tv/m3u8/syriatv.m3u8?id=syria_news
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Bg52GiG.png" group-title="",Sama TV
 http://95.170.215.109/hls/m3u8/SAMA-TV-Backup.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RzPOwqI.png" group-title="",Spacetoon
diff --git a/channels/th.m3u b/channels/th.m3u
index 40b9098e1..cd741c762 100644
--- a/channels/th.m3u
+++ b/channels/th.m3u
@@ -21,10 +21,10 @@ http://live.pjmcdn.info/live/Ch7-HD.stream/playlist.m3u8
 http://stream.rs.co.th/ch8-hi/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://thaich2.com/images/logoch2-nm.png" group-title="",Channel 2
 http://stream.rs.co.th/ch2-hi/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CHANNEL 8 (Opt-1)
-http://usa.login.in.th:1935/ch8/ch8/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CHANNEL 8 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CHANNEL 8
 http://usa.login.in.th:1935/ch8/ch8/chunklist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CHANNEL 8
+http://usa.login.in.th:1935/ch8/ch8/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.digitalinsider.co.th/Apps/TT/Images/ddtv.png" group-title="",DDTV
 http://203.156.63.20:1935/live/ddtv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.mvtv.co.th/wp-content/uploads/2019/01/DoChannal59.png" group-title="",Do Channel
@@ -49,12 +49,12 @@ http://183.182.100.184/live/mcothd/playlist.m3u8
 http://mcotdigital-5nrixa.cdn.byteark.com/mcotfamily/smil:mcotfamily.smil/chunklist_w121661968_b2000000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/c/ce/MCOT_Family_14.png" group-title="",MCOT Family 14
 http://mcotdigital-5nrixa.cdn.byteark.com/mcotfamily/smil:mcotfamily.smil/chunklist_w524236822_b2000000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Shop",MCOT FAMILY 14 [720p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Shop",MCOT FAMILY 14
 http://mcotdigital-5nrixa.cdn.byteark.com/mcotfamily/smil:mcotfamily.smil/chunklist_w969608825_b2000000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.doohdbox.com/assets/20170804152543659647755.jpg" group-title="",MCOT HD (Opt-1)
-http://mcotdigital-pnnouc.cdn.byteark.com/mcothd1080p_edge/smil:mcothd1080p.smil/chunklist_w534518664_b3000000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.doohdbox.com/assets/20170804152543659647755.jpg" group-title="",MCOT HD (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.doohdbox.com/assets/20170804152543659647755.jpg" group-title="",MCOT HD
 http://live.pjmcdn.info/live/MCOT-HD.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.doohdbox.com/assets/20170804152543659647755.jpg" group-title="",MCOT HD
+http://mcotdigital-pnnouc.cdn.byteark.com/mcothd1080p_edge/smil:mcothd1080p.smil/chunklist_w534518664_b3000000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/d/d5/Mono_29_Logo.png" group-title="",MONO 29
 http://183.182.100.184/live/mono29/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.mvtv.co.th/wp-content/uploads/2019/01/mvtv.jpg" group-title="",MVTV
@@ -67,10 +67,10 @@ https://edge1a.v2h-cdn.com/appt3/five.stream_720p/chunklist_w1616935929.m3u8
 https://edge1a.v2h-cdn.com/appt7/MHONG.stream_360p/chunklist_w839479703.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.mvtv.co.th/wp-content/uploads/2019/01/mixmajor.jpg" group-title="",MVTV Major Mix
 https://edge1a.v2h-cdn.com/appt7/Mix_major.stream_720p/chunklist_w670261144.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/f/f8/Nation_TV_Logo.svg/1200px-Nation_TV_Logo.svg.png" group-title="",Nation TV (Opt-1)
-http://live.nationtv.tv/hls/ntv_th_sd.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/f/f8/Nation_TV_Logo.svg/1200px-Nation_TV_Logo.svg.png" group-title="",Nation TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/f/f8/Nation_TV_Logo.svg/1200px-Nation_TV_Logo.svg.png" group-title="",Nation TV
 http://live.nationtv.tv/hls/ntv_th_hd.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/f/f8/Nation_TV_Logo.svg/1200px-Nation_TV_Logo.svg.png" group-title="",Nation TV
+http://live.nationtv.tv/hls/ntv_th_sd.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/th/thumb/7/73/New18logo.png/300px-New18logo.png" group-title="",New18
 http://newtv.cdn.byteark.com/live/playlist_576p/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://tv.guchill.com/images/img_tv/tv/ch5.gif" group-title="",NTB Ch
diff --git a/channels/tm.m3u b/channels/tm.m3u
index 3b0508e0d..1e0ea9f85 100644
--- a/channels/tm.m3u
+++ b/channels/tm.m3u
@@ -1,33 +1,33 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/altyn_asyr_tv-webtvonlive-com.jpg" group-title="",Altyn Asyr TV
 https://alpha.tv.online.tm/legacyhls/ch001_720/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/Asgabat-webtvonlive-com.jpg" group-title="",Asgabat TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/Asgabat-webtvonlive-com.jpg" group-title="",Asgabat TV
 https://alpha.tv.online.tm/legacyhls/ch006_720/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/Asgabat-webtvonlive-com.jpg" group-title="",Asgabat TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/Asgabat-webtvonlive-com.jpg" group-title="",Asgabat TV
 https://str-3.mediabay.tv/Ashhabad/playlist.m3u8?token=fff6373417bafa13fbefc66605a2462d46701e85-a65e02228b561d4515f00716a9fefa2e-1566593844-1566583044
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/Miras-webtvonlive-com.jpg" group-title="",Miras (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/Miras-webtvonlive-com.jpg" group-title="",Miras
 https://alpha.tv.online.tm/legacyhls/ch003_720/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/Miras-webtvonlive-com.jpg" group-title="",Miras (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/Miras-webtvonlive-com.jpg" group-title="",Miras
 https://str-4.mediabay.tv/TM_Miras/playlist.m3u8?token=758f2706f867c489d03741550e0ad6e6a1f27b61-9fe26d03a43bf6c65e83737fd5353a0c-1566593755-1566582955
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/T%C3%BCrkmen-Owazy-webtvonlive-com.jpg" group-title="",Türkmen Owazy (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/T%C3%BCrkmen-Owazy-webtvonlive-com.jpg" group-title="",Türkmen Owazy
 https://alpha.tv.online.tm/legacyhls/ch005_720/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/T%C3%BCrkmen-Owazy-webtvonlive-com.jpg" group-title="",Türkmen Owazy (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/T%C3%BCrkmen-Owazy-webtvonlive-com.jpg" group-title="",Türkmen Owazy
 https://str-3.mediabay.tv/TM_Owazy/playlist.m3u8?token=1de76f33624c4182be24f9a405ad9f8deef34dab-f526812f825dc04ef0778060c2dcad62-1566593879-1566583079
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Türkmenistan Sport (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Türkmenistan Sport
 http://217.174.225.146/hls/ch004_720/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Türkmenistan Sport (Opt-2)
-https://alpha.tv.online.tm/hls/ch004_720/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Türkmenistan Sport (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Türkmenistan Sport
 http://217.174.225.146/legacyhls/ch004_720/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tv-online.in/wp-content/uploads/2015/09/Turkmen-sport-logo.jpg" group-title="Sport",Türkmenistan Sport (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Türkmenistan Sport
+https://alpha.tv.online.tm/hls/ch004_720/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tv-online.in/wp-content/uploads/2015/09/Turkmen-sport-logo.jpg" group-title="Sport",Türkmenistan Sport
 https://alpha.tv.online.tm/legacyhls/ch004_720/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tv-online.in/wp-content/uploads/2015/09/Turkmen-sport-logo.jpg" group-title="Sport",Türkmenistan Sport (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tv-online.in/wp-content/uploads/2015/09/Turkmen-sport-logo.jpg" group-title="Sport",Türkmenistan Sport
 https://str-4.mediabay.tv/TMSport/playlist.m3u8?token=139c3b01a4ce022eddd5a94da74bfbcc6a1c3463-e24987dc7a082fe9515692abbcf638e5-1566593681-1566582881
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tdh.gov.tm/static/logo/7.png" group-title="",Türkmenistan TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tdh.gov.tm/static/logo/7.png" group-title="",Türkmenistan TV
 http://alpha.tv.online.tm/hls/ch007_400/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tdh.gov.tm/static/logo/7.png" group-title="",Türkmenistan TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tdh.gov.tm/static/logo/7.png" group-title="",Türkmenistan TV
 https://str-4.mediabay.tv/Turkmenistan/playlist.m3u8?token=c49a3ef1f1cdfa223ae5118ce01c0add98d28ab5-8182aa7b17659070aa92753382c6f5fb-1566593792-1566582992
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/Yaslyk-webtvonlive-com.jpg" group-title="",Yaslyk TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/Yaslyk-webtvonlive-com.jpg" group-title="",Yaslyk TV
 https://alpha.tv.online.tm/legacyhls/ch002_720/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/Yaslyk-webtvonlive-com.jpg" group-title="",Yaslyk TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/Yaslyk-webtvonlive-com.jpg" group-title="",Yaslyk TV
 https://str-2.mediabay.tv/Yaslyk/playlist.m3u8?token=7448f4f8fbe8702c565207ea9b679448c749343d-a9cc42b62c4c6e9bb9ced45b81d289c1-1566593711-1566582911
diff --git a/channels/tn.m3u b/channels/tn.m3u
index f83c3794b..cb2b02590 100644
--- a/channels/tn.m3u
+++ b/channels/tn.m3u
@@ -3,7 +3,7 @@
 http://livecdnh2.tvanywhere.ae/hls/nessma/04.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://saheltv.tn/wp-content/uploads/2018/03/saheltv_logox2.png" group-title="",Sahel TV
 http://142.44.214.231:1935/saheltv/myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/cZM2t0P.png" group-title="",Tunisie Immobilier TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/cZM2t0P.png" group-title="",Tunisie Immobilier TV
 http://serv30.vintera.tv:8081/africa/tunisieimmob/chunks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/cZM2t0P.png" group-title="",Tunisie Immobilier TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/cZM2t0P.png" group-title="",Tunisie Immobilier TV
 https://5ac31d8a4c9af.streamlock.net/tunimmob/myStream/chunklist.m3u8
diff --git a/channels/tr.m3u b/channels/tr.m3u
index 6f55f5474..bc726e7e5 100644
--- a/channels/tr.m3u
+++ b/channels/tr.m3u
@@ -1,9 +1,9 @@
 #EXTM3U x-tvg-url="http://195.154.221.171/epg/guideturkey.xml.gz"
 #EXTINF:-1 tvg-id="A Haber TR" tvg-name="A Haber TR" tvg-logo="" group-title="News",A Haber
 http://trkvz-m.ercdn.net/trkvz-temp/ahaberhdm.m3u8
-#EXTINF:-1 tvg-id="A Spor TR" tvg-name="A Spor TR" tvg-logo="" group-title="Sport",A Spor (Opt-1)
+#EXTINF:-1 tvg-id="A Spor TR" tvg-name="A Spor TR" tvg-logo="" group-title="Sport",A Spor
 http://trkvz-m.ercdn.net/trkvz-temp/asporhdm.m3u8
-#EXTINF:-1 tvg-id="A Spor TR" tvg-name="A Spor TR" tvg-logo="https://i.imgur.com/B8ML0VM.png" group-title="Sport",A Spor (Opt-2)
+#EXTINF:-1 tvg-id="A Spor TR" tvg-name="A Spor TR" tvg-logo="https://i.imgur.com/B8ML0VM.png" group-title="Sport",A Spor
 https://trkvz-m.ercdn.net/trkvz-temp/asporhdm.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://akilli.tv/assets/img/logo.png" group-title="",Akilli TV
 http://akillitvhls.cdn.streamprovider.net/chunklist.m3u8
@@ -17,9 +17,9 @@ http://e7wfgmi6.blue.onyxservers.com/hls-live/livepkgr/_definst_/liveevent/Amozh
 http://trkvz-m.ercdn.net/trkvz-temp/atvhdm.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Ben TV
 http://kanalben.cubecdn.net/live/kanalben1.m3u8
-#EXTINF:-1 tvg-id="Beyaz TV HD TR" tvg-name="Beyaz TV HD TR" tvg-logo="https://i.imgur.com/eTJIlt9.jpg" group-title="",Beyaz TV (Opt-1)
+#EXTINF:-1 tvg-id="Beyaz TV HD TR" tvg-name="Beyaz TV HD TR" tvg-logo="https://i.imgur.com/eTJIlt9.jpg" group-title="",Beyaz TV
 http://streams2.livetv.az/turk/beyaz/playlist.m3u8
-#EXTINF:-1 tvg-id="Beyaz TV HD TR" tvg-name="Beyaz TV HD TR" tvg-logo="https://i.imgur.com/eTJIlt9.jpg" group-title="",Beyaz TV (Opt-2)
+#EXTINF:-1 tvg-id="Beyaz TV HD TR" tvg-name="Beyaz TV HD TR" tvg-logo="https://i.imgur.com/eTJIlt9.jpg" group-title="",Beyaz TV
 https://streams.livetv.az/turk/beyaz/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.brtk.net/wp-content/themes/brtk_theme/images/brt1-logo.png" group-title="",BRT 1 (Kıbrıs)
 http://wms.brtk.net:1935/live/brt1/playlist.m3u8
@@ -29,15 +29,15 @@ http://wms.brtk.net:1935/live/brt2/BratuMarian.m3u8
 http://wms.brtk.net:1935/live/brt2/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://cantv.tv/wp-content/uploads/2019/04/cropped-can_tv_web_site_logo_00-300x141.png" group-title="",Can TV
 http://canbroadcast.com:7000/canlican/tv.m3u8
-#EXTINF:-1 tvg-id="Cartoon Network TR" tvg-name="Cartoon Network TR" tvg-logo="https://i.imgur.com/7R5GZ6x.jpg" group-title="",Cartoon Network Turkiye (Opt-1)
+#EXTINF:-1 tvg-id="Cartoon Network TR" tvg-name="Cartoon Network TR" tvg-logo="https://i.imgur.com/7R5GZ6x.jpg" group-title="",Cartoon Network Turkiye
 http://streams2.livetv.az/turk/cartoon/playlist.m3u8
-#EXTINF:-1 tvg-id="Cartoon Network TR" tvg-name="Cartoon Network TR" tvg-logo="https://i.imgur.com/7R5GZ6x.jpg" group-title="",Cartoon Network Turkiye (Opt-2)
+#EXTINF:-1 tvg-id="Cartoon Network TR" tvg-name="Cartoon Network TR" tvg-logo="https://i.imgur.com/7R5GZ6x.jpg" group-title="",Cartoon Network Turkiye
 https://streams.livetv.az/turk/cartoon/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://sport-tv-guide.live/images/tv-station-cay-tv-895.png" group-title="",Cay TV
 http://stream2.taksimbilisim.com:1935/caytv/bant1/CAYTV.m3u8
-#EXTINF:-1 tvg-id="CNN TURK TR" tvg-name="CNN TURK TR" tvg-logo="https://i.imgur.com/iarVuFy.png" group-title="News",CNN Türk (Opt-1)
+#EXTINF:-1 tvg-id="CNN TURK TR" tvg-name="CNN TURK TR" tvg-logo="https://i.imgur.com/iarVuFy.png" group-title="News",CNN Türk
 http://2122248091.dogannet.tv/S2/HLS_LIVE/cnn_turk/1000/prog_index.m3u8
-#EXTINF:-1 tvg-id="CNN TURK TR" tvg-name="CNN TURK TR" tvg-logo="https://i.imgur.com/iarVuFy.png" group-title="News",CNN Türk (Opt-2)
+#EXTINF:-1 tvg-id="CNN TURK TR" tvg-name="CNN TURK TR" tvg-logo="https://i.imgur.com/iarVuFy.png" group-title="News",CNN Türk
 https://212224109111.dogannet.tv/S2/HLS_LIVE/cnnturknp/track_4_1000/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/yhzxKnt.png" group-title="",CRI Turk Belgesel
 http://cri.aa.net.tr:1935/belgesel/belgesel/chunklist_w120871004.m3u8
@@ -47,30 +47,30 @@ http://live.arkumedia.com:1935/dersim62tv/dersim62tv/playlist.m3u8
 https://streams.livetv.az/turk/disney/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Diyar TV
 https://str-2.mediabay.tv/DiyarTV/playlist.m3u8?token=9ca167a41f306672dd8e311018b71f7bb179e77c-3450c98733509050673afb0b0fc05544-1566585192-1566574392
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",DMAX (Opt-1)
-https://jviqfbc2.rocketcdn.com/dmax.smil/chunklist_b496000_sltur.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/MwuqE6S.jpg" group-title="",DMAX (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/MwuqE6S.jpg" group-title="",DMAX
 https://jviqfbc2.rocketcdn.com/dmax.smil/chunklist_b2328000_sltur.m3u8
-#EXTINF:-1 tvg-id="Dream TV TR" tvg-name="Dream TV TR" tvg-logo="" group-title="",Dream TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",DMAX
+https://jviqfbc2.rocketcdn.com/dmax.smil/chunklist_b496000_sltur.m3u8
+#EXTINF:-1 tvg-id="Dream TV TR" tvg-name="Dream TV TR" tvg-logo="" group-title="",Dream TV
 http://bit.ly/2mjP1Di
-#EXTINF:-1 tvg-id="Dream TV TR" tvg-name="Dream TV TR" tvg-logo="https://iptv.live/images/logo/channel/smalls/def6e6a0f57052cc936abe5f49207b85.png" group-title="",Dream TV (Opt-2)
-https://live.dogannet.tv/S2/HLS_LIVE/dreamtv/1000/prog_index.m3u8
-#EXTINF:-1 tvg-id="Dream TV TR" tvg-name="Dream TV TR" tvg-logo="https://s.dreamtv.com.tr/assets/dist/images/dream-tv-logo.png" group-title="",Dream TV (Opt-3)
+#EXTINF:-1 tvg-id="Dream TV TR" tvg-name="Dream TV TR" tvg-logo="https://s.dreamtv.com.tr/assets/dist/images/dream-tv-logo.png" group-title="",Dream TV
 http://live.dogannet.tv/S2/HLS_LIVE/dreamtv/index.m3u8
+#EXTINF:-1 tvg-id="Dream TV TR" tvg-name="Dream TV TR" tvg-logo="https://iptv.live/images/logo/channel/smalls/def6e6a0f57052cc936abe5f49207b85.png" group-title="",Dream TV
+https://live.dogannet.tv/S2/HLS_LIVE/dreamtv/1000/prog_index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.eurostartv.com.tr/Content/img/logo.png" group-title="",EuroStar
 http://xrklj56s.rocketcdn.com/eurostar.stream_360p/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HdXaTr8.png" group-title="",Ezidxan TV
 http://217.79.179.96/EZIDXANTV/1080/HD/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="FOX TR" tvg-name="FOX TR" tvg-logo="https://static.iptv-epg.com/gb/FOX.uk.png" group-title="",FOX (Opt-1)
+#EXTINF:-1 tvg-id="FOX TR" tvg-name="FOX TR" tvg-logo="https://static.iptv-epg.com/gb/FOX.uk.png" group-title="",FOX
 http://streams2.livetv.az/turk/fox_stream/playlist.m3u8
-#EXTINF:-1 tvg-id="FOX TR" tvg-name="FOX TR" tvg-logo="https://static.iptv-epg.com/gb/FOX.uk.png" group-title="",FOX (Opt-2)
+#EXTINF:-1 tvg-id="FOX TR" tvg-name="FOX TR" tvg-logo="https://static.iptv-epg.com/gb/FOX.uk.png" group-title="",FOX
 https://blutv-beta.akamaized.net/foxtvhd/foxtvhd.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="HABERTURK TR" tvg-name="HABERTURK TR" tvg-logo="http://www.hdtvler.tv//media/images/tvlogo/7678c74d-3003-415c-8a90-d50bf31531b6_haberturk-turk-hd.jpg" group-title="News",Habertürk TV
 http://soledge7.dogannet.tv/S1/HLS_LIVE/haberturk/1000/prog_index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Nx2Cyq0.png" group-title="",Istanbul Metropolitan Municipality (Opt-1)
-http://wowza.istweb.tv:1935/dp/istanbul2/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Istanbul Metropolitan Municipality (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Istanbul Metropolitan Municipality
 http://wowza.istweb.tv:1935/dp/istanbul2/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Nx2Cyq0.png" group-title="",Istanbul Metropolitan Municipality
+http://wowza.istweb.tv:1935/dp/istanbul2/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.freeetv.com/images/03_logo/kanal19_Turkey.jpg" group-title="",Kanal 19
 http://live.arkumedia.com:1935/kanal19tv/kanal19tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/uHAGsRk.png" group-title="",Kanal 3
@@ -79,42 +79,42 @@ http://stream.taksimbilisim.com:1935/kanal3/bant1/Kanal3.m3u8?fluxustv.m3u8
 https://blutv-beta.akamaized.net/kanal7hd/kanal7hd.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Kanal D
 http://185102219109.dogannet.tv/S1/HLS_LIVE/kanald/1000/prog_index.m3u8
-#EXTINF:-1 tvg-id="Kanal D TR" tvg-name="Kanal D TR" tvg-logo="http://www.yilmaztv.com/logo/kanal-d.png" group-title="",Kanal D (Opt-1)
-http://212.224.109.109/S2/HLS_LIVE/kanald/500/prog_index.m3u8
-#EXTINF:-1 tvg-id="Kanal D TR" tvg-name="Kanal D TR" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/379.png" group-title="",Kanal D (Opt-2)
+#EXTINF:-1 tvg-id="Kanal D TR" tvg-name="Kanal D TR" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/379.png" group-title="",Kanal D
 http://18515265153.dogannet.tv/S2/HLS_LIVE/kanaldnp/track_1_320/playlist.m3u8?
-#EXTINF:-1 tvg-id="Kanal D TR" tvg-name="Kanal D TR" tvg-logo="http://www.yilmaztv.com/logo/kanal-d.png" group-title="",Kanal D (Opt-3)
+#EXTINF:-1 tvg-id="Kanal D TR" tvg-name="Kanal D TR" tvg-logo="http://www.yilmaztv.com/logo/kanal-d.png" group-title="",Kanal D
 http://188.138.9.246/S2/HLS_LIVE/kanald/index.m3u8
-#EXTINF:-1 tvg-id="Kanal D TR" tvg-name="Kanal D TR" tvg-logo="http://www.yilmaztv.com/logo/kanal-d.png" group-title="",Kanal D (Opt-4)
+#EXTINF:-1 tvg-id="Kanal D TR" tvg-name="Kanal D TR" tvg-logo="http://www.yilmaztv.com/logo/kanal-d.png" group-title="",Kanal D
 http://212.224.109.109/S2/HLS_LIVE/kanald/1000/prog_index.m3u8
-#EXTINF:-1 tvg-id="Kanal D TR" tvg-name="Kanal D TR" tvg-logo="http://oklivetv.com/wp-content/uploads/2015/05/kanal-d-hd-logo-resmi.png" group-title="",Kanal D (Opt-5)
+#EXTINF:-1 tvg-id="Kanal D TR" tvg-name="Kanal D TR" tvg-logo="http://www.yilmaztv.com/logo/kanal-d.png" group-title="",Kanal D
+http://212.224.109.109/S2/HLS_LIVE/kanald/500/prog_index.m3u8
+#EXTINF:-1 tvg-id="Kanal D TR" tvg-name="Kanal D TR" tvg-logo="http://oklivetv.com/wp-content/uploads/2015/05/kanal-d-hd-logo-resmi.png" group-title="",Kanal D
 https://soledge7.dogannet.tv/S2/HLS_LIVE/kanald/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/UbVZFtm.png" group-title="",Kanal Urfa
 http://stream.taksimbilisim.com:1935/kanalurfa/bant1/chunklist_w1042205694.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/D8uqiZD.jpg" group-title="",Kon TV
 https://59cba4d34b678.streamlock.net/live/kontv/chunklist_w286386544.m3u8
-#EXTINF:-1 tvg-id="Kral Pop TR" tvg-name="Kral Pop TR" tvg-logo="" group-title="Music",Kral Pop (Opt-1)
-http://bqgsd19q.rocketcdn.com/kralpop_720/chunklist.m3u8
-#EXTINF:-1 tvg-id="Kral Pop TR" tvg-name="Kral Pop TR" tvg-logo="https://pbs.twimg.com/profile_images/468714376023666688/30svdqHA_400x400.png" group-title="Music",Kral Pop (Opt-2)
+#EXTINF:-1 tvg-id="Kral Pop TR" tvg-name="Kral Pop TR" tvg-logo="https://pbs.twimg.com/profile_images/468714376023666688/30svdqHA_400x400.png" group-title="Music",Kral Pop
 http://0ajuu84p.rocketcdn.com/kralpop_720/chunklist.m3u8
+#EXTINF:-1 tvg-id="Kral Pop TR" tvg-name="Kral Pop TR" tvg-logo="" group-title="Music",Kral Pop
+http://bqgsd19q.rocketcdn.com/kralpop_720/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tvsefasi.com/images/tvlogo/kralpopakustik.png" group-title="Music",Kral POP Akustik
 http://dmu3sqri.rocketcdn.com/kraldijital-akustiktv.smil/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://3.bp.blogspot.com/-jTr_QYPH05c/V7HPOLRjYrI/AAAAAAAAQO8/XrTNox9lXU0aUJMy6srE3z3ewAYZjnQwgCLcB/s1600/kralpopkonser.jpg" group-title="Music",Kral Pop Konser
 http://0ajuu84p.rocketcdn.com/kraldijital-popkonsertv.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="Kral TV TR" tvg-name="Kral TV TR" tvg-logo="http://www.giniko.com/logos/190x110/395.png" group-title="",Kral TV (Opt-1)
-http://mid5dg6m.rocketcdn.com/kraltv_720/chunklist.m3u8
-#EXTINF:-1 tvg-id="Kral TV TR" tvg-name="Kral TV TR" tvg-logo="http://www.giniko.com/logos/190x110/395.png" group-title="",Kral TV (Opt-2)
+#EXTINF:-1 tvg-id="Kral TV TR" tvg-name="Kral TV TR" tvg-logo="http://www.giniko.com/logos/190x110/395.png" group-title="",Kral TV
 http://0ajuu84p.rocketcdn.com/kraltv_720/chunklist.m3u8
+#EXTINF:-1 tvg-id="Kral TV TR" tvg-name="Kral TV TR" tvg-logo="http://www.giniko.com/logos/190x110/395.png" group-title="",Kral TV
+http://mid5dg6m.rocketcdn.com/kraltv_720/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://muzrad.com/wp-content/uploads/2015/11/muzrad_kral-world-radio-8-ilde-yayinda.jpg" group-title="",Kral World
 http://stmpo0wa.rocketcdn.com/kralworldtv_720/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LcUYuJ5.png" group-title="Music",Med Muzîk
 http://137.74.205.201/live3/mm-3mbps.m3u8
 #EXTINF:-1 tvg-id="Minika GO TR" tvg-name="Minika GO TR" tvg-logo="http://i.minika.com.tr/go/site/v1/i/goLogo.png" group-title="",Minika Go
 http://streams2.livetv.az/turk/minika_go/playlist.m3u8
-#EXTINF:-1 tvg-id="NTV TR" tvg-name="NTV TR" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/b/b5/NTV_logo.png" group-title="News",NTV (Opt-1)
-https://nt4p9nef.rocketcdn.com/ntvhd.stream_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="NTV TR" tvg-name="NTV TR" tvg-logo="" group-title="News",NTV (Opt-2)
+#EXTINF:-1 tvg-id="NTV TR" tvg-name="NTV TR" tvg-logo="" group-title="News",NTV
 http://nt4p9nef.rocketcdn.com/ntvhd.stream_360p/chunklist.m3u8
+#EXTINF:-1 tvg-id="NTV TR" tvg-name="NTV TR" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/b/b5/NTV_logo.png" group-title="News",NTV
+https://nt4p9nef.rocketcdn.com/ntvhd.stream_720p/chunklist.m3u8
 #EXTINF:-1 tvg-id="NTV Spor TR" tvg-name="NTV Spor TR" tvg-logo="https://i.imgur.com/hzrFNZQ.png" group-title="Sport",NTV Spor
 http://46.105.233.106:8181/hls/ntvspor/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ON4 TV
@@ -123,16 +123,16 @@ http://yayin.netradyom.com:1935/live/on4/playlist.m3u8
 http://source2.primetime.ch:2981/play/royaltv/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.rudaw.net/ContentFilesArchive/137909Image1.jpg" group-title="",Rudaw
 https://svs.itworkscdn.net/rudawlive/rudawlive.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="Semerkand TV TR" tvg-name="Semerkand TV TR" tvg-logo="" group-title="",Semerkand TV (Opt-1)
-http://semerkandglb.mediatriple.net:1935/semerkandliveedge/semerkand1/master.m3u8
-#EXTINF:-1 tvg-id="Semerkand TV TR" tvg-name="Semerkand TV TR" tvg-logo="" group-title="",Semerkand TV (Opt-2)
-http://semerkandglb.mediatriple.net:1935/semerkandliveedge/semerkand1/radyodelisi.m3u8
-#EXTINF:-1 tvg-id="Semerkand TV TR" tvg-name="Semerkand TV TR" tvg-logo="" group-title="",Semerkand TV (Opt-3)
+#EXTINF:-1 tvg-id="Semerkand TV TR" tvg-name="Semerkand TV TR" tvg-logo="" group-title="",Semerkand TV
 http://semerkandglb.mediatriple.net/semerkandliveedge/semerkand3/sansar.m3u8
-#EXTINF:-1 tvg-id="Semerkand TV TR" tvg-name="Semerkand TV TR" tvg-logo="" group-title="",Semerkand TV (Opt-4)
+#EXTINF:-1 tvg-id="Semerkand TV TR" tvg-name="Semerkand TV TR" tvg-logo="" group-title="",Semerkand TV
 http://semerkandglb.mediatriple.net:1935/semerkandliveedge/semerkand1/BratuMarian.m3u8
-#EXTINF:-1 tvg-id="Semerkand TV TR" tvg-name="Semerkand TV TR" tvg-logo="" group-title="",Semerkand TV (Opt-5)
+#EXTINF:-1 tvg-id="Semerkand TV TR" tvg-name="Semerkand TV TR" tvg-logo="" group-title="",Semerkand TV
+http://semerkandglb.mediatriple.net:1935/semerkandliveedge/semerkand1/master.m3u8
+#EXTINF:-1 tvg-id="Semerkand TV TR" tvg-name="Semerkand TV TR" tvg-logo="" group-title="",Semerkand TV
 http://semerkandglb.mediatriple.net:1935/semerkandliveedge/semerkand1/playlist.m3u8
+#EXTINF:-1 tvg-id="Semerkand TV TR" tvg-name="Semerkand TV TR" tvg-logo="" group-title="",Semerkand TV
+http://semerkandglb.mediatriple.net:1935/semerkandliveedge/semerkand1/radyodelisi.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Seven
 http://97.107.115.84:1935/live/myStream2/playlist.m3u8
 #EXTINF:-1 tvg-id="Show TR" tvg-name="Show TR" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/4/4b/Show_TV.svg/800px-Show_TV.svg.png" group-title="",Show
@@ -141,19 +141,19 @@ http://streams2.livetv.az/turk/showtv/playlist.m3u8
 http://speda.teradek.live:1935/live/spedahd/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GAmKpO6.png" group-title="Sport",Sports TV
 https://mn-nl.mncdn.com/blutv_live/sportstv/sportstv.smil/chunklist_b1596000_sltur.m3u8
-#EXTINF:-1 tvg-id="Star TV HD TR" tvg-name="Star TV HD TR" tvg-logo="https://i.imgur.com/2jKvBsQ.jpg" group-title="",Star TV (Opt-1)
+#EXTINF:-1 tvg-id="Star TV HD TR" tvg-name="Star TV HD TR" tvg-logo="https://i.imgur.com/2jKvBsQ.jpg" group-title="",Star TV
 http://lcgid8xu.rocketcdn.com/startvhd.stream_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="Star TV HD TR" tvg-name="Star TV HD TR" tvg-logo="https://i.imgur.com/2jKvBsQ.jpg" group-title="",Star TV (Opt-2)
+#EXTINF:-1 tvg-id="Star TV HD TR" tvg-name="Star TV HD TR" tvg-logo="https://i.imgur.com/2jKvBsQ.jpg" group-title="",Star TV
 https://blutv-beta.akamaized.net/startvhd/startvhd.smil/chunklist_b2628000_sltur.m3u8
-#EXTINF:-1 tvg-id="Star TV HD TR" tvg-name="Star TV HD TR" tvg-logo="https://i.imgur.com/2jKvBsQ.jpg" group-title="",Star TV (Opt-3)
+#EXTINF:-1 tvg-id="Star TV HD TR" tvg-name="Star TV HD TR" tvg-logo="https://i.imgur.com/2jKvBsQ.jpg" group-title="",Star TV
 https://streams.livetv.az/turk/star_stream/chunks.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TBMM TV
 http://mecliscanlitv-lh.akamaihd.net:80/i/MECLISTV_1@127503/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/c/ca/Teve2_logo.png" group-title="",Teve 2
 http://soledge7.dogannet.tv/S1/HLS_LIVE/tv2/1000/prog_index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://pbs.twimg.com/profile_images/458666982905098240/Ef3T7N7P.png" group-title="",TGRT Belgesel (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://pbs.twimg.com/profile_images/458666982905098240/Ef3T7N7P.png" group-title="",TGRT Belgesel
 http://cdn1.streamencoding.com:1935/tgrt_belgesel/amlst:live-30/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.hdtvizle.net/test/uploads/posts/2015-07/1438125096_tgrtbelgesel.png" group-title="",TGRT Belgesel (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.hdtvizle.net/test/uploads/posts/2015-07/1438125096_tgrtbelgesel.png" group-title="",TGRT Belgesel
 http://cdn1.streamencoding.com:1935/tgrt_belgesel/tgrt3/playlist.m3u8
 #EXTINF:-1 tvg-id="TGRT Haber TR" tvg-name="TGRT Haber TR" tvg-logo="http://www.hdtvizle.net/test/uploads/posts/2015-08/1438599705_tgrthaber.png" group-title="News",TGRT Haber
 http://cdn1.streamencoding.com:1935/tgrt_haber/tgrt3/playlist.m3u8
@@ -165,23 +165,23 @@ http://tjktv.ercdn.net/tjktv.m3u8
 https://pa9agxjg.rocketcdn.com/tlctv.smil/chunklist_b2328000_sltur.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iJIHMq9.png" group-title="News",TRT Arabi
 http://trtcanlitv-lh.akamaihd.net/i/TRTARAPCA_1@181945/master.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="TRT Cocuk TR" tvg-name="TRT Cocuk TR" tvg-logo="http://trthaberstatic.s3-website-eu-west-1.amazonaws.com/resimler/542000/543144.jpg" group-title="Kids",TRT Cocuk (Opt-1)
+#EXTINF:-1 tvg-id="TRT Cocuk TR" tvg-name="TRT Cocuk TR" tvg-logo="http://trthaberstatic.s3-website-eu-west-1.amazonaws.com/resimler/542000/543144.jpg" group-title="Kids",TRT Cocuk
 http://trtcanlitv-lh.akamaihd.net/i/TRTCOCUK_1@181844/master.m3u8
-#EXTINF:-1 tvg-id="TRT Cocuk TR" tvg-name="TRT Cocuk TR" tvg-logo="http://trthaberstatic.s3-website-eu-west-1.amazonaws.com/resimler/542000/543144.jpg" group-title="Kids",TRT Cocuk (Opt-2)
+#EXTINF:-1 tvg-id="TRT Cocuk TR" tvg-name="TRT Cocuk TR" tvg-logo="http://trthaberstatic.s3-website-eu-west-1.amazonaws.com/resimler/542000/543144.jpg" group-title="Kids",TRT Cocuk
 https://str-3.mediabay.tv/TRT_COCUK/playlist.m3u8?token=ae192ecfc9730d2d1b47643043738be2539930dd-e237b85f4e92acc5c7f8e16763e43529-1566585321-1566574521
 #EXTINF:-1 tvg-id="TRT Diyanet TR" tvg-name="TRT Diyanet TR" tvg-logo="https://www.diyanet.tv/Diyanet-Theme/images/logo.png" group-title="",TRT Diyanet
 https://nocvp-usd.noccdn.net/asset/7wGduAH1/chunklist.m3u8
-#EXTINF:-1 tvg-id="TRT Haber TR" tvg-name="TRT Haber TR" tvg-logo="https://pbs.twimg.com/media/CyVPO6MW8AAvy-0.jpg" group-title="News",TRT Haber (Opt-1)
+#EXTINF:-1 tvg-id="TRT Haber TR" tvg-name="TRT Haber TR" tvg-logo="https://pbs.twimg.com/media/CyVPO6MW8AAvy-0.jpg" group-title="News",TRT Haber
 http://trtcanlitv-lh.akamaihd.net/i/TRTHABERHD_1@181942/master.m3u8
-#EXTINF:-1 tvg-id="TRT Haber TR" tvg-name="TRT Haber TR" tvg-logo="https://pbs.twimg.com/media/CyVPO6MW8AAvy-0.jpg" group-title="News",TRT Haber (Opt-2)
+#EXTINF:-1 tvg-id="TRT Haber TR" tvg-name="TRT Haber TR" tvg-logo="https://pbs.twimg.com/media/CyVPO6MW8AAvy-0.jpg" group-title="News",TRT Haber
 https://str-3.mediabay.tv/TRT_Haber/playlist.m3u8?token=b63717abb6e7a1f4387ca4a281fc0394849efe81-e8f5c9ec66a95bf92943345f09490f39-1566585413-1566574613
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TRT Kurdi
 http://trtcanlitv-lh.akamaihd.net/i/TRT6_1@181944/master.m3u8
 #EXTINF:-1 tvg-id="TRT Muzik TR" tvg-name="TRT Muzik TR" tvg-logo="http://www.canlitv.gallery/wp-content/uploads/2016/09/trtmuzik-tv-canli.png" group-title="Music",TRT Muzik
 http://trtcanlitv-lh.akamaihd.net/i/TRTMUZIK_1@181845/master.m3u8
-#EXTINF:-1 tvg-id="TRT Spor TR" tvg-name="TRT Spor TR" tvg-logo="" group-title="Sport",TRT Spor (Opt-1)
+#EXTINF:-1 tvg-id="TRT Spor TR" tvg-name="TRT Spor TR" tvg-logo="" group-title="Sport",TRT Spor
 http://trtcanlitv-lh.akamaihd.net/i/TRTSPOR1_1@182042/master.m3u8
-#EXTINF:-1 tvg-id="TRT Spor TR" tvg-name="TRT Spor TR" tvg-logo="https://trtkurumsal.trt.net.tr/Uploads/image/png/2019-03-20-11.23.47/26a2ed090ada4b9fba97b3fcab3551d7_w_118.png" group-title="Sport",TRT Spor (Opt-2)
+#EXTINF:-1 tvg-id="TRT Spor TR" tvg-name="TRT Spor TR" tvg-logo="https://trtkurumsal.trt.net.tr/Uploads/image/png/2019-03-20-11.23.47/26a2ed090ada4b9fba97b3fcab3551d7_w_118.png" group-title="Sport",TRT Spor
 https://mn-nl.mncdn.com/blutv_live/trtsporhd/trtsporhd.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://webtvonlive.com/wp-content/uploads/tv4-webtvonlive-com.jpg" group-title="",TV 4
 https://mn-nl.mncdn.com/karamel/karamel/chunklist.m3u8
diff --git a/channels/tz.m3u b/channels/tz.m3u
index 5bf91c230..5c75e9b91 100644
--- a/channels/tz.m3u
+++ b/channels/tz.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Wf2BlTG.png" group-title="",IBN TV (TZ) (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Wf2BlTG.png" group-title="",IBN TV (TZ)
 http://138.68.138.119:8080/low/5a8993709ea19/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Wf2BlTG.png" group-title="",IBN TV (TZ) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Wf2BlTG.png" group-title="",IBN TV (TZ)
 http://159.65.95.207/hls/stream.m3u8
diff --git a/channels/ua.m3u b/channels/ua.m3u
index 12289467b..fdfbb46e1 100644
--- a/channels/ua.m3u
+++ b/channels/ua.m3u
@@ -1,53 +1,53 @@
 #EXTM3U x-tvg-url="https://iptvx.one/epg/epg.xml.gz"
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.freeintertv.com/modules/Main/image/100news.jpg" group-title="",100% News (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.freeintertv.com/modules/Main/image/100news.jpg" group-title="",100% News
 http://85.238.112.40:8810/hls_sec/239.17.16.32-.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://xmtvplayer.com/chan-imgs/100_percent_news.png" group-title="",100% News (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://xmtvplayer.com/chan-imgs/100_percent_news.png" group-title="",100% News
 http://85.238.112.40:8810/hls_sec/239.33.16.32-.m3u8
 #EXTINF:-1 tvg-id="11kanal" tvg-name="11 канал Днепр" tvg-logo="https://www.11tv.dp.ua/res/gfx/11logo300X300.jpg" group-title="",11 канал (Днепр)
 http://212.3.106.230/hls-live/live/_definst_/liveevent/livestream.m3u8
-#EXTINF:-1 tvg-id="112-ua" tvg-name="112 Украина" tvg-logo="https://iptvx.one/icn/112.png" group-title="News",112 Україна (Opt-1)
-http://app.live.112.events/hls/112hd_mid/index.m3u8
-#EXTINF:-1 tvg-id="112-ua" tvg-name="112 Украина" tvg-logo="https://iptvx.one/icn/112.png" group-title="News",112 Україна (Opt-2)
-http://app.live.112.events/hls-ua/112hd_hi/index.m3u8
-#EXTINF:-1 tvg-id="112-ua" tvg-name="112 Украина" tvg-logo="https://iptvx.one/icn/112.png" group-title="News",112 Україна (Opt-3)
+#EXTINF:-1 tvg-id="112-ua" tvg-name="112 Украина" tvg-logo="https://iptvx.one/icn/112.png" group-title="News",112 Україна
 http://api.tv.ipnet.ua/api/v1/manifest/1442908080.m3u8
-#EXTINF:-1 tvg-id="112-ua" tvg-name="112 Украина" tvg-logo="https://iptvx.one/icn/112.png" group-title="News",112 Україна (Opt-4)
-http://app.live.112.events/hls-ua/112hd_mid/index.m3u8
-#EXTINF:-1 tvg-id="112-ua" tvg-name="112 Украина" tvg-logo="https://iptvx.one/icn/112.png" group-title="News",112 Україна (Opt-5)
+#EXTINF:-1 tvg-id="112-ua" tvg-name="112 Украина" tvg-logo="https://iptvx.one/icn/112.png" group-title="News",112 Україна
 http://api.tv.ipnet.ua/api/v1/manifest/1442908080.m3u8?codec=mpeg4&app=playlist
-#EXTINF:-1 tvg-id="112-ua" tvg-name="112 Украина" tvg-logo="https://iptvx.one/icn/112.png" group-title="News",112 Україна (Opt-6)
+#EXTINF:-1 tvg-id="112-ua" tvg-name="112 Украина" tvg-logo="https://iptvx.one/icn/112.png" group-title="News",112 Україна
+http://app.live.112.events/hls-ua/112hd_hi/index.m3u8
+#EXTINF:-1 tvg-id="112-ua" tvg-name="112 Украина" tvg-logo="https://iptvx.one/icn/112.png" group-title="News",112 Україна
+http://app.live.112.events/hls-ua/112hd_mid/index.m3u8
+#EXTINF:-1 tvg-id="112-ua" tvg-name="112 Украина" tvg-logo="https://iptvx.one/icn/112.png" group-title="News",112 Україна
 http://app.live.112.events/hls/112hd_hi/index.m3u8
-#EXTINF:-1 tvg-id="24news-ua" tvg-name="24 Украина" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/ab/24_Group_Ukraine_04.png" group-title="News",24 канал (Opt-1)
+#EXTINF:-1 tvg-id="112-ua" tvg-name="112 Украина" tvg-logo="https://iptvx.one/icn/112.png" group-title="News",112 Україна
+http://app.live.112.events/hls/112hd_mid/index.m3u8
+#EXTINF:-1 tvg-id="24news-ua" tvg-name="24 Украина" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/ab/24_Group_Ukraine_04.png" group-title="News",24 канал
 http://api.tv.ipnet.ua/api/v1/manifest/1293298050.m3u8
-#EXTINF:-1 tvg-id="24news-ua" tvg-name="24 Украина" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/ab/24_Group_Ukraine_04.png" group-title="News",24 канал (Opt-2)
-http://api.tv.ipnet.ua/api/v1/manifest/1293298050.m3u8?codec=mpeg4&app=playlist
-#EXTINF:-1 tvg-id="24news-ua" tvg-name="24 Украина" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/ab/24_Group_Ukraine_04.png" group-title="News",24 канал (Opt-3)
+#EXTINF:-1 tvg-id="24news-ua" tvg-name="24 Украина" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/ab/24_Group_Ukraine_04.png" group-title="News",24 канал
 http://api.tv.ipnet.ua/api/v1/manifest/1293298050.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="24news-ua" tvg-name="24 Украина" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/ab/24_Group_Ukraine_04.png" group-title="News",24 канал (Opt-4)
+#EXTINF:-1 tvg-id="24news-ua" tvg-name="24 Украина" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/ab/24_Group_Ukraine_04.png" group-title="News",24 канал
+http://api.tv.ipnet.ua/api/v1/manifest/1293298050.m3u8?codec=mpeg4&app=playlist
+#EXTINF:-1 tvg-id="24news-ua" tvg-name="24 Украина" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/a/ab/24_Group_Ukraine_04.png" group-title="News",24 канал
 http://streamvideol1.luxnet.ua/news24/smil:news24.stream.smil/chunklist_b1328800.m3u8
-#EXTINF:-1 tvg-id="34-dnepr" tvg-name="34 канал Днепр" tvg-logo="https://iptvx.one/icn/34.png" group-title="",34 канал (Днепр) (Opt-1)
+#EXTINF:-1 tvg-id="34-dnepr" tvg-name="34 канал Днепр" tvg-logo="https://iptvx.one/icn/34.png" group-title="",34 канал (Днепр)
 http://api.tv.ipnet.ua/api/v1/manifest/2118742463.m3u8
-#EXTINF:-1 tvg-id="34-dnepr" tvg-name="34 канал Днепр" tvg-logo="https://iptvx.one/icn/34.png" group-title="",34 канал (Днепр) (Opt-2)
+#EXTINF:-1 tvg-id="34-dnepr" tvg-name="34 канал Днепр" tvg-logo="https://iptvx.one/icn/34.png" group-title="",34 канал (Днепр)
 http://api.tv.ipnet.ua/api/v1/manifest/2118742463.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="rti" tvg-name="RTi" tvg-logo="" group-title="",4 канал (Opt-1)
-http://api.tv.ipnet.ua/api/v1/manifest/2118742331.m3u8?codec=mpeg4&app=playlist
-#EXTINF:-1 tvg-id="rti" tvg-name="RTi" tvg-logo="" group-title="",4 канал (Opt-2)
-http://api.tv.ipnet.ua/api/v1/manifest/2118742331.m3u8
-#EXTINF:-1 tvg-id="rti" tvg-name="RTi" tvg-logo="https://4channel.com.ua/wp-content/uploads/2018/04/4logo-main.png" group-title="",4 канал (Opt-3)
-http://cdn.vsnw.net:8081/interradio/1080i.m3u8
-#EXTINF:-1 tvg-id="rti" tvg-name="RTi" tvg-logo="" group-title="",4 канал (Opt-4)
-http://cdn.vsnw.net:8081/interradio/720i.m3u8
-#EXTINF:-1 tvg-id="rti" tvg-name="RTi" tvg-logo="" group-title="",4 канал (Opt-5)
-http://cdn.vsnw.net:8081/interradio/480i.m3u8
-#EXTINF:-1 tvg-id="rti" tvg-name="RTi" tvg-logo="" group-title="",4 канал (Opt-7)
+#EXTINF:-1 tvg-id="rti" tvg-name="RTi" tvg-logo="" group-title="",4 канал
 http://95.67.106.10/hls/nta_ua_hi/index.m3u8
-#EXTINF:-1 tvg-id="rti" tvg-name="RTi" tvg-logo="" group-title="",4 канал (Opt-8)
+#EXTINF:-1 tvg-id="rti" tvg-name="RTi" tvg-logo="" group-title="",4 канал
 http://95.67.106.10/hls/nta_ua_low/index.m3u8
-#EXTINF:-1 tvg-id="rti" tvg-name="RTi" tvg-logo="" group-title="",4 канал (Opt-9)
+#EXTINF:-1 tvg-id="rti" tvg-name="RTi" tvg-logo="" group-title="",4 канал
 http://95.67.106.10/hls/nta_ua_mid/index.m3u8
-#EXTINF:-1 tvg-id="5kanal-ua" tvg-name="5 канал Украина" tvg-logo="https://iptvx.one/icn/5ua.png" group-title="News",5 канал (Opt-1)
+#EXTINF:-1 tvg-id="rti" tvg-name="RTi" tvg-logo="" group-title="",4 канал
+http://api.tv.ipnet.ua/api/v1/manifest/2118742331.m3u8
+#EXTINF:-1 tvg-id="rti" tvg-name="RTi" tvg-logo="" group-title="",4 канал
+http://api.tv.ipnet.ua/api/v1/manifest/2118742331.m3u8?codec=mpeg4&app=playlist
+#EXTINF:-1 tvg-id="rti" tvg-name="RTi" 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="rti" tvg-name="RTi" tvg-logo="" group-title="",4 канал
+http://cdn.vsnw.net:8081/interradio/480i.m3u8
+#EXTINF:-1 tvg-id="rti" tvg-name="RTi" tvg-logo="" group-title="",4 канал
+http://cdn.vsnw.net:8081/interradio/720i.m3u8
+#EXTINF:-1 tvg-id="5kanal-ua" tvg-name="5 канал Украина" tvg-logo="https://iptvx.one/icn/5ua.png" group-title="News",5 канал
 http://api.tv.ipnet.ua/api/v1/manifest/1293299450.m3u8
-#EXTINF:-1 tvg-id="5kanal-ua" tvg-name="5 канал Украина" tvg-logo="https://iptvx.one/icn/5ua.png" group-title="News",5 канал (Opt-2)
+#EXTINF:-1 tvg-id="5kanal-ua" tvg-name="5 канал Украина" tvg-logo="https://iptvx.one/icn/5ua.png" group-title="News",5 канал
 http://api.tv.ipnet.ua/api/v1/manifest/1293299450.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="7kanal-odessa" tvg-name="7 канал Одесса" tvg-logo="" group-title="",7 канал (Одесса)
 http://cdn10.live-tv.od.ua:8081/7tvod/7tvod-abr/7tvod/7tvod/playlist.m3u8
@@ -55,77 +55,77 @@ http://cdn10.live-tv.od.ua:8081/7tvod/7tvod-abr/7tvod/7tvod/playlist.m3u8
 https://str-3.mediabay.tv/8Kanal_UA/playlist.m3u8?token=8e5150c623b32e0fb6739dc90a51ebb6abdd65d0-8e86cc5d7d55bdc0ddaa626cfcb9c324-1566590920-1566580120
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Antenna
 http://streamer.antenna.com.ua/hls/antenna.m3u8
-#EXTINF:-1 tvg-id="atr-ua" tvg-name="ATR" tvg-logo="https://iptvx.one/icn/atr-ua.png" group-title="Local",ATR (Opt-1)
-http://stream.atr.ua/atr/live/index.m3u8
-#EXTINF:-1 tvg-id="atr-ua" tvg-name="ATR" tvg-logo="https://iptvx.one/icn/atr-ua.png" group-title="Local",ATR (Opt-2)
+#EXTINF:-1 tvg-id="atr-ua" tvg-name="ATR" tvg-logo="https://iptvx.one/icn/atr-ua.png" group-title="Local",ATR
 http://api.tv.ipnet.ua/api/v1/manifest/2007308341.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://acrotv.com/images/broad/20190129103233812.jpg" group-title="Travel",BamBarBia TV (Opt-1)
-http://cdn1.live-tv.od.ua:8081/bbb/bbbtv-abr/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Travel",BamBarBia TV (Opt-2)
+#EXTINF:-1 tvg-id="atr-ua" tvg-name="ATR" tvg-logo="https://iptvx.one/icn/atr-ua.png" group-title="Local",ATR
+http://stream.atr.ua/atr/live/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Travel",BamBarBia TV
 http://cdn1.live-tv.od.ua:8081/bbb/bbbtv-abr/bbb/bbbtv-720p/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://acrotv.com/images/broad/20190129103233812.jpg" group-title="Travel",BamBarBia TV
+http://cdn1.live-tv.od.ua:8081/bbb/bbbtv-abr/playlist.m3u8
 #EXTINF:-1 tvg-id="cnl-eu" tvg-name="CNL Европа" tvg-logo="" group-title="Religious",CNL (Европа)
 http://live-mobile.cdn01.net/hls-live/202E1F/default/mobile/stream_10429_3.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ECO TV
 http://api.tv.ipnet.ua/api/v1/manifest/1311963170.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9c/GTV_/82017/9.svg/999px-GTV_/82017/9.svg.png" group-title="",GTV (Opt-1)
-http://cdn1.live-tv.od.ua:8081/a1od/gtvod-abr/a1od/gtvod-720p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",GTV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",GTV
 http://cdn1.live-tv.od.ua:8081/a1od/gtvod-abr/a1od/gtvod-480p/playlist.m3u8
-#EXTINF:-1 tvg-id="hdfashion" tvg-name="HDFashion" tvg-logo="" group-title="Fashion",HDFashion & LifeStyle (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9c/GTV_/82017/9.svg/999px-GTV_/82017/9.svg.png" group-title="",GTV
+http://cdn1.live-tv.od.ua:8081/a1od/gtvod-abr/a1od/gtvod-720p/playlist.m3u8
+#EXTINF:-1 tvg-id="hdfashion" tvg-name="HDFashion" tvg-logo="" group-title="Fashion",HDFashion & LifeStyle
 http://95.67.47.115/hls/hdfashion_ua_hi/index.m3u8
-#EXTINF:-1 tvg-id="hdfashion" tvg-name="HDFashion" tvg-logo="" group-title="Fashion",HDFashion & LifeStyle (Opt-2)
-http://95.67.47.115/hls/hdfashion_ua_mid/index.m3u8
-#EXTINF:-1 tvg-id="hdfashion" tvg-name="HDFashion" tvg-logo="https://files.company.fashiontv.com/wp-content/uploads/2017/03/fashiontv_logo_blue_horizontal.png" group-title="Fashion",HDFashion & LifeStyle (Opt-3)
+#EXTINF:-1 tvg-id="hdfashion" tvg-name="HDFashion" tvg-logo="https://files.company.fashiontv.com/wp-content/uploads/2017/03/fashiontv_logo_blue_horizontal.png" group-title="Fashion",HDFashion & LifeStyle
 http://95.67.47.115/hls/hdfashion_ua_hi/index.m3u8?xtreamiptv.m3u8
-#EXTINF:-1 tvg-id="id-fashion" tvg-name="ID Fashion" tvg-logo="" group-title="Fashion",ID Fashion (Opt-1)
+#EXTINF:-1 tvg-id="hdfashion" tvg-name="HDFashion" tvg-logo="" group-title="Fashion",HDFashion & LifeStyle
+http://95.67.47.115/hls/hdfashion_ua_mid/index.m3u8
+#EXTINF:-1 tvg-id="id-fashion" tvg-name="ID Fashion" tvg-logo="" group-title="Fashion",ID Fashion
 http://idfashion-hls1.cosmonova.net.ua/hls/idfashion_ua_hi/index.m3u8
-#EXTINF:-1 tvg-id="id-fashion" tvg-name="ID Fashion" tvg-logo="" group-title="Fashion",ID Fashion (Opt-2)
+#EXTINF:-1 tvg-id="id-fashion" tvg-name="ID Fashion" tvg-logo="" group-title="Fashion",ID Fashion
 http://idfashion-hls1.cosmonova.net.ua/hls/idfashion_ua_low/index.m3u8
-#EXTINF:-1 tvg-id="id-fashion" tvg-name="ID Fashion" tvg-logo="" group-title="Fashion",ID Fashion (Opt-3)
+#EXTINF:-1 tvg-id="id-fashion" tvg-name="ID Fashion" tvg-logo="" group-title="Fashion",ID Fashion
 http://idfashion-hls1.cosmonova.net.ua/hls/idfashion_ua_mid/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://thewatchtv.com/wp-content/uploads/2013/01/impact.jpg" group-title="Religious",Impact
 http://206.190.141.27:1935/live/impact/playlist.m3u8
-#EXTINF:-1 tvg-id="inter-ua" tvg-name="Iнтер" tvg-logo="https://iptvx.one/icn/inter-ua.png" group-title="",Iнтер (Opt-1)
-https://edge3.iptv.macc.com.ua/img/inter_3/index.m3u8
-#EXTINF:-1 tvg-id="inter-ua" tvg-name="Iнтер" tvg-logo="https://inter.ua/images/logo.png" group-title="",Iнтер (Opt-2)
+#EXTINF:-1 tvg-id="inter-ua" tvg-name="Iнтер" tvg-logo="https://inter.ua/images/logo.png" group-title="",Iнтер
 http://109.68.41.148:1935/live/inter_3/playlist.m3u8
+#EXTINF:-1 tvg-id="inter-ua" tvg-name="Iнтер" tvg-logo="https://iptvx.one/icn/inter-ua.png" group-title="",Iнтер
+https://edge3.iptv.macc.com.ua/img/inter_3/index.m3u8
 #EXTINF:-1 tvg-id="inter-plus-ua" tvg-name="Iнтер+" tvg-logo="https://iptvx.one/icn/inter-plus-ua.png" group-title="",Iнтер+
 http://cdn10.live-tv.od.ua:8081/kontaktod/kontaktod-abr-lq/playlist.m3u8
-#EXTINF:-1 tvg-id="k1-ua" tvg-name="К1" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/e/ee/K1_62014.jpg" group-title="",K1 (Opt-1)
+#EXTINF:-1 tvg-id="k1-ua" tvg-name="К1" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/e/ee/K1_62014.jpg" group-title="",K1
 http://109.68.40.67/life/k1.m3u8
-#EXTINF:-1 tvg-id="k1-ua" tvg-name="К1" tvg-logo="https://www.k1.ua/images/logo.png" group-title="",K1 (Opt-2)
+#EXTINF:-1 tvg-id="k1-ua" tvg-name="К1" tvg-logo="https://www.k1.ua/images/logo.png" group-title="",K1
 http://109.68.40.67:80/life/k1_3/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://kratu.ua/wp-content/uploads/2016/06/Old-Logo.png" group-title="",Kratu (Opt-1)
-https://webcams.ks.ua/tvhls/stream1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://kratu.ua/wp-content/uploads/2016/06/Old-Logo.png" group-title="",Kratu (Opt-2)
-http://46.175.163.130/vod/2/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://s3.vefire.ru/l/ru/KRATUTV.gif" group-title="",Kratu (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://s3.vefire.ru/l/ru/KRATUTV.gif" group-title="",Kratu
 http://212.113.32.169:8080/Apple/2/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://kratu.ua/wp-content/uploads/2016/06/Old-Logo.png" group-title="",Kratu
+http://46.175.163.130/vod/2/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://kratu.ua/wp-content/uploads/2016/06/Old-Logo.png" group-title="",Kratu
+https://webcams.ks.ua/tvhls/stream1/index.m3u8
 #EXTINF:-1 tvg-id="lale" tvg-name="Lale" tvg-logo="https://lale.ws/wp-content/themes/lale/images/logo.png" group-title="",Lale
 http://stream.atr.ua/lale//live/index.m3u8
-#EXTINF:-1 tvg-id="maxxi-tv" tvg-name="Maxxi-TV" tvg-logo="" group-title="",Maxxi-TV (Opt-1)
+#EXTINF:-1 tvg-id="maxxi-tv" tvg-name="Maxxi-TV" tvg-logo="" group-title="",Maxxi-TV
 http://api.tv.ipnet.ua/api/v1/manifest/1293296550.m3u8
-#EXTINF:-1 tvg-id="maxxi-tv" tvg-name="Maxxi-TV" tvg-logo="" group-title="",Maxxi-TV (Opt-2)
+#EXTINF:-1 tvg-id="maxxi-tv" tvg-name="Maxxi-TV" tvg-logo="" group-title="",Maxxi-TV
 http://api.tv.ipnet.ua/api/v1/manifest/1293296550.m3u8?codec=mpeg4&app=playlist
-#EXTINF:-1 tvg-id="mostvideo" tvg-name="MostVideo" tvg-logo="" group-title="",MostVideo TV (Opt-1)
-http://wow.stib.com.ua:1935/tv/ch1/playlist_b125000.m3u8
-#EXTINF:-1 tvg-id="mostvideo" tvg-name="MostVideo" tvg-logo="" group-title="",MostVideo TV (Opt-2)
-http://w4.mostvideo.tv/tv/ch1.m3u8
-#EXTINF:-1 tvg-id="mostvideo" tvg-name="MostVideo" tvg-logo="" group-title="",MostVideo TV (Opt-3)
-http://wow.stib.com.ua:1935/tv/ch1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MostVideo TV (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",MostVideo TV
 http://w4.mostvideo.tv/heltv/ch2.m3u8
+#EXTINF:-1 tvg-id="mostvideo" tvg-name="MostVideo" tvg-logo="" group-title="",MostVideo TV
+http://w4.mostvideo.tv/tv/ch1.m3u8
+#EXTINF:-1 tvg-id="mostvideo" tvg-name="MostVideo" tvg-logo="" group-title="",MostVideo TV
+http://wow.stib.com.ua:1935/tv/ch1/playlist.m3u8
+#EXTINF:-1 tvg-id="mostvideo" tvg-name="MostVideo" tvg-logo="" group-title="",MostVideo TV
+http://wow.stib.com.ua:1935/tv/ch1/playlist_b125000.m3u8
 #EXTINF:-1 tvg-id="musicbox-ua-hd" tvg-name="MusicBox UA" tvg-logo="https://www.firstonetv.live/images/logos/ua/MUSICBOX.png" group-title="Music",MusicBox UA
 http://212.26.132.86/hls/mb_ua_2500.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="newsone-ua" tvg-name="NewsOne" tvg-logo="https://iptvx.one/icn/newsone.png" group-title="",NewsOne
 http://cdn1.live-tv.od.ua:8081/ktkod/ktkod-abr/ktkod/ktkod/playlist.m3u8
-#EXTINF:-1 tvg-id="o-tv" tvg-name="OTV" tvg-logo="https://iptvx.one/icn/otv-music.png" group-title="Music",OTV (Opt-1)
+#EXTINF:-1 tvg-id="o-tv" tvg-name="OTV" tvg-logo="https://iptvx.one/icn/otv-music.png" group-title="Music",OTV
 http://212.26.146.148/hls/otv.m3u8
-#EXTINF:-1 tvg-id="o-tv" tvg-name="OTV" tvg-logo="http://o-tv.tv/img/logo.png" group-title="Music",OTV (Opt-2)
+#EXTINF:-1 tvg-id="o-tv" tvg-name="OTV" tvg-logo="http://o-tv.tv/img/logo.png" group-title="Music",OTV
 http://api.tv.ipnet.ua/api/v1/manifest/1293297500.m3u8
-#EXTINF:-1 tvg-id="o-tv" tvg-name="OTV" tvg-logo="https://iptvx.one/icn/otv-music.png" group-title="Music",OTV (Opt-3)
+#EXTINF:-1 tvg-id="o-tv" tvg-name="OTV" tvg-logo="https://iptvx.one/icn/otv-music.png" group-title="Music",OTV
 http://api.tv.ipnet.ua/api/v1/manifest/1293297500.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="o-tv" tvg-name="OTV" tvg-logo="https://n.divan.tv/img/global_img/media_api/channels/e5301c0c/6c5c8b91_med.png" group-title="Music",OTV (Opt-4)
+#EXTINF:-1 tvg-id="o-tv" tvg-name="OTV" tvg-logo="https://n.divan.tv/img/global_img/media_api/channels/e5301c0c/6c5c8b91_med.png" group-title="Music",OTV
 http://api.tv.ipnet.ua/api/v1/manifest/1293297500.m3u8?codec=mpeg4&app=playlist
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Renome (Одесса)
 http://85.238.112.40:8810/hls_sec/239.33.116.26-.m3u8
@@ -135,76 +135,76 @@ http://hls.simon.ua/live-HD/live/playlist.m3u8
 https://open-cdn.lanet.tv/live/1019.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://slavmir.tv/bitrix/templates/slavmir/images/logo.png" group-title="",Slavmir.tv
 http://n1.slavmir.tv:1935/live/Cinegy.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/22ygbZg.jpg" group-title="",STV (Одесса) (Opt-1)
-http://cdn1.live-tv.od.ua:8081/stvod/stvod-abr/stvod/stvod/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://stv-media.tv/templates/stv/images/stv-03.gif" group-title="",STV (Одесса) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://stv-media.tv/templates/stv/images/stv-03.gif" group-title="",STV (Одесса)
 http://cdn1.live-tv.od.ua:8081/stvod/stvod-abr/playlist.m3u8
-#EXTINF:-1 tvg-id="tv5-zaporozhie" tvg-name="TV5 Запорожье" tvg-logo="https://tv5.zp.ua/wp-content/uploads/2017/04/TV5_logo_UA-01.png" group-title="",TV5 Запорожье (Opt-1)
-http://rtsp.cdn.ua/tv5.zp.ua_live/_definst_/mp4:tv5/playlist.m3u8
-#EXTINF:-1 tvg-id="tv5-zaporozhie" tvg-name="TV5 Запорожье" tvg-logo="https://tv5.zp.ua/wp-content/uploads/2017/02/logo_header2.png" group-title="",TV5 Запорожье (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/22ygbZg.jpg" group-title="",STV (Одесса)
+http://cdn1.live-tv.od.ua:8081/stvod/stvod-abr/stvod/stvod/playlist.m3u8
+#EXTINF:-1 tvg-id="tv5-zaporozhie" tvg-name="TV5 Запорожье" tvg-logo="https://tv5.zp.ua/wp-content/uploads/2017/02/logo_header2.png" group-title="",TV5 Запорожье
 http://hls.cdn.ua/tv5.zp.ua_live/_definst_/mp4:tv5/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",TV7+ (Хмельницький) (Opt-1)
+#EXTINF:-1 tvg-id="tv5-zaporozhie" tvg-name="TV5 Запорожье" tvg-logo="https://tv5.zp.ua/wp-content/uploads/2017/04/TV5_logo_UA-01.png" group-title="",TV5 Запорожье
+http://rtsp.cdn.ua/tv5.zp.ua_live/_definst_/mp4:tv5/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",TV7+ (Хмельницький)
 http://tv7plus.com/hls/tv7.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",TV7+ (Хмельницький) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",TV7+ (Хмельницький)
 http://tv7plus.com/hls/tv7_site.m3u8
-#EXTINF:-1 tvg-id="ua-donbas" tvg-name="UA:Донбас" tvg-logo="" group-title="",UA:Донбас (Opt-1)
-http://api.tv.ipnet.ua/api/v1/manifest/1311274061.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="ua-donbas" tvg-name="UA:Донбас" tvg-logo="" group-title="",UA:Донбас (Opt-2)
-http://api.tv.ipnet.ua/api/v1/manifest/1311274061.m3u8?codec=mpeg4&app=playlist
-#EXTINF:-1 tvg-id="ua-donbas" tvg-name="UA:Донбас" tvg-logo="https://dn.suspilne.media/inc/img/logo-5.png" group-title="",UA:Донбас (Opt-3)
+#EXTINF:-1 tvg-id="ua-donbas" tvg-name="UA:Донбас" tvg-logo="https://dn.suspilne.media/inc/img/logo-5.png" group-title="",UA:Донбас
 http://api.tv.ipnet.ua/api/v1/manifest/1311274061.m3u8
-#EXTINF:-1 tvg-id="tysa1" tvg-name="UA:Закарпаття" tvg-logo="https://iptvx.one/icn/tysa1.png" group-title="",UA:Закарпаття (Opt-1)
-http://api.tv.ipnet.ua/api/v1/manifest/2118742462.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="tysa1" tvg-name="UA:Закарпаття" tvg-logo="https://zakarpattya.net.ua/postimages/news/2018/12/46856833_372987726772655_3183301791244615680_n.png" group-title="",UA:Закарпаття (Opt-2)
+#EXTINF:-1 tvg-id="ua-donbas" tvg-name="UA:Донбас" tvg-logo="" group-title="",UA:Донбас
+http://api.tv.ipnet.ua/api/v1/manifest/1311274061.m3u8?codec=mpeg4
+#EXTINF:-1 tvg-id="ua-donbas" tvg-name="UA:Донбас" tvg-logo="" group-title="",UA:Донбас
+http://api.tv.ipnet.ua/api/v1/manifest/1311274061.m3u8?codec=mpeg4&app=playlist
+#EXTINF:-1 tvg-id="tysa1" tvg-name="UA:Закарпаття" tvg-logo="https://zakarpattya.net.ua/postimages/news/2018/12/46856833_372987726772655_3183301791244615680_n.png" group-title="",UA:Закарпаття
 http://api.tv.ipnet.ua/api/v1/manifest/2118742462.m3u8
-#EXTINF:-1 tvg-id="ua-krym" tvg-name="UA:Крим" tvg-logo="https://iptvx.one/icn/ua-krym.png" group-title="",UA:Крим (Opt-1)
-http://api.tv.ipnet.ua/api/v1/manifest/2118742409.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="ua-krym" tvg-name="UA:Крим" tvg-logo="https://iptvx.one/icn/ua-krym.png" group-title="",UA:Крим (Opt-2)
-http://api.tv.ipnet.ua/api/v1/manifest/2118742409.m3u8?codec=mpeg4&app=playlist
-#EXTINF:-1 tvg-id="ua-krym" tvg-name="UA:Крим" tvg-logo="https://iptvx.one/icn/ua-krym.png" group-title="",UA:Крим (Opt-3)
+#EXTINF:-1 tvg-id="tysa1" tvg-name="UA:Закарпаття" tvg-logo="https://iptvx.one/icn/tysa1.png" group-title="",UA:Закарпаття
+http://api.tv.ipnet.ua/api/v1/manifest/2118742462.m3u8?codec=mpeg4
+#EXTINF:-1 tvg-id="ua-krym" tvg-name="UA:Крим" tvg-logo="https://iptvx.one/icn/ua-krym.png" group-title="",UA:Крим
 http://api.tv.ipnet.ua/api/v1/manifest/2118742409.m3u8
-#EXTINF:-1 tvg-id="kultura-ua" tvg-name="UA:Культура" tvg-logo="" group-title="",UA:Культура (Opt-1)
-http://api.tv.ipnet.ua/api/v1/manifest/1311962540.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="kultura-ua" tvg-name="UA:Культура" tvg-logo="https://culture.suspilne.media/inc/img/logo_culture.png" group-title="",UA:Культура (Opt-2)
+#EXTINF:-1 tvg-id="ua-krym" tvg-name="UA:Крим" tvg-logo="https://iptvx.one/icn/ua-krym.png" group-title="",UA:Крим
+http://api.tv.ipnet.ua/api/v1/manifest/2118742409.m3u8?codec=mpeg4
+#EXTINF:-1 tvg-id="ua-krym" tvg-name="UA:Крим" tvg-logo="https://iptvx.one/icn/ua-krym.png" group-title="",UA:Крим
+http://api.tv.ipnet.ua/api/v1/manifest/2118742409.m3u8?codec=mpeg4&app=playlist
+#EXTINF:-1 tvg-id="kultura-ua" tvg-name="UA:Культура" tvg-logo="https://culture.suspilne.media/inc/img/logo_culture.png" group-title="",UA:Культура
 http://api.tv.ipnet.ua/api/v1/manifest/1311962540.m3u8
-#EXTINF:-1 tvg-id="kultura-ua" tvg-name="UA:Культура" tvg-logo="" group-title="",UA:Культура (Opt-3)
+#EXTINF:-1 tvg-id="kultura-ua" tvg-name="UA:Культура" tvg-logo="" group-title="",UA:Культура
+http://api.tv.ipnet.ua/api/v1/manifest/1311962540.m3u8?codec=mpeg4
+#EXTINF:-1 tvg-id="kultura-ua" tvg-name="UA:Культура" tvg-logo="" group-title="",UA:Культура
 http://api.tv.ipnet.ua/api/v1/manifest/1311962540.m3u8?codec=mpeg4&app=playlist
-#EXTINF:-1 tvg-id="ua-odesa" tvg-name="UA:Одеса" tvg-logo="" group-title="",UA:Одеса (Opt-1)
-http://api.tv.ipnet.ua/api/v1/manifest/2118742468.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="ua-odesa" tvg-name="UA:Одеса" tvg-logo="" group-title="",UA:Одеса (Opt-2)
+#EXTINF:-1 tvg-id="ua-odesa" tvg-name="UA:Одеса" tvg-logo="" group-title="",UA:Одеса
 http://api.tv.ipnet.ua/api/v1/manifest/2118742468.m3u8
-#EXTINF:-1 tvg-id="ua-pershy" tvg-name="UA:Перший" tvg-logo="https://iptvx.one/icn/ua-pershy.png" group-title="",UA:Перший (Opt-1)
-http://play.lanet.tv/live/9921.m3u8
-#EXTINF:-1 tvg-id="ua-pershy" tvg-name="UA:Перший" tvg-logo="https://iptvx.one/icn/ua-pershy.png" group-title="",UA:Перший (Opt-2)
-http://api.tv.ipnet.ua/api/v1/manifest/871803891.m3u8?codec=mpeg4&app=playlist
-#EXTINF:-1 tvg-id="ua-pershy" tvg-name="UA:Перший" tvg-logo="https://iptvx.one/icn/ua-pershy.png" group-title="",UA:Перший (Opt-3)
-http://api.tv.ipnet.ua/api/v1/manifest/871803891.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="ua-pershy" tvg-name="UA:Перший" tvg-logo="http://1tv.com.ua/img/logo.png" group-title="",UA:Перший (Opt-4)
+#EXTINF:-1 tvg-id="ua-odesa" tvg-name="UA:Одеса" tvg-logo="" group-title="",UA:Одеса
+http://api.tv.ipnet.ua/api/v1/manifest/2118742468.m3u8?codec=mpeg4
+#EXTINF:-1 tvg-id="ua-pershy" tvg-name="UA:Перший" tvg-logo="http://1tv.com.ua/img/logo.png" group-title="",UA:Перший
 http://api.tv.ipnet.ua/api/v1/manifest/871803891.m3u8
-#EXTINF:-1 tvg-id="ua-tv" tvg-name="UATV" tvg-logo="" group-title="",UATV (Opt-1)
-http://api.tv.ipnet.ua/api/v1/manifest/2118742330.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="ua-tv" tvg-name="UATV" tvg-logo="" group-title="",UATV (Opt-2)
-http://ua-tv-hls2.cosmonova.net.ua/hls/ua-tv_ua_low/index.m3u8
-#EXTINF:-1 tvg-id="ua-tv" tvg-name="UATV" tvg-logo="" group-title="",UATV (Opt-3)
+#EXTINF:-1 tvg-id="ua-pershy" tvg-name="UA:Перший" tvg-logo="https://iptvx.one/icn/ua-pershy.png" group-title="",UA:Перший
+http://api.tv.ipnet.ua/api/v1/manifest/871803891.m3u8?codec=mpeg4
+#EXTINF:-1 tvg-id="ua-pershy" tvg-name="UA:Перший" tvg-logo="https://iptvx.one/icn/ua-pershy.png" group-title="",UA:Перший
+http://api.tv.ipnet.ua/api/v1/manifest/871803891.m3u8?codec=mpeg4&app=playlist
+#EXTINF:-1 tvg-id="ua-pershy" tvg-name="UA:Перший" tvg-logo="https://iptvx.one/icn/ua-pershy.png" group-title="",UA:Перший
+http://play.lanet.tv/live/9921.m3u8
+#EXTINF:-1 tvg-id="ua-tv" tvg-name="UATV" tvg-logo="" group-title="",UATV
 http://api.tv.ipnet.ua/api/v1/manifest/2118742330.m3u8
-#EXTINF:-1 tvg-id="ua-tv" tvg-name="UATV" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/10/UATV.png" group-title="",UATV (Opt-4)
+#EXTINF:-1 tvg-id="ua-tv" tvg-name="UATV" tvg-logo="" group-title="",UATV
+http://api.tv.ipnet.ua/api/v1/manifest/2118742330.m3u8?codec=mpeg4
+#EXTINF:-1 tvg-id="ua-tv" tvg-name="UATV" tvg-logo="" group-title="",UATV
+http://ua-tv-hls2.cosmonova.net.ua/hls/ua-tv_ua_low/index.m3u8
+#EXTINF:-1 tvg-id="ua-tv" tvg-name="UATV" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2017/10/UATV.png" group-title="",UATV
 http://ua-tv-hls2.cosmonova.net.ua/hls/ua-tv_ua_mid/index.m3u8
-#EXTINF:-1 tvg-id="ua-tv" tvg-name="UATV" tvg-logo="" group-title="",UATV (Opt-5)
-https://ua-tv-hls3.cosmonova.net.ua/hls/ua-tv_ua_mid/index.m3u8
-#EXTINF:-1 tvg-id="ua-tv" tvg-name="UATV" tvg-logo="" group-title="",UATV (Opt-6)
+#EXTINF:-1 tvg-id="ua-tv" tvg-name="UATV" tvg-logo="" group-title="",UATV
 https://str-2.mediabay.tv/UATV_HD/playlist.m3u8?token=60664093523d3c44394a7022701c1945bb0487b0-9213151e202466269deeda1730037c83-1566591064-1566580264
+#EXTINF:-1 tvg-id="ua-tv" tvg-name="UATV" tvg-logo="" group-title="",UATV
+https://ua-tv-hls3.cosmonova.net.ua/hls/ua-tv_ua_mid/index.m3u8
 #EXTINF:-1 tvg-id="z-zapor" tvg-name="Z (Запорожье)" tvg-logo="https://ztv.zp.ua/wp-content/themes/tv-z/img/logo.png" group-title="",Z (Запорожье)
 https://stream.ztv.zp.ua/hls/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://big-tv.org/uploads/posts/2017-11/thumbs/1510692417_a1-odessa.png" group-title="",А1 (Одесса) (Opt-1)
-http://cdn1.live-tv.od.ua:8081/a1od/a1od-abr/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",А1 (Одесса) (Opt-2)
-http://cdn1.live-tv.od.ua:8081/a1od/a1od-abr/a1od/a1od-720p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",А1 (Одесса) (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",А1 (Одесса)
 http://cdn1.live-tv.od.ua:8081/a1od/a1od-abr/a1od/a1od-480p/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ak.od.ua/wp-content/uploads/2017/01/logo_retina.png" group-title="",Академия (Opt-1)
-http://cdn1.live-tv.od.ua:8081/36chod/36chod-abr/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Академия (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",А1 (Одесса)
+http://cdn1.live-tv.od.ua:8081/a1od/a1od-abr/a1od/a1od-720p/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://big-tv.org/uploads/posts/2017-11/thumbs/1510692417_a1-odessa.png" group-title="",А1 (Одесса)
+http://cdn1.live-tv.od.ua:8081/a1od/a1od-abr/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Академия
 http://cdn1.live-tv.od.ua:8081/36chod/36chod-abr/36chod/36chod/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ak.od.ua/wp-content/uploads/2017/01/logo_retina.png" group-title="",Академия
+http://cdn1.live-tv.od.ua:8081/36chod/36chod-abr/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Архат ТВ
 http://arhat.tv/public/720p/index.m3u8
 #EXTINF:-1 tvg-id="vkusnoe-tv" tvg-name="Вкусное TV" tvg-logo="" group-title="Food",Вкусное ТВ
@@ -217,11 +217,11 @@ http://hls.cdn.ua/vo.org.ua_live/_definst_/online-ru-hotbird-high/playlist.m3u8
 http://94.45.135.158:1935/live/HrBroadcast/playlist.m3u8
 #EXTINF:-1 tvg-id="hromadske" tvg-name="Громадське" tvg-logo="http://xittv.net/img/can/78.png" group-title="",Громадське
 http://api.tv.ipnet.ua/api/v1/manifest/2118742457.m3u8
-#EXTINF:-1 tvg-id="donbass-ua" tvg-name="Донбасс" tvg-logo="http://donbass.tv/images/default/logo_donbass.png" group-title="",Донбас (Opt-1)
+#EXTINF:-1 tvg-id="donbass-ua" tvg-name="Донбасс" tvg-logo="http://donbass.tv/images/default/logo_donbass.png" group-title="",Донбас
 http://api.tv.ipnet.ua/api/v1/manifest/2118742461.m3u8
-#EXTINF:-1 tvg-id="donbass-ua" tvg-name="Донбасс" tvg-logo="https://iptvx.one/icn/donbas.png" group-title="",Донбас (Opt-2)
+#EXTINF:-1 tvg-id="donbass-ua" tvg-name="Донбасс" tvg-logo="https://iptvx.one/icn/donbas.png" group-title="",Донбас
 http://api.tv.ipnet.ua/api/v1/manifest/2118742461.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="donbass-ua" tvg-name="Донбасс" tvg-logo="https://iptvx.one/icn/donbas.png" group-title="",Донбас (Opt-3)
+#EXTINF:-1 tvg-id="donbass-ua" tvg-name="Донбасс" tvg-logo="https://iptvx.one/icn/donbas.png" group-title="",Донбас
 http://api.tv.ipnet.ua/api/v1/manifest/2118742461.m3u8?codec=mpeg4&app=playlist
 #EXTINF:-1 tvg-id="donecchina-tv" tvg-name="Донеччина TV" tvg-logo="https://i.imgur.com/dHqUHfw.png" group-title="",Донеччина TV
 http://stream.dn.ua/hls/stream.m3u8
@@ -229,145 +229,145 @@ http://stream.dn.ua/hls/stream.m3u8
 http://cdn1.live-tv.od.ua:8081/dumska/dumska-abr/dumska/dumska720p/playlist.m3u8
 #EXTINF:-1 tvg-id="dumskaya" tvg-name="Думская TV" tvg-logo="https://dumskaya.net/i3/logotv.png" group-title="",Думская TV
 http://cdn1.live-tv.od.ua:8081/dumska/dumska-abr/playlist.m3u8
-#EXTINF:-1 tvg-id="espreso-tv" tvg-name="Еспресо TV" tvg-logo="https://iptvx.one/icn/espreso.png" group-title="",Еспресо TV (Opt-1)
+#EXTINF:-1 tvg-id="espreso-tv" tvg-name="Еспресо TV" tvg-logo="https://iptvx.one/icn/espreso.png" group-title="",Еспресо TV
 http://api.tv.ipnet.ua/api/v1/manifest/2007567821.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="espreso-tv" tvg-name="Еспресо TV" tvg-logo="https://iptvx.one/icn/espreso.png" group-title="",Еспресо TV (Opt-2)
+#EXTINF:-1 tvg-id="espreso-tv" tvg-name="Еспресо TV" tvg-logo="https://iptvx.one/icn/espreso.png" group-title="",Еспресо TV
 http://api.tv.ipnet.ua/api/v1/manifest/2007567821.m3u8?codec=mpeg4&app=playlist
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Здоровье (Одесса) (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Здоровье (Одесса)
 http://cdn1.live-tv.od.ua:8081/zdorovood/zdorovo-abr-lq/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://zd.od.ua/wp-content/uploads/2018/01/zdor-2.png" group-title="",Здоровье (Одесса) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://zd.od.ua/wp-content/uploads/2018/01/zdor-2.png" group-title="",Здоровье (Одесса)
 http://cdn1.live-tv.od.ua:8081/zdorovood/zdorovo-abr-lq/zdorovood/zdorovo/playlist.m3u8
-#EXTINF:-1 tvg-id="kyiv-ua" tvg-name="Київ" tvg-logo="http://acrotv.com/images/broad/20181001132346096.jpg" group-title="",Київ TV (Opt-1)
+#EXTINF:-1 tvg-id="kyiv-ua" tvg-name="Київ" tvg-logo="http://acrotv.com/images/broad/20181001132346096.jpg" group-title="",Київ TV
 http://api.tv.ipnet.ua/api/v1/manifest/1293296300.m3u8
-#EXTINF:-1 tvg-id="kyiv-ua" tvg-name="Київ" tvg-logo="https://iptvx.one/icn/kyiv.png" group-title="",Київ TV (Opt-2)
-http://api.tv.ipnet.ua/api/v1/manifest/1293296300.m3u8?codec=mpeg4&app=playlist
-#EXTINF:-1 tvg-id="kyiv-ua" tvg-name="Київ" tvg-logo="https://iptvx.one/icn/kyiv.png" group-title="",Київ TV (Opt-3)
+#EXTINF:-1 tvg-id="kyiv-ua" tvg-name="Київ" tvg-logo="https://iptvx.one/icn/kyiv.png" group-title="",Київ TV
 http://api.tv.ipnet.ua/api/v1/manifest/1293296300.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="kyiv-ua" tvg-name="Київ" tvg-logo="https://iptvx.one/icn/kyiv.png" group-title="",Київ TV (Opt-4)
+#EXTINF:-1 tvg-id="kyiv-ua" tvg-name="Київ" tvg-logo="https://iptvx.one/icn/kyiv.png" group-title="",Київ TV
+http://api.tv.ipnet.ua/api/v1/manifest/1293296300.m3u8?codec=mpeg4&app=playlist
+#EXTINF:-1 tvg-id="kyiv-ua" tvg-name="Київ" tvg-logo="https://iptvx.one/icn/kyiv.png" group-title="",Київ TV
 http://hls-kyivtv.cdnvideo.ru/kyivtv/kyivtv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="krt-ua" tvg-name="КРТ" tvg-logo="" group-title="",КРТ (Opt-1)
-http://api.tv.ipnet.ua/api/v1/manifest/1298864660.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="krt-ua" tvg-name="КРТ" tvg-logo="" group-title="",КРТ (Opt-2)
-http://api.tv.ipnet.ua/api/v1/manifest/1298864660.m3u8?codec=mpeg4&app=playlist
-#EXTINF:-1 tvg-id="krt-ua" tvg-name="КРТ" tvg-logo="http://tvkrt.com.ua/img/tvkrtlogo.png" group-title="",КРТ (Opt-3)
+#EXTINF:-1 tvg-id="krt-ua" 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="krt-ua" tvg-name="КРТ" tvg-logo="" group-title="",КРТ
+http://api.tv.ipnet.ua/api/v1/manifest/1298864660.m3u8?codec=mpeg4
+#EXTINF:-1 tvg-id="krt-ua" tvg-name="КРТ" tvg-logo="" group-title="",КРТ
+http://api.tv.ipnet.ua/api/v1/manifest/1298864660.m3u8?codec=mpeg4&app=playlist
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Круг (Одесса)
 http://cdn1.live-tv.od.ua:8081/krugod/krugod-abr/krugod/krugod/playlist.m3u8
 #EXTINF:-1 tvg-id="m1-ua" tvg-name="М1" tvg-logo="https://iptvx.one/icn/m1-ua.png" group-title="",М1
 http://live.m2.tv/hls/stream.m3u8
-#EXTINF:-1 tvg-id="m2-ua" tvg-name="М2" tvg-logo="http://m2.tv/assets/logo-231ef42a791ac4e9287a94c6dd492ebd740ad3bea40f789cd489683b758ff65d.png" group-title="Music",М2 (Opt-1)
+#EXTINF:-1 tvg-id="m2-ua" tvg-name="М2" tvg-logo="http://m2.tv/assets/logo-231ef42a791ac4e9287a94c6dd492ebd740ad3bea40f789cd489683b758ff65d.png" group-title="Music",М2
 http://live.m2.tv/hls3/stream.m3u8
-#EXTINF:-1 tvg-id="maliatko-tv" tvg-name="Малятко TV" tvg-logo="https://i.imgur.com/aOS34dT.png" group-title="Kids",Малятко TV (Opt-1)
+#EXTINF:-1 tvg-id="maliatko-tv" tvg-name="Малятко TV" tvg-logo="https://i.imgur.com/aOS34dT.png" group-title="Kids",Малятко TV
 http://api.tv.ipnet.ua/api/v1/manifest/1311963260.m3u8
-#EXTINF:-1 tvg-id="maliatko-tv" tvg-name="Малятко TV" tvg-logo="https://iptvx.one/icn/maliatko-tv.png" group-title="Kids",Малятко TV (Opt-2)
+#EXTINF:-1 tvg-id="maliatko-tv" tvg-name="Малятко TV" tvg-logo="https://iptvx.one/icn/maliatko-tv.png" 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="",Медиа-Информ
 http://cdn1.live-tv.od.ua:8081/mediainfo/miod-abr/mediainfo/miod/playlist.m3u8
-#EXTINF:-1 tvg-id="nadia" tvg-name="Надія" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="",Надія (Opt-1)
-http://stream.hope.ua/hopeua/live_1/playlist.m3u8
-#EXTINF:-1 tvg-id="nadia" tvg-name="Надія" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="",Надія (Opt-2)
+#EXTINF:-1 tvg-id="nadia" tvg-name="Надія" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="",Надія
 http://bcliveunivsecure-lh.akamaihd.net/i/HopeChannelUkraine_1@432955/index_700_av-p.m3u8
+#EXTINF:-1 tvg-id="nadia" tvg-name="Надія" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="",Надія
+http://stream.hope.ua/hopeua/live_1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",НАШ
 http://api.tv.ipnet.ua/api/v1/manifest/1293296550.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",НТК
 http://stream.ntktv.ua/s/ntk/ntk.m3u8
-#EXTINF:-1 tvg-id="ntn-ua" tvg-name="НТН" tvg-logo="https://ntn.ua/images/new_logo.png" group-title="",НТН (Opt-1)
-https://edge3.iptv.macc.com.ua/img/ntn_3/index.m3u8
-#EXTINF:-1 tvg-id="ntn-ua" tvg-name="НТН" tvg-logo="https://ntn.ua/images/new_logo.png" group-title="",НТН (Opt-2)
+#EXTINF:-1 tvg-id="ntn-ua" tvg-name="НТН" tvg-logo="https://ntn.ua/images/new_logo.png" group-title="",НТН
 http://109.68.41.148:1935/live/ntn_3/playlist.m3u8
+#EXTINF:-1 tvg-id="ntn-ua" tvg-name="НТН" tvg-logo="https://ntn.ua/images/new_logo.png" group-title="",НТН
+https://edge3.iptv.macc.com.ua/img/ntn_3/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://4.bp.blogspot.com/-2jLl6rP9uB0/UWCjNwyiHqI/AAAAAAAABXA/giDBQTC3Gvw/s1600/ont3+copy.jpg" group-title="",Общественное Независимое Телевидение
 http://85.238.112.40:8810/hls_sec/239.33.75.33-.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://mediacast.tv/wp-content/uploads/2018/03/pershui-dilovyi.png" group-title="",Одеса
 http://cdn1.live-tv.od.ua:8081/riood/riood-abr/riood/riood/playlist.m3u8
-#EXTINF:-1 tvg-id="otb-galychyna" tvg-name="ОТБ Галичина" tvg-logo="" group-title="",ОТБ Галичина (Opt-1)
-http://api.tv.ipnet.ua/api/v1/manifest/2118742464.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="otb-galychyna" tvg-name="ОТБ Галичина" tvg-logo="" group-title="",ОТБ Галичина (Opt-2)
+#EXTINF:-1 tvg-id="otb-galychyna" tvg-name="ОТБ Галичина" tvg-logo="" group-title="",ОТБ Галичина
 http://api.tv.ipnet.ua/api/v1/manifest/2118742464.m3u8
-#EXTINF:-1 tvg-id="pervy-gorodskoy-kryvrig" tvg-name="Первый городской (Кривой Рог)" tvg-logo="" group-title="",Первый городской (Кривой Рог) (Opt-1)
+#EXTINF:-1 tvg-id="otb-galychyna" tvg-name="ОТБ Галичина" tvg-logo="" group-title="",ОТБ Галичина
+http://api.tv.ipnet.ua/api/v1/manifest/2118742464.m3u8?codec=mpeg4
+#EXTINF:-1 tvg-id="pervy-gorodskoy-kryvrig" tvg-name="Первый городской (Кривой Рог)" tvg-logo="" group-title="",Первый городской (Кривой Рог)
 http://cdn1.live-tv.od.ua:8081/1tvkr/1tvkr-abr/1tvkr/1tvkr/playlist.m3u8
-#EXTINF:-1 tvg-id="pervy-gorodskoy-kryvrig" tvg-name="Первый городской (Кривой Рог)" tvg-logo="http://big-tv.org/uploads/posts/2017-11/thumbs/1510692123_pervyy-gorodskoy-krivoy-rog.png" group-title="",Первый городской (Кривой Рог) (Opt-2)
+#EXTINF:-1 tvg-id="pervy-gorodskoy-kryvrig" tvg-name="Первый городской (Кривой Рог)" tvg-logo="http://big-tv.org/uploads/posts/2017-11/thumbs/1510692123_pervyy-gorodskoy-krivoy-rog.png" group-title="",Первый городской (Кривой Рог)
 http://cdn1.live-tv.od.ua:8081/1tvkr/1tvkr-abr/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Первый городской (Одесса) (Opt-1)
-http://cdn1.live-tv.od.ua:8081/1tvod/1tvod-abr/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://sun9-18.userapi.com/c639227/v639227583/45ae7/tw3dA0ptuXI.jpg" group-title="",Первый городской (Одесса) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://sun9-18.userapi.com/c639227/v639227583/45ae7/tw3dA0ptuXI.jpg" group-title="",Первый городской (Одесса)
 http://91.194.79.46:8081/stream1/channel1/playlist.m3u8
-#EXTINF:-1 tvg-id="pervy-delovoy" tvg-name="Первый деловой" tvg-logo="https://fbc.net.ua/wp-content/uploads/2017/01/cropped-cropped-cropped-logo111.png" group-title="Business",Первый деловой (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Первый городской (Одесса)
+http://cdn1.live-tv.od.ua:8081/1tvod/1tvod-abr/playlist.m3u8
+#EXTINF:-1 tvg-id="pervy-delovoy" tvg-name="Первый деловой" tvg-logo="https://fbc.net.ua/wp-content/uploads/2017/01/cropped-cropped-cropped-logo111.png" group-title="Business",Первый деловой
 http://pershij-dlovij-hls3.cosmonova.net.ua/hls/pershij-dlovij_ua_hi/index.m3u8
-#EXTINF:-1 tvg-id="pervy-delovoy" tvg-name="Первый деловой" tvg-logo="" group-title="Business",Первый деловой (Opt-2)
+#EXTINF:-1 tvg-id="pervy-delovoy" tvg-name="Первый деловой" tvg-logo="" group-title="Business",Первый деловой
 http://pershij-dlovij-hls3.cosmonova.net.ua/hls/pershij-dlovij_ua_mid/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Business",Перший Діловий
 http://mediabay.tv/tv/480/%D0%9F%D0%B5%D1%80%D1%88%D0%B8%D0%B9%20%D0%94%D1%96%D0%BB%D0%BE%D0%B2%D0%B8%D0%B9%20%D0%A2%D0%B5%D0%BB%D0%B5%D0%BA%D0%B0%D0%BD%D0%B0%D0%BB
-#EXTINF:-1 tvg-id="pershy-zaxidny" tvg-name="Перший Західний" tvg-logo="http://1zahid.com/img/logo.png" group-title="",Перший Західний (Львов) (Opt-1)
+#EXTINF:-1 tvg-id="pershy-zaxidny" tvg-name="Перший Західний" tvg-logo="http://1zahid.com/img/logo.png" group-title="",Перший Західний (Львов)
 http://api.tv.ipnet.ua/api/v1/manifest/2118742459.m3u8
-#EXTINF:-1 tvg-id="pershy-zaxidny" tvg-name="Перший Західний" tvg-logo="" group-title="",Перший Західний (Львов) (Opt-2)
-http://hls.cdn.ua/1zahid.com_live/_definst_/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="pershy-zaxidny" tvg-name="Перший Західний" tvg-logo="" group-title="",Перший Західний (Львов) (Opt-3)
+#EXTINF:-1 tvg-id="pershy-zaxidny" tvg-name="Перший Західний" tvg-logo="" group-title="",Перший Західний (Львов)
 http://api.tv.ipnet.ua/api/v1/manifest/2118742459.m3u8?codec=mpeg4&app=playlist
-#EXTINF:-1 tvg-id="pershy-zaxidny" tvg-name="Перший Західний" tvg-logo="" group-title="",Перший Західний (Львов) (Opt-4)
+#EXTINF:-1 tvg-id="pershy-zaxidny" tvg-name="Перший Західний" tvg-logo="" group-title="",Перший Західний (Львов)
+http://hls.cdn.ua/1zahid.com_live/_definst_/livestream/playlist.m3u8
+#EXTINF:-1 tvg-id="pershy-zaxidny" tvg-name="Перший Західний" tvg-logo="" group-title="",Перший Західний (Львов)
 http://rtmp.cdn.ua/1zahid.com_live/_definst_/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="pravdatyt" 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="priamyj" tvg-name="Прямий" tvg-logo="https://liveam.tv/assets/images/chnl/prm.png" group-title="",Прямий (Opt-1)
+#EXTINF:-1 tvg-id="priamyj" tvg-name="Прямий" tvg-logo="https://liveam.tv/assets/images/chnl/prm.png" group-title="",Прямий
 http://api.tv.ipnet.ua/api/v1/manifest/1293294600.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="priamyj" tvg-name="Прямий" tvg-logo="" group-title="",Прямий (Opt-2)
+#EXTINF:-1 tvg-id="priamyj" tvg-name="Прямий" tvg-logo="" group-title="",Прямий
 http://api.tv.ipnet.ua/api/v1/manifest/1293294600.m3u8?codec=mpeg4&app=playlist
-#EXTINF:-1 tvg-id="priamyj" tvg-name="Прямий" tvg-logo="https://prm.ua/wp-content/themes/prm-new/img/header-logo.png" group-title="",Прямий (Opt-3)
+#EXTINF:-1 tvg-id="priamyj" 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="rada-ua" tvg-name="Рада" tvg-logo="http://onlines.tv/wp-content/uploads/2017/04/1514921891_telekanal-rada.png" group-title="",Рада (Opt-1)
-http://api.tv.ipnet.ua/api/v1/manifest/1312714970.m3u8
-#EXTINF:-1 tvg-id="rada-ua" tvg-name="Рада" tvg-logo="https://iptvx.one/icn/rada.png" group-title="",Рада (Opt-2)
-http://api.tv.ipnet.ua/api/v1/manifest/1312714970.m3u8?codec=mpeg4
-#EXTINF:-1 tvg-id="rada-ua" tvg-name="Рада" tvg-logo="http://onlines.tv/wp-content/uploads/2017/04/1514921891_telekanal-rada.png" group-title="",Рада (Opt-3)
+#EXTINF:-1 tvg-id="rada-ua" tvg-name="Рада" tvg-logo="http://onlines.tv/wp-content/uploads/2017/04/1514921891_telekanal-rada.png" group-title="",Рада
 http://217.20.164.181/live/rada480p.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="rada-ua" 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="rada-ua" tvg-name="Рада" tvg-logo="https://iptvx.one/icn/rada.png" group-title="",Рада
+http://api.tv.ipnet.ua/api/v1/manifest/1312714970.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.i.ua/radio/logo/1/161.jpg" group-title="",Радио Люкс
 http://stream1.luxnet.ua/luxstudio/smil:luxstudio.stream.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="raiua" tvg-name="РАІ" tvg-logo="" group-title="",РАІ (Opt-1)
-http://api.tv.ipnet.ua/api/v1/manifest/2118742460.m3u8?codec=mpeg4&app=playlist
-#EXTINF:-1 tvg-id="raiua" tvg-name="РАІ" tvg-logo="https://rai.ua/template/images/trkrai_logo.png" group-title="",РАІ (Opt-2)
+#EXTINF:-1 tvg-id="raiua" tvg-name="РАІ" tvg-logo="https://rai.ua/template/images/trkrai_logo.png" group-title="",РАІ
 http://api.tv.ipnet.ua/api/v1/manifest/2118742460.m3u8
-#EXTINF:-1 tvg-id="raiua" tvg-name="РАІ" tvg-logo="" group-title="",РАІ (Opt-3)
+#EXTINF:-1 tvg-id="raiua" tvg-name="РАІ" tvg-logo="" group-title="",РАІ
 http://api.tv.ipnet.ua/api/v1/manifest/2118742460.m3u8?codec=mpeg4
+#EXTINF:-1 tvg-id="raiua" tvg-name="РАІ" tvg-logo="" group-title="",РАІ
+http://api.tv.ipnet.ua/api/v1/manifest/2118742460.m3u8?codec=mpeg4&app=playlist
 #EXTINF:-1 tvg-id="reportior" tvg-name="Репортер" tvg-logo="http://reporter.odessa.ua/wp-content/uploads/2017/05/logo_retina-300x99.png" group-title="",Репортер
 http://cdn1.live-tv.od.ua:8081/31chod/31chod-abr/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Сварожичи (Opt-1)
-http://tv.tv-project.com:1935/live/live1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Сварожичи (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Сварожичи
 http://80.91.177.102:1935/live/live1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Сварожичи (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Сварожичи
+http://tv.tv-project.com:1935/live/live1/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Сварожичи
 https://str-3.mediabay.tv/Svarojichi/playlist.m3u8?token=b19e462acc435383c56b2f61712fe7d1f0b02516-c60ca68e9e1400b7a8bb35889a0af1d4-1566591110-1566580310
-#EXTINF:-1 tvg-id="sonce-ua" tvg-name="Сонце" tvg-logo="" group-title="",Сонце (Opt-1)
+#EXTINF:-1 tvg-id="sonce-ua" tvg-name="Сонце" tvg-logo="" group-title="",Сонце
 http://api.tv.ipnet.ua/api/v1/manifest/709640461.m3u8
-#EXTINF:-1 tvg-id="sonce-ua" tvg-name="Сонце" tvg-logo="" group-title="",Сонце (Opt-2)
+#EXTINF:-1 tvg-id="sonce-ua" tvg-name="Сонце" tvg-logo="" group-title="",Сонце
 http://api.tv.ipnet.ua/api/v1/manifest/709640461.m3u8?codec=mpeg4
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ТIС (Одесса)
 http://cdn10.live-tv.od.ua:8081/riood/tisod-abr-lq/riood/tisod504/playlist.m3u8
-#EXTINF:-1 tvg-id="tva-ua" tvg-name="ТВА" tvg-logo="" group-title="",ТВА (Чернiвцi) (Opt-1)
+#EXTINF:-1 tvg-id="tva-ua" tvg-name="ТВА" tvg-logo="" group-title="",ТВА (Чернiвцi)
 http://hls.cdn.ua/tva.ua_live/_definst_/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="tva-ua" tvg-name="ТВА" tvg-logo="" group-title="",ТВА (Чернiвцi) (Opt-2)
+#EXTINF:-1 tvg-id="tva-ua" tvg-name="ТВА" tvg-logo="" group-title="",ТВА (Чернiвцi)
 http://rtsp.cdn.ua/tva.ua_live/_definst_/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Твій плюс
 http://62.64.92.118:8080/Apple/1/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.tistv.news/wp-content/uploads/2018/02/logo-main-2.png" group-title="",ТИС ТВ
 http://cdn10.live-tv.od.ua:8081/riood/tisod-abr/riood/tisod504/playlist.m3u8
-#EXTINF:-1 tvg-id="treti-cifrovoj" tvg-name="Третий Цифровой" tvg-logo="" group-title="",Третий Цифровой (Opt-1)
+#EXTINF:-1 tvg-id="treti-cifrovoj" tvg-name="Третий Цифровой" tvg-logo="" group-title="",Третий Цифровой
 http://cdn1.live-tv.od.ua:8081/3tvod/3tvod-abr/3tvod/3tvod/playlist.m3u8
-#EXTINF:-1 tvg-id="treti-cifrovoj" tvg-name="Третий Цифровой" tvg-logo="http://tretiy.tv/wp-content/uploads/2017/12/logo.png" group-title="",Третий Цифровой (Opt-2)
+#EXTINF:-1 tvg-id="treti-cifrovoj" tvg-name="Третий Цифровой" tvg-logo="http://tretiy.tv/wp-content/uploads/2017/12/logo.png" group-title="",Третий Цифровой
 http://cdn1.live-tv.od.ua:8081/3tvod/3tvod-abr/playlist.m3u8
-#EXTINF:-1 tvg-id="trk-chernivci" tvg-name="ТРК Чернівці" tvg-logo="" group-title="",ТРК Чернівці (Opt-1)
+#EXTINF:-1 tvg-id="trk-chernivci" tvg-name="ТРК Чернівці" tvg-logo="" group-title="",ТРК Чернівці
 http://91.205.207.20:1935/live/mtrk.chernivtsi.rvqs-92g8-sg04-6h4t/playlist.m3u8
 #EXTINF:-1 tvg-id="xerson-plus" tvg-name="Херсон Плюс" tvg-logo="https://khersontv.com/wp-content/themes/hueman/img/logo.png" group-title="",Херсон Плюс
 http://46.175.163.130/ks_plus/index.m3u8
 #EXTINF:-1 tvg-id="chern-promin" tvg-name="Чернівецький Промінь" tvg-logo="" group-title="",Чернівецький Промінь
 http://langate.tv/promin/live_720/index.m3u8
-#EXTINF:-1 tvg-id="chepe-info" tvg-name="ЧП.iнфо" tvg-logo="https://iptvx.one/icn/chpinfo.png" group-title="",ЧП.iнфо (Opt-1)
-http://109.68.40.67/life/magnolia_3/index.m3u8
-#EXTINF:-1 tvg-id="chepe-info" tvg-name="ЧП.iнфо" tvg-logo="https://iptvx.one/icn/chpinfo.png" group-title="",ЧП.iнфо (Opt-2)
+#EXTINF:-1 tvg-id="chepe-info" tvg-name="ЧП.iнфо" tvg-logo="https://iptvx.one/icn/chpinfo.png" group-title="",ЧП.iнфо
 http://109.68.40.67/life/magnolia.m3u8
-#EXTINF:-1 tvg-id="yuzhnaya-volna" tvg-name="Южная волна" tvg-logo="" group-title="",Южная волна (Opt-1)
+#EXTINF:-1 tvg-id="chepe-info" tvg-name="ЧП.iнфо" tvg-logo="https://iptvx.one/icn/chpinfo.png" group-title="",ЧП.iнфо
+http://109.68.40.67/life/magnolia_3/index.m3u8
+#EXTINF:-1 tvg-id="yuzhnaya-volna" tvg-name="Южная волна" tvg-logo="" group-title="",Южная волна
 http://cdn1.live-tv.od.ua:8081/wave/wave-abr/playlist.m3u8
-#EXTINF:-1 tvg-id="yuzhnaya-volna" tvg-name="Южная волна" tvg-logo="" group-title="",Южная волна (Opt-2)
+#EXTINF:-1 tvg-id="yuzhnaya-volna" tvg-name="Южная волна" tvg-logo="" group-title="",Южная волна
 http://cdn1.live-tv.od.ua:8081/wave/wave-abr/wave/wave-720/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://yatb.tv/wp-content/uploads/2018/03/73d917e7-logo.jpg" group-title="",ЯТБ (Херсон) (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://yatb.tv/wp-content/uploads/2018/03/73d917e7-logo.jpg" group-title="",ЯТБ (Херсон)
 http://46.175.163.130/vod/8/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ЯТБ (Херсон) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ЯТБ (Херсон)
 http://46.175.163.130/vod/9/index.m3u8
diff --git a/channels/uk.m3u b/channels/uk.m3u
index a5e96a498..fa4e0fe4c 100644
--- a/channels/uk.m3u
+++ b/channels/uk.m3u
@@ -9,9 +9,9 @@ https://live2.hoolatv.com/live/5usa_hi/chunks.m3u8?__fvd__
 https://eu-de-edge-01.zetcast.net/ShetlandWebcams/Studio1ABR/playlist.m3u8
 #EXTINF:-1 tvg-id="BBC ALBA UK" tvg-name="BBC ALBA UK" tvg-logo="http://hoolatv.com/sites/default/files/channels/bbcalba.png" group-title="",BBC Alba
 https://live2.hoolatv.com/live/bbcalba_hi/chunks.m3u8
-#EXTINF:-1 tvg-id="BBC News UK" tvg-name="BBC News UK" tvg-logo="https://d2n0069hmnqmmx.cloudfront.net/epgdata/1.0/newchanlogos/80/35/skychb2011.png" group-title="News",BBC News (Opt-1)
+#EXTINF:-1 tvg-id="BBC News UK" tvg-name="BBC News UK" tvg-logo="https://d2n0069hmnqmmx.cloudfront.net/epgdata/1.0/newchanlogos/80/35/skychb2011.png" group-title="News",BBC News
 https://1636691764.rsc.cdn77.org/LS-ATL-54548-11/tracks-v1a1/mono.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="BBC News UK" tvg-name="BBC News UK" tvg-logo="https://d2n0069hmnqmmx.cloudfront.net/epgdata/1.0/newchanlogos/80/35/skychb2011.png" group-title="News",BBC News (Opt-2)
+#EXTINF:-1 tvg-id="BBC News UK" tvg-name="BBC News UK" tvg-logo="https://d2n0069hmnqmmx.cloudfront.net/epgdata/1.0/newchanlogos/80/35/skychb2011.png" group-title="News",BBC News
 https://1674331492.rsc.cdn77.org/LS-ATL-54548-11/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="BBC One HD UK" tvg-name="BBC One HD UK" tvg-logo="https://static.iptv-epg.com/gb/BBC1.uk.png" group-title="",BBC One
 https://live2.hoolatv.com/live/bbcone_hi/chunks.m3u8
@@ -39,10 +39,10 @@ https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/cruise_tv/hls_video/inde
 https://live2.hoolatv.com/live/dave_hi/chunks.m3u8?__fvd__
 #EXTINF:-1 tvg-id="E4 UK" tvg-name="E4 UK" tvg-logo="https://static.iptv-epg.com/gb/E4.uk.png" group-title="",E4
 https://live2.hoolatv.com/live/e4_hi/chunks.m3u8?__fvd__
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/3/38/Gemporia_tv_in.png" group-title="Shop",Gemporia (Opt-1)
-https://57d6b85685bb8.streamlock.net/abrgemporiaukgfx/livestream_source/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/3/38/Gemporia_tv_in.png" group-title="Shop",Gemporia (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/3/38/Gemporia_tv_in.png" group-title="Shop",Gemporia
 http://57d6b85685bb8.streamlock.net:1935/abrgemporiaukgfx/livestream_360p/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/3/38/Gemporia_tv_in.png" group-title="Shop",Gemporia
+https://57d6b85685bb8.streamlock.net/abrgemporiaukgfx/livestream_source/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",God TV UK
 https://str-2.mediabay.tv/GODUnitedKingdom/playlist.m3u8?token=eb3db6c4f651ec9936048ec697460f9ba0a7c749-bb9ed7947b89bf967c52dd4164372354-1566591582-1566580782
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/jt6g1Jt.png" group-title="Sport",Horizon Sports
@@ -59,9 +59,9 @@ https://live2.hoolatv.com/live/itv3_hi/chunks.m3u8?__fvd__
 https://live2.hoolatv.com/live/itv4_hi/chunks.m3u8?__fvd__
 #EXTINF:-1 tvg-id="ITVBe UK" tvg-name="ITVBe UK" tvg-logo="https://static.iptv-epg.com/gb/ITVBe.uk.png" group-title="",ITVBe
 https://live2.hoolatv.com/live/itvbe_hi/chunks.m3u8?__fvd__
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.marcroberts.ie/News/img_news/keep-it-country.png" group-title="",Keep It Country TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.marcroberts.ie/News/img_news/keep-it-country.png" group-title="",Keep It Country TV
 http://cdn.fs-chf01-03-4ed412cd-27f7-09d8-bb30-72e28dab4eb1.arqiva-ott-live.com/live-audio_track=96000-video=1100000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.marcroberts.ie/News/img_news/keep-it-country.png" group-title="",Keep It Country TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.marcroberts.ie/News/img_news/keep-it-country.png" group-title="",Keep It Country TV
 http://cdn.fs-chf01-03-4ed412cd-27f7-09d8-bb30-72e28dab4eb1.arqiva-ott-live.com/live-audio_track=96000-video=1100000.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="More4 UK" tvg-name="More4 UK" tvg-logo="https://static.iptv-epg.com/gb/E4.uk.png" group-title="",More4
 https://live2.hoolatv.com/live/more4_hi/chunks.m3u8?__fvd__
@@ -69,11 +69,11 @@ https://live2.hoolatv.com/live/more4_hi/chunks.m3u8?__fvd__
 https://live2.hoolatv.com/live/quest_hi/chunks.m3u8?__fvd__
 #EXTINF:-1 tvg-id="QUEST RED UK" tvg-name="QUEST RED UK" tvg-logo="http://hoolatv.com/sites/default/files/channels/questred.png" group-title="",Quest Red
 https://live2.hoolatv.com/live/questred_hi/chunks.m3u8?__fvd__
-#EXTINF:-1 tvg-id="RT HD UK" tvg-name="RT HD UK" tvg-logo="https://static.iptv-epg.com/ru/RTUK.ru.png" group-title="News",RT UK (Opt-1)
+#EXTINF:-1 tvg-id="RT HD UK" tvg-name="RT HD UK" tvg-logo="https://static.iptv-epg.com/ru/RTUK.ru.png" group-title="News",RT UK
 http://rt-uk.secure.footprint.net/1106.m3u8?streamType=live
-#EXTINF:-1 tvg-id="RT HD UK" tvg-name="RT HD UK" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Russia-today-logo.svg/480px-Russia-today-logo.svg.png" group-title="News",RT UK (Opt-2)
+#EXTINF:-1 tvg-id="RT HD UK" tvg-name="RT HD UK" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Russia-today-logo.svg/480px-Russia-today-logo.svg.png" group-title="News",RT UK
 https://rt-uk.secure.footprint.net/1106.m3u8
-#EXTINF:-1 tvg-id="RT HD UK" tvg-name="RT HD UK" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Russia-today-logo.svg/480px-Russia-today-logo.svg.png" group-title="News",RT UK (Opt-3)
+#EXTINF:-1 tvg-id="RT HD UK" tvg-name="RT HD UK" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Russia-today-logo.svg/480px-Russia-today-logo.svg.png" group-title="News",RT UK
 https://str-2.mediabay.tv/RussiaTodayUnitedKingdom/playlist.m3u8?token=770312f2343a0fe62a4175fae955f63b6faf54b4-3567629e02cf76de989a729456ac92e0-1566590830-1566580030
 #EXTINF:-1 tvg-id="S4C UK" tvg-name="S4C UK" tvg-logo="http://hoolatv.com/sites/default/files/channels/s4c.png" group-title="",S4C
 https://live2.hoolatv.com/live/s4c_hi/chunks.m3u8?__fvd__
@@ -83,9 +83,9 @@ http://tv.sheffieldlive.org/hls/main.m3u8
 http://msleurope2s.akamaized.net/hls/live/2000183/sonymaxukhdmsl/playlist.m3u8
 #EXTINF:-1 tvg-id="TG4 UK" tvg-name="TG4 UK" tvg-logo="https://static.iptv-epg.com/ie/TG4.ie.png" group-title="",TG4
 http://csm-e.cds1.yospace.com/csm/live/74246610.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/K1AW9O1.png" group-title="",Venus TV (Opt-1)
-https://a.jsrdn.com/rtmp/22690/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/K1AW9O1.png" group-title="",Venus TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/K1AW9O1.png" group-title="",Venus TV
 http://45.77.90.56:8080/hls/mystream.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/K1AW9O1.png" group-title="",Venus TV
+https://a.jsrdn.com/rtmp/22690/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/pYEGZrO.png" group-title="",Vox Africa UK
 http://109.231.229.37:3401/voxafuk/voxafhlsout/chunklist_w985073329.m3u8
diff --git a/channels/us.m3u b/channels/us.m3u
index c4e8b27f8..c2ee4b775 100644
--- a/channels/us.m3u
+++ b/channels/us.m3u
@@ -1,7 +1,7 @@
 #EXTM3U x-tvg-url="http://epg.streamstv.me/epg/guide-usa.xml.gz"
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.247retro.com/images/sidebar_logo_gradient.jpg" group-title="Movies",24/7 Retro TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.247retro.com/images/sidebar_logo_gradient.jpg" group-title="Movies",24/7 Retro TV
 http://247retrotv.com:1935/live/smil:247retro.smil/chunklist_w1193920237_b1928000_sleng.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",24/7 Retro TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",24/7 Retro TV
 http://247retrotv.com:1935/live/smil:247retro.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/CKCtZo7.png" group-title="",30A Investment Pitch
 http://www.30a-tv.com/InvPit.m3u8?fluxustv.m3u8
@@ -9,28 +9,28 @@ http://www.30a-tv.com/InvPit.m3u8?fluxustv.m3u8
 http://30a-tv.com/music.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.sidewalkstv.com/wp-content/uploads/2013/10/sw-tep-large-300x125.png" group-title="",30A Sidewalks
 http://30a-tv.com/sidewalks.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/4TEMhxH.png" group-title="",30A TV (Opt-1)
-http://30a-tv.com/my999.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/4TEMhxH.png" group-title="",30A TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/4TEMhxH.png" group-title="",30A TV
 http://30a-tv.com/my999.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/4ydVVIA.png" group-title="Religious",3ABN Latino (Opt-1)
-https://moiptvhls-i.akamaihd.net/hls/live/652315/secure/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",3ABN Latino (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/4TEMhxH.png" group-title="",30A TV
+http://30a-tv.com/my999.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",3ABN Latino
 http://uni5rtmp.tulix.tv:1935/bettervida/bettervida/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/4ydVVIA.png" group-title="Religious",3ABN Latino
+https://moiptvhls-i.akamaihd.net/hls/live/652315/secure/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/e/ea/KMTV3.png" group-title="",3News Now (KMTV-TV)
 http://content.uplynk.com/channel/328d1434fb51476cb6567c74d5b2cc70.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/b/b5/WHDH_7_logo.png" group-title="Local",7News Boston (WHDH) (Opt-1)
-https://bcsecurelivehls-i.akamaihd.net/hls/live/598046/4744899807001_1/livestream/master_540-57.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/b/b5/WHDH_7_logo.png" group-title="Local",7News Boston (WHDH) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/b/b5/WHDH_7_logo.png" group-title="Local",7News Boston (WHDH)
 https://bcsecurelivehls-i.akamaihd.net/hls/live/598046/4744899807001_1/livestream/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/b/b5/WHDH_7_logo.png" group-title="Local",7News Boston (WHDH)
+https://bcsecurelivehls-i.akamaihd.net/hls/live/598046/4744899807001_1/livestream/master_540-57.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/abcnews.png" group-title="News",ABC News Digital 1
 https://abclive1-lh.akamaihd.net/i/abc_live01@423395/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",ABC News Digital 10
 https://abclive1-lh.akamaihd.net/i/abc_live10@420897/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/abcnews.png" group-title="News",ABC News Digital 11 (Opt-1)
-https://abclive2-lh.akamaihd.net/i/abc_live11@423404/index_4000_av-b.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/abcnews.png" group-title="News",ABC News Digital 11 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/abcnews.png" group-title="News",ABC News Digital 11
 http://abclive2-lh.akamaihd.net/i/abc_live11@423404/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/abcnews.png" group-title="News",ABC News Digital 11
+https://abclive2-lh.akamaihd.net/i/abc_live11@423404/index_4000_av-b.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",ABC News Digital 2
 https://abclive1-lh.akamaihd.net/i/abc_live02@423396/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",ABC News Digital 3
@@ -57,16 +57,16 @@ http://svc-lvanvato-cxtv-wjax.cmgvideo.com/wjax/2564k/index.m3u8
 http://api.new.livestream.com/accounts/26511688/events/7954874/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Legislative",ACTV
 http://granicusliveus12-a.akamaihd.net/azleg/G0247_012/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",Adult Swim (Opt-1)
-https://adultswimhls-i.akamaihd.net/hls/live/238460-b/adultswim/main/1/master_Layer7.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",Adult Swim (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",Adult Swim
 http://adultswimhls-i.akamaihd.net/hls/live/238460/adultswim/main/1/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/AdultSwimOnAir.us.png" group-title="Entertainment",Adult Swim (Opt-3)
-http://adultswimhls-i.akamaihd.net/hls/live/238460/adultswim/main/1/master_Layer7.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://123tvgo.com/wp-content/uploads/2018/08/adultswim-269x151.png" group-title="Entertainment",Adult Swim (Opt-4)
-https://adultswimhls-i.akamaihd.net/hls/live/238460/adultswim/main/1/master_Layer6.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",Adult Swim (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",Adult Swim
 http://adultswimhls-i.akamaihd.net/hls/live/238460/adultswim/main/1/master_Layer5.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/AdultSwimOnAir.us.png" group-title="Entertainment",Adult Swim
+http://adultswimhls-i.akamaihd.net/hls/live/238460/adultswim/main/1/master_Layer7.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Entertainment",Adult Swim
+https://adultswimhls-i.akamaihd.net/hls/live/238460-b/adultswim/main/1/master_Layer7.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://123tvgo.com/wp-content/uploads/2018/08/adultswim-269x151.png" group-title="Entertainment",Adult Swim
+https://adultswimhls-i.akamaihd.net/hls/live/238460/adultswim/main/1/master_Layer6.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/AdultSwimOnAir.us.png" group-title="Entertainment",Adult Swim Animation Marathon
 http://amd.cdn.turner.com/adultswim/big/streams/playlists/animated-marathon.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Akaku 53 (Hawaii)
@@ -75,10 +75,10 @@ https://akaku.vod.castus.tv/live/ch1.m3u8
 https://akaku.vod.castus.tv/live/ch2.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Akaku 55 (Hawaii)
 https://akaku.vod.castus.tv/live/ch3.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://image.roku.com/developer_channels/prod/ce03bcd0975942929a2cef7daced1a01474dd7f441b691ceaa2a9dba454b4cdb.png" group-title="",AKC TV (Opt-1)
-https://video.blivenyc.com/broadcast/prod/2061/22/file-3192k.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AKC TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AKC TV
 https://video.blivenyc.com/broadcast/2061/22/file-858k.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://image.roku.com/developer_channels/prod/ce03bcd0975942929a2cef7daced1a01474dd7f441b691ceaa2a9dba454b4cdb.png" group-title="",AKC TV
+https://video.blivenyc.com/broadcast/prod/2061/22/file-3192k.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/6OxGGpI.png" group-title="",Albanian TV of America
 http://stream.shqiptv.com:7080/altvusa/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",Aliento Vision
@@ -87,9 +87,9 @@ http://livestreamcdn.net:1935/AlientoSD/smil:AlientoSD.smil/playlist.m3u8
 http://api.new.livestream.com/accounts/5730046/events/2966225/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/oIw8LSy.jpg" group-title="",America's Funniest Videos
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-americasfunniesthomevideos/CDN/1280x720_5000000/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",American Horrors (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",American Horrors
 http://170.178.189.66:1935/live/Stream1/.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",American Horrors (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",American Horrors
 http://170.178.189.66:1935/live/Stream1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hSYez3V.png" group-title="",Atlanta Channel
 http://media4.tripsmarter.com:1935/LiveTV/ACVBHD/chucklist.m3u8
@@ -119,23 +119,23 @@ http://stream.iphonewebtown.com:1935/bibleexplorations/bexplorationsmobile.strea
 https://stitcher.pluto.tv/stitch/hls/channel/561c5b0dada51f8004c4d855/master.m3u8?deviceType=web&deviceMake=Chrome&deviceModel=Chrome&sid=6e360db0-724b-11e8-be77-bf4d1417b012&deviceId=889540f0-712d-11e8-b9ec-8ba319deeadf&deviceVersion=37.0.2049.0&appVersion=2.0.0&deviceDNT=0&userId=&advertisingId=&deviceLat=38.5783&deviceLon=-90.6666&app_name=&appName=&appStoreUrl=&serverSideAds=true
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/c/c5/BlazeTVDec2018.png" group-title="Entertainment",BlazeTV
 https://theblaze4.akamaized.net/hls/live//699982/theblaze/cm-dvr/master.m3u8
-#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s71799_h3_aa.png" group-title="Business",Bloomberg TV (Opt-1)
-https://liveproduseast.akamaized.net/btv/desktop/us_live.m3u8
-#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s71799_h3_aa.png" group-title="Business",Bloomberg TV (Opt-2)
-http://cdn-videos.akamaized.net/btv/desktop/akamai/europe/live/primary.m3u8
-#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s71799_h3_aa.png" group-title="Business",Bloomberg TV (Opt-3)
-https://liveproduseast.global.ssl.fastly.net/btv/desktop/us_live.m3u8
-#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s71799_h3_aa.png" group-title="Business",Bloomberg TV (Opt-4)
-https://cdn-videos.akamaized.net/btv/desktop/fastly/asia/live/primary.m3u8
-#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://i.imgur.com/idRFfhY.png" group-title="Business",Bloomberg TV (Opt-5)
-http://210.210.155.35/session/1f4b9814-7ed5-11e8-aa50-c81f66f89318/uq2663/h/h03/index1.m3u8
-#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/6a/Fox_Life_Turkey.png" group-title="Business",Bloomberg TV (Opt-6)
+#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/6a/Fox_Life_Turkey.png" group-title="Business",Bloomberg TV
 http://210.210.155.35/session/1f4b9814-7ed5-11e8-aa50-c81f66f89318/uq2663/h/h03/01.m3u8
-#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s71799_h3_aa.png" group-title="Business",Bloomberg TV (Opt-7)
+#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://i.imgur.com/idRFfhY.png" group-title="Business",Bloomberg TV
+http://210.210.155.35/session/1f4b9814-7ed5-11e8-aa50-c81f66f89318/uq2663/h/h03/index1.m3u8
+#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s71799_h3_aa.png" group-title="Business",Bloomberg TV
+http://cdn-videos.akamaized.net/btv/desktop/akamai/europe/live/primary.m3u8
+#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s71799_h3_aa.png" group-title="Business",Bloomberg TV
 http://cdn-videos.akamaized.net/btv/desktop/akamai/us/live/primary.m3u8
-#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s71799_h3_aa.png" group-title="Business",Bloomberg TV (Opt-8)
+#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s71799_h3_aa.png" group-title="Business",Bloomberg TV
 http://liveproduseast.akamaized.net/us/Channel-USTV-AWS-virginia-1/Source-USTV-1000-1_live.m3u8
-#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTb3KJ9YQPn_U_FdsCBkOI60nVG_rfwJX6jEDj8RV4DQ3fs1DRiGTgGNA" group-title="Business",Bloomberg TV (Opt-9)
+#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s71799_h3_aa.png" group-title="Business",Bloomberg TV
+https://cdn-videos.akamaized.net/btv/desktop/fastly/asia/live/primary.m3u8
+#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s71799_h3_aa.png" group-title="Business",Bloomberg TV
+https://liveproduseast.akamaized.net/btv/desktop/us_live.m3u8
+#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s71799_h3_aa.png" group-title="Business",Bloomberg TV
+https://liveproduseast.global.ssl.fastly.net/btv/desktop/us_live.m3u8
+#EXTINF:-1 tvg-id="Bloomberg TV USA-US" tvg-name="Bloomberg TV USA-US" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTb3KJ9YQPn_U_FdsCBkOI60nVG_rfwJX6jEDj8RV4DQ3fs1DRiGTgGNA" group-title="Business",Bloomberg TV
 https://liveproduseast.global.ssl.fastly.net/us/Channel-USTV-AWS-virginia-1/Source-USTV-240-1_live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Bloomberg TV Live Event
 https://liveproduseast.akamaized.net/btv/desktop/us_event.m3u8
@@ -145,10 +145,10 @@ https://liveproduseast.global.ssl.fastly.net/btv/desktop/us_politics.m3u8
 http://granicusliveus2-a.akamaihd.net/bloomingtonmn/G1223_002/chunklist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/3/35/Boomerang_2014_logo.svg/175px-Boomerang_2014_logo.svg.png" group-title="",Boomerang
 http://185.246.209.109:8080/BOOMERANG/index.m3u8
-#EXTINF:-1 tvg-id="FOX Boston-US" tvg-name="FOX Boston-US" tvg-logo="https://media.myfoxbostoncom.cmgdigital.com/photo/2018/07/19/logo-main-wfxt_1532037842427_12380292_ver1.0.png" group-title="Local",Boston 25 News (WFXT) (Opt-1)
-http://svc-lvanvato-cxtv-wfxt.cmgvideo.com:80/wfxt/2564k/index.m3u8
-#EXTINF:-1 tvg-id="FOX Boston-US" tvg-name="FOX Boston-US" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSU3tOhoaIyjC8qJ_OjWjddzk-GMGxXDfKYzRfNhqOrxoLzZze3IpdGBw" group-title="Local",Boston 25 News (WFXT) (Opt-2)
+#EXTINF:-1 tvg-id="FOX Boston-US" tvg-name="FOX Boston-US" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSU3tOhoaIyjC8qJ_OjWjddzk-GMGxXDfKYzRfNhqOrxoLzZze3IpdGBw" group-title="Local",Boston 25 News (WFXT)
 http://svc-lvanvato-cxtv-wfxt.cmgvideo.com/wfxt/2564k/index.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="FOX Boston-US" tvg-name="FOX Boston-US" tvg-logo="https://media.myfoxbostoncom.cmgdigital.com/photo/2018/07/19/logo-main-wfxt_1532037842427_12380292_ver1.0.png" group-title="Local",Boston 25 News (WFXT)
+http://svc-lvanvato-cxtv-wfxt.cmgvideo.com:80/wfxt/2564k/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Bowie TV
 http://granicusliveus3-a.akamaihd.net/cityofbowie/G0466_001/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/2KjJq8r.jpg" group-title="Music",BritAsia TV (US Eastern)
@@ -161,12 +161,12 @@ http://a.jsrdn.com/broadcast/d5b47/+0000/low/c.m3u8
 http://na-all15.secdn.net/pegstream3-live/play/c3e1e4c4-7f11-4a54-8b8f-c590a95b4ade/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.butv10.com/wp-content/themes/butv10/_images/favicon.png" group-title="Local",BUTV10 (Boston University)
 http://butv10-livestream.bu.edu/live/WIFI-2096k-1080p/WIFI-2096k-1080p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSJCVb6ID85LxiWckJQk8K1fklnO6-jhl3jup2AYP9NWRBGT8CPJ7p-GMo" group-title="",Buzzr
+https://buzzr.global.ssl.fastly.net/out/u/buzzr_hls.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/BuzzrTV.us.png" group-title="Entertainment",Buzzr
+https://buzzr.global.ssl.fastly.net/out/u/buzzr_hls_4.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/b/be/Buzzr_%28TV_Network%29_Logo.png" group-title="",Buzzr
 https://buzzr.global.ssl.fastly.net/out/u/buzzr_hls_4.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/BuzzrTV.us.png" group-title="Entertainment",Buzzr (Opt-1)
-https://buzzr.global.ssl.fastly.net/out/u/buzzr_hls_4.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSJCVb6ID85LxiWckJQk8K1fklnO6-jhl3jup2AYP9NWRBGT8CPJ7p-GMo" group-title="",Buzzr (Opt-2)
-https://buzzr.global.ssl.fastly.net/out/u/buzzr_hls.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/TDRDF4q.png" group-title="",byu TV
 http://a.jsrdn.com/broadcast/d5b46/+0000/high/c.m3u8
 #EXTINF:-1 tvg-id="CSPAN-US" tvg-name="CSPAN-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s10161_h3_aa.png" group-title="",C-Span
@@ -175,12 +175,12 @@ https://skystreams-lh.akamaihd.net/i/SkyC1_1@500806/master.m3u8
 https://skystreams-lh.akamaihd.net/i/SkyC2_1@500807/master.m3u8
 #EXTINF:-1 tvg-id="CSPAN 3-US" tvg-name="CSPAN 3-US" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/cspan3.png" group-title="",C-Span 3
 https://skystreams-lh.akamaihd.net/i/SkyC3_1@500808/master.m3u8
-#EXTINF:-1 tvg-id="California Music Channel(CMTV)-US" tvg-name="California Music Channel(CMTV)-US" tvg-logo="https://i.imgur.com/9TbpsS0.png" group-title="",California Music Channel (Opt-1)
-https://cmctv.ios.internapcdn.net/cmctv_vitalstream_com/live_1/CMC-TV/master.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="California Music Channel(CMTV)-US" tvg-name="California Music Channel(CMTV)-US" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/cmc-cali-tv.png" group-title="Music",California Music Channel (Opt-2)
-https://cmctv.ios.internapcdn.net/cmctv_vitalstream_com/live_1/CMC-TV/CMC-TV.m3u8
-#EXTINF:-1 tvg-id="California Music Channel(CMTV)-US" tvg-name="California Music Channel(CMTV)-US" tvg-logo="" group-title="Music",California Music Channel (Opt-3)
+#EXTINF:-1 tvg-id="California Music Channel(CMTV)-US" tvg-name="California Music Channel(CMTV)-US" tvg-logo="" group-title="Music",California Music Channel
 http://cmctv.ios.internapcdn.net/cmctv_vitalstream_com/live_1/CMC-TV/.m3u8
+#EXTINF:-1 tvg-id="California Music Channel(CMTV)-US" tvg-name="California Music Channel(CMTV)-US" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/cmc-cali-tv.png" group-title="Music",California Music Channel
+https://cmctv.ios.internapcdn.net/cmctv_vitalstream_com/live_1/CMC-TV/CMC-TV.m3u8
+#EXTINF:-1 tvg-id="California Music Channel(CMTV)-US" tvg-name="California Music Channel(CMTV)-US" tvg-logo="https://i.imgur.com/9TbpsS0.png" group-title="",California Music Channel
+https://cmctv.ios.internapcdn.net/cmctv_vitalstream_com/live_1/CMC-TV/master.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Capital City Connection
 http://na-us-se13.secdn.net/pegstream3-live/play/5f0d9ca5-4e85-4c01-a426-9ec8d44c2c9c/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/tmKtbf9.png" group-title="Education",Capital City Connection (Montgomery)
@@ -193,59 +193,59 @@ http://origin3-edge2.ord.yourstreamlive.com:1935/live/yourstreamlive/out_657_198
 http://catholictvhd-lh.akamaihd.net:80/i/ctvhd_1@88148/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CBN Español
 http://bcliveuniv-lh.akamaihd.net/i/iptv2_1@194050/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",CBN News (Opt-1)
-https://bcliveunivsecure-lh.akamaihd.net/i/iptv1_1@500579/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",CBN News (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",CBN News
 http://bcliveuniv-lh.akamaihd.net/i/iptv1_1@194050/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",CBN News (Opt-3)
-http://bcliveunivsecure-lh.akamaihd.net/i/news_1@500579/index_150_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://123tvgo.com/wp-content/uploads/2018/08/cbn-news-269x151.png" group-title="News",CBN News (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://123tvgo.com/wp-content/uploads/2018/08/cbn-news-269x151.png" group-title="News",CBN News
 http://bcliveuniv-lh.akamaihd.net/i/news_1@194050/index_900_av-p.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",CBN News (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",CBN News
 http://bcliveuniv-lh.akamaihd.net:80/i/news_1@194050/master.m3u8
-#EXTINF:-1 tvg-id="CBS HD New York-US" tvg-name="CBS HD New York-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s10098_h3_aa.png" group-title="",CBS (Opt-1)
-http://161.0.157.50/PLTV/88888888/224/3221227041/index.m3u8
-#EXTINF:-1 tvg-id="CBS HD New York-US" tvg-name="CBS HD New York-US" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/cbs.png" group-title="",CBS (Opt-2)
-http://161.0.157.50/PLTV/88888888/224/3221227041/03.m3u8
-#EXTINF:-1 tvg-id="CBS HD New York-US" tvg-name="CBS HD New York-US" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/cbs.png" group-title="",CBS (Opt-3)
-http://161.0.157.50/PLTV/88888888/224/3221227041/01.m3u8
-#EXTINF:-1 tvg-id="CBS HD New York-US" tvg-name="CBS HD New York-US" tvg-logo="https://upload.wikimedia.org/wikipedia/en/d/d1/Kweslogo.png" group-title="",CBS (Opt-4)
-http://161.0.157.51/PLTV/88888888/224/3221227041/01.m3u8
-#EXTINF:-1 tvg-id="CBS HD New York-US" tvg-name="CBS HD New York-US" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/cbs.png" group-title="",CBS (Opt-5)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",CBN News
+http://bcliveunivsecure-lh.akamaihd.net/i/news_1@500579/index_150_av-p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",CBN News
+https://bcliveunivsecure-lh.akamaihd.net/i/iptv1_1@500579/master.m3u8
+#EXTINF:-1 tvg-id="CBS HD New York-US" tvg-name="CBS HD New York-US" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/cbs.png" group-title="",CBS
 http://161.0.157.5/PLTV/88888888/224/3221227041/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/03/cbs-news-us.png" group-title="News",CBSN (Opt-1)
-http://cbsnewshd-lh.akamaihd.net/i/CBSNHD_7@199302/index_700_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/03/cbs-news-us.png" group-title="News",CBSN (Opt-2)
-http://cbsnewshd-lh.akamaihd.net/i/CBSNHD_7@199302/index_2200_av-p.m3u8?sd=10&rebase=on
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/03/cbs-news-us.png" group-title="News",CBSN (Opt-3)
-http://cbsnewshd-lh.akamaihd.net:80/i/CBSNHD_7@199302/index_1200_av-b.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/03/cbs-news-us.png" group-title="News",CBSN (Opt-4)
-http://cbsnewshd-lh.akamaihd.net/i/CBSNHD_7@199302/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/03/cbs-news-us.png" group-title="News",CBSN (Opt-5)
-http://cbsnewshd-lh.akamaihd.net/i/CBSNHD_7@199302/index_2200_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/03/cbs-news-us.png" group-title="News",CBSN (Opt-6)
-http://cbsnhls-i.akamaihd.net/hls/live/264710/CBSN_mdialog/prodstream/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/03/cbs-news-us.png" group-title="News",CBSN (Opt-7)
+#EXTINF:-1 tvg-id="CBS HD New York-US" tvg-name="CBS HD New York-US" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/cbs.png" group-title="",CBS
+http://161.0.157.50/PLTV/88888888/224/3221227041/01.m3u8
+#EXTINF:-1 tvg-id="CBS HD New York-US" tvg-name="CBS HD New York-US" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/cbs.png" group-title="",CBS
+http://161.0.157.50/PLTV/88888888/224/3221227041/03.m3u8
+#EXTINF:-1 tvg-id="CBS HD New York-US" tvg-name="CBS HD New York-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s10098_h3_aa.png" group-title="",CBS
+http://161.0.157.50/PLTV/88888888/224/3221227041/index.m3u8
+#EXTINF:-1 tvg-id="CBS HD New York-US" tvg-name="CBS HD New York-US" tvg-logo="https://upload.wikimedia.org/wikipedia/en/d/d1/Kweslogo.png" group-title="",CBS
+http://161.0.157.51/PLTV/88888888/224/3221227041/01.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/03/cbs-news-us.png" group-title="News",CBSN
 http://bit.ly/2F78T4M
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/03/cbs-news-us.png" group-title="News",CBSN
+http://cbsnewshd-lh.akamaihd.net/i/CBSNHD_7@199302/index_2200_av-p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/03/cbs-news-us.png" group-title="News",CBSN
+http://cbsnewshd-lh.akamaihd.net/i/CBSNHD_7@199302/index_2200_av-p.m3u8?sd=10&rebase=on
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/03/cbs-news-us.png" group-title="News",CBSN
+http://cbsnewshd-lh.akamaihd.net/i/CBSNHD_7@199302/index_700_av-p.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/03/cbs-news-us.png" group-title="News",CBSN
+http://cbsnewshd-lh.akamaihd.net/i/CBSNHD_7@199302/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/03/cbs-news-us.png" group-title="News",CBSN
+http://cbsnewshd-lh.akamaihd.net:80/i/CBSNHD_7@199302/index_1200_av-b.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2019/03/cbs-news-us.png" group-title="News",CBSN
+http://cbsnhls-i.akamaihd.net/hls/live/264710/CBSN_mdialog/prodstream/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/e/e1/KCAL-TV_Logo.png" group-title="",CBSN Los Angeles
 https://dai.google.com/linear/hls/event/TxSbNMu4R5anKrjV02VOBg/master.m3u8?iu=/4128/CBS.LA.OTT
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cbsnews2.cbsistatic.com/hub/i/2018/12/11/044a5de4-b638-466c-a6f2-fe9513ede3a8/2f47b3fc5562b15462c61363170766fb/logo-cbsn-ny-web-444x224.png" group-title="News",CBSN New York (Opt-1)
-https://www.cbsnews.com/common/video/cbsn-ny-prod.m3u8?iu=/8264/vaw-can/desktop/cbsnews
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cbsnewyork.files.wordpress.com/2018/06/3_newyork_cbs2_wlny1055.png" group-title="News",CBSN New York (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cbsnewyork.files.wordpress.com/2018/06/3_newyork_cbs2_wlny1055.png" group-title="News",CBSN New York
 https://cbslocallive-i.akamaihd.net/hls/live/724686/CBSNNY_2/master_2200.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cbsnews2.cbsistatic.com/hub/i/2018/12/11/044a5de4-b638-466c-a6f2-fe9513ede3a8/2f47b3fc5562b15462c61363170766fb/logo-cbsn-ny-web-444x224.png" group-title="News",CBSN New York
+https://www.cbsnews.com/common/video/cbsn-ny-prod.m3u8?iu=/8264/vaw-can/desktop/cbsnews
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.charlottecountyfl.gov/cctv/PublishingImages/CC-TV-color-logo.jpg" group-title="",CC-TV (Charlotte County)
 http://granicusliveus3-a.akamaihd.net/charlotte/G0055_002/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCX1 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCX1
 http://156.142.85.152/live/WIFI-2096k-1080p/WIFI-2096k-1080p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SC5nyyL.png" group-title="",CCX1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SC5nyyL.png" group-title="",CCX1
 http://156.142.85.152/live/WIFI-2096k-1080p/WIFI-2096k-1080p.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCX2 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCX2
 https://nwct-tr-ls2.nwct.org/live/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCX2 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCX2
 https://nwct-tr-ls2.nwct.org/live/WIFI-2096k-1080p/WIFI-2096k-1080p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCX3 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCX3
 https://nwct-tr-ls3.nwct.org/live/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCX3 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",CCX3
 https://nwct-tr-ls3.nwct.org/live/WIFI-2096k-1080p/WIFI-2096k-1080p.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://live-tv-channels.org/pt-data/uploads/logo/us-cerritos-tv3.jpg" group-title="Local",Cerritos TV3
 http://granicusliveus4-a.akamaihd.net/cerritos/G0010_002/chunklist.m3u8?fluxustv.m3u8
@@ -261,9 +261,9 @@ http://media.smc-host.com:1935/cycnow.com/cyc2/chunklist_w884806316.m3u8
 https://classicarts.global.ssl.fastly.net/live/cas/master_3000k.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",CNN
 https://1674331492.rsc.cdn77.org/ls-54548-1/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/f0FtDEI.png" group-title="",Court TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/f0FtDEI.png" group-title="",Court TV
 https://content.uplynk.com/channel/92c7be9fb47143a58683d202e321e571.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/f0FtDEI.png" group-title="",Court TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/f0FtDEI.png" group-title="",Court TV
 https://content.uplynk.com/channel/92c7be9fb47143a58683d202e321e571.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.csudh.edu/Assets/templates/header/CSUDH-RGB-Logo-Burgundy-Background.png" group-title="Local",CSUDH TV (Dominguez Hills)
 http://dhtv5.csudh.edu:1935/live/myStream/playlist.m3u8
@@ -275,15 +275,15 @@ http://video.ct-n.com/live/ctnspare/chunklist_w252238746_DVR.m3u8
 http://video.ct-n.com/live/web1stream/chunklist_w1992415243_DVR.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/He6Ugfn.jpg" group-title="",CT-N Live Stream 2
 http://video.ct-n.com/live/web2stream/chunklist_w1202315245_DVR.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Bj37ZMY.png" group-title="",CTN (Opt-1)
-http://rtmp.ottdemo.rrsat.com/ctntv/ctntvmulti.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Bj37ZMY.png" group-title="",CTN (Opt-2)
-http://rrsatrtmp.tulix.tv/ctntv/ctntvmulti.smil/chunklist_w846886780_b1764000.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Bj37ZMY.png" group-title="",CTN (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Bj37ZMY.png" group-title="",CTN
 http://admin.ottdemo.rrsat.com:1935/ctntv/ctntv2/playlist.m3u8
-#EXTINF:-1 tvg-id="Daystar  - Network-US" tvg-name="Daystar  - Network-US" tvg-logo="http://www.daystar.com/wp-content/uploads/daystar-logo-1.png" group-title="Religious",Daystar TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Bj37ZMY.png" group-title="",CTN
+http://rrsatrtmp.tulix.tv/ctntv/ctntvmulti.smil/chunklist_w846886780_b1764000.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Bj37ZMY.png" group-title="",CTN
+http://rtmp.ottdemo.rrsat.com/ctntv/ctntvmulti.smil/chunklist.m3u8
+#EXTINF:-1 tvg-id="Daystar  - Network-US" tvg-name="Daystar  - Network-US" tvg-logo="http://www.daystar.com/wp-content/uploads/daystar-logo-1.png" group-title="Religious",Daystar TV
 http://bcsecurelivehls-i.akamaihd.net/hls/live/621275/1539097700001/master_240p.m3u8
-#EXTINF:-1 tvg-id="Daystar  - Network-US" tvg-name="Daystar  - Network-US" tvg-logo="http://www.daystar.com/wp-content/uploads/daystar-logo-1.png" group-title="Religious",Daystar TV (Opt-2)
+#EXTINF:-1 tvg-id="Daystar  - Network-US" tvg-name="Daystar  - Network-US" tvg-logo="http://www.daystar.com/wp-content/uploads/daystar-logo-1.png" group-title="Religious",Daystar TV
 https://bcsecurelivehls-i.akamaihd.net/hls/live/621275/1539097700001/master_1080p.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Legislative",DC Council Channel
 http://video.oct.dc.gov/out/u/15_12.m3u8
@@ -339,12 +339,12 @@ http://api.new.livestream.com/accounts/6180769/events/live/live.m3u8
 http://api.new.livestream.com/accounts/9485505/events/3244983/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/2/2f/Wjbk-logo.png" group-title="Local",FOX 2 Detroit (WJBK)
 http://api.new.livestream.com/accounts/6396566/events/2598525/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",FOX 32 News (WFLD) (Opt-1)
-http://api.new.livestream.com/accounts/6370732/events/live/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://media.fox32chicago.com/lakana-fox-global/theme/images/wfld/placeholder-4x3.jpg" group-title="Local",FOX 32 News (WFLD) (Opt-2)
-http://api.new.livestream.com/accounts/6370732/events/2591850/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/FOX32WFLD.us.png" group-title="Local",FOX 32 News (WFLD) (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/FOX32WFLD.us.png" group-title="Local",FOX 32 News (WFLD)
 http://109.236.92.216:9090/CTVNews/tracks-v1a1/mono.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://media.fox32chicago.com/lakana-fox-global/theme/images/wfld/placeholder-4x3.jpg" group-title="Local",FOX 32 News (WFLD)
+http://api.new.livestream.com/accounts/6370732/events/2591850/live.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",FOX 32 News (WFLD)
+http://api.new.livestream.com/accounts/6370732/events/live/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",FOX 46 Charlotte (WJZY)
 http://api.new.livestream.com/accounts/6370805/events/live/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",FOX 5 Atlanta (WAGA-TV)
@@ -353,31 +353,31 @@ http://api.new.livestream.com/accounts/4241684/events/2152811/live.m3u8
 http://api.new.livestream.com/accounts/2363281/events/1763520/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://media.fox35orlando.com/lakana-fox-global/theme/images/wofl/logo-fox-35-orlando-wofl-alt.png" group-title="Local",FOX 51 (WOGX)
 http://api.new.livestream.com/accounts/6372875/events/2592470/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",FOX 54 (WFXG) (Opt-1)
-http://api.new.livestream.com/accounts/11328309/events/live/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/c/c0/Wfxg_gold.GIF" group-title="Local",FOX 54 (WFXG) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/c/c0/Wfxg_gold.GIF" group-title="Local",FOX 54 (WFXG)
 http://api.new.livestream.com/accounts/11328309/events/3653675/live.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",FOX 54 (WFXG)
+http://api.new.livestream.com/accounts/11328309/events/live/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.broadcastingcable.com/.image/t_share/MTU0MjAzNTkxNjYxMjAwNzIw/fox8-logojpg.jpg" group-title="Local",FOX 8 (WVUE-DT)
 http://api.new.livestream.com/accounts/10891792/events/3578864/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/6/65/WJW_%28TV%29_logo.png" group-title="Local",FOX 8 News (WJW)
 http://api.new.livestream.com/accounts/57501/events/1146195/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/FoxBusiness.us.png" group-title="Business",FOX Business Network
 https://1329918864.rsc.cdn77.org/ls-54548-1/index.m3u8
-#EXTINF:-1 tvg-id="Fox News-US" tvg-name="Fox News-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s60179_h3_aa.png" group-title="News",FOX News (Opt-1)
+#EXTINF:-1 tvg-id="Fox News-US" tvg-name="Fox News-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s60179_h3_aa.png" group-title="News",FOX News
 http://foxnewsuni-f.akamaihd.net/i/FNCGOPREV_40220@40220/master.m3u8
-#EXTINF:-1 tvg-id="Fox News-US" tvg-name="Fox News-US" tvg-logo="http://123tvgo.com/wp-content/uploads/2018/08/fox-news-269x151.jpg" group-title="News",FOX News (Opt-2)
-https://foxnewsuni-f.akamaihd.net/i/FNCGOPREV_40220@40220/index_300000_av-p.m3u8
-#EXTINF:-1 tvg-id="Fox News-US" tvg-name="Fox News-US" tvg-logo="https://static.iptv-epg.com/us/FoxNews.us.png" group-title="News",FOX News (Opt-3)
+#EXTINF:-1 tvg-id="Fox News-US" tvg-name="Fox News-US" tvg-logo="https://static.iptv-epg.com/us/FoxNews.us.png" group-title="News",FOX News
 https://1674331492.rsc.cdn77.org/LS-ATL-54548-4/tracks-v1a1/mono.m3u8
+#EXTINF:-1 tvg-id="Fox News-US" tvg-name="Fox News-US" tvg-logo="http://123tvgo.com/wp-content/uploads/2018/08/fox-news-269x151.jpg" group-title="News",FOX News
+https://foxnewsuni-f.akamaihd.net/i/FNCGOPREV_40220@40220/index_300000_av-p.m3u8
 #EXTINF:-1 tvg-id="Fox Sports 1-US" tvg-name="Fox Sports 1-US" tvg-logo="https://ya-webdesign.com/transparent450_/fox-sports-1-png-15.png" group-title="Sport",FOX Sports 1
 http://185.246.209.109:8080/FOX_SPORTS1/tracks-v1a1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",FOX19 Now (WXIX-TV) (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",FOX19 Now (WXIX-TV)
 http://api.new.livestream.com/accounts/12136532/events/live/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",FOX19 Now (WXIX-TV) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",FOX19 Now (WXIX-TV)
 https://livestream-f.akamaihd.net/i/12136532_3798375_lsivebnd26zzrimsxyv_1@383316/master.m3u8?__b__=678&dw=14400&hdnea=st=1565953391~exp=1565955191~acl=/i/12136532_3798375_lsivebnd26zzrimsxyv_1@383316/*~hmac=1273775f30cbe2b3722d563fb7f12fd97a68d73a1900f7eed1c6a41f990ac927&set-segment-duration=responsive&__a__=off
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/FOXKOKI.us.png" group-title="Local",FOX23 News (KOKI) (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/FOXKOKI.us.png" group-title="Local",FOX23 News (KOKI)
 http://svc-lvanvato-cxtv-koki.cmgvideo.com/koki/2564k/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/d/dd/KOKI23.png" group-title="Local",FOX23 News (KOKI) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/d/dd/KOKI23.png" group-title="Local",FOX23 News (KOKI)
 https://svc-lvanvato-cxtv-koki.cmgvideo.com/koki/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/9/99/FOX28WTGS.PNG" group-title="Local",FOX28 Savannah (WTGS)
 http://content.uplynk.com/channel/e56ba52a1b9d45ad8c8a033fd83fe480.m3u8
@@ -389,10 +389,10 @@ http://api.new.livestream.com/accounts/2304479/events/1745643/live.m3u8
 http://api.new.livestream.com/accounts/9486720/events/3245377/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/b/b3/WGHP_Fox_8_News_logo.png/225px-WGHP_Fox_8_News_logo.png" group-title="Local",FOX8 (WGHP)
 http://api.new.livestream.com/accounts/9287016/events/3206504/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/4/44/Logo_of_Free_Speech_TV.png" group-title="",Free Speech TV (Opt-1)
-https://edge.free-speech-tv-live.top.comcast.net/out/u/fstv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Free Speech TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Free Speech TV
 http://bit.ly/2xV7ewi
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/4/44/Logo_of_Free_Speech_TV.png" group-title="",Free Speech TV
+https://edge.free-speech-tv-live.top.comcast.net/out/u/fstv.m3u8
 #EXTINF:-1 tvg-id="FUSE TV - Eastern feed-US" tvg-name="FUSE TV - Eastern feed-US" tvg-logo="https://static.iptv-epg.com/us/FuseTV.us.png" group-title="",Fuse TV
 http://185.246.209.109:8080/FUSE/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.glendaleaz.com/images/City-Logo-Text.png" group-title="Local",Glendale 11
@@ -415,18 +415,18 @@ http://granicusliveus4-a.akamaihd.net/greenbeltmd/G0610_001/chunklist.m3u8
 http://granicusliveus4-a.akamaihd.net/greensboro/G0197_003/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/hbo-zone.png" group-title="Movies",HBO Zone
 http://185.246.209.109:8080/HBO_ZONE/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcRVHMLBXY_Qp1yTenR0dqCEdtaZjp38qTXsU_eDeWRg_yHYvbva" group-title="Movies",HBO2 (Opt-1)
-http://161.0.157.51/PLTV/88888888/224/3221227026/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/8/8b/HBO_2_Logo.png" group-title="Movies",HBO2 (Opt-2)
-http://161.0.157.5/PLTV/88888888/224/3221227026/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://liveitkodi.com/Logos/HBO2.png" group-title="Movies",HBO2 (Opt-3)
-http://161.0.157.5:80/PLTV/88888888/224/3221227026/03.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://2.bp.blogspot.com/-1L5Qo-Hs6Qc/TXxCPre9m_I/AAAAAAAACG4/k6UmYBngn9g/s1600/Picture%2B20.png" group-title="Movies",HBO2 (Opt-4)
-http://161.0.157.5/PLTV/88888888/224/3221227026/3.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://s-media-cache-ak0.pinimg.com/736x/7d/8b/4c/7d8b4c3bc50471c093a4747a0b1113c1.jpg" group-title="Movies",HBO2 (Opt-5)
-http://161.0.157.5/PLTV/88888888/224/3221227026/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",HBO2 (Opt-6)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Movies",HBO2
 http://161.0.157.5/PLTV/88888888/224/3221227026/01.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://s-media-cache-ak0.pinimg.com/736x/7d/8b/4c/7d8b4c3bc50471c093a4747a0b1113c1.jpg" group-title="Movies",HBO2
+http://161.0.157.5/PLTV/88888888/224/3221227026/03.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://2.bp.blogspot.com/-1L5Qo-Hs6Qc/TXxCPre9m_I/AAAAAAAACG4/k6UmYBngn9g/s1600/Picture%2B20.png" group-title="Movies",HBO2
+http://161.0.157.5/PLTV/88888888/224/3221227026/3.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/8/8b/HBO_2_Logo.png" group-title="Movies",HBO2
+http://161.0.157.5/PLTV/88888888/224/3221227026/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcRVHMLBXY_Qp1yTenR0dqCEdtaZjp38qTXsU_eDeWRg_yHYvbva" group-title="Movies",HBO2
+http://161.0.157.51/PLTV/88888888/224/3221227026/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://liveitkodi.com/Logos/HBO2.png" group-title="Movies",HBO2
+http://161.0.157.5:80/PLTV/88888888/224/3221227026/03.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/caGRikb.png" group-title="",Honor TV
 https://a.jsrdn.com/broadcast/d5b48/+0000/low/c.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/exdDHml.png" group-title="",Hope Channel
@@ -435,9 +435,9 @@ https://bcliveunivsecure-lh.akamaihd.net/i/HopeChannel_1@571270/master.m3u8
 https://html5-lh.akamaihd.net/i/html5_01@182967/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://sc.dish.com/shared/images/station-logos/hsn2.png" group-title="Shop",HSN2
 https://hsn2html5-lh.akamaihd.net/i/hsn2html5_01@13178/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/DkvWWbE.png" group-title="",Hunt Channel (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/DkvWWbE.png" group-title="",Hunt Channel
 https://1111296894.rsc.cdn77.org/LS-ATL-56868-1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.huntchannel.tv/wp-content/uploads/2017/10/HC-Logo-transparent.png" group-title="",Hunt Channel (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.huntchannel.tv/wp-content/uploads/2017/10/HC-Logo-transparent.png" group-title="",Hunt Channel
 https://1111296894.rsc.cdn77.org/LS-ATL-56868-1/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/d/db/IFC_2014_logo.svg/375px-IFC_2014_logo.svg.png" group-title="",IFC
 http://185.246.209.109:8080/IFC/index.m3u8
@@ -461,10 +461,10 @@ http://klive-a.akamaihd.net/dc-0/live/hls/p/391241/e/0_bthpnu1j/sd/10000/t/YwqLo
 http://media4.tripsmarter.com:1935/LiveTV/KTVHD/chunklist_w363623166.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://pluto.tv.s3.amazonaws.com/assets/images/channels/410c79a3-193d-ed36-bce8-5f86d9b4996a-KidsTV_featured.jpg" group-title="",Kids TV
 http://stitcher.pluto.tv/stitch/hls/channel/51c75f7bb6f26ba1cd00002f/master.m3u8?deviceType=%2C%2C&deviceMake=&deviceModel=&sid=c8b023af-ff3b-4fb6-87f0-4af929510c3d&deviceId=29556502-e2a5-45de-8deb-3b3dfa36b936_e62c9abb601b4ed5&deviceVersion=7.1.1_25&appVersion=3.5.1&deviceDNT=0&userId=&advertisingId=6e7a218c-1bf7-46bf-b486-0902a3cd5a1c&deviceLat=&deviceLon=-&app_name=&appName=&appStoreUrl=&profileLimit=high
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://mediaweb.kirotv.com/photo/2018/09/24/kiro7_header_logo_152x60_13118164_ver1.0.png" group-title="Local",KIRO 7 News (KIRO-TV) (Opt-1)
-http://svc-lvanvato-cxtv-kiro.cmgvideo.com:80/kiro/1864k/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://m.media-amazon.com/images/G/01/DeveloperBlogs/AmazonDeveloperBlogs/legacy/KIRO7_NEWS_blu_text._CB520201523_.png" group-title="Local",KIRO 7 News (KIRO-TV) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://m.media-amazon.com/images/G/01/DeveloperBlogs/AmazonDeveloperBlogs/legacy/KIRO7_NEWS_blu_text._CB520201523_.png" group-title="Local",KIRO 7 News (KIRO-TV)
 http://svc-lvanvato-cxtv-kiro.cmgvideo.com/kiro/1864k/index.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://mediaweb.kirotv.com/photo/2018/09/24/kiro7_header_logo_152x60_13118164_ver1.0.png" group-title="Local",KIRO 7 News (KIRO-TV)
+http://svc-lvanvato-cxtv-kiro.cmgvideo.com:80/kiro/1864k/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/lEnuR22.png" group-title="Religious",KNXT Catholic TV
 http://origin7-edge2.ord.yourstreamlive.com:1935/live/yourstreamlive/amlst:out_2324_4sqkvkde/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",KOMO News (KOMO-TV)
@@ -473,30 +473,30 @@ https://content.uplynk.com/2c88dfe19e1447e6a6aa27e8e143a140.m3u8
 http://173.199.158.79:1935/roku/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",KTVB
 http://ktvb-lh.akamaihd.net/i/KTVB_Shows_1@60359/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.liveonlineradio.net/wp-content/uploads/2016/07/Radio-Latinos-Up.jpg" group-title="",Latinos Up! TV (Opt-1)
-https://5b38ce71f1f00.streamlock.net/8080/8080/chunklist_w956830983.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/etndUmR.png" group-title="",Latinos Up! TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/etndUmR.png" group-title="",Latinos Up! TV
 http://5955f4ce3f2b7.streamlock.net:1935/8080/8080/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.liveonlineradio.net/wp-content/uploads/2016/07/Radio-Latinos-Up.jpg" group-title="",Latinos Up! TV
+https://5b38ce71f1f00.streamlock.net/8080/8080/chunklist_w956830983.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.ytimg.com/vi/6sopMvVTmGc/hqdefault.jpg" group-title="",Law & Crime
 https://live-lawandcrime.simplestreamcdn.com/landc_d1/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.ytimg.com/vi/6sopMvVTmGc/hqdefault.jpg" group-title="",Law & Crime 2
 https://live-lawandcrime.simplestreamcdn.com/landc_d2/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.leominster.tv/SiteAssets/LATV%20Black%20and%20Gold.png" group-title="Local",Leominster TV Educational (Opt-1)
-http://edu.leominster.tv/Edu/smil:Edu.smil/chunklist_w43731873_b1344100_sleng_t64NzIwcA==.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Leominster TV Educational (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Leominster TV Educational
 http://edu.leominster.tv/Edu/smil:Edu.smil/chunklist_w43731873_b1344100_sleng_t64NzIwcA==.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.leominster.tv/SiteAssets/LATV%20Black%20and%20Gold.png" group-title="Local",Leominster TV Government (Opt-1)
-http://gov.leominster.tv/Gov/smil:Gov.smil/chunklist_w1957429215_b1344100_sleng_t64NzIwcA==.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Leominster TV Government (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.leominster.tv/SiteAssets/LATV%20Black%20and%20Gold.png" group-title="Local",Leominster TV Educational
+http://edu.leominster.tv/Edu/smil:Edu.smil/chunklist_w43731873_b1344100_sleng_t64NzIwcA==.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Leominster TV Government
 http://gov.leominster.tv/Gov/smil:Gov.smil/chunklist_w1957429215_b1344100_sleng_t64NzIwcA==.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.leominster.tv/SiteAssets/LATV%20Black%20and%20Gold.png" group-title="Local",Leominster TV Public (Opt-1)
-http://gov.leominster.tv/Pub/smil:Pub.smil/chunklist_w2036537178_b1344100_sleng_t64NzIwcA==.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Leominster TV Public (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.leominster.tv/SiteAssets/LATV%20Black%20and%20Gold.png" group-title="Local",Leominster TV Government
+http://gov.leominster.tv/Gov/smil:Gov.smil/chunklist_w1957429215_b1344100_sleng_t64NzIwcA==.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Leominster TV Public
 http://gov.leominster.tv/Pub/smil:Pub.smil/chunklist_w2036537178_b1344100_sleng_t64NzIwcA==.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.kyforward.com/wp-content/uploads/2017/11/City-Logo-Files_Web_Horse_Blue_1.png" group-title="Local",Lex TV (Opt-1)
-http://granicusliveus2-a.akamaihd.net/lfucg/G0264_002/chunklist_w831870727.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Lex TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.leominster.tv/SiteAssets/LATV%20Black%20and%20Gold.png" group-title="Local",Leominster TV Public
+http://gov.leominster.tv/Pub/smil:Pub.smil/chunklist_w2036537178_b1344100_sleng_t64NzIwcA==.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Lex TV
 http://granicusliveus2-a.akamaihd.net/lfucg/G0264_002/chunklist_w831870727.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.kyforward.com/wp-content/uploads/2017/11/City-Logo-Files_Web_Horse_Blue_1.png" group-title="Local",Lex TV
+http://granicusliveus2-a.akamaihd.net/lfucg/G0264_002/chunklist_w831870727.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",LifevisionTV
 http://uni5rtmp.tulix.tv/lifevision/lifevision.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/YnOZtNm.png" group-title="Religious",LoveWorld USA
@@ -507,19 +507,19 @@ http://live.mcn6.org:8180/live/CELL-496k-270p/CELL-496k-270p.m3u8
 http://185.246.209.109:8080/ME_TV/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/U7SuTIe.png" group-title="",Ministerio TV
 http://ph1.ministeriotv.com:1936/29/stream/playlist.m3u8
-#EXTINF:-1 tvg-id="MLB Network-US" tvg-name="MLB Network-US" tvg-logo="https://static.iptv-epg.com/us/MLBNetwork.us.png" group-title="Sport",MLB Network (Opt-1)
-http://mlblive-akc.mlb.com/ls01/mlbam/mlb_network/NETWORK_LINEAR_1/master_tablet.m3u8
-#EXTINF:-1 tvg-id="MLB Network-US" tvg-name="MLB Network-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s62081_h3_aa.png" group-title="Sport",MLB Network (Opt-2)
-http://mlblive-akc.mlb.com/ls01/mlbam/mlb_network/NETWORK_LINEAR_1/master_wired.m3u8
-#EXTINF:-1 tvg-id="MLB Network-US" tvg-name="MLB Network-US" tvg-logo="" group-title="Sport",MLB Network (Opt-3)
+#EXTINF:-1 tvg-id="MLB Network-US" tvg-name="MLB Network-US" tvg-logo="" group-title="Sport",MLB Network
 http://mlblive-akc.mlb.com/ls01/mlbam/mlb_network/NETWORK_LINEAR_1/master_mobile.m3u8
+#EXTINF:-1 tvg-id="MLB Network-US" tvg-name="MLB Network-US" tvg-logo="https://static.iptv-epg.com/us/MLBNetwork.us.png" group-title="Sport",MLB Network
+http://mlblive-akc.mlb.com/ls01/mlbam/mlb_network/NETWORK_LINEAR_1/master_tablet.m3u8
+#EXTINF:-1 tvg-id="MLB Network-US" tvg-name="MLB Network-US" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s62081_h3_aa.png" group-title="Sport",MLB Network
+http://mlblive-akc.mlb.com/ls01/mlbam/mlb_network/NETWORK_LINEAR_1/master_wired.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://pmcvariety.files.wordpress.com/2016/10/mobcrush.jpg" group-title="",Mobcrush
 https://ott.mobcrush.com/hls/0/ott.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/XzKinh7.jpg" group-title="Fashion",Models Inc.
 https://bozztv.com/36bay2/gin/giniko_modelinc_2000kb_36bay2/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.mctvohio.com/uploads/mc-black-beveledstyle.jpg" group-title="Music",Music Choice (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.mctvohio.com/uploads/mc-black-beveledstyle.jpg" group-title="Music",Music Choice
 http://edge.music-choice-play-chaina1.top.comcast.net/PlayMetadataInserter/play/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Music Choice (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Music",Music Choice
 https://edge.music-choice-play-chainb1.top.comcast.net/PlayMetadataInserter/play/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/b/b4/NASA_TV.svg/1200px-NASA_TV.svg.png" group-title="",NASA TV
 http://hls.ums.ustream.tv/playlist/directhls/channel/6540154/playlist.m3u8?sgn=31d0dfb847c358d4cedcd2256dc4e1c42a7f13a7
@@ -529,24 +529,24 @@ https://bozztv.com/36bay2/gin/giniko_nbaplus_1000kb_36bay2/tracks-v1a1/mono.m3u8
 http://185.246.209.109:8080/NBA9/index.m3u8
 #EXTINF:-1 tvg-id="US-NBC HD New York" tvg-name="US-NBC HD New York" tvg-logo="https://s3.amazonaws.com/schedulesdirect/assets/stationLogos/s28717_h3_aa.png" group-title="",NBC
 http://161.0.157.5/PLTV/88888888/224/3221227040/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",NBC 6 South Florida (WTVJ) (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",NBC 6 South Florida (WTVJ)
 http://161.0.157.51/PLTV/88888888/224/3221227040/01.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",NBC 6 South Florida (WTVJ) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",NBC 6 South Florida (WTVJ)
 http://161.0.157.51/PLTV/88888888/224/3221227040/03.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://channelpear.com/images/media/14551.jpg" group-title="Local",NBC Bay Area (KNTV) (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://channelpear.com/images/media/14551.jpg" group-title="Local",NBC Bay Area (KNTV)
 http://kntvlive-f.akamaihd.net/i/kntvb2_1@15530/index_1286_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",NBC Bay Area (KNTV) (Opt-2)
-https://kntvlive-f.akamaihd.net/i/kntvb2_1@15530/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",NBC Bay Area (KNTV) (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",NBC Bay Area (KNTV)
 https://kntvlive-f.akamaihd.net/i/kntvb1_1@15530/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",NBC Bay Area (KNTV)
+https://kntvlive-f.akamaihd.net/i/kntvb2_1@15530/master.m3u8
 #EXTINF:-1 tvg-id="NBC HD Charlotte-US" tvg-name="NBC HD Charlotte-US" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/nbc.png" group-title="Local",NBC Charlotte (WCNC-TV)
 http://wcnc-lh.akamaihd.net/i/WCNC_Breaking_1@195112/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://media.graytvinc.com/designimages/site+logo+368x132+Depth.png" group-title="Local",NBC15 Madison (WMTV)
 http://ad-playlistserver.aws.syncbak.com/playlist/899088/master.m3u8?access_token=eyJhbGciOiJIUzI1NiIsImtpZCI6IkdyYXkyMDE2MDgyOSIsInN1YiI6IioiLCJ0eXAiOiJKV1QifQ.eyJleHAiOjE3OTAzNjkxMDUsImlzcyI6IldMUyIsIm1kNSI6ImJhZTU4Y2ZlZWM2NmU1MjZkNmVjZmE1YmUzNTQxMzQ4IiwibWlkIjoiODk5MDg4In0.vBWkHmqS3z3dpq8UWfbk4wFd-vQlj6B0up-rpt7X_7Q
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.destinationnetwork.com/images/channel_logos/notv_logo.png" group-title="",New Orleans TV (Opt-1)
-http://media4.tripsmarter.com:1935/LiveTV/NOTVHD/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",New Orleans TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",New Orleans TV
 http://bit.ly/2N6lxn9
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.destinationnetwork.com/images/channel_logos/notv_logo.png" group-title="",New Orleans TV
+http://media4.tripsmarter.com:1935/LiveTV/NOTVHD/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://cdn.news12.com/polopoly_fs/1.8890454.1464300091!/httpImage/image.jpg_gen/derivatives/display_600/image.jpg" group-title="News",News 12 Brooklyn
 http://hls.iptv.optimum.net/news12/nipadlive/index_new.m3u8?callsign=N12KN
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://cdn.news12.com/polopoly_fs/1.8890451.1464300188!/httpImage/image.jpg_gen/derivatives/display_600/image.jpg" group-title="News",News 12 Connecticut
@@ -573,27 +573,27 @@ http://hls.iptv.optimum.net/news12/nipadlive/index_new.m3u8?callsign=N12TW_NJ
 http://hls.iptv.optimum.net/news12/nipadlive/index_new.m3u8?callsign=N12TW_NYC
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.secondspace.com/ktvz/img/KTVZ_Widget.png" group-title="Local",NewsChannel 21 (KTVZ)
 http://api.new.livestream.com/accounts/19128364/events/5285531/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Newsmax TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Newsmax TV
 https://nmxlive.akamaized.net/hls/live/529965/Live_1/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://123tvgo.com/wp-content/uploads/2018/08/Newsmax-259x151.jpg" group-title="News",Newsmax TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://123tvgo.com/wp-content/uploads/2018/08/Newsmax-259x151.jpg" group-title="News",Newsmax TV
 https://nmxlive.akamaized.net/hls/live/529965/Live_1/index_288.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/6e/Newsmax_TV_Logo.png" group-title="News",Newsmax TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/6e/Newsmax_TV_Logo.png" group-title="News",Newsmax TV
 https://nmxlive.akamaized.net/hls/live/529965/Live_1/index_720.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://yournewsnet.com/wp-content/uploads/2018/03/NNLogo.jpg" group-title="",NewsNet (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://yournewsnet.com/wp-content/uploads/2018/03/NNLogo.jpg" group-title="",NewsNet
 http://broadcastny.yournewsnet.com:8081/master/newsnetweb/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/e/ef/NewsNetLogo.png" group-title="",NewsNet (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/e/ef/NewsNetLogo.png" group-title="",NewsNet
 http://broadcastny.yournewsnet.com:8081/master/newsnetweb/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Newsy (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Newsy
 https://content.uplynk.com/channel/4bb4901b934c4e029fd4c1abfc766c37.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://newsymain-npgroup.netdna-ssl.com/images/settings/150228249385.jpg" group-title="",Newsy (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://newsymain-npgroup.netdna-ssl.com/images/settings/150228249385.jpg" group-title="",Newsy
 https://content.uplynk.com/channel/4bb4901b934c4e029fd4c1abfc766c37.m3u8?ad=newsyweb
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/gb/NickJunior.uk.png" group-title="Kids",Nick Jr.
 http://185.246.209.109:8080/NICKJR/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",NOW
 https://str-2.mediabay.tv/NOWTV/playlist.m3u8?token=fd7aaee6eb39de279727a5e84b6e6388f6742475-fcba5557b8f4daac4ddd6837c8ef3e28-1566591158-1566580358
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",NRBTV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",NRBTV
 http://uni6rtmp.tulix.tv/nrbnetwork/myStream.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",NRBTV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",NRBTV
 https://str-3.mediabay.tv/NRBTV/playlist.m3u8?token=68143294df4f1498f0797c830e9ce8c3b74816c2-a7671effed2277972f45de6dfc176e5f-1566593513-1566582713
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",NYXT
 http://api.new.livestream.com/accounts/19770665/events/5522162/live.m3u8
@@ -627,10 +627,10 @@ https://bcsecurelivehls-i.akamaihd.net/hls/live/505785/5367332899001/master.m3u8
 http://api.new.livestream.com/accounts/9486768/events/3245401/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://securecdn.pymnts.com/wp-content/uploads/2017/03/QVC.jpg" group-title="Shop",QVC
 http://qvclvp2.mmdlive.lldns.net/qvclvp2/cd5bfeab75a34ba18301490388fd4daa/manifest.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1iszbIx.jpg" group-title="Local",Raleigh Television Network (Opt-1)
-http://granicusliveus2-a.akamaihd.net/raleigh/G0224_002/chunklist_w716725136.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Raleigh Television Network (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Raleigh Television Network
 http://granicusliveus2-a.akamaihd.net/raleigh/G0224_002/chunklist_w716725136.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1iszbIx.jpg" group-title="Local",Raleigh Television Network
+http://granicusliveus2-a.akamaihd.net/raleigh/G0224_002/chunklist_w716725136.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Auto",Rev'n
 http://dcunilive28-lh.akamaihd.net/i/dclive_1@624563/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/sOVdYJZ.png" group-title="",Revelation TV
@@ -639,24 +639,24 @@ http://rtv.cdn.mangomolo.com/rtv/smil:switch.smil/playlist.m3u8
 http://185.246.209.109:8080/REVOLT/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://pluto.tv.s3.amazonaws.com/channels/5ac7d243cd17c85601684f57/featuredImage.jpg" group-title="",Revry
 https://stitcher.pluto.tv/stitch/hls/channel/5ac7d243cd17c85601684f57/master.m3u8?deviceType=&deviceMake=&deviceVersion=&deviceId=&appVersion=&deviceDNT=0&deviceModel=&embedPartner=pluto.tv&sid=iaasl9n3jh3esnglai5na3geu7
-#EXTINF:-1 tvg-id="RT America-US" tvg-name="RT America-US" tvg-logo="https://www.rt.com/static/block/touch-icon/apple-touch-icon-144x144-precomposed.png" group-title="News",RT America (Opt-1)
-https://rt-usa.secure.footprint.net/1105.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="RT America-US" tvg-name="RT America-US" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Russia-today-logo.svg/480px-Russia-today-logo.svg.png" group-title="News",RT America (Opt-2)
+#EXTINF:-1 tvg-id="RT America-US" tvg-name="RT America-US" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Russia-today-logo.svg/480px-Russia-today-logo.svg.png" group-title="News",RT America
 https://rt-usa.secure.footprint.net/1105.m3u8
-#EXTINF:-1 tvg-id="RT America-US" tvg-name="RT America-US" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Russia-today-logo.svg/480px-Russia-today-logo.svg.png" group-title="News",RT America (Opt-3)
+#EXTINF:-1 tvg-id="RT America-US" tvg-name="RT America-US" tvg-logo="https://www.rt.com/static/block/touch-icon/apple-touch-icon-144x144-precomposed.png" group-title="News",RT America
+https://rt-usa.secure.footprint.net/1105.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="RT America-US" tvg-name="RT America-US" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Russia-today-logo.svg/480px-Russia-today-logo.svg.png" group-title="News",RT America
 https://str-2.mediabay.tv/RussiaTodayAmerica/playlist.m3u8?token=153b9cec7f4249f0bc252bfef05d5030b29066a5-b229ed06f75d5b1467f00b4f36f8f847-1566590741-1566579941
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/sDGZCpL.png" group-title="",SafeTV
 http://18.191.91.130:1935/live/safetv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",SBN (Opt-1)
-http://sonlife7-i.akamaihd.net/hls/live/585011/ch7/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hDOC6nx.png" group-title="Religious",SBN (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hDOC6nx.png" group-title="Religious",SBN
 http://sonlife5-i.akamaihd.net/hls/live/584631/ch5/ch53/ch53.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",SBN
+http://sonlife7-i.akamaihd.net/hls/live/585011/ch7/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",SBN Global
 http://sonlife10-i.akamaihd.net/hls/live/585013/ch10/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",SBN International (Opt-1)
-http://sonlife8-i.akamaihd.net/hls/live/585012/ch8/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",SBN International (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",SBN International
 http://sonlife8-i.akamaihd.net/hls/live/585012/ch8/ch80/ch80.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Religious",SBN International
+http://sonlife8-i.akamaihd.net/hls/live/585012/ch8/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://pluto.tv.s3.amazonaws.com/assets/images/channels/f7531066-b03f-9806-4292-b2cce8913a23-ScienceTV_featured.jpg" group-title="",Science TV
 http://stitcher.pluto.tv/stitch/hls/channel/563a970aa1a1f7fe7c9daad7/master.m3u8?deviceType=&deviceMake=&deviceModel=&sid=2&deviceId=&deviceVersion=&appVersion=&deviceDNT=&userId=&advertisingId=&deviceLat=&deviceLon=-&app_name=&appName=&appStoreUrl=&profileLimit=high
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.ytimg.com/vi/BP3oCHckmMY/maxresdefault.jpg" group-title="",SCP-TV - St. Charles Parish TV
@@ -673,9 +673,9 @@ http://185.246.209.109:8080/SHOWTIME_SHOWCASE/index.m3u8
 http://185.246.209.109:8080/SMITHSONIAN/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1ZKpTT5.jpg" group-title="Sport",Sportskool
 https://a.jsrdn.com/broadcast/22697/+0000/hi/c.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/n38w3FD.png" group-title="Sport",Stadium (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/n38w3FD.png" group-title="Sport",Stadium
 https://d28avce4cnwu2y.cloudfront.net/v1/manifest/61a556f78e4547c8ab5c6297ea291d6350767ca2/Mux/37f5dd6d-5713-4998-8354-8c6675612b42/0.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/b/b2/Stadium_TV_network_logo.png" group-title="Sport",Stadium (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/b/b2/Stadium_TV_network_logo.png" group-title="Sport",Stadium
 https://d28avce4cnwu2y.cloudfront.net/v1/manifest/61a556f78e4547c8ab5c6297ea291d6350767ca2/Mux/37f5dd6d-5713-4998-8354-8c6675612b42/1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://pluto.tv.s3.amazonaws.com/assets/images/channels/0d2aa422-73cb-a635-1058-66bbcf517773-StandUp_featured.jpg" group-title="",Stand-Up TV
 http://stitcher.pluto.tv/stitch/hls/channel/5637d31f319573e26b64040b/master.m3u8?deviceType=&deviceMake=&deviceModel=&sid=4&deviceId=&deviceVersion=&appVersion=&deviceDNT=&userId=&advertisingId=&deviceLat=&deviceLon=-&app_name=&appName=&appStoreUrl=&profileLimit=high
@@ -685,9 +685,9 @@ http://cdn61.liveonlineservices.com/hls/subrang.m3u8
 http://185.246.209.109:8080/SYFY/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/YaIhZeo.png" group-title="",TastyTrade
 https://trinity-lh.akamaihd.net/i/ttmain_d@82127/index_3128_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Fbzbq1y.png" group-title="",TBD (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Fbzbq1y.png" group-title="",TBD
 http://content.uplynk.com/channel/1831163f97674328ad9f4b4814ed39c5.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TBD (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TBD
 http://content.uplynk.com/channel/1831163f97674328ad9f4b4814ed39c5.m3u8?tc=1&exp=1614631202&rn=614441536&ct=c&cid=1831163f97674328ad9f4b4814ed39c5&ad=comet&ad.adUnit=%2FTBD%2FLivestream_midroll&ad._debug=TBDNET_ssai_livestream_midroll&ad.ad_rule=1&ad.pmad=12&ad.output=xml_vmap1&sig=5d194a4e4c5a4d59023d6a39a2ba5ba82dcd817b615e9f82115c41d9b26ffd0a
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://static.iptv-epg.com/us/TCM.us.png" group-title="Entertainment",TCM
 http://185.246.209.109:8080/TCM/index.m3u8
@@ -705,40 +705,40 @@ http://granicusliveus1-a.akamaihd.net/tempe/G0355_003/chunklist.m3u8
 https://dai2.xumo.com/xumocdn/p=roku/amagi_hls_data_xumo1212A-theasylum/CDN/1280x720_2500000/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",The Country Network
 http://dcunilive2-lh.akamaihd.net/i/dclive_1@390829/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://logos-download.com/wp-content/uploads/2016/02/The_CW_logo_4800x2000.png" group-title="",The CW South Florida (WSFL-TV) (Opt-1)
-http://190.80.3.28/CW/CW.isml/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://logos-download.com/wp-content/uploads/2016/02/The_CW_logo_4800x2000.png" group-title="",The CW South Florida (WSFL-TV) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://logos-download.com/wp-content/uploads/2016/02/The_CW_logo_4800x2000.png" group-title="",The CW South Florida (WSFL-TV)
 http://190.80.3.28/CW/CW.isml/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://logos-download.com/wp-content/uploads/2016/02/The_CW_logo_4800x2000.png" group-title="",The CW South Florida (WSFL-TV)
+http://190.80.3.28/CW/CW.isml/index.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/xDGoG1r.jpg" group-title="Movies",The Film Detective
 https://distro.akamaized.net/indexfd_1280x720.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.outdoorcookingchannel.com/wp-content/uploads/2014/06/150-logo.png" group-title="",The Outdoor Cooking Channel (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.outdoorcookingchannel.com/wp-content/uploads/2014/06/150-logo.png" group-title="",The Outdoor Cooking Channel
 http://edge1.tikilive.com:1935/unrestricted_tikilive/25947/amlst:NWKlw6jwyXpz/chunklist_w981409619_b1105254.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.outdoorcookingchannel.com/wp-content/uploads/2014/06/150-logo.png" group-title="",The Outdoor Cooking Channel (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.outdoorcookingchannel.com/wp-content/uploads/2014/06/150-logo.png" group-title="",The Outdoor Cooking Channel
 http://edge1.tikilive.com:1935/unrestricted_tikilive/25947/amlst:NWKlw6jwyXpz/chunklist_w981409619_b1105254.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://cdn.iphoneincanada.ca/wp-content/uploads/2015/07/the-shopping-channel-logo.jpg" group-title="Shop",The Shopping Channel
 http://tscstreaming-lh.akamaihd.net/i/TSCLiveStreaming_1@91031/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",The Southeastern Channel
 http://147.174.13.196/live/WIFI-1296k-540p/WIFI-1296k-540p.m3u8
-#EXTINF:-1 tvg-id="The Weather Channel-US" tvg-name="The Weather Channel-US" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/weatherchannel.png" group-title="",The Weather Channel (Opt-1)
-http://weather-lh.akamaihd.net/i/twc_1@92006/master.m3u8
-#EXTINF:-1 tvg-id="The Weather Channel-US" tvg-name="The Weather Channel-US" tvg-logo="" group-title="",The Weather Channel (Opt-2)
+#EXTINF:-1 tvg-id="The Weather Channel-US" tvg-name="The Weather Channel-US" tvg-logo="" group-title="",The Weather Channel
 http://bit.ly/2wQwd1G
-#EXTINF:-1 tvg-id="The Weather Channel-US" tvg-name="The Weather Channel-US" tvg-logo="" group-title="",The Weather Channel (Opt-3)
+#EXTINF:-1 tvg-id="The Weather Channel-US" tvg-name="The Weather Channel-US" tvg-logo="" group-title="",The Weather Channel
 http://weather-lh.akamaihd.net/i/twc_1@92006/index_2400_av-b.m3u8
+#EXTINF:-1 tvg-id="The Weather Channel-US" tvg-name="The Weather Channel-US" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/weatherchannel.png" group-title="",The Weather Channel
+http://weather-lh.akamaihd.net/i/twc_1@92006/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/BvRObyp.png" group-title="",The Works
 https://mgm-ssai.akamaized.net/amagi_hls_data_mgmAAAAAA-theworks/CDN/720x404_1425600/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/t8ZCTXN.jpg" group-title="",Titanic TV
 https://a.jsrdn.com/broadcast/22719/+0000/hi/c.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/wzBD6fy.png" group-title="",TMZ
 https://dai2.xumo.com/xumocdn/p=roku/amagi_hls_data_xumo1234A-tmz/CDN/1280x720_5000000/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.viennava.gov/images/pages/N282/tvcnlogo2.jpg" group-title="Local",Town of Vienna Community Network (Opt-1)
-https://granicusliveus2-a.akamaihd.net/vienna-va/G1359_002/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.viennava.gov/images/pages/N282/tvcnlogo2.jpg" group-title="Local",Town of Vienna Community Network (Opt-2)
-https://granicusliveus2-a.akamaihd.net/vienna-va/G1359_003/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Town of Vienna Community Network (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Town of Vienna Community Network
 https://granicusliveus2-a.akamaihd.net/vienna-va/G1359_002/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Town of Vienna Community Network (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.viennava.gov/images/pages/N282/tvcnlogo2.jpg" group-title="Local",Town of Vienna Community Network
+https://granicusliveus2-a.akamaihd.net/vienna-va/G1359_002/playlist.m3u8?fluxustv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",Town of Vienna Community Network
 https://granicusliveus2-a.akamaihd.net/vienna-va/G1359_003/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.viennava.gov/images/pages/N282/tvcnlogo2.jpg" group-title="Local",Town of Vienna Community Network
+https://granicusliveus2-a.akamaihd.net/vienna-va/G1359_003/playlist.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Travel",Travel Channel
 http://bit.ly/2NHfoDb
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.ytimg.com/vi/_Jt1yB1y-MM/hqdefault.jpg" group-title="Religious",Trinity Channel
@@ -771,16 +771,16 @@ http://content-ausc2.uplynk.com/channel/7a16e3d5ffd0413ba4d8ac89688ed7cd/e.m3u8?
 http://184.173.179.163:1935/victorytelevisionnetwork/victorytelevisionnetwork/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vkDryWT.png" group-title="",Viva Cristo TV
 http://ss6.domint.net:1946/vct_str/vctv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hcbtTcz.png" group-title="Local",VSiN (Opt-1)
-http://api.new.livestream.com/accounts/22774234/events/6897936/live.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.vsin.com/assets/1/6/logo-300x157-bg-1.png" group-title="Local",VSiN (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.vsin.com/assets/1/6/logo-300x157-bg-1.png" group-title="Local",VSiN
 http://api.new.livestream.com/accounts/22774234/events/6897936/live.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hcbtTcz.png" group-title="Local",VSiN
+http://api.new.livestream.com/accounts/22774234/events/6897936/live.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/d/d0/WBRC_logo_2015.png/300px-WBRC_logo_2015.png" group-title="Local",WBRC FOX6 News (WBRC)
 http://api.new.livestream.com/accounts/12446860/events/3855294/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/8/86/WBRZ_Logo_2013.png" group-title="Local",WBRZ News 2 Louisiana (WBRZ-TV) (Opt-1)
-http://cms-wowza.lunabyte.io/wbrz-live-1/_definst_/smil:wbrz-live.smil/chunklist_b1300000.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",WBRZ News 2 Louisiana (WBRZ-TV) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",WBRZ News 2 Louisiana (WBRZ-TV)
 http://cms-wowza.lunabyte.io/wbrz-live-1/_definst_/smil:wbrz-live.smil/chunklist_b1300000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/8/86/WBRZ_Logo_2013.png" group-title="Local",WBRZ News 2 Louisiana (WBRZ-TV)
+http://cms-wowza.lunabyte.io/wbrz-live-1/_definst_/smil:wbrz-live.smil/chunklist_b1300000.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://worcester.vod.castus.tv/wccalive.png" group-title="",WCCA-TV (Worcester)
 http://worcester.vod.castus.tv/live/ch1.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",WeatherNation TV
@@ -789,19 +789,19 @@ http://cdnapi.kaltura.com/p/931702/sp/93170200/playManifest/entryId/1_oorxcge2/f
 http://svc-lvanvato-cxtv-wftv.cmgvideo.com/wftv/2564k/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",WGGS-TV (Greenville)
 https://d202lge9i6ts6.cloudfront.net/origin1ingest1/c7956aac88/chunklist.m3u8
-#EXTINF:-1 tvg-id="WGN HD Chicago-US" tvg-name="WGN HD Chicago-US" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/wgn-cvo.png" group-title="Local",WGN-TV (Chicago) (Opt-1)
-http://wgntribune-lh.akamaihd.net/i/WGNPrimary_1@304622/index_750_av-b.m3u8
-#EXTINF:-1 tvg-id="WGN HD Chicago-US" tvg-name="WGN HD Chicago-US" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/wgn-cvo.png" group-title="Local",WGN-TV (Chicago) (Opt-2)
-http://wgntribune-lh.akamaihd.net/i/WGNPrimary_1@304622/master.m3u8
-#EXTINF:-1 tvg-id="WGN HD Chicago-US" tvg-name="WGN HD Chicago-US" tvg-logo="" group-title="",WGN-TV (Chicago) (Opt-3)
+#EXTINF:-1 tvg-id="WGN HD Chicago-US" tvg-name="WGN HD Chicago-US" tvg-logo="" group-title="",WGN-TV (Chicago)
 http://bit.ly/2z8NPLB
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.livenewsmag.com/wp-content/uploads/2017/03/WHIO-TV-Channel-7-Ohio.jpg" group-title="Local",WHIO (Opt-1)
+#EXTINF:-1 tvg-id="WGN HD Chicago-US" tvg-name="WGN HD Chicago-US" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/wgn-cvo.png" group-title="Local",WGN-TV (Chicago)
+http://wgntribune-lh.akamaihd.net/i/WGNPrimary_1@304622/index_750_av-b.m3u8
+#EXTINF:-1 tvg-id="WGN HD Chicago-US" tvg-name="WGN HD Chicago-US" tvg-logo="https://cdn.tvpassport.com/image/station/240x135/wgn-cvo.png" group-title="Local",WGN-TV (Chicago)
+http://wgntribune-lh.akamaihd.net/i/WGNPrimary_1@304622/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.livenewsmag.com/wp-content/uploads/2017/03/WHIO-TV-Channel-7-Ohio.jpg" group-title="Local",WHIO
 http://svc-lvanvato-cxtv-whio.cmgvideo.com/whio/2596k/index.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/6/69/WHIO-TV_Logo.png/285px-WHIO-TV_Logo.png" group-title="Local",WHIO (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/6/69/WHIO-TV_Logo.png/285px-WHIO-TV_Logo.png" group-title="Local",WHIO
 http://svc-lvanvato-cxtv-whio.cmgvideo.com:80/whio/2596k/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://wpcommunitymedia.org/images/city-of-white-plains.png" group-title="",White Plains Community Media
 http://stream.swagit.com/live-edge/whiteplainsny/smil:std-4x3-1-b/chunklist_w1456643228_b512000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",WHO TV Channel 13 News (WHO-DT) (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Local",WHO TV Channel 13 News (WHO-DT)
 http://api.new.livestream.com/accounts/9976600/events/3382760/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://thumbnail.imgbin.com/23/20/7/imgbin-american-broadcasting-company-logo-big-three-television-networks-freeform-abc-news-jingdong-broadcasting-co-KWKAkEcDZv6dkyE2FuYVv0MpA_t.jpg" group-title="Local",WJCL TV
 http://185.246.209.109:8080/ABC/index.m3u8
@@ -811,17 +811,17 @@ http://api.new.livestream.com/accounts/8522553/events/live/live.m3u8
 http://api.new.livestream.com/accounts/22400479/events/6650525/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",WOSN TV
 http://streamengine.wosn.tv:1935/live/WOSNLive_1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",WOW! TV (Opt-1)
-http://cdn.elsalvadordigital.com:1935/wowtv/wowtv/chunklist_w84588335.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",WOW! TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",WOW! TV
 http://cdn.elsalvadordigital.com:1935/wowtv/wowtv/chunklist_w454258933.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",WOW! TV (Opt-3)
-http://cdn.elsalvadordigital.com:1935/wowtv/wowtv/playlist.m3u8?JoCaRoIPTV.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",WOW! TV (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",WOW! TV
+http://cdn.elsalvadordigital.com:1935/wowtv/wowtv/chunklist_w84588335.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",WOW! TV
 http://cdn.elsalvadordigital.com:1935/wowtv/wowtv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/EA2rA7R.png" group-title="Local",WPBT South Florida PBS (WPBT) (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",WOW! TV
+http://cdn.elsalvadordigital.com:1935/wowtv/wowtv/playlist.m3u8?JoCaRoIPTV.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/EA2rA7R.png" group-title="Local",WPBT South Florida PBS (WPBT)
 http://190.80.3.28/PBS/PBS.isml/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/EA2rA7R.png" group-title="Local",WPBT South Florida PBS (WPBT) (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/EA2rA7R.png" group-title="Local",WPBT South Florida PBS (WPBT)
 http://190.80.3.28/PBS/PBS.isml/index.m3u8?fluxustv.m3u8
 #EXTINF:-1 tvg-id="WPIX New York (SUPERSTATION)-US" tvg-name="WPIX New York (SUPERSTATION)-US" tvg-logo="https://tribwpix.files.wordpress.com/2015/09/2048x1536-news-copy.png" group-title="Local",WPIX 11 New York (WPIX)
 http://api.new.livestream.com/accounts/8896933/events/3104530/live.m3u8
@@ -841,7 +841,7 @@ http://162.210.195.121:8080/WWETVHD/index.m3u8
 http://api.new.livestream.com/accounts/22998687/events/6864865/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Xcorps TV
 http://vcnxcorps.teleosmedia.com/stream/xcorps/xcorps/seglist_720p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/c3Z5i2L.png" group-title="",Z Living (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/c3Z5i2L.png" group-title="",Z Living
 https://y5w8j4a9.ssl.hwcdn.net/zlivingusa_r/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/c3Z5i2L.png" group-title="",Z Living (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/c3Z5i2L.png" group-title="",Z Living
 https://y5w8j4a9.ssl.hwcdn.net/zlivingusa_r_prod/tracks-v1a1/index.m3u8
diff --git a/channels/uy.m3u b/channels/uy.m3u
index 58a23a3fc..23b742278 100644
--- a/channels/uy.m3u
+++ b/channels/uy.m3u
@@ -11,13 +11,13 @@ http://tv.iptv5region.com:25461/bronder/12365/24785
 http://tv.iptv5region.com:25461/bronder/12365/24784
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://pbs.twimg.com/profile_images/1049437586132008962/TCt-fRpM.jpg" group-title="",Canal 8 Rivera
 http://tv.iptv5region.com:25461/bronder/12365/24783
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.montevideo.com.uy/plantillas/temas17/canal-M-17/images/canalm@3.png" group-title="",Canal M (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.montevideo.com.uy/plantillas/temas17/canal-M-17/images/canalm@3.png" group-title="",Canal M
 http://wowza.montevideo.com.uy:1936/live/_definst_/mvdstrem/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.montevideo.com.uy/plantillas/temas17/canal-M-17/images/canalm@3.png" group-title="",Canal M (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.montevideo.com.uy/plantillas/temas17/canal-M-17/images/canalm@3.png" group-title="",Canal M
 http://wowza.montevideo.com.uy:1936/live/_definst_/mvdstrem/chunklist_w1488231185.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.montevideo.com.uy/plantillas/temas17/canal-M-17/images/canalm@3.png" group-title="",Canal M (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.montevideo.com.uy/plantillas/temas17/canal-M-17/images/canalm@3.png" group-title="",Canal M
 http://wowza.montevideo.com.uy:1936/live/_definst_/mvdstrem/chunklist_w240300788.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.montevideo.com.uy/plantillas/temas17/canal-M-17/images/canalm@3.png" group-title="",Canal M (Opt-4)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.montevideo.com.uy/plantillas/temas17/canal-M-17/images/canalm@3.png" group-title="",Canal M
 http://wowza.montevideo.com.uy:1936/live/_definst_/mvdstrem/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/9/94/Logo_Canal_U_%28Uruguay%29.png" group-title="",Canal U
 http://tv.iptv5region.com:25461/bronder/12365/24780
@@ -33,9 +33,9 @@ http://tv.iptv5region.com:25461/bronder/12365/24772
 http://tv.iptv5region.com:25461/bronder/12365/24773
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://casaencantada.com.uy/wp-content/uploads/2017/12/logo-uruguay-natural-2png.png" group-title="",Uruguay Natural
 http://tv.iptv5region.com:25461/bronder/12365/24777
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.bienaldemontevideo.com/imgs/pat/vtv.png" group-title="",VTV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.bienaldemontevideo.com/imgs/pat/vtv.png" group-title="",VTV
 http://trinity-lh.akamaihd.net/i/GolTVModel4A_d@422865/index_500_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.bienaldemontevideo.com/imgs/pat/vtv.png" group-title="",VTV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.bienaldemontevideo.com/imgs/pat/vtv.png" group-title="",VTV
 http://tv.iptv5region.com:25461/bronder/12365/24771
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/VTV%2BUruguay.svg/1200px-VTV%2BUruguay.svg.png" group-title="",VTV Plus
 http://tv.iptv5region.com:25461/bronder/12365/24769
diff --git a/channels/uz.m3u b/channels/uz.m3u
index 994c14a90..d3de9f1a0 100644
--- a/channels/uz.m3u
+++ b/channels/uz.m3u
@@ -1,41 +1,41 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Bolajon (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Bolajon
 https://str-3.mediabay.tv/Bolajon/playlist.m3u8?token=96560bedca2b34376b2bb8bc29f36a86780e969f-776219b0fa4485644aeb04a909a50363-1566522145-1566511345
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Bolajon (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Bolajon
 https://str-4.mediabay.tv/Bolajon/playlist.m3u8?token=9b9c06aec338a933e325663006a79cf63368066b-d319c69c5c16804249c065a0212c2425-1566588205-1566577405
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Dunyo bo‘ylab (Opt-1)
-https://str-3.mediabay.tv/Dunyo/playlist.m3u8?token=f0f03eabe8ebb7bcf33175aebcbd36f4dfd1ea1e-6f96818481a8e15a16fbb1582483b16e-1566522214-1566511414
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Dunyo bo‘ylab (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Dunyo bo‘ylab
 https://str-2.mediabay.tv/Dunyo/playlist.m3u8?token=55a354e39ba316fba6297d4d8a6bafdc2cbb48ef-e49815ad9937038f23ac52ee3d0e61fa-1566588079-1566577279
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Madaniyat va Ma'rifat (Opt-1)
-https://str-4.mediabay.tv/Madaniyat/playlist.m3u8?token=f30d9834a2ed3a2dafdeac54822e32cb87649966-edccb03b31cddf63c7b92eed218134c7-1566521990-1566511190
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Madaniyat va Ma'rifat (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Dunyo bo‘ylab
+https://str-3.mediabay.tv/Dunyo/playlist.m3u8?token=f0f03eabe8ebb7bcf33175aebcbd36f4dfd1ea1e-6f96818481a8e15a16fbb1582483b16e-1566522214-1566511414
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Madaniyat va Ma'rifat
 https://str-2.mediabay.tv/Madaniyat/playlist.m3u8?token=c8510f99933bff61b089672f5aa916febdab2367-0d474757757b6679f7d47754def05229-1566588164-1566577364
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Mahalla (Opt-1)
-https://str-3.mediabay.tv/Mahalla/playlist.m3u8?token=ae825fad3468edbc94e798eadce6e20f2d428607-a75ad2f60d6b8e8085c6b7fa53045420-1566522496-1566511696
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Mahalla (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Madaniyat va Ma'rifat
+https://str-4.mediabay.tv/Madaniyat/playlist.m3u8?token=f30d9834a2ed3a2dafdeac54822e32cb87649966-edccb03b31cddf63c7b92eed218134c7-1566521990-1566511190
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Mahalla
 https://str-3.mediabay.tv/Mahalla/playlist.m3u8?token=760845da9b8b52e7b46157af077f4354de0c78ab-cc6481496c262c6e33c3e496e2b3e7e1-1566588247-1566577447
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Mahalla
+https://str-3.mediabay.tv/Mahalla/playlist.m3u8?token=ae825fad3468edbc94e798eadce6e20f2d428607-a75ad2f60d6b8e8085c6b7fa53045420-1566522496-1566511696
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Milliy TV
 https://str-4.mediabay.tv/Milliy1/playlist.m3u8?token=0b630b67a3d0b1c1dab63389c9aa5f6070defd37-2cfe8c43c8ed5daa2c9e6314310c7fa9-1566587902-1566577102
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Navo
 https://str-2.mediabay.tv/Navo/playlist.m3u8?token=60b03d5a16060725e8821cd865914526defd4e3c-ba114b86936428767924692389b687db-1566588280-1566577480
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",O`zbekiston (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",O`zbekiston
 https://str-4.mediabay.tv/Uzbekistan/playlist.m3u8?token=4a358b3b25a75c88ce42c8c2142ed34b246b6657-763497234657d052617e7844904cfd5b-1566521483-1566510683
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",O`zbekiston (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",O`zbekiston
 https://str-4.mediabay.tv/Uzbekistan/playlist.m3u8?token=5172802e8f9c0fdc188930344ec8b6ecbd51ddbd-2bc603e5a31f89ad79eed674350daed0-1566587791-1566576991
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Oilaviy (Opt-1)
-https://str-2.mediabay.tv/Oilaviy/playlist.m3u8?token=5fbd0689fe41e1700c06eb3c3526aa9d6fd36e9d-26cc723684fd08ce52ff68e6f2bd20e1-1566522412-1566511612
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Oilaviy (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Oilaviy
 https://str-2.mediabay.tv/Oilaviy/playlist.m3u8?token=065b586f9be429f22b7feb7920965bb64d6235c2-570d919ee3aa44d583b35a3776179ad1-1566588045-1566577245
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Oilaviy
+https://str-2.mediabay.tv/Oilaviy/playlist.m3u8?token=5fbd0689fe41e1700c06eb3c3526aa9d6fd36e9d-26cc723684fd08ce52ff68e6f2bd20e1-1566522412-1566511612
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Sevimli
 https://str-4.mediabay.tv/Sevimli1/playlist.m3u8?token=aee99c69234a635ae8f847ad87c986cafdc202f9-3db548b77f544c7b30cfc2bec1cfa063-1566587841-1566577041
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Toshkent (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Toshkent
 https://str-3.mediabay.tv/Toshkent/playlist.m3u8?token=c1a8c90670e14aecf9dfa8b4b9c80e2c716fe94f-b326c67dfd84e7c8779be6f5d7a925e2-1566522059-1566511259
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Toshkent (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Toshkent
 https://str-4.mediabay.tv/Toshkent/playlist.m3u8?token=afd0a0fd02519b82e0282b22d373f20cbe46a382-f06851612bd2667c352cf36b44572f2f-1566588017-1566577217
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Uzreport TV
 https://str-4.mediabay.tv/UzreportTV/playlist.m3u8?token=bbfd34886c8c38b82e368c09695b9a07f1c9aaad-5660f071d58ed99d4b1b68aacf846e2c-1566587690-1566576890
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Yoshlar (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Yoshlar
 https://str-2.mediabay.tv/Yoshlar/playlist.m3u8?token=3d501a9c07284381bb76a1ccc26bcbe35acacd0d-e7dc55d567a370b95410a9d63e02da4b-1566521921-1566511121
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Yoshlar (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Yoshlar
 https://str-4.mediabay.tv/Yoshlar/playlist.m3u8?token=b14e78c7a4958a30730829e26b2014dab045365e-ab5d25d42da8f56d18af9e8f814c0e77-1566587971-1566577171
diff --git a/channels/ve.m3u b/channels/ve.m3u
index f7127a006..4cf3e0b53 100644
--- a/channels/ve.m3u
+++ b/channels/ve.m3u
@@ -3,12 +3,12 @@
 http://vcp1.myplaytv.com:1935/radiodigitalfm/radiodigitalfm/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FlLXxgq.png" group-title="",Corazón Llanero
 http://5.189.191.70:1935/corazonllanerotvweb/corazonllanerotvweb/chunklist_w1799524531.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iQtrqmc.jpg" group-title="",Promar TV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iQtrqmc.jpg" group-title="",Promar TV
 http://edge.wms28.lorini.net/promar/promar/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iQtrqmc.jpg" group-title="",Promar TV (Opt-2)
-http://vpn58.hdtv.lorini.net/promar/promar/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iQtrqmc.jpg" group-title="",Promar TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iQtrqmc.jpg" group-title="",Promar TV
 http://vcp1.myplaytv.com:1935/promar/promar/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/iQtrqmc.jpg" group-title="",Promar TV
+http://vpn58.hdtv.lorini.net/promar/promar/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Af6z5hL.png" group-title="",TELESUR
 http://k3.usastreams.com:1935/telesur/telesur/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/Af6z5hL.png" group-title="",TELESUR HD
diff --git a/channels/vn.m3u b/channels/vn.m3u
index cc5abd18a..8e1290d64 100644
--- a/channels/vn.m3u
+++ b/channels/vn.m3u
@@ -3,9 +3,9 @@
 http://vietcago.net/vstv/angiangtv1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ANTG
 http://vietcago.net/vstv/antg.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tduc.tk/logo/antv.png" group-title="",ANTV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tduc.tk/logo/antv.png" group-title="",ANTV
 http://antvlive.ab5c6921.cdnviet.com/antv/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tduc.tk/logo/antv.png" group-title="",ANTV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tduc.tk/logo/antv.png" group-title="",ANTV
 http://vietcago.net/vstv/antv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AnVien
 http://vietcago.net/vstv/anvien.m3u8
@@ -55,9 +55,9 @@ http://tv.ctvcamau.vn/live/tv/tv.m3u8
 http://vietcago.net/vstv/danangtv1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://danangtv.vn/images/drt1.png" group-title="",Da Nang TV1 HD
 http://drtdnglive.e49a7c38.cdnviet.com/livedrt1/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9I4gX5Y.png" group-title="",Da Nang TV2 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9I4gX5Y.png" group-title="",Da Nang TV2
 http://drtdnglive.e49a7c38.cdnviet.com/livestream/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9I4gX5Y.png" group-title="",Da Nang TV2 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/9I4gX5Y.png" group-title="",Da Nang TV2
 http://vietcago.net/vstv/danangtv2.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",DakLakTV
 http://vietcago.net/vstv/daklaktv.m3u8
@@ -81,10 +81,10 @@ http://vietcago.net/vstv/hanamtv.m3u8
 http://vietcago.net/vstv/hanoi1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",HaNoiTV2
 http://vietcago.net/vstv/hanoi2.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3OkfjW5.jpg" group-title="",HaTinhTV (Opt-1)
-http://vietcago.net/vstv/hatinhtv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3OkfjW5.jpg" group-title="",HaTinhTV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3OkfjW5.jpg" group-title="",HaTinhTV
 http://171.244.141.125:8080/hls/hatinhtv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/3OkfjW5.jpg" group-title="",HaTinhTV
+http://vietcago.net/vstv/hatinhtv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",HauGiangTV
 http://vietcago.net/vstv/haugiangtv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/BnFWgS7.png" group-title="",HBTV
@@ -113,28 +113,28 @@ http://vietcago.net/vstv/htvcphim.m3u8
 http://vietcago.net/vstv/htvcphunu.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://hanamtv.vn/template/default/images/logo.png" group-title="",Hà Nam
 http://113.160.198.111/Medias/HaNam/Playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://uphinhnhanh.com/images/2019/01/31/IMG_20190131_222501.jpg" group-title="",Hưng Yên (Opt-1)
-http://live.hungyentv.vn:1935/live/HYTV/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FEffTjz.jpg" group-title="",Hưng Yên (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/FEffTjz.jpg" group-title="",Hưng Yên
 http://live.hungyentv.vn:1935/live/HYTV/chunklist_w769520286.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://uphinhnhanh.com/images/2019/01/31/IMG_20190131_222501.jpg" group-title="",Hưng Yên
+http://live.hungyentv.vn:1935/live/HYTV/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://s23.postimg.org/q8pgw4wgb/IBC.jpg" group-title="",IBC TV 57.8
 http://liveplay3.malimarcdn.com/ibcnews/ibcnews.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ITV
 http://vietcago.net/vstv/itv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KhanhHoaTV
 http://vietcago.net/vstv/khanhhoatv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HqYi1Dw.png" group-title="",KienGiangTV (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HqYi1Dw.png" group-title="",KienGiangTV
 http://tv.kgtv.vn/live/kgtv/kgtv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HqYi1Dw.png" group-title="",KienGiangTV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/HqYi1Dw.png" group-title="",KienGiangTV
 http://vietcago.net/vstv/kiengiangtv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vzaqu80.png" group-title="",KienGiangTV1 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vzaqu80.png" group-title="",KienGiangTV1
 http://tv.kgtv.vn/live/kgtv1/kgtv1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vzaqu80.png" group-title="",KienGiangTV1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/vzaqu80.png" group-title="",KienGiangTV1
 http://vietcago.net/vstv/kiengiangtv1.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0vd4Tgb.jpg" group-title="",KonTumTV (Opt-1)
-http://www.vietcago.net/vstv/kontumtv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0vd4Tgb.jpg" group-title="",KonTumTV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0vd4Tgb.jpg" group-title="",KonTumTV
 http://117.2.88.22/hls-live/livepkgr/_definst_/liveevent/kontumtv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0vd4Tgb.jpg" group-title="",KonTumTV
+http://www.vietcago.net/vstv/kontumtv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://goo.gl/DNboVb" group-title="",LA34 - Long An
 http://113.161.229.13/hls-live/livepkgr/_definst_/liveevent/tv.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",LamDongTV
@@ -181,10 +181,10 @@ http://113.164.225.140:1935/live/quochoitvlive.stream_720p/playlist.m3u8
 http://vietcago.net/vstv/sam.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://s29.postimg.org/x5pf3uayf/SBTN_SET.png" group-title="",SBTN
 http://settv.saigon.ns01.us:1935/vietset574tvv/myStream/chunklist_w542335559.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://s27.postimg.org/65e8ozu8z/set.png" group-title="",SET TV (Opt-1)
-http://livestream.vnvn.net/hls-live/livepkgr/_definst_/settv574-3/settv574-3.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.settv574.com/images/file/sqiLlF2i1AgBAjAv/settv574-logo.png" group-title="",SET TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.settv574.com/images/file/sqiLlF2i1AgBAjAv/settv574-logo.png" group-title="",SET TV
 http://livestream.vnvn.net/hls-live/livepkgr/_definst_/settv574-1/settv574-1.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://s27.postimg.org/65e8ozu8z/set.png" group-title="",SET TV
+http://livestream.vnvn.net/hls-live/livepkgr/_definst_/settv574-3/settv574-3.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",SocTrangTV1
 http://vietcago.net/vstv/soctrangtv1.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",SocTrangTV2
@@ -213,12 +213,12 @@ http://live.vnanet.vn/VnewsLive_Android.m3u8
 http://vietcago.net/vstv/ttxvn.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="TTXVN" tvg-logo="http://tduc.tk/logo/ttxvn.png" group-title="",TTXVN HD
 http://live.vnanet.vn/720P/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://s24.postimg.org/7t4su66md/vbs1.png" group-title="",VBS TV (Opt-1)
-http://uni6rtmp.tulix.tv:1935/vbstv/vbsabr.smil/chunklist_w530158239_b1228800.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://s23.postimg.org/99da6ha97/VBS.png" group-title="",VBS TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://s23.postimg.org/99da6ha97/VBS.png" group-title="",VBS TV
 http://uni6rtmp.tulix.tv:1935/vbstv/vbsabr.smil/chunklist_w1847269952_b204800.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",VBS TV (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",VBS TV
 http://uni6rtmp.tulix.tv:1935/vbstv/vbsabr.smil/chunklist_w439903609_b1228800.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://s24.postimg.org/7t4su66md/vbs1.png" group-title="",VBS TV
+http://uni6rtmp.tulix.tv:1935/vbstv/vbsabr.smil/chunklist_w530158239_b1228800.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Vietteen
 http://vietcago.net/vstv/vietteen.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="VITV" tvg-logo="http://tduc.tk/logo/vitv.png" group-title="",VITV
diff --git a/channels/xk.m3u b/channels/xk.m3u
index f7f77487a..9fc99e84c 100644
--- a/channels/xk.m3u
+++ b/channels/xk.m3u
@@ -3,21 +3,21 @@
 http://91.187.117.230:8080
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qYPQaYf.png" group-title="",Rrokum
 http://82.114.65.202:1935/live/rrokumtv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LTkYnzl.png" group-title="",RTK 1 HD (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LTkYnzl.png" group-title="",RTK 1 HD
 http://84.22.56.10:1935/rtk1stream/rtk1.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LTkYnzl.png" group-title="",RTK 1 HD (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/LTkYnzl.png" group-title="",RTK 1 HD
 http://stream1.rtkit.com:1935/rtk1stream/rtk1.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RQI1pBn.png" group-title="",RTK 3 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RQI1pBn.png" group-title="",RTK 3
 http://stream1.rtkit.com:1935/rtk3stream/rtk3.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RQI1pBn.png" group-title="",RTK 3 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RQI1pBn.png" group-title="",RTK 3
 http://stream2.rtkit.com:1935/rtk3stream/rtk3.stream/chunklist_w2121045972.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RQI1pBn.png" group-title="",RTK 3 (Opt-3)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/RQI1pBn.png" group-title="",RTK 3
 http://stream2.rtkit.com:1935/rtk3stream/rtk3.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H4EWXF3.png" group-title="",RTK 4
 http://84.22.56.10:1935/rtk4stream/rtk4.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H4EWXF3.png" group-title="",RTK 4 (Opt-1)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H4EWXF3.png" group-title="",RTK 4
 http://stream1.rtkit.com:1935/rtk4stream/rtk4.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H4EWXF3.png" group-title="",RTK 4 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/H4EWXF3.png" group-title="",RTK 4
 http://stream2.rtkit.com:1935/rtk4stream/rtk4.stream/chunklist_w599618358.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/C2ngFzz.png" group-title="",RTV Puls
 http://rtvpuls.itprishtina.com:8005/rtvpuls-eset/index.m3u8
diff --git a/channels/zw.m3u b/channels/zw.m3u
index e7324277a..f37f6804f 100644
--- a/channels/zw.m3u
+++ b/channels/zw.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GUZYfio.png" group-title="",Yadah TV (Opt-1)
-https://streaming.viewsat.eu/viewsatstream18/viewsatstream18.smil/chunklist_w1924943123_b2000000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5nzTXQM.png" group-title="",Yadah TV (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/5nzTXQM.png" group-title="",Yadah TV
 https://streaming.viewsat.eu/viewsatstream18/viewsatstream18.smil/chunklist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/GUZYfio.png" group-title="",Yadah TV
+https://streaming.viewsat.eu/viewsatstream18/viewsatstream18.smil/chunklist_w1924943123_b2000000.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/sHaLAYC.png" group-title="",ZBCtv
 http://41.221.144.210:8001/live/zimtv/index.m3u8