Merge branch 'master' into LaneSh4d0w-move-si-channels

2022-11-12 18:37:28 +01:00 · 2022-11-12 18:37:28 +01:00 · 73a1042a1a
parent 430012f426 e7faa81b33
commit 73a1042a1a
35 changed files with 524 additions and 518 deletions
--- a/streams/ae.m3u
+++ b/streams/ae.m3u
@ -73,6 +73,8 @@ https://jmc-live.ercdn.net/hawastvhd/hawastvhd.m3u8
 https://admdn5.cdn.mangomolo.com/majid/smil:majid.stream.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="MBC1USA.us" status="online",MBC 1 USA (1080p)
 https://shls-mbc1na-prod-dub.shahid.net/out/v1/84ab37e99d6e4b16b33c6600f94f6ccb/index.m3u8
 #EXTINF:-1 tvg-id="MBC1USA.us" status="online",MBC 1 USA (1080p)
 https://shls-live-ak.akamaized.net/out/v1/0965e4d7deae49179172426cbfb3bc5e/index.m3u8
 #EXTINF:-1 tvg-id="MBC3.ae" status="online",MBC 3 EUR (1080p)
 https://shls-mbc3-eur-prod-dub.shahid.net/out/v1/fce09dd6a967431a871efb3b8dec9f82/index.m3u8
 #EXTINF:-1 tvg-id="MBC3.ae" status="online",MBC 3 KSA (1080p)
--- a/streams/cn.m3u
+++ b/streams/cn.m3u
--- a/streams/in.m3u
+++ b/streams/in.m3u
@ -309,7 +309,7 @@ https://a.jsrdn.com/broadcast/7ef91d3d7a/+0000/c.m3u8
 https://43wrzjnpqoxe-hls-live.wmncdn.net/indywood/indywoodtv/index.m3u8
 #EXTINF:-1 tvg-id="" status="online",Keralabhumi
 http://103.153.92.157:11037/hls/kbh.m3u8
-#EXTINF:-1 tvg-id="" status="online",KITE Victers (Kerala) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="KiteVicters.in" status="online",KITE Victers (Kerala) (720p) [Not 24/7]
 https://932y4x26ljv8-hls-live.5centscdn.com/victers/tv.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Life TV (480p) [Not 24/7]
 http://59c3ec70cfde0.streamlock.net/channel_6/channel6/playlist.m3u8
@ -319,7 +319,7 @@ http://192.99.2.28/mandra_hls/mandra.m3u8
 https://gvjyg2n9doem-hls-live.5centscdn.com/navmediastream/d0dbe915091d400bd8ee7f27f0791303.sdp/chunks.m3u8
 #EXTINF:-1 tvg-id="" status="online",NVision
 http://live.singamcloud.in:1935/nvision/nvision/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Relax TV (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="RelaxTV.in" status="error",Relax TV (576p) [Not 24/7]
 http://198.144.149.82:8080/NOTV/RELAXTV/index.m3u8?token=GTR
 #EXTINF:-1 tvg-id="" status="online",Sada TV (1080p) [Not 24/7]
 http://cdn12.henico.net:8080/live/sadatv/index.m3u8
--- a/streams/in_samsung.m3u
+++ b/streams/in_samsung.m3u
@ -23,5 +23,5 @@ https://inshort-samsungindia.amagi.tv/playlist.m3u8
 http://mavtv-mavtvglobal-1-in.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",People are Awesome
 https://jukin-peopleareawesome-2-in.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",The Pet Collective
+#EXTINF:-1 tvg-id="ThePetCollectiveIndia.in" status="online",The Pet Collective
 https://the-pet-collective-international-in.samsung.wurl.tv/playlist.m3u8
--- a/streams/it.m3u
+++ b/streams/it.m3u
@ -326,11 +326,11 @@ https://live2-radio-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channe
 http://wms.shared.streamshow.it:1935/visualradio/visualradio/live.m3u8
 #EXTINF:-1 tvg-id="Vuemme.it" status="online",Vuemme (480p)
 https://5db313b643fd8.streamlock.net/Vuemme/Vuemme/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Canale 21 Extra (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canale21Extra.it" status="online",Canale 21 Extra (480p) [Not 24/7]
 https://stream.mariatvcdn.com/canaleventunodue/61d14e72c90980498c9d7cee64fde847.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Gold 78 (1080p)
 https://stream2.xdevel.com/video1s86-22/stream/playlist_dvr.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",Gold TV Italia (576p)
+#EXTINF:-1 tvg-id="GoldTV.it" status="timeout",Gold TV Italia (576p)
 http://151.0.207.99:1935/GoldTV/GOLD_17/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Radio Radicale TV (240p) [Not 24/7]
 https://video-ar.radioradicale.it/diretta/padtv2/playlist.m3u8
--- a/streams/kr.m3u
+++ b/streams/kr.m3u
@ -469,7 +469,7 @@ http://amdlive-ch03.ctnd.com.edgesuite.net/arirang_3ch/smil:arirang_3ch.smil/pla
 http://amdlive.ctnd.com.edgesuite.net/arirang_3ch/smil:arirang_3ch.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Arirang Radio (720p)
 https://amdlive-ch02-ctnd-com.akamaized.net/arirang_3ch/smil:arirang_3ch.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",EBS E (400p)
+#EXTINF:-1 tvg-id="EBSEnglish.kr" status="online",EBS E (400p)
 https://ebsonair.ebs.co.kr/plus3familypc/familypc1m/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",GoodTV (1080p)
 http://mobliestream.c3tv.com:1935/live/goodtv.sdp/playlist.m3u8
--- a/streams/kz.m3u
+++ b/streams/kz.m3u
@ -35,9 +35,9 @@ https://tvcdn01.oktv.kz/tv/mtrk/playlist.m3u8
 http://serv25.vintera.tv:8081/novoetv/nov_tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Qazaqstan.kz" status="online",Qazaqstan TV [Geo-blocked]
 https://qazaqstantv-stream.qazcdn.com/qazaqstantv/qazaqstantv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",7 канал (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="7Kanal.kz" status="online",7 канал (576p) [Not 24/7]
 https://sc.id-tv.kz/7_kanal.m3u8
 #EXTINF:-1 tvg-id="" status="online",Qazaqstan TV International
 https://qazaqstantv-stream.qazcdn.com/international/international/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Алматы (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="AlmatyTV.kz" status="online",Алматы (576p) [Not 24/7]
 https://sc.id-tv.kz/Almaty.m3u8
--- a/streams/ma.m3u
+++ b/streams/ma.m3u
@ -27,7 +27,7 @@ http://streaming1.medi1tv.com/live/smil:medi1tv.smil/playlist.m3u8
 https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/tamazight_tv8_snrt/hls_snrt/tamazight_tv8_snrt.m3u8
 #EXTINF:-1 tvg-id="TeleMaroc.ma" status="online",Télé Maroc (1080p)
 https://api.new.livestream.com/accounts/27130247/events/8196478/live.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",Al Aoula International (360p)
+#EXTINF:-1 tvg-id="AlAoulaEurope.ma" status="blocked",Al Aoula International (360p)
 https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/al_aoula_inter/hls_snrt/al_aoula_inter.m3u8
 #EXTINF:-1 tvg-id="" status="online",Maghreb Arabe Press (720p) [Not 24/7]
 https://www.maptvnews.ma/live/smil:OutStream1.smil/playlist.m3u8
--- a/streams/ru.m3u
+++ b/streams/ru.m3u
@ -616,6 +616,10 @@ https://tvchannelstream1.tvzvezda.ru/cdn/tvzvezda/playlist.m3u8
 http://ott-cdn.ucom.am/s85/index.m3u8
 #EXTINF:-1 tvg-id="" status="online",43 канал (720p)
 http://sochinskayatrk.ru/hdtv/hls/43Channel_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="BackusTVoriginal.ru" status="error",Backus TV (720p) [Not 24/7]
 http://stream.backustv.ru/live/btv/index.m3u8
 #EXTINF:-1 tvg-id="BackusTVDark.ru" status="error",Backus TV Страшное (720p) [Not 24/7]
 http://stream.backustv.ru/live/btv2/index.m3u8
 #EXTINF:-1 tvg-id="" status="online",Bollywood HD (1080p) [Not 24/7]
 https://sc.id-tv.kz/bollywood_hd.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",HD life (1080p) [Not 24/7]
@ -685,16 +689,16 @@ https://a3569455801-s26881.cdn.ngenix.net/live/smil:rtrp.smil/playlist.m3u8
 https://serv30.vintera.tv/sochi/sochi24/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",СТРК (720p) [Not 24/7]
 http://sochinskayatrk.ru/hdtv/hls/strc_hd/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",СТС (480p)
+#EXTINF:-1 tvg-id="CTC.ru" status="online" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",СТС (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s52/04.m3u8
-#EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.84 Safari/537.36 CrKey/1.21a.76178",СТС (540p) [Geo-blocked]
+#EXTINF:-1 tvg-id="CTC.ru" status="online" user-agent="Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.84 Safari/537.36 CrKey/1.21a.76178",СТС (540p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.84 Safari/537.36 CrKey/1.21a.76178
 https://zabava-htlive.cdn.ngenix.net/hls/CH_STS/variant.m3u8
-#EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.84 Safari/537.36 CrKey/1.21a.76178",СТС (540p) [Geo-blocked]
+#EXTINF:-1 tvg-id="CTC.ru" status="online" user-agent="Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.84 Safari/537.36 CrKey/1.21a.76178",СТС (540p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.84 Safari/537.36 CrKey/1.21a.76178
 https://zabava-htlive.cdn.ngenix.net/hls/CH_STSLOVE/variant.m3u8
-#EXTINF:-1 tvg-id="" status="online",СТС (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="CTC.ru" status="online",СТС (576p) [Not 24/7]
 https://sc.id-tv.kz/STS.m3u8
 #EXTINF:-1 tvg-id="" status="online",ТВ Кварц (576p) [Not 24/7]
 https://video.quartztelecom.ru:18080/hls/2386168/71fe656b993c510f39a5/playlist.m3u8
--- a/streams/se_samsung.m3u
+++ b/streams/se_samsung.m3u
@ -47,7 +47,7 @@ https://rakuten-spotlight-9-se.samsung.wurl.tv/playlist.m3u8
 https://rightsboosterltd-scl-1-se.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Tastemade
 https://tmint-aus-samsungswedan.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",The Pet Collective International
+#EXTINF:-1 tvg-id="ThePetCollectiveSweden.se" status="online",The Pet Collective International
 https://the-pet-collective-international-se.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Travelxp
 https://travelxp-travelxp-1-se.samsung.wurl.tv/playlist.m3u8
--- a/streams/sk.m3u
+++ b/streams/sk.m3u
@ -7,33 +7,33 @@ http://live.tvlux.sk:1935/lux/lux.stream/playlist.m3u8
 http://lb.streaming.sk/tvruzinov/stream/playlist.m3u8
 #EXTINF:-1 tvg-id="TVSeverka.sk" status="timeout",TV Severka (576p)
 http://88.212.7.11/live/test_severka_web_player/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",JOJ (540p) [Not 24/7]
+#EXTINF:-1 tvg-id="JOJ24.sk" status="online",JOJ (540p) [Not 24/7]
 https://nn.geo.joj.sk/hls/joj-540.m3u8
-#EXTINF:-1 tvg-id="" status="online",JOJ (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="JOJ24HD.sk" status="online",JOJ (720p) [Not 24/7]
 https://nn.geo.joj.sk/hls/joj-720.m3u8
-#EXTINF:-1 tvg-id="" status="online",JOJ (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="JOJ24HD.sk" status="online",JOJ (720p) [Not 24/7]
 https://nn.geo.joj.sk/live/hls/joj-720.m3u8
-#EXTINF:-1 tvg-id="" status="online",JOJ Family (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="JOJFamily.sk" status="online",JOJ Family (360p) [Not 24/7]
 https://nn.geo.joj.sk/hls/family-360.m3u8
-#EXTINF:-1 tvg-id="" status="online",JOJ Family (540p) [Not 24/7]
+#EXTINF:-1 tvg-id="JOJFamily.sk" status="online",JOJ Family (540p) [Not 24/7]
 https://nn.geo.joj.sk/hls/family-540.m3u8
-#EXTINF:-1 tvg-id="" status="online",JOJ Family (540p) [Not 24/7]
+#EXTINF:-1 tvg-id="JOJFamily.sk" status="online",JOJ Family (540p) [Not 24/7]
 https://nn.geo.joj.sk/live/hls/family-540.m3u8
 #EXTINF:-1 tvg-id="" status="online",LocAll (406p)
 http://tv.geniusnet.sk:8081/localltv/pl.m3u8
-#EXTINF:-1 tvg-id="" status="online",Nove Zamky (486p)
+#EXTINF:-1 tvg-id="NZTV.sk" status="online",Nove Zamky (486p)
 http://s1.media-planet.sk/live/novezamky/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Plus (540p) [Not 24/7]
 https://nn.geo.joj.sk/live/hls/jojplus-540.m3u8
 #EXTINF:-1 tvg-id="" status="online",Raj TV (720p) [Not 24/7]
 https://ottst05.flexitv.sk/2827-tv-pc.m3u8
-#EXTINF:-1 tvg-id="" status="online",Televizia OSEM (360p)
+#EXTINF:-1 tvg-id="TV8.sk" status="online",Televizia OSEM (360p)
 http://109.74.145.11:1935/tv8/mp4:tv8.stream_360p/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Televízia OSEM (576p)
+#EXTINF:-1 tvg-id="TV8.sk" status="online",Televízia OSEM (576p)
 http://109.74.145.11:1935/tv8/ngrp:tv8.stream_all/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",TV Nové Zámky (486p)
+#EXTINF:-1 tvg-id="NZTV.sk" status="online",TV Nové Zámky (486p)
 http://s1.media-planet.sk/live/novezamky/lihattv.m3u8
-#EXTINF:-1 tvg-id="" status="online",TV Nové Zámky (486p) [Not 24/7]
+#EXTINF:-1 tvg-id="NZTV.sk" status="online",TV Nové Zámky (486p) [Not 24/7]
 http://s1.media-planet.sk/live/novezamky/BratuMarian.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",TV Poprad (1080p) [Not 24/7]
 http://213.81.153.221:8080/poprad
--- a/streams/sl.m3u
+++ b/streams/sl.m3u
@ -1,3 +1,3 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" status="online",AYV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AYVTV.sl" status="online",AYV (720p) [Not 24/7]
 https://1219373429.rsc.cdn77.org/live/stream-1/chunklist.m3u8
--- a/streams/sy.m3u
+++ b/streams/sy.m3u
@ -27,5 +27,5 @@ http://vod.ortas.sy:1935/oLive/sat05042022/playlist.m3u8
 https://svs.itworkscdn.net/syriatvlive/syriatv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",alltv (400p)
 http://185.96.70.242:1935/live/alltv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="error",Noor Al-Sham (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="NourElSham.sy" status="error",Nour El-Sham (360p) [Not 24/7]
 http://vod.ortas.sy:1935/oLive/nour05042022/playlist.m3u8
--- a/streams/tr.m3u
+++ b/streams/tr.m3u
@ -328,7 +328,7 @@ http://yayin3.canlitv.com:1935/live/vuslattv/playlist.m3u8
 https://59cba4d34b678.streamlock.net/live/vuslattv/playlist.m3u8
 #EXTINF:-1 tvg-id="VuslatTV.tr" status="online",Vuslat TV (720p) [Not 24/7]
 https://waw2.artiyerelmedya.net/vuslattv/bant1/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",360 TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="360.tr" status="online",360 TV (720p) [Not 24/7]
 https://turkmedya-live.ercdn.net/tv360/tv360.m3u8
 #EXTINF:-1 tvg-id="" status="online",Ahi TV Kirsehir (576p)
 http://yayin3.canlitv.com:1935/canlitv/ahitv/playlist.m3u8
--- a/streams/ua.m3u
+++ b/streams/ua.m3u
@ -102,7 +102,7 @@ http://46.149.48.21:1234
 https://freedom.cdn-01.cosmonova.net.ua/mobile-app/main/freedom/master.m3u8
 #EXTINF:-1 tvg-id="Z.ua" status="online",Z (Запорожье) (1080p)
 https://stream.ztv.zp.ua/hls/live.m3u8
-#EXTINF:-1 tvg-id="" status="online",4 канал (1080p)
+#EXTINF:-1 tvg-id="4Kanal.ua" status="online",4 канал (1080p)
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCQdSS9GSBbtSqW3oNB39KTw/live
 #EXTINF:-1 tvg-id="" status="online",I-UA.tv (1080p)
 https://kie2.cdn.i-ua.tv/hlsme/iuatv.m3u8
@ -112,7 +112,7 @@ http://194.50.51.34/playlist.m3u8
 https://stream.ntktv.ua/s/ntk/ntk.m3u8
 #EXTINF:-1 tvg-id="" status="online",Орбіта ТВ (360p) [Not 24/7]
 http://ftp.orbita.dn.ua/hls/orbita.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",ОТВ (Днепр) (576p)
+#EXTINF:-1 tvg-id="OTV.ua" status="timeout",ОТВ (Днепр) (576p)
 http://91.193.128.233:1935/live/otv.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Репортер (720p) [Not 24/7]
 http://cdn1.live-tv.od.ua:8081/31chod/31chod-abr/playlist.m3u8
--- a/streams/uk.m3u
+++ b/streams/uk.m3u
@ -385,9 +385,9 @@ https://vs-cmaf-push-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_two_hd
 https://vs-hls-push-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_two_hd/t=3840/v=pv14/b=5070016/main.m3u8
 #EXTINF:-1 tvg-id="" status="blocked",BBC Two Northern Ireland HD (720p) [Geo-blocked]
 https://vs-hls-pushb-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_two_northern_ireland_hd/t=3840/v=pv14/b=5070016/main.m3u8
-#EXTINF:-1 tvg-id="" status="online",Brit Asia Live (US Eastern) (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="BritAsiaTV.uk" status="online",Brit Asia Live (US Eastern) (360p) [Not 24/7]
 https://a.jsrdn.com/broadcast/22693_4rGhgrBU/-0500/c.m3u8
-#EXTINF:-1 tvg-id="" status="online",Brit Asia Live (US Pacific) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="BritAsiaTV.uk" status="online",Brit Asia Live (US Pacific) (720p) [Not 24/7]
 https://a.jsrdn.com/broadcast/22693_4rGhgrBU/-0800/c.m3u8
 #EXTINF:-1 tvg-id="" status="blocked",CBeebies (540p) [Geo-blocked]
 https://vs-hls-pushb-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:cbeebies_hd/mobile_wifi_main_sd_abr_v2_akamai_hls_live_http.m3u8
@ -397,7 +397,7 @@ https://vs-hls-pushb-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:cbeebies_h
 https://vs-cmaf-pushb-uk.live.fastly.md.bbci.co.uk/x=3/i=urn:bbc:pips:service:cbeebies_hd/iptv_hd_abr_v1.mpd
 #EXTINF:-1 tvg-id="" status="online",Channel S (US Eastern) (720p)
 https://a.jsrdn.com/broadcast/22679_24MrQma9TX/-0500/c.m3u8
-#EXTINF:-1 tvg-id="" status="online",Channel S (US Pacific) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="ChannelS.uk" status="online",Channel S (US Pacific) (720p) [Not 24/7]
 https://a.jsrdn.com/broadcast/22679_24MrQma9TX/-0800/c.m3u8
 #EXTINF:-1 tvg-id="" status="online",Craft Store TV (720p)
 https://live-hochanda.simplestreamcdn.com/hochanda/live.m3u8
@ -421,7 +421,7 @@ https://live.ishiacloud.com/haditv.co.uk/haditv7.m3u8
 http://35.189.69.44/tmp_hls/desibox/index.m3u8
 #EXTINF:-1 tvg-id="" status="online",Ideal World TV (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/c/IdealworldTvShopping/live
-#EXTINF:-1 tvg-id="" status="online",ITV 1 (1080p)
+#EXTINF:-1 tvg-id="ITV.uk" status="online",ITV 1 (1080p)
 http://w4.12all.tv:4000/play/itv1/index.m3u8
 #EXTINF:-1 tvg-id="" status="blocked",JimJam Россия (576p) [Not 24/7]
 http://188.40.68.167/russia/jimjam/playlist.m3u8
--- a/streams/uk_channelbox.m3u
+++ b/streams/uk_channelbox.m3u
@ -47,7 +47,9 @@ http://88.150.241.11/tsstreamer/BollywoodClassicLDAI_SD.ts
 http://95.154.197.48/tsstreamer/BollywoodHDLDAI_SD.ts
 #EXTINF:-1 tvg-id="" status="timeout",BollywoodHD
 http://109.169.55.98/tsstreamer/BollywoodHDLDAI_SD.ts
-#EXTINF:-1 tvg-id="" status="timeout",CMusic
+#EXTINF:-1 tvg-id="CMusicTV.uk" status="online",CMusic
 http://95.154.194.78/tsstreamer/CMusicLDAI_SD.ts
 #EXTINF:-1 tvg-id="CMusicTV.uk" status="timeout",CMusic
 http://78.129.193.17/tsstreamer/CMusicLDAI_SD.ts
 #EXTINF:-1 tvg-id="" status="timeout",CMusic
 http://95.154.194.78/tsstreamer/CMusicLDAI_SD.ts
@ -91,9 +93,9 @@ http://212.84.160.41/tsstreamer/HeritageLDAI_SD.ts
 http://82.145.63.157/tsstreamer/KaraokeLDAI_SD.ts
 #EXTINF:-1 tvg-id="" status="timeout",MMA TV (360p)
 http://212.38.189.94/tsstreamer/MMALDAI_SD.ts
-#EXTINF:-1 tvg-id="" status="timeout",Naturescape
+#EXTINF:-1 tvg-id="NaturescapeUK.uk" status="timeout",Naturescape
 http://176.227.215.109/tsstreamer/NaturescapeLDAI_SD.ts
-#EXTINF:-1 tvg-id="" status="online",NollyAfrica
+#EXTINF:-1 tvg-id="NollyAfrica.uk" status="online",NollyAfrica
 http://82.145.63.157/tsstreamer/NollyAfricaLDAI_SD.ts
 #EXTINF:-1 tvg-id="" status="online",NTD
 http://5.152.223.78/tsstreamer/NTD_SD.ts
@ -125,7 +127,7 @@ http://78.129.193.17/tsstreamer/TwistedMirrorLDAI_SD.ts
 http://95.154.194.78/tsstreamer/TwistedMirrorLDAI_SD.ts
 #EXTINF:-1 tvg-id="" status="timeout",Unreel
 http://78.129.253.189/tsstreamer/UnreelLDAI_SD.ts
-#EXTINF:-1 tvg-id="" status="online",VoxAfrica
+#EXTINF:-1 tvg-id="VoxAfrica.uk" status="online",VoxAfrica
 http://188.227.164.31/tsstreamer/VoxAfrica_SD.ts
 #EXTINF:-1 tvg-id="" status="timeout",WBC
 http://78.129.253.189/tsstreamer/WBCLDAI_SD.ts
--- a/streams/uk_rakuten.m3u
+++ b/streams/uk_rakuten.m3u
@ -11,15 +11,17 @@ https://mavtv-mavtvglobal-1-eu.rakuten.wurl.tv/playlist.m3u8
 https://revry-revrynews-1-eu.rakuten.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Bloomberg TV (1080p)
 https://bloomberg-bloomberg-1-eu.rakuten.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Rakuten Action Movies UK (720p)
+#EXTINF:-1 tvg-id="TravelxpEurope.in" status="online",Travel XP (720p)
 https://travelxp-travelxp-1-eu.rakuten.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="RakutenTVActionMoviesUK.uk" status="online",Rakuten Action Movies UK (720p)
 https://rakuten-actionmovies-1-eu.rakuten.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Rakuten Comedy Movies UK (720p)
+#EXTINF:-1 tvg-id="RakutenTVComedyMoviesUK.uk" status="online",Rakuten Comedy Movies UK (720p)
 https://rakuten-comedymovies-1-eu.rakuten.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Rakuten Family UK (720p)
+#EXTINF:-1 tvg-id="RakutenTVFamilyMoviesUK.uk" status="online",Rakuten Family UK (720p)
 https://rakuten-family-1-eu.rakuten.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Rakuten Shows UK (720p)
 https://rakuten-tvshows-1-eu.rakuten.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Rakuten Spotlight UK (720p)
+#EXTINF:-1 tvg-id="RakutenTVSpotlightUK.uk" status="online",Rakuten Spotlight UK (720p)
 https://rakuten-spotlight-1-eu.rakuten.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Rakuten Top Free UK (720p)
 https://rakuten-topfree-1-eu.rakuten.wurl.tv/playlist.m3u8
--- a/streams/uk_samsung.m3u
+++ b/streams/uk_samsung.m3u
@ -49,11 +49,11 @@ https://timeline-samsung-uk.amagi.tv/playlist.m3u8
 https://wonder-samsung-uk.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Comedy Channel (1080p)
 https://uksono1-samsunguk.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fashion TV (England) (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="FashionTelevisionEurope.uk" status="online",Fashion TV (England) (1080p) [Not 24/7]
 https://fashiontv-fashiontv-1-gb.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",FTF For the fans (720p)
+#EXTINF:-1 tvg-id="ForTheFans.uk" status="online",FTF For the fans (720p)
 https://elevensports-uk.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Gusto TV (720p)
+#EXTINF:-1 tvg-id="GustoTVUK.uk" status="online",Gusto TV (720p)
 https://gustotv-samsung-gb.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Horse and Country (720p)
 https://hncfree-samsung-uk.amagi.tv/playlist.m3u8
--- a/streams/us.m3u
+++ b/streams/us.m3u
@ -1838,9 +1838,9 @@ https://16live00.akamaized.net/CBS_EAST/index.m3u8
 https://livevideo01.wwltv.com/hls/live/2016516/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="WXXVDT1.us" status="online",WXXV-TV News Biloxi MS (720p)
 https://dai.google.com/linear/hls/event/cJXgmHHTQIGMhSzDk7TBsA/master.m3u8
-#EXTINF:-1 tvg-id="WZDXDT1.us" status="online",Fox 54.1 Huntsville AL (WZDX) (1080p)
+#EXTINF:-1 tvg-id="WZDXDT1.us" status="online",Fox 54.1 Huntsville (1080p)
 https://livevideo01.rocketcitynow.com/hls/live/2011659/newscasts/live.m3u8
-#EXTINF:-1 tvg-id="WZZMDT1.us" status="online",ABC 13 Grand Rapids MI (WZZM) (1080p)
+#EXTINF:-1 tvg-id="WZZMDT1.us" status="online",ABC 13 Grand Rapids (1080p)
 https://livevideo01.wzzm13.com/hls/live/2016280/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="YahooFinance.us" status="online",Yahoo! Finance (1080p)
 https://d1ewctnvcwvvvu.cloudfront.net/playlist.m3u8
@ -1860,51 +1860,51 @@ https://yuma-az.secure.footprint.net/egress/bhandler/yumaaz/streama/playlist.m3u
 https://yuma-az.secure.footprint.net/egress/bhandler/yumaaz/streamb/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",ABC News (720p)
 https://content.uplynk.com/channel/3324f2467c414329b3b0cc5cd987b6be.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",ABC Tallahassee FL (WTXL-TV1) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="WTXLDT1.us" status="blocked",ABC Tallahassee (720p) [Not 24/7]
 https://5e6cea03e25b6.streamlock.net/live/WTXLHD.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Ace TV (KCKS-LD3) (480p)
+#EXTINF:-1 tvg-id="KCKSLD3.us" status="online",Ace TV (KCKS-LD3) (480p)
 https://cdn.igocast.com/channel3_hls/channel3_master.m3u8
-#EXTINF:-1 tvg-id="" status="online",Action (KCKS-LD4) (480p)
+#EXTINF:-1 tvg-id="KCKSLD4.us" status="online",Action (KCKS-LD4) (480p)
 https://cdn.igocast.com/channel4_hls/channel4_master.m3u8
 #EXTINF:-1 tvg-id="" status="blocked",Actionable (720p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5c7e25a1932c8368bdbfd87d/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",ACTV Phoenix AZ
+#EXTINF:-1 tvg-id="ACTV.us" status="online",ACTV
 https://cdn3.wowza.com/5/ODB6NmF5K3l4T1h5/persis/6361162879_AZ-247.stream_247/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",AMC Latin America
+#EXTINF:-1 tvg-id="AMCLatinAmerica.us" status="timeout",AMC Latin America
 http://209.91.213.10:8088/play/a013
-#EXTINF:-1 tvg-id="" status="online",America's Voice (KCKS-LD5) (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="KCKSLD5.us" status="online",Real America's Voice (KCKS-LD5) (480p) [Not 24/7]
 https://cdn.igocast.com/channel5_hls/channel5_master.m3u8
-#EXTINF:-1 tvg-id="" status="online",AWC TV
+#EXTINF:-1 tvg-id="AWCTV.us" status="online",AWC TV
 https://arizonawesterncol.secure.footprint.net/egress/bhandler/arizonawesterncol/streama/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",AXN East Asia (Indonesian subtitle) (576p)
+#EXTINF:-1 tvg-id="AXNIndonesia.id" status="timeout",AXN East Asia (Indonesian subtitle) (576p)
 http://210.210.155.37/dr9445/h/h141/index.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",AXN Latinoamérica (576p)
 http://209.91.213.10:8088/play/a011
-#EXTINF:-1 tvg-id="" status="online",Bloomberg TV Asia (576p)
+#EXTINF:-1 tvg-id="BloombergTVAsia.hk" status="online",Bloomberg TV Asia (576p)
 http://210.210.155.37/dr9445/h/h03/index.m3u8
 #EXTINF:-1 tvg-id="" status="online",Bloomberg TV Asia (720p)
 https://bloomberg.com/media-manifest/streams/asia.m3u8
 #EXTINF:-1 tvg-id="" status="online",Bloomberg TV Asia Live Event (720p)
 https://bloomberg.com/media-manifest/streams/asia-event.m3u8
-#EXTINF:-1 tvg-id="" status="online",Bloomberg TV Europe (720p)
+#EXTINF:-1 tvg-id="BloombergTVEurope.uk" status="online",Bloomberg TV Europe (720p)
 https://bloomberg.com/media-manifest/streams/eu.m3u8
-#EXTINF:-1 tvg-id="" status="online",Bloomberg TV US (720p)
+#EXTINF:-1 tvg-id="BloombergTV.us" status="online",Bloomberg TV US (720p)
 https://bloomberg.com/media-manifest/streams/us.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Brazzers Latinoamérica [Geo-blocked]
 http://45.5.8.78:8000/play/a029
-#EXTINF:-1 tvg-id="" status="online",Buzzr (KCKS-LD1) (480p)
+#EXTINF:-1 tvg-id="KCKSLD1.us" status="online",Buzzr (KCKS-LD1) (480p)
 https://cdn.igocast.com/channel1_hls/channel1_master.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Cartoon Network Latin America
 http://209.91.213.10:8088/play/a00k
-#EXTINF:-1 tvg-id="" status="online",CFM TV Channel 98 (Fort Myers FL) (360p)
+#EXTINF:-1 tvg-id="CFMTVChannel98.us" status="online",CFM TV Channel 98 (360p)
 http://cdn3.wowza.com/5/djRwZmQvTEJidmZD/cityftmyers/G2083_002/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Channel 11 Scottsdale AZ
+#EXTINF:-1 tvg-id="" status="online",Channel 11
 https://cdn3.wowza.com/5/RXJNMFI3VlVkOEFP/scottsdale/G0040_007/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="online",CityTV Santa Barbara (1080p)
+#EXTINF:-1 tvg-id="CityTVSantaBarbara.us" status="online",CityTV Santa Barbara (1080p)
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/c/Citytv18/live
-#EXTINF:-1 tvg-id="" status="online",Cupertino City Channel (720p)
+#EXTINF:-1 tvg-id="CupertinoCityChannel.us" status="online",Cupertino City Channel (720p)
 https://cdn3.wowza.com/5/dk84U1p2UUdoMGxT/cupertino/G0067_003/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",DC Council Channel (1080p)
+#EXTINF:-1 tvg-id="DCC.us" status="online",DC Council Channel (1080p)
 https://video.oct.dc.gov/out/u/15_12.m3u8
 #EXTINF:-1 tvg-id="" status="online",Delicioso [Geo-blocked]
 https://unidfp-nlds139.global.ssl.fastly.net/nlds/univisionnow/cocina2/as/live/cocina2_hd_pc.m3u8?t1=
@ -1912,7 +1912,7 @@ https://unidfp-nlds139.global.ssl.fastly.net/nlds/univisionnow/cocina2/as/live/c
 https://unidfp-nlds140.global.ssl.fastly.net/nlds/univisionnow/challenge28/as/live/challenge28_hd_pc.m3u8?t1=
 #EXTINF:-1 tvg-id="" status="timeout",Disney Channel Asia (720p)
 http://198.16.106.62:8278/streams/d/Disneyxd/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",Disney Channel España (1080p)
+#EXTINF:-1 tvg-id="DisneyChannelSpain.es" status="timeout",Disney Channel España (1080p)
 http://5.255.90.184:2004/play/a006/index.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Disney Junior Asia (720p)
 http://198.16.106.62:8278/streams/d/Disneyjr/playlist.m3u8
@ -1920,15 +1920,15 @@ http://198.16.106.62:8278/streams/d/Disneyjr/playlist.m3u8
 http://209.91.213.10:8088/play/a00n
 #EXTINF:-1 tvg-id="" status="timeout",DryBar Comedy (720p)
 https://a.jsrdn.com/broadcast/e29bdbbbf3/+0000/c.m3u8
-#EXTINF:-1 tvg-id="" status="online",edTV
+#EXTINF:-1 tvg-id="edTV.us" status="online",edTV
 https://arizonawesterncol.secure.footprint.net/egress/bhandler/arizonawesterncol/streamb/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",EMT Media TV Los Angeles CA
+#EXTINF:-1 tvg-id="KNETCD1.us" status="online",EMT Media TV Los Angeles CA
 https://hwlive.streamingmediahosting.com/14135-live/0_lkq7fay8/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",EMT Media TV Los Angeles CA [Geo-blocked]
+#EXTINF:-1 tvg-id="KNETCD1.us" status="online",EMT Media TV Los Angeles CA [Geo-blocked]
 https://mediaplatform.streamingmediahosting.com/p/14135/sp/1413500/playManifest/entryId/0_lkq7fay8/format/applehttp/protocol/https/uiConfId/6710347/a.m3u8
-#EXTINF:-1 tvg-id="" status="online",Entrepreneur (720p)
+#EXTINF:-1 tvg-id="EntrepreneurTV.us" status="online",Entrepreneur (720p)
 https://a.jsrdn.com/broadcast/7582ed85f7/+0000/c.m3u8
-#EXTINF:-1 tvg-id="" status="online",EPlusTV 6 Jackson TN
+#EXTINF:-1 tvg-id="EPlusTV6.us" status="online",EPlusTV 6
 https://jacksonenergy.secure.footprint.net/egress/bhandler/jacksonenergy/streama/index.m3u8
 #EXTINF:-1 tvg-id="" status="online",ESR 24x7 eSports Network (1080p)
 https://eyeonesports.com/ES2RA-628g.m3u8
@ -1942,57 +1942,53 @@ http://ott-cdn.ucom.am/s79/index.m3u8
 http://ott-cdn.ucom.am/s86/index.m3u8
 #EXTINF:-1 tvg-id="" status="online",Fox HD Russia
 https://sc.id-tv.kz/FOX_HD.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",Fox Tallahassee FL (WTWC-TV2) (720p)
+#EXTINF:-1 tvg-id="WTWCDT2.us" status="blocked",Fox Tallahassee (720p)
 https://5e6cea03e25b6.streamlock.net/live/WTWC-FX.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",Freeform
+#EXTINF:-1 tvg-id="FreeformEast.us" status="blocked",Freeform
 https://16live00.akamaized.net/FREEFORM/index.m3u8
 #EXTINF:-1 tvg-id="" status="online",Fútbol [Geo-blocked]
 https://unidfp-nlds153.global.ssl.fastly.net/nlds/univisionnow/futbol/as/live/futbol_hd_pc.m3u8?t1=
 #EXTINF:-1 tvg-id="" status="timeout",FX Peru
 http://209.91.213.10:8088/play/a01z
-#EXTINF:-1 tvg-id="" status="online",GLC TV God's Learning Channel (480p)
+#EXTINF:-1 tvg-id="KPCBDT1.us" status="online",God's Learning Channel (480p)
 https://2-fss-1.streamhoster.com/pl_122/200562-1176456-1/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",Grit Tallahassee FL (WTXL-TV3) (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="WTXLDT3.us" status="blocked",Grit Tallahassee (480p) [Not 24/7]
 https://5e6cea03e25b6.streamlock.net/live/GRIT.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Grit Xtra
 https://scripps-gritxtra-1-us.vizio.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Gusto TV (1080p)
 https://d3cajslujfq92p.cloudfront.net/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",International Vietnamese Television IVTV Channel 57.16 (720p)
+#EXTINF:-1 tvg-id="KJLADT16.us" status="online",International Vietnamese Television IVTV Channel 57.16 (720p)
 https://59d39900ebfb8.streamlock.net/8478/8478/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",KBSV/AssyriaSat (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="KBSVDT1.us" status="online",AssyriaSat (720p) [Not 24/7]
 http://66.242.170.53/hls/live/temp/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",Knoxville Community Media
+#EXTINF:-1 tvg-id="KnoxvilleCommunityMedia.us" status="online",Knoxville Community Media
 https://knoxville-tn.secure.footprint.net/egress/bhandler/knoxvilletn/streama/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",Kool TV (1080p)
+#EXTINF:-1 tvg-id="K21GND1.us" status="timeout",Kool TV (1080p)
 http://209.182.219.50:1935/roku/roku/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Lao-Thai US TV (720p)
+#EXTINF:-1 tvg-id="LaoThaiTV.us" status="online",Lao-Thai TV (720p)
 https://livefta.malimarcdn.com/ftaedge00/laothaius.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",Level One
+#EXTINF:-1 tvg-id="MBCAmerica.us" status="online",MBC America (480p)
 https://stitcheraws.unreel.me/wse-node04.powr.com/live/5af61be7d5eeee7af3d1db47/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",MBC America (480p)
 https://dacastmmd.mmdlive.lldns.net/dacastmmd/1c94dc9f1c08487a97995571800b9667/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",METV (Merced Educational Television)
+#EXTINF:-1 tvg-id="MercedEducationalTV.us" status="online",METV (Merced Educational Television)
 https://mercedcouedu.secure.footprint.net/egress/bhandler/mercedcouedu/streamc/chunklist_b1192000.m3u8
 #EXTINF:-1 tvg-id="" status="online",MGM HD USA (576p)
 http://c0.cdn.trinity-tv.net/stream/uq2t763988wmx82xs37vrzrtrvaz686y22jd9gcgvgbhu88g6dntdb82kggx9zgvpvwj5wisyi5mgwwgdqzm7d6xbf7yvctwzvhsu3t57ms3wa4qxwyeuqk3ayrdwx3k2b6cdtnrydx9qa3ezqzea===.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",MTV Hits Latinoamérica (576p)
 http://209.91.213.10:8088/play/a00z
 #EXTINF:-1 tvg-id="" status="timeout",MTV Latinoamérica (1080p)
 http://209.91.213.10:8088/play/a01a
 #EXTINF:-1 tvg-id="" status="timeout",National Geographic España
 http://5.255.90.184:2001/play/a04i
-#EXTINF:-1 tvg-id="" status="blocked",NBC Tallahassee FL (WTWC-TV1) (720p)
+#EXTINF:-1 tvg-id="WTWCDT1.us" status="blocked",NBC Tallahassee (720p)
 https://5e6cea03e25b6.streamlock.net/live/WTWC-NB.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="blocked",NESN National (1080p)
 https://bcovlive-a.akamaihd.net/bea11a7dfef34b08be06aaca4a72bcdf/us-east-1/6141518204001/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",New Orleans Television (NOTV) (720p)
+#EXTINF:-1 tvg-id="KNOVCD1.us" status="online",NOTV (720p)
 http://media4.tripsmarter.com:1935/LiveTV/NOTVHD/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",New Orleans Television (NOTV) (720p)
+#EXTINF:-1 tvg-id="KNOVCD1.us" status="online",NOTV (720p)
 https://5b0f5374bdf0c.streamlock.net:444/LiveTV/NOTVHD/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",News4JAX+
 https://dai.google.com/linear/hls/event/RDmbn03GRCOLNG1eetEKhg/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",NewsNet (KCKS-LD2) (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="KCKSLD2.us" status="online",NewsNet (KCKS-LD2) (480p) [Not 24/7]
 https://cdn.igocast.com/channel2_hls/channel2_master.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Nick Jr Latinoamérica (480p)
 http://201.168.205.12:8000/play/a0ck/index.m3u8
@ -2000,37 +1996,37 @@ http://201.168.205.12:8000/play/a0ck/index.m3u8
 https://unilivemtveu-lh.akamaihd.net/i/nickde_1@448749/master.m3u8
 #EXTINF:-1 tvg-id="" status="online",Novelas [Geo-blocked]
 https://unidfp-nlds166.global.ssl.fastly.net/nlds/univisionnow/novelas2plist/as/live/novelas2plist_hd_pc.m3u8?t1=
-#EXTINF:-1 tvg-id="" status="online",NTD TV (New Tang Dynasty Television)
+#EXTINF:-1 tvg-id="NTDTVEast.us" status="online",NTD TV (New Tang Dynasty Television)
 http://cnhls.ntdtv.com/cn/live400/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",NTD TV UK (New Tang Dynasty Television)
 https://ntd02.akamaized.net/NTD-UK/index.m3u8
 #EXTINF:-1 tvg-id="" status="online",NTD TV West (New Tang Dynasty Television)
 https://ntd02.akamaized.net/NTD-West/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",Pan Armenian TV
+#EXTINF:-1 tvg-id="PanarmenianTV.us" status="online",Panarmenian TV
 https://us1.ottstream.live:17071/C279/index.m3u8?token=123TREWQ456
-#EXTINF:-1 tvg-id="" status="online",PBS 39 Extra Philadelphia PA (WPPT) (480p)
+#EXTINF:-1 tvg-id="WPPTDT1.us" status="online",PBS 39 Extra Philadelphia (480p)
 https://forerunnerrtmp.livestreamingcdn.com/output18-2/output18-2.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",PBS Tallahassee FL (WFSU-TV1) (720p)
+#EXTINF:-1 tvg-id="WFSUDT1.us" status="blocked",PBS Tallahassee (720p)
 https://5e6cea03e25b6.streamlock.net/live/WFSU-PBS.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",PHXTV Phoenix AZ
+#EXTINF:-1 tvg-id="PHXTV.us" status="online",PHXTV
 https://cdn3.wowza.com/5/bGZUOHp2TnhudnM2/phoenix/G1498_002/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="online",PIX11 New York NY (720p)
+#EXTINF:-1 tvg-id="WPIXDT1.us" status="online",PIX11 (720p)
 https://content.uplynk.com/channel/98828f7707b84dc496472d5789143df2.m3u8
-#EXTINF:-1 tvg-id="" status="online",Prescott Valley TV Prescott Valley AZ
+#EXTINF:-1 tvg-id="PrescottValleyTV.us" status="online",Prescott Valley TV
 https://live-h1.frontlayer.net/fl207891/live/chunks.m3u8
-#EXTINF:-1 tvg-id="" status="online",QVC2 (Deutsch) (540p)
+#EXTINF:-1 tvg-id="QVC2Germany.de" status="online",QVC2 (Deutsch) (540p)
 http://live.qvcde.simplestreamcdn.com/live/qvcde_plus_clean/bitrate1.isml/live.m3u8
 #EXTINF:-1 tvg-id="" status="online",QVC Beauty (German) (540p)
 https://d2mn03dhv5o3g8.cloudfront.net/live/qvcde_beauty_clean/bitrate1.isml/live.m3u8
 #EXTINF:-1 tvg-id="" status="online",QVC PLUS (540p)
 https://d2mn03dhv5o3g8.cloudfront.net/live/qvcde_plus_clean/bitrate1.isml/live.m3u8
-#EXTINF:-1 tvg-id="" status="online",QVC UK +1 (540p)
+#EXTINF:-1 tvg-id="QVCUKPlus1.uk" status="online",QVC UK +1 (540p)
 https://live-qvcuk.simplestreamcdn.com/hera/remote/qvcuk_primary_sdi1/live.m3u8
-#EXTINF:-1 tvg-id="" status="online",QVC UK Beauty (540p)
+#EXTINF:-1 tvg-id="QVCBeautyUK.uk" status="online",QVC UK Beauty (540p)
 http://live.qvcuk.simplestreamcdn.com/live/qvcuk_beauty_clean/bitrate1.isml/live.m3u8
-#EXTINF:-1 tvg-id="" status="online",QVC UK Extra (540p)
+#EXTINF:-1 tvg-id="QVCExtraUK.uk" status="online",QVC UK Extra (540p)
 https://live-qvcuk.simplestreamcdn.com/live/qvcuk_extra_clean/bitrate1.isml/live.m3u8
-#EXTINF:-1 tvg-id="" status="online",QVC UK Style (540p)
+#EXTINF:-1 tvg-id="QVCStyleUK.uk" status="online",QVC UK Style (540p)
 http://live.qvcuk.simplestreamcdn.com/live/qvcuk_style_clean/bitrate1.isml/live.m3u8
 #EXTINF:-1 tvg-id="" status="online",Radio Javan (720p)
 https://stream.rjtv.stream/live/smil:rjtv.smil/playlist.m3u8
@ -2040,34 +2036,34 @@ https://stream.rjtv.tv/live/smil:rjtv.smil/playlist.m3u8
 https://59514edd5dd8e.streamlock.net/lax/lax/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Retro TV (720p)
 https://bcovlive-a.akamaihd.net/5e531be3ed6c41229b2af2d9bffba88d/us-east-1/6183977686001/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Retro TV (KCKS-LD9) (480p)
+#EXTINF:-1 tvg-id="KCKSLD9.us" status="online",Retro TV (KCKS-LD9) (480p)
 https://cdn.igocast.com/channel9_hls/channel9_master.m3u8
-#EXTINF:-1 tvg-id="" status="online",Rev'n (720p)
+#EXTINF:-1 tvg-id="RevnTV.us" status="online",Rev'n (720p)
 https://bcovlive-a.akamaihd.net/a71236fdda1747999843bd3d55bdd6fa/us-east-1/6183977686001/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Rev'n (KCKS-LD7) (480p)
+#EXTINF:-1 tvg-id="KCKSLD7.us" status="online",Rev'n (KCKS-LD7) (480p)
 https://cdn.igocast.com/channel7_hls/channel7_master.m3u8
 #EXTINF:-1 tvg-id="" status="online",Scream Factory TV (720p)
 https://shoutfactory-screamfactorytv-1-us.ono.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Shop LC (KCKS-LD10) (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="KCKSLD10.us" status="online",Shop LC (KCKS-LD10) (480p) [Not 24/7]
 https://cdn.igocast.com/channel10_hls/channel10_master.m3u8
 #EXTINF:-1 tvg-id="" status="blocked",Slimo (540p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5c7e2783932c8368bdbfd8a5/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (iPad; CPU OS 9_3_5 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13G36",Space Channel
+#EXTINF:-1 tvg-id="SpaceChannel.us" status="online" user-agent="Mozilla/5.0 (iPad; CPU OS 9_3_5 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13G36",Space Channel
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPad; CPU OS 9_3_5 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13G36
 https://stream.ads.ottera.tv/playlist.m3u8?network_id=565
-#EXTINF:-1 tvg-id="" status="blocked",SportsGrid (720p)
+#EXTINF:-1 tvg-id="SportsGrid.us" status="blocked",SportsGrid (720p)
 https://playout4multirtmp.tulix.tv/live6/Stream1/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",TCT HD Tri-State Christian Television (1080p)
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://api.new.livestream.com/accounts/29565692/events/9276365/
-#EXTINF:-1 tvg-id="" status="online",Temple University TV (Tutv) (720p)
+#EXTINF:-1 tvg-id="TUTV.us" status="online",Temple University TV (tutv) (720p)
 https://templeuni.secure.footprint.net/egress/bhandler/templeuni/streama/manifest.m3u8
-#EXTINF:-1 tvg-id="" status="online",The Florida Channel (480p)
+#EXTINF:-1 tvg-id="WFSUDT2.us" status="online",The Florida Channel (480p)
 https://cdnapisec.kaltura.com/p/2593311/sp/259331100/playManifest/entryId/1_ta2cmesd/format/applehttp/protocol/https/a.m3u8
 #EXTINF:-1 tvg-id="" status="online",The Grapevine
 https://ov.ottera.tv/live/master.m3u8?channel=mcom_gv_us
-#EXTINF:-1 tvg-id="" status="online",The Ohio Channel (WOSU-DT3) (720p)
+#EXTINF:-1 tvg-id="WOSUDT3.us" status="online",The Ohio Channel (720p)
 https://5ebe6889de541.streamlock.net/live/stream_10/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",TNT
+#EXTINF:-1 tvg-id="TNTEast.us" status="blocked",TNT
 https://16live00.akamaized.net/TNT/index.m3u8
 #EXTINF:-1 tvg-id="" status="online",Toonami Aftermath East (480p)
 http://api.toonamiaftermath.com:3000/est/playlist.m3u8
@ -2078,37 +2074,31 @@ http://api.toonamiaftermath.com:3000/radio/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",TPT Now KTCA-DT5 (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36
 https://api.new.livestream.com/accounts/12638076/events/8488790/live.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",Tranquil Thunderstorms (720p)
+#EXTINF:-1 tvg-id="truTVLatinAmerica.us" status="timeout",truTV América Latina
 https://a.jsrdn.com/broadcast/18b42f9aef/+0000/c.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Tru TV América Latina
 http://190.61.37.173:9001/play/a084/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",TruTV East (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="truTVEast.us" status="online",truTV East (720p) [Geo-blocked]
 https://tve-live-lln.warnermediacdn.com/hls/live/2023176/trueast/slate/VIDEO_0_3564000.m3u8
-#EXTINF:-1 tvg-id="" status="online",TruTV West (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="truTVWest.us" status="online",truTV West (720p) [Geo-blocked]
 https://tve-live-lln.warnermediacdn.com/hls/live/2023178/truwest/slate/VIDEO_0_3564000.m3u8
-#EXTINF:-1 tvg-id="" status="online",TV4 Bullhead City AZ (360p)
+#EXTINF:-1 tvg-id="TV4.us" status="online",TV4 (360p)
 https://cdn3.wowza.com/5/UWpORHhLSEs5SkJs/bullheadcity/G0860_001/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Untamed Sports TV (KCKS-LD8) (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="VH1East.us" status="online",VH1 (1080p)
 https://cdn.igocast.com/channel8_hls/channel8_master.m3u8
 #EXTINF:-1 tvg-id="" status="online",VH1 (1080p)
 https://content.uplynk.com/channel/36953f5b6546464590d2fcd954bc89cf.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",Victory Television Network (240p)
+#EXTINF:-1 tvg-id="KVTNDT1.us" status="timeout",Victory Television Network (240p)
 http://184.173.179.163:1935/victorytelevisionnetwork/victorytelevisionnetwork/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Vida Visión Network (720p)
+#EXTINF:-1 tvg-id="WACXDT5.us" status="online",Vida Visión Network (720p)
 https://f-tx-edge-87.christianworldmedia.com/radiovidavision/mp4:radiovidavision/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Village of Hastings-On-Hudson NY (WHOH-TV) (360p)
 http://stream.swagit.com/live-edge/hastingsonhudsonny/smil:std-4x3-1-a/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",VPOD-TV 59.3 Chicago IL (WAOE) (1080p)
+#EXTINF:-1 tvg-id="WAOEDT3.us" status="online",VPOD-TV 59.3 Chicago IL (WAOE) (1080p)
 https://81988.global.ssl.fastly.net/6054f2db9a679c037cbbb2b2/live_7749cbc088e711eb99623595db260c33/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",WDAY-X Automatic Weather Frago ND (720p)
+#EXTINF:-1 tvg-id="" status="online",WDAY-X Automatic Weather Fargo ND (720p)
 https://player-api.new.livestream.com/accounts/27442514/events/8331542/live.m3u8
-#EXTINF:-1 tvg-id="" status="online",WeatherNation (KCKS-LD6) (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="KCKSLD6.us" status="online",WeatherNation (KCKS-LD6) (480p) [Not 24/7]
 https://cdn.igocast.com/channel6_hls/channel6_master.m3u8
-#EXTINF:-1 tvg-id="" status="online",WPS TV (360p)
+#EXTINF:-1 tvg-id="WPSTV.us" status="online",WPS TV (360p)
 https://2-fss-2.streamhoster.com/pl_120/amlst:203530-1426406/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",WSTO
+#EXTINF:-1 tvg-id="WSTOTV.us" status="online",WSTO
-https://5d80890572342.streamlock.net:1936/live/wstoLive/playlist.m3u8
+https://stoughton-wi.secure.footprint.net/egress/bhandler/stoughtonwi/streama/chunklist_b2192000.m3u8
 #EXTINF:-1 tvg-id="" status="online",Xplore Reisen (720p) [Not 24/7]
-https://d46c0ebf9ef94053848fdd7b1f2f6b90.mediatailor.eu-central-1.amazonaws.com/v1/master/81bfcafb76f9c947b24574657a9ce7fe14ad75c0/live-prod/1ecb875d-8be7-11eb-a7de-bacfe1f83627/0/master.m3u8?country=DE&optout=0&uid=749544ec3d9a45d48c600d03cac91dfd&vendor=philips
+https://d46c0ebf9ef94053848fdd7b1f2f6b90.mediatailor.eu-central-1.amazonaws.com/v1/master/81bfcafb76f9c947b24574657a9ce7fe14ad75c0/live-prod/1ecb875d-8be0
 #EXTINF:-1 tvg-id="" status="online",YouTV
 https://tv.sikkylab.me/hls/stream.m3u8
--- a/streams/us_bumblebee.m3u
+++ b/streams/us_bumblebee.m3u
@ -53,5 +53,5 @@ https://stitcheraws.unreel.me/wse-node02.powr.com/live/5bf22491932c8304fc4533e4/
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5e2626030145130f25474626/playlist.m3u8
 #EXTINF:-1 tvg-id="BumblebeeTVTropicsLive.us" status="blocked",Bumblebee TV Tropics Live (1080p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5c9538b9932c837b4939735c/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",Bumblebee TV Classics #2 (720p)
+#EXTINF:-1 tvg-id="BumblebeeTVClassics2.us" status="blocked",Bumblebee TV Classics 2 (720p)
 https://stitcheraws.unreel.me/wse-node05.powr.com/live/60f881602da3a5575eceb854/playlist.m3u8
--- a/streams/us_fubo.m3u
+++ b/streams/us_fubo.m3u
@ -1,3 +1,3 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" status="online",fubo Sports Network (720p)
+#EXTINF:-1 tvg-id="FuboSportsNetwork.us" status="online",fubo Sports Network (720p)
 https://dai2-xumo.fubo.tv/amagi_hls_data_xumo1212A-fubo/CDN/master.m3u8
--- a/streams/us_glewedtv.m3u
+++ b/streams/us_glewedtv.m3u
@ -1,15 +1,15 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="" status="online",CampusLore (720p)
 https://linear-235.frequency.stream/dist/glewedtv/235/hls/master/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Choppertown (720p)
+#EXTINF:-1 tvg-id="Choppertown.us" status="online",Choppertown (720p)
 https://linear-11.frequency.stream/dist/glewedtv/11/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",DeFiance Media (1080p)
 https://amg01529-defiancetv-defiancemedia-glewed-tre8x.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Estrella News (720p)
+#EXTINF:-1 tvg-id="EstrellaNews.us" status="online",Estrella News (720p)
 https://estrellanews-glewed.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Estrella TV (1080p)
+#EXTINF:-1 tvg-id="EstrellaTVEast.us" status="online",Estrella TV (1080p)
 https://estrellatv-glewed.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Pursuit UP (720p)
+#EXTINF:-1 tvg-id="PursuitUP.us" status="online",Pursuit UP (720p)
 https://linear-205.frequency.stream/dist/glewedtv/205/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Swerve Sports (1080p)
 https://linear-253.frequency.stream/dist/glewedtv/253/hls/master/playlist.m3u8
--- a/streams/us_klowdtv.m3u
+++ b/streams/us_klowdtv.m3u
@ -15,7 +15,9 @@ http://n1.klowdtv.net/live1/oan_720p/playlist.m3u8
 http://n1.klowdtv.net/live2/pop_720p/playlist.m3u8
 #EXTINF:-1 tvg-id="RedseatTheFirst.us" status="online",Redseat The First (720p)
 https://redseat-thefirst-klowdtv.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",QVC Live (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="SportsGrid.uk" status="online",SportsGrid (720p)
 https://sportsgrid-klowdtv.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="QVC.us" status="online",QVC Live (720p) [Not 24/7]
 http://n1.klowdtv.net/live2/qvclive_720p/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",SportsGrid (720p)
 https://sportsgrid-klowdtv.amagi.tv/playlist.m3u8
--- a/streams/us_pbs.m3u
+++ b/streams/us_pbs.m3u
@ -257,7 +257,7 @@ https://wxxidt.lls.pbs.org/out/v1/9ea6c5eb539d4545b74b67d064d12395/index.m3u8
 https://wyesdt.lls.pbs.org/out/v1/3d4b8e15f65d475f8278fee4ff14becf/index.m3u8
 #EXTINF:-1 tvg-id="WYINDT1.us" status="blocked",PBS Gary IN (WYIN) (1080p)
 https://wyindt.lls.pbs.org/out/v1/27414b46e52d43758be8227e4a91c863/index.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",PBS Arlington DC (WETA) (1080p)
+#EXTINF:-1 tvg-id="WETADT1.us" status="blocked",PBS Arlington DC (WETA) (1080p)
 https://wetadt5.lls.pbs.org/out/v1/616d9af7dd7641c1ba0b7be651c343a4/index.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",PBS Knoxville TN (WETP) (1080p)
+#EXTINF:-1 tvg-id="WETPDT1.us" status="blocked",PBS Knoxville TN (WETP) (1080p)
 https://wetpdt.lls.pbs.org/out/v1/8eb86a48b4f54a24a31aa9cf46b02494/index.m3u8
--- a/streams/us_plex.m3u
+++ b/streams/us_plex.m3u
@ -77,18 +77,20 @@ https://dth07jsr8atug.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25
 https://yahoo-plex.amagi.tv/hls/amagi_hls_data_yahoofina-yahoofinance-plex/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="YahooFinance.us" status="online",Yahoo! Finance (1080p)
 https://yahoo-plex.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Dark Matter TV (720p)
+#EXTINF:-1 tvg-id="DarkMatterTV.us" status="online",Dark Matter TV (720p)
 https://dmtv-plex.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",EDGEsport (1080p)
 https://edgesports-plex.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Freebie TV (720p) [Not 24/7]
 https://d1h1d6qoy9vnra.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/Freebie-Plex/187.m3u8
-#EXTINF:-1 tvg-id="" status="online",Hi-YAH! (1080p)
+#EXTINF:-1 tvg-id="HiYAH.us" status="online",Hi-YAH! (1080p)
 https://linear-59.frequency.stream/dist/plex/59/hls/master/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Real Families (1080p)
+#EXTINF:-1 tvg-id="RealFamilies.us" status="online",Real Families (1080p)
 https://lds-realfamilies-plex.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Real Stories (1080p)
 https://lds-realstories-plex.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="XploreTV.us" status="error",Xplore (1080p)
 https://xplore-plex.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Reuters (1080p)
 https://reuters-reutersnow-1.plex.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",SportsGrid (1080p)
--- a/streams/us_pluto.m3u
+++ b/streams/us_pluto.m3u
@ -1107,17 +1107,15 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5616f9c0a
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f4ec10ed9636f00089b8c89/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="" status="online",Insight+ (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ad9b73efd87eb3a2717ccde/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=d54bbd90-1c0f-11eb-8801-b9710ba01352&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=f10cd89a-c878-4a4d-8b3d-f5238f421aa0&terminate=false&userId=
-#EXTINF:-1 tvg-id="" status="online",Paramount Plus Picks (720p)
+#EXTINF:-1 tvg-id="ParamountPlusPicks.us" status="online",Paramount Plus Picks (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ff8c708653d080007361b14/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d14fc31252d35decbc4080b&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=873&terminate=false&userId=
-#EXTINF:-1 tvg-id="" status="online",People are Awesome (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PeopleAreAwesome.us" status="online",People are Awesome (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e54169f4b9b25000994a303/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5e54169f4b9b25000994a303&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=340&terminate=false&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Animals (720p)
+#EXTINF:-1 tvg-id="PlutoTVAnimals.us" status="online",Pluto TV Animals (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d767ae7b456c8cf265ce922/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5d767ae7b456c8cf265ce922&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=9015b970-057f-11eb-aeab-0242ac110002&terminate=false&userId=
 #EXTINF:-1 tvg-id="" status="online",Pluto TV Animals (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/56b27f85ff3037045055037e/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=56b27f85ff3037045055037e&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=666&terminate=false&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Animals (720p)
+#EXTINF:-1 tvg-id="PlutoTVAnimals.us" status="online",Pluto TV Animals (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d767ae7b456c8cf265ce922/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Animals (720p)
+#EXTINF:-1 tvg-id="PlutoTVAnimals.us" status="online",Pluto TV Animals (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ddf8ea0d000120009bcad83/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="" status="online",Pluto TV Animals+ (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ad9b6f57ef2767e1846e59f/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=d548b050-1c0f-11eb-8801-b9710ba01352&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=b6f8a12a-554c-4970-82ca-4dc1f84a4016&terminate=false&userId=
@ -1181,11 +1179,11 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ddf93054
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e793a7cfbdf780007f7eb75/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="" status="online",Pluto TV Gusto TV (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5c5c47f3662f6b3c476fc03e/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="" status="online",Pluto TV HISTORY (240p)
+#EXTINF:-1 tvg-id="PlutoTVHistory.us" status="online",Pluto TV HISTORY (240p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5a4d35dfa5c02e717a234f86/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5a4d35dfa5c02e717a234f86&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=651&terminate=false&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV HISTORY (720p)
+#EXTINF:-1 tvg-id="PlutoTVHistory.us" status="online",Pluto TV HISTORY (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d767b1c126c65d0a307355f/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5d767b1c126c65d0a307355f&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=52e8f9a9-0583-11eb-97af-0242ac110002&terminate=false&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV HISTORY (720p)
+#EXTINF:-1 tvg-id="PlutoTVHistory.us" status="online",Pluto TV HISTORY (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d4af1803e7983b391d73b13/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="" status="online",Pluto TV Junior (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1aa9bcd8160700076d45d1/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
@ -1243,19 +1241,23 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d8d08395
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f121460b73ac6000719fbaf/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f121460b73ac6000719fbaf&deviceLat=-23.5475&deviceLon=-46.6361&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=BR&serverSideAds=false&sid=706&terminate=false&userId=
 #EXTINF:-1 tvg-id="" status="online",Pluto TV Nick Ukraine (720p)
 http://siloh-sp.plutotv.net/lilo/production/NickUkraine/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Paranormal (720p)
+#EXTINF:-1 tvg-id="PlutoTVParanormal.us" status="online",Pluto TV Paranormal (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5adf96e3e738977e2c31cb04/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5adf96e3e738977e2c31cb04&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=669&terminate=false&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Paranormal (720p)
+#EXTINF:-1 tvg-id="PlutoTVParanormal.us" status="online",Pluto TV Paranormal (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8ed9461b35690007a0bc3a/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Paranormal (720p)
+#EXTINF:-1 tvg-id="PlutoTVParanormal.us" status="online",Pluto TV Paranormal (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f98487036af340008da1e37/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=1&deviceId=5f98487036af340008da1e37&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=DE&serverSideAds=false&sid=77386fa6-3401-11eb-8335-0242ac110002&terminate=false&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Paranormal (720p)
+#EXTINF:-1 tvg-id="PlutoTVParanormal.us" status="online",Pluto TV Paranormal (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5adf96e3e738977e2c31cb04/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Paranormal (720p)
+#EXTINF:-1 tvg-id="PlutoTVParanormal.us" status="online",Pluto TV Paranormal (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d4af2ffa9506ab29cf38c38/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Paranormal (720p)
+#EXTINF:-1 tvg-id="PlutoTVParanormal.us" status="online",Pluto TV Paranormal (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8ed9461b35690007a0bc3a/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Paranormal (720p)
+#EXTINF:-1 tvg-id="PlutoTVParanormal.us" status="online",Pluto TV Paranormal (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8ed9461b35690007a0bc3a/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVParanormal.us" status="online",Pluto TV Paranormal (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f98487036af340008da1e37/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="PlutoTVParanormal.us" status="online",Pluto TV Paranormal (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/612ce5214bb5790007ad3016/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&serverSideAds=false&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="" status="online",Pluto TV Paranormal (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f98487036af340008da1e37/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
@ -1303,7 +1305,7 @@ https://siloh.pluto.tv/lilo/production/WeatherNation/DFW/master.m3u8
 https://siloh.pluto.tv/lilo/production/WeatherNation/Houston/master.m3u8
 #EXTINF:-1 tvg-id="" status="online",WeatherNation Los Angeles (720p)
 https://siloh.pluto.tv/lilo/production/WeatherNation/LA/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",WeatherNation New York (720p)
+#EXTINF:-1 tvg-id="WeatherNationNewYork.us" status="online",WeatherNation New York (720p)
 https://siloh.pluto.tv/lilo/production/WeatherNation/NYC/master.m3u8
 #EXTINF:-1 tvg-id="" status="online",WeatherNation Philadelphia (720p)
 https://siloh.pluto.tv/lilo/production/WeatherNation/Philadelphia/master.m3u8
--- a/streams/us_roku.m3u
+++ b/streams/us_roku.m3u
@ -93,11 +93,11 @@ https://unbeaten-roku.amagi.tv/playlist.m3u8
 https://weathernationtv.roku.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="YahooFinance.us" status="online",Yahoo! Finance (1080p)
 https://yahoo-roku-us.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Hi-YAH! (1080p)
+#EXTINF:-1 tvg-id="HiYAH.us" status="online",Hi-YAH! (1080p)
 https://linear-59.frequency.stream/dist/roku/59/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Pac 12 Insider (1080p)
 https://pac12-roku-us.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",RCN Mas
 https://rcntv-rcnmas-1-us.roku.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Xplore (1080p)
+#EXTINF:-1 tvg-id="XploreTV.us" status="online",Xplore (1080p)
 https://xplore-roku.amagi.tv/playlist.m3u8
--- a/streams/us_samsung.m3u
+++ b/streams/us_samsung.m3u
@ -89,25 +89,25 @@ https://edgesport-rakuten-samsung.amagi.tv/playlist.m3u8
 https://edgesport-samsungus.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",EDGEsport (US) (720p)
 https://img-edgesport.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",ESTV (1080p)
+#EXTINF:-1 tvg-id="EsTV.us" status="online",ESTV (1080p)
 https://estv-rakuten-samsung.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Gusto TV (720p)
 https://gustotv.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",ION
+#EXTINF:-1 tvg-id="IONTVEast.us" status="online",ION
 https://scripps-ion-1-us.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",ION Plus
+#EXTINF:-1 tvg-id="IONPlusEast.us" status="online",ION Plus
 https://ion-plus.samsung.wurl.com/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Ion Plus (1080p)
+#EXTINF:-1 tvg-id="IONPlusEast.us" status="online",Ion Plus (1080p)
 https://ion-plus.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="PursuitUP.us" status="timeout",Pursuit Up (720p)
 https://pursuitup.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Pac 12 Insider (1080p)
 https://pac12-samsungus.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Pursuit Up (720p)
 https://pursuitup.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",SportsGrid (1080p)
 https://sportsgrid-samsungus.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Stingray Naturescape (1080p)
+#EXTINF:-1 tvg-id="StingrayNaturescape.ca" status="online",Stingray Naturescape (1080p)
 https://stingray-naturescape-1.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",WeatherSpy
+#EXTINF:-1 tvg-id="WeatherSpy.us" status="online",WeatherSpy
 https://jukin-weatherspy-1-us.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Xplore (1080p)
+#EXTINF:-1 tvg-id="XploreTV.us" status="online",Xplore (1080p)
 http://xlpore-samsungus.amagi.tv/playlist.m3u8
--- a/streams/us_simultv.m3u
+++ b/streams/us_simultv.m3u
@ -15,17 +15,17 @@ https://simultv.s.llnwi.net/n4s4/CutUpNCook/interlink.m3u8
 https://simultv.s.llnwi.net/o054/Dimensions/interlink.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Funnybone (720p)
 https://simultv.s.llnwi.net/o054/FunnyBone/interlink.m3u8
-#EXTINF:-1 tvg-id="" status="online",Kartoon Circus
+#EXTINF:-1 tvg-id="KartoonCircus.us" status="online",Kartoon Circus
 https://simultv.s.llnwi.net/o062/KartoonCircus/interlink.m3u8
 #EXTINF:-1 tvg-id="" status="online",Kid Central (720p)
 https://simultv.s.llnwi.net/o058/KidCentral/interlink.m3u8
-#EXTINF:-1 tvg-id="" status="online",Lifestyle
+#EXTINF:-1 tvg-id="Lifestyle.us" status="online",Lifestyle
 https://simultv.s.llnwi.net/o058/Lifestyle/interlink.m3u8
 #EXTINF:-1 tvg-id="" status="online",Military Home Life (720p)
 https://simultv.s.llnwi.net/n4s4/MilitaryHomeLife/interlink.m3u8
-#EXTINF:-1 tvg-id="" status="online",Mythos
+#EXTINF:-1 tvg-id="Mythos.us" status="online",Mythos
 https://simultv.s.llnwi.net/o058/Mythos/interlink.m3u8
-#EXTINF:-1 tvg-id="" status="online",Prime Time Drama
+#EXTINF:-1 tvg-id="PrimeTimeDrama.us" status="online",Prime Time Drama
 https://simultv.s.llnwi.net/o064/PrimeTimeDrama/interlink.m3u8
 #EXTINF:-1 tvg-id="" status="online",Providence Christian Network
 https://simultv.s.llnwi.net/n4s4/ProvidenceNetwork/interlink.m3u8
@ -35,7 +35,7 @@ https://simultv.s.llnwi.net/o059/ReadySetAction/interlink.m3u8
 https://simultv.s.llnwi.net/o060/SimSiTV/interlink.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Slap Tech
 https://simultv.s.llnwi.net/o061/SlapTech/interlink.m3u8
-#EXTINF:-1 tvg-id="" status="online",Spydar
+#EXTINF:-1 tvg-id="SpydarTV.us" status="online",Spydar
 https://simultv.s.llnwi.net/o062/Spydar/interlink.m3u8
 #EXTINF:-1 tvg-id="" status="online",Switch (720p)
 https://simultv.s.llnwi.net/o062/Switch/interlink.m3u8
--- a/streams/us_stirr.m3u
+++ b/streams/us_stirr.m3u
@ -279,101 +279,101 @@ https://dai.google.com/linear/hls/event/gJJhuFTCRo-HAHYsffb3Xg/master.m3u8
 https://dai.google.com/linear/hls/event/im0MqOKRTHy9nVa1sirQSg/master.m3u8
 #EXTINF:-1 tvg-id="WeatherSpy.us" status="online",WeatherSpy (720p)
 https://dai.google.com/linear/hls/event/vZB78SsNSXWOR63VJrNC2Q/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",beIN Sports Xtra (1080p)
+#EXTINF:-1 tvg-id="beINSportsXtraUSA.us" status="online",beIN Sports Xtra (1080p)
 https://dai.google.com/linear/hls/event/3e-9BOvHQrCI9hboMYjb6w/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",Bloomberg TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="BloombergTV.us" status="online",Bloomberg TV (1080p) [Not 24/7]
 https://dai.google.com/linear/hls/event/NiumF4GTSGe-pXM-iMsP0A/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",CBSN (720p)
+#EXTINF:-1 tvg-id="CBSNews.us" status="online",CBSN (720p)
 https://dai.google.com/linear/hls/event/Sid4xiTQTkCT1SLu6rjUSQ/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",CBSN Bay Area CA (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="CBSNewsBayArea.us" status="online",CBSN Bay Area CA (720p) [Not 24/7]
 https://dai.google.com/linear/hls/event/VE8b4n-YStusEGv5Z2NmsQ/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",CBSN Boston MA (720p)
+#EXTINF:-1 tvg-id="CBSNewsBoston.us" status="online",CBSN Boston MA (720p)
 https://dai.google.com/linear/hls/event/26FJK7wRSo6RhPsK70XS_w/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",CBSN Chicago IL (720p)
+#EXTINF:-1 tvg-id="CBSNewsChicago.us" status="online",CBSN Chicago IL (720p)
 https://dai.google.com/linear/hls/event/DWt8iR1YQ-OJQsxczu8KfQ/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",CBSN Dallas Ft Worth TX (720p)
+#EXTINF:-1 tvg-id="CBSNewsDFW.us" status="online",CBSN Dallas Ft Worth TX (720p)
 https://dai.google.com/linear/hls/event/o5J3g4U9T16CvYnS7Qd86Q/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",CBSN Denver CO (720p)
+#EXTINF:-1 tvg-id="CBSNewsColorado.us" status="online",CBSN Denver CO (720p)
 https://dai.google.com/linear/hls/event/EUo67MWSRh6toPi0heJKnQ/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",CBSN Los Angeles CA (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="CBSNewsLosAngeles.us" status="online",CBSN Los Angeles CA (720p) [Not 24/7]
 https://dai.google.com/linear/hls/event/TxSbNMu4R5anKrjV02VOBg/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",CBSN Minnesota MN (720p)
+#EXTINF:-1 tvg-id="CBSNewsMinnesota.us" status="online",CBSN Minnesota MN (720p)
 https://dai.google.com/linear/hls/event/zcWPVCfURNSPxeidcckQLA/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",CBSN New York NY (720p)
+#EXTINF:-1 tvg-id="CBSNewsNewYork.us" status="online",CBSN New York NY (720p)
 http://dai.google.com/linear/hls/event/rtcMlf4RTvOEkaudeany5w/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",CBSN Philly PA (720p)
+#EXTINF:-1 tvg-id="CBSNewsPhilly.us" status="online",CBSN Philly PA (720p)
 https://dai.google.com/linear/hls/event/Xu-ITJ2GTNGaxGn893mmWg/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",CBSN Pittsburgh PA (720p)
+#EXTINF:-1 tvg-id="CBSNewsPittsburgh.us" status="online",CBSN Pittsburgh PA (720p)
 https://dai.google.com/linear/hls/event/i5SXVKI4QIuV-eF2XAH4FQ/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",Dust (1080p)
+#EXTINF:-1 tvg-id="DUST.us" status="online",Dust (1080p)
 https://dai.google.com/linear/hls/event/xuMJ1vhQQDGjEWlxK9Qh4w/master.m3u8
 #EXTINF:-1 tvg-id="" status="online",Insight TV (1080p)
 https://dai.google.com/linear/hls/event/KAfBFcVrQgKmHhpzvkEn9A/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",RetroCrush TV (720p)
+#EXTINF:-1 tvg-id="RetroCrushTV.us" status="online",RetroCrush TV (720p)
 https://digitalmediarights-retrocrush-1.sinclair.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Stingray Everything 80s (1080p)
 https://stirr.ott-channels.stingray.com/128/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",Stingray Naturescape (1080p)
+#EXTINF:-1 tvg-id="StingrayNaturescape.ca" status="online",Stingray Naturescape (1080p)
 https://dai.google.com/linear/hls/event/6RPZlzksTCyB1euPqLcBZQ/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR American Classics (360p)
+#EXTINF:-1 tvg-id="AmericanClassics.us" status="online",STIRR American Classics (360p)
 https://dai.google.com/linear/hls/event/0e06oV-NTI2ygS2MRQk9ZA/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Charge! (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Charge.us" status="online",STIRR Charge! (720p) [Not 24/7]
 https://dai.google.com/linear/hls/event/e1QjWFRNSR2YFYGsPbkfgg/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Choppertown (720p)
+#EXTINF:-1 tvg-id="Choppertown.us" status="online",STIRR Choppertown (720p)
 https://dai.google.com/linear/hls/event/N3c94WZQQq2fruixzfcCUQ/master.m3u8
 #EXTINF:-1 tvg-id="" status="online",STIRR Cinehouse (720p)
 https://dai.google.com/linear/hls/event/28oUp4GcQ-u49U4_jjC4Iw/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR CineLife (1080p)
+#EXTINF:-1 tvg-id="CineLife.us" status="online",STIRR CineLife (1080p)
 https://dai.google.com/linear/hls/event/PFJ1Jhd6SsSMcu3qq86wzQ/master.m3u8
 #EXTINF:-1 tvg-id="" status="online",STIRR City (480p)
 https://dai.google.com/linear/hls/event/4aD5IJf0QgKUJwPbq2fngg/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Classica (1080p)
+#EXTINF:-1 tvg-id="Classica.us" status="online",STIRR Classica (1080p)
 https://dai.google.com/linear/hls/event/AaFxJXOhQl-BsTVC9OCunQ/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Comedy Dynamics (1080p)
+#EXTINF:-1 tvg-id="ComedyDynamics.us" status="online",STIRR Comedy Dynamics (1080p)
 https://dai.google.com/linear/hls/event/NJK_yxrcTBqULaHt-wi0Wg/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Comet (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Comet.us" status="online",STIRR Comet (720p) [Not 24/7]
 https://dai.google.com/linear/hls/event/83L2OqtGSZ6lbWt8ODomWg/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Deal or No Deal (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="DealorNoDeal.us" status="online",STIRR Deal or No Deal (720p) [Not 24/7]
 https://dai.google.com/linear/hls/event/9cq79TtPR6WbyaQGeDlHjA/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Docurama (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="Docurama.us" status="online",STIRR Docurama (1080p) [Not 24/7]
 https://dai.google.com/linear/hls/event/Hx_PEMEsSzOCcZgy0Tq2YQ/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Electric Now (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="ElectricNow.us" status="online",STIRR Electric Now (1080p) [Not 24/7]
 https://dai.google.com/linear/hls/event/KsvJAc81Qoewj6opYso6Fw/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR evrgrn (1080p)
+#EXTINF:-1 tvg-id="EVRGRN.us" status="online",STIRR EVRGRN (1080p)
 https://dai.google.com/linear/hls/event/TDUiZE57Q3-CS7Its4kLDQ/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR FilmRise Free Movies (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="FilmRiseFreeMovies.us" status="online",STIRR FilmRise Free Movies (720p) [Not 24/7]
 https://dai.google.com/linear/hls/event/Va1QEor0SWO_x_SQNyaF0w/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Gravitas Movies (720p)
+#EXTINF:-1 tvg-id="GravitasMovies.us" status="online",STIRR Gravitas Movies (720p)
 https://dai.google.com/linear/hls/event/EpqgwRlpQKq73ySVSohJWA/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Gravitas Movies (720p)
+#EXTINF:-1 tvg-id="GravitasMovies.us" status="online",STIRR Gravitas Movies (720p)
 https://gravitas-movies.sinclair.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",STIRR Gusto TV (1080p)
 https://dai.google.com/linear/hls/event/tdSCy5u2R5WtCLXX4NwDtg/master.m3u8
 #EXTINF:-1 tvg-id="" status="online",STIRR Horror Movies (720p)
 https://dai.google.com/linear/hls/event/3NTKKQBuQtaIrcUBj20lyg/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR HSN (720p)
+#EXTINF:-1 tvg-id="HSN.us" status="online",STIRR HSN (720p)
 https://dai.google.com/linear/hls/event/akursTHNTo6qGf1TtlHNsw/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR MavTV (720p)
+#EXTINF:-1 tvg-id="MAVTV.us" status="online",STIRR MavTV (720p)
 https://dai.google.com/linear/hls/event/YoBM0ae5Q62TPdrfFHS4RQ/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR MavTV (720p)
+#EXTINF:-1 tvg-id="MAVTV.us" status="online",STIRR MavTV (720p)
 https://mavtv-1.sinclair.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Mystery Science Theater 3000 (1080p)
+#EXTINF:-1 tvg-id="MysteryScienceTheater3000.us" status="online",STIRR Mystery Science Theater 3000 (1080p)
 https://dai.google.com/linear/hls/event/rmBGeSwhQEG64TrT0_JO2A/master.m3u8
 #EXTINF:-1 tvg-id="" status="online",STIRR National (720p)
 https://dai.google.com/linear/hls/event/-V3XSvA2Sa6e8h7cnHXB8w/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Outside TV (1080p)
+#EXTINF:-1 tvg-id="OutsideTV.us" status="online",STIRR Outside TV (1080p)
 https://dai.google.com/linear/hls/event/HJAq3zH1SUy_B6fb1j80_Q/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR People TV (1080p)
+#EXTINF:-1 tvg-id="PeopleTV.us" status="online",STIRR People TV (1080p)
 https://dai.google.com/linear/hls/event/Fe9LYYCFR5Csif-I5dyMHg/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Popstar! TV (1080p)
+#EXTINF:-1 tvg-id="PopstarTV.us" status="online",STIRR Popstar! TV (1080p)
 https://dai.google.com/linear/hls/event/cJFuxTLzQUqbGGrqTMBJuw/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR PursuitUp (720p)
+#EXTINF:-1 tvg-id="PursuitUP.us" status="online",STIRR PursuitUp (720p)
 https://dai.google.com/linear/hls/event/NpkpFaFVRqaQwSkpPdramg/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR QVC (720p)
+#EXTINF:-1 tvg-id="QVC.us" status="online",STIRR QVC (720p)
 https://dai.google.com/linear/hls/event/roEbn_l7Tzezwy22F1NSfA/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR RetroCrush TV (480p)
+#EXTINF:-1 tvg-id="RetroCrushTV.us" status="online",STIRR RetroCrush TV (480p)
 https://dai.google.com/linear/hls/event/7LAMGFcmQN6iFJjNoHWXrg/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Revry (720p)
+#EXTINF:-1 tvg-id="Revry.us" status="online",STIRR Revry (720p)
 https://dai.google.com/linear/hls/event/gvO6-Y6TTjCxRf1QALU4VQ/master.m3u8
 #EXTINF:-1 tvg-id="" status="online",STIRR SOAR (720p) [Not 24/7]
 https://dai.google.com/linear/hls/event/_PDxBUttQYqkxPnmh3VOZA/master.m3u8
@ -385,21 +385,21 @@ http://stadium.sinclair.wurl.com/manifest/playlist.m3u8
 https://dai.google.com/linear/hls/event/0jRU1DBXSW6a_TFheLfAUQ/master.m3u8
 #EXTINF:-1 tvg-id="" status="online",STIRR Stingray Pop Adult (1080p)
 https://ott-linear-channels.stingray.com/hls/stirr/104.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Stingray Rock Alternative (1080p)
+#EXTINF:-1 tvg-id="StingrayRockAlternative.ca" status="online",STIRR Stingray Rock Alternative (1080p)
 https://ott-linear-channels.stingray.com/hls/stirr/102.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Stingray Today's Latin Pop (1080p)
+#EXTINF:-1 tvg-id="StingrayTodaysLatinPop.ca" status="online",STIRR Stingray Today's Latin Pop (1080p)
 https://ott-linear-channels.stingray.com/hls/stirr/190.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Stingray Urban Beats (1080p)
+#EXTINF:-1 tvg-id="StingrayUrbanBeat.ca" status="online",STIRR Stingray Urban Beat (1080p)
 https://ott-linear-channels.stingray.com/hls/stirr/133.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Tennis Channel (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="TennisChannel.us" status="online",STIRR Tennis Channel (720p) [Geo-blocked]
 https://playoutengine.sinclairstoryline.com/playout/9f87522c-5a0e-4ff4-b82c-d5564216132f.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR The Archive (720p)
+#EXTINF:-1 tvg-id="TheArchive.us" status="online",STIRR The Archive (720p)
 https://dai.google.com/linear/hls/event/MdbYPXWRStmMq1DaQhsBUw/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR The Bob Ross Channel (240p)
+#EXTINF:-1 tvg-id="TheBobRossChannel.us" status="online",STIRR The Bob Ross Channel (240p)
 https://dai.google.com/linear/hls/event/3dbJrQmVT_-psb-KBYuKQA/master.m3u8
 #EXTINF:-1 tvg-id="" status="online",STIRR TV Mix (720p)
 https://dai.google.com/linear/hls/event/ZP8ZMv95Q0Gm9EiyYOGHAA/master.m3u8
-#EXTINF:-1 tvg-id="" status="error",STIRR Whistle Sports (1080p)
+#EXTINF:-1 tvg-id="WhistleSports.us" status="online",STIRR Whistle Sports (1080p)
 https://dai.google.com/linear/hls/event/Wu11mwhnTKGNhwZimEK6Jg/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Wipeout Xtra (720p)
+#EXTINF:-1 tvg-id="WipeoutXtra.us" status="online",STIRR Wipeout Xtra (720p)
 https://dai.google.com/linear/hls/event/0DG8p66IRES7ZzEe1WJS-w/master.m3u8
--- a/streams/us_vizio.m3u
+++ b/streams/us_vizio.m3u
@ -67,15 +67,15 @@ https://venntv-vizio.amagi.tv/playlist.m3u8
 https://yahoo-vizio.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="YoungHollywood.us" status="online",Young Hollywood (720p)
 https://younghollywood-vizio.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Dark Matter TV (720p)
+#EXTINF:-1 tvg-id="DarkMatterTV.us" status="online",Dark Matter TV (720p)
 https://dmtv-viziosc.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Ion Plus (1080p)
+#EXTINF:-1 tvg-id="IONPlusEast.us" status="online",Ion Plus (1080p)
 https://ion-ion-plus-1.vizio.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",LEGO Channels (720p)
+#EXTINF:-1 tvg-id="LegoChannel.us" status="online",LEGO Channel (720p)
 https://legochannel-vizio.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Pac 12 Insider (720p)
 https://pac12-vizio.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",SportsGrid (1080p)
 https://sportsgrid-vizio.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Xplore (1080p)
+#EXTINF:-1 tvg-id="XPloreTV.us" status="online",Xplore (1080p)
 https://xplore-vizio.amagi.tv/playlist.m3u8
--- a/streams/us_xumo.m3u
+++ b/streams/us_xumo.m3u
@ -195,21 +195,21 @@ https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxwired/CDN/playlist.m3u8
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxworldpokertour/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",ABC News (1080p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-abcnews/CDN/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",Bloomberg TV US (720p)
+#EXTINF:-1 tvg-id="BloombergTV.us" status="online",Bloomberg TV US (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxbloomberg/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",CBC News (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxcbcnews/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",FilmRise Free Movies (Redbox) (720p)
+#EXTINF:-1 tvg-id="FilmRiseFreeMovies.us" status="online",FilmRise Free Movies (Redbox) (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxfilmrisefreemovies/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Hi-YAH! (720p)
+#EXTINF:-1 tvg-id="HiYAH.us" status="online",Hi-YAH! (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxhi-ya/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",ION Mystery (1080p)
 https://scripps-ionmystery-1-us.xumo.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Law & Crime (XUMO) (720p)
+#EXTINF:-1 tvg-id="LawCrime.us" status="online",Law & Crime (XUMO) (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1234A-lawcrime/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",People are Awesome (720p)
+#EXTINF:-1 tvg-id="PeopleAreAwesome.us" status="online",People Are Awesome (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxpeopleareawesome/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Real nosey (720p)
+#EXTINF:-1 tvg-id="RealNosey.us" status="online",Real Nosey (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxrealnosey/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",SportsGrid (1080p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-xumosportsgrid/CDN/master.m3u8
--- a/streams/uy.m3u
+++ b/streams/uy.m3u
@ -5,5 +5,5 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.twitch.tv/charruatv
 https://videostreaming.cloudserverlatam.com/8062/8062/playlist.m3u8
 #EXTINF:-1 tvg-id="UCL.uy" status="online",UCL (720p)
 http://162.246.18.122:8081/telepuerto-master/ucl-abr/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",Canal 10 (720p)
+#EXTINF:-1 tvg-id="Canal10.uy" status="timeout",Canal 10 (720p)
 https://edge3-hr.cvattv.com.ar/live/c4eds/Canal10_URU/SA_SAGEMCOM/Canal10_URU.m3u8
--- a/streams/ve.m3u
+++ b/streams/ve.m3u
@ -39,5 +39,5 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/vpi
 https://vcp.myplaytv.com/petrotv/petrotv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",TNO Radio
 https://stmv1.srvstm.com/tnovideo1/tnovideo1/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Ve Plus (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="VePlus.ve" status="online",Ve Plus (480p) [Not 24/7]
 http://190.122.96.187:8888/http/006