Merge pull request #12368 from AntiPontifex/master

Further updates
2 years ago · 0ef565f476
parent ee8f353746 6ece725d36
commit 0ef565f476
28 changed files with 113 additions and 113 deletions
--- a/streams/sg.m3u
+++ b/streams/sg.m3u
@ -31,9 +31,9 @@ https://d11h6a6nhl9kj9.cloudfront.net/hls/clr4ctv_suria/master.m3u8
 https://cdn-telkomsel-01.akamaized.net/Content/HLS/Live/channel(abe4ead2-1a88-4330-9f41-382fcf94bba2)/index.m3u8
 #EXTINF:-1 tvg-id="Vasantham.sg" status="blocked",Vasantham [Geo-blocked]
 https://d39v9xz8f7n8tk.cloudfront.net/hls/clr4ctv_vsnthm/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",HITS (576p) [Geo-blocked]
+#EXTINF:-1 tvg-id="HITS.sg" status="online",HITS (576p) [Geo-blocked]
 http://210.210.155.37/dr9445/h/h37/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",Rock Entertainment (576p) [Geo-blocked]
+#EXTINF:-1 tvg-id="ROCKEntertainment.sg" status="online",ROCK Entertainment (576p) [Geo-blocked]
 http://210.210.155.37/dr9445/h/h16/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",Rock Extreme (576p) [Geo-blocked]
+#EXTINF:-1 tvg-id="ROCKExtreme.sg" status="online",ROCK Extreme (576p) [Geo-blocked]
 http://210.210.155.37/dr9445/h/h15/index.m3u8
--- a/streams/si_xploretv.m3u
+++ b/streams/si_xploretv.m3u
@ -13,9 +13,9 @@ https://streamer12.xploretv.si/__cl/cg:prod/__c/A1_SI_HBO3HD_ott/__op/dash-defau
 https://streamer12.xploretv.si/__cl/cg:prod/__c/A1_SI_HBOHD_ott/__op/dash-default/__dci/__f/index.m3u8?admin=xploreTv_test_user&redirect=true
 #EXTINF:-1 tvg-id="" status="blocked",History Channel (1080p)
 https://streamer12.xploretv.si/__cl/cg:prod/__c/A1_SI_HISTORYHD_ott/__op/dash-default/__dci/__f/index.m3u8?admin=xploreTv_test_user&redirect=true
-#EXTINF:-1 tvg-id="" status="blocked",SLO 1
+#EXTINF:-1 tvg-id="TVSLO1.si" status="blocked",SLO 1
 https://streamer03.xploretv.si/__cl/cg:prod/__c/A1_SI_SLO1HD_ott/__op/dash-default/__dci/__f/index.m3u8?admin=xploreTv_test_user&redirect=true
-#EXTINF:-1 tvg-id="" status="blocked",SLO 2
+#EXTINF:-1 tvg-id="TVSLO2.si" status="blocked",SLO 2
 https://streamer03.xploretv.si/__cl/cg:prod/__c/A1_SI_SLO2HD_ott/__op/dash-default/__dci/__f/index.m3u8?admin=xploreTv_test_user&redirect=true
-#EXTINF:-1 tvg-id="" status="blocked",SLO 3
+#EXTINF:-1 tvg-id="TVSLO3.si" status="blocked",SLO 3
 https://streamer03.xploretv.si/__cl/cg:prod/__c/A1_SI_SLO3HD_ott/__op/dash-default/__dci/__f/index.m3u8?admin=xploreTv_test_user&redirect=true
--- a/streams/sn.m3u
+++ b/streams/sn.m3u
@ -5,5 +5,5 @@ https://stream.sen-gt.com/A2iMusic/myStream/playlist.m3u8
 https://stream.sen-gt.com/A2iReligion/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="SenTV.sn" status="blocked",Sen TV (480p)
 https://live3.acangroup.org:1929/acanabr/sentv.stream_all/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",A2i TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="A2iNaja.sn" status="online",A2i TV (1080p) [Not 24/7]
 https://stream.sen-gt.com/A2itv/myStream/playlist.m3u8
--- a/streams/sv.m3u
+++ b/streams/sv.m3u
@ -27,9 +27,9 @@ https://5fc584f3f19c9.streamlock.net/tvo/smil:tvo.smil/playlist.m3u8
 https://cdn.elsalvadordigital.com:1936/wowtv/smil:wowtv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Canal TRV (480p)
 https://stream.oursnetworktv.com/latin/encoder44/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",El Camino TV (480p)
+#EXTINF:-1 tvg-id="ElCaminoTV.sv" status="online",El Camino TV (480p)
 https://5d32e2b9b7eed.streamlock.net:4443/ectv/ectv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Sol TV Morazán (1080p)
 http://rtmp.info:1935/soltv/envivo/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Taber TV (1080p)
+#EXTINF:-1 tvg-id="TaberTV.sv" status="online",Taber TV (1080p)
 https://5ca9af4645e15.streamlock.net/tabertv/smil:tabertv.smil/playlist.m3u8
--- a/streams/th.m3u
+++ b/streams/th.m3u
@ -72,41 +72,41 @@ http://vip2.liveanywhere.asia:1935/tvmuslim/tvmuslim/playlist.m3u8
 http://symc-cdn.violin.co.th:1935/tndedge/whitechannel/chunklist.m3u8
 #EXTINF:-1 tvg-id="" status="online",NBT Bangkok (1080p) [Not 24/7]
 http://live.prd.go.th:1935/live/ch1_L.sdp/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Thai PBS (Opt-4) (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="ThaiPBS3.th" status="online",Thai PBS (Opt-4) (1080p) [Not 24/7]
 https://thaipbs-live.cdn.byteark.com/live/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.3809.25 Safari/537.36",True Premier Football HD 1 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TruePremierFootball1.th" status="blocked" user-agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.3809.25 Safari/537.36",True Premier Football HD 1 (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.3809.25 Safari/537.36
 https://smart-tv.livedoomovie.com:4431/02_PremierHD1_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",True Premier Football HD 2 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TruePremierFootball2.th" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",True Premier Football HD 2 (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
 https://smart-tv.livedoomovie.com:4431/02_PremierHD2_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",True Premier Football HD 3 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TruePremierFootball3.th" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",True Premier Football HD 3 (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
 https://smart-tv.livedoomovie.com:4431/02_PremierHD3_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",True Premier Football HD 4 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TruePremierFootball4.th" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",True Premier Football HD 4 (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
 https://smart-tv.livedoomovie.com:4431/02_PremierHD4_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",True Premier Football HD 5 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TruePremierFootball5.th" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",True Premier Football HD 5 (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
 https://smart-tv.livedoomovie.com:4431/02_PremierHD5_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",True Sport 5 (480p Scaled) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TrueSports5.th" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",TrueSports 5 (480p Scaled) (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
 https://smart-tv.livedoomovie.com:4431/02_sport5_480p/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",True Sport 7 (480p Scaled) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TrueSports7.th" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",TrueSports 7 (480p Scaled) (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
 https://smart-tv.livedoomovie.com:4431/02_sport7_480p/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",True Sport HD 1 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TrueSports1.th" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",TrueSports 1 HD (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
 https://smart-tv.livedoomovie.com:4431/02_2sporthd1_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",True Sport HD 2 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TrueSports2.th" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",TrueSports 2 HD (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
 https://smart-tv.livedoomovie.com:4431/02_2sporthd2_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",True Sport HD 3 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TrueSports3.th" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",TrueSports 3 HD (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
 https://smart-tv.livedoomovie.com:4431/02_2sporthd3_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",True Sport HD 4 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TrueSports4.th" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",TrueSports 4 HD (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
 https://smart-tv.livedoomovie.com:4431/02_2sporthd4_720p/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",True Tennis HD (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TrueTennis.th" status="blocked" user-agent="Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36",True Tennis HD (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 Macintosh; Intel Mac OS X 10_14_5 AppleWebKit/537.36 KHTML, like Gecko Chrome/96.0.3809.25 Safari/537.36
 https://smart-tv.livedoomovie.com:4431/02_TennisHD_720p/chunklist.m3u8
--- a/streams/tr.m3u
+++ b/streams/tr.m3u
@ -431,7 +431,7 @@ https://mn-nl.mncdn.com/blutv_bizimev/bizimev_sd.smil/playlist.m3u8
 https://live.duhnet.tv/S2/HLS_LIVE/eurodnp/playlist.m3u8
 #EXTINF:-1 tvg-id="FlashTV.tr",Flash TV (720p)
 https://mn-nl.mncdn.com/blutv_flashtv/live.m3u8
-#EXTINF:-1 tvg-id="FortunaTV.tr",Fortuna TV Istambul (720p)
+#EXTINF:-1 tvg-id="FortunaTV.tr",Fortuna TV (720p)
 https://fortunacdn.socialsmart.tv/ftvturk/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="KonTV.tr",Kon TV (720p)
 https://mn-nl.mncdn.com/blutv_kontv2/live.m3u8
--- a/streams/tw.m3u
+++ b/streams/tw.m3u
@ -119,13 +119,13 @@ http://50.7.220.74:8278/videolandmovie/playlist.m3u8?ct=18335&tid=ma2dac66da407&
 http://50.7.220.74:8278/videolandsport/playlist.m3u8?ct=19226&tid=MA6A1192684511926845&tsum=0b7ca9a61e7371df68108a27dc358c68
 #EXTINF:-1 tvg-id="WXTV.tw" status="online",唯心電視 (480p)
 http://mobile.ccdntech.com/transcoder/_definst_/vod164_Live/live/chunklist_w1177047531.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",Asia Travel (720p)
+#EXTINF:-1 tvg-id="AsiaTravelTV.tw" status="blocked",Asia Travel (720p)
 http://50.7.220.74:8278/asiatravel_twn/playlist.m3u8?ct=19225&tid=MF2F4967516549675165&tsum=3b56404a8f861c7fef6ac79a798e4a8c
 #EXTINF:-1 tvg-id="" status="blocked",Cinemax Taiwan (720p)
 http://50.7.220.74:8278/cinemax_twn/playlist.m3u8?ct=17874&tid=mf18038aaba6311485855&tsum=63ee6bcdb705ee72ea3d0f0d84ed6df1
-#EXTINF:-1 tvg-id="" status="online",EBC Yoyo (東森幼幼台)
+#EXTINF:-1 tvg-id="EBCYOYO.tw" status="online",EBC Yoyo (東森幼幼台)
 https://raw.githubusercontent.com/etag2000/IPTV/YTlive/ebcyoyo.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",EBC Yoyo (東森幼幼台) (720p)
+#EXTINF:-1 tvg-id="EBCYOYO.tw" status="blocked",EBC Yoyo (東森幼幼台) (720p)
 http://50.7.220.74:8278/yoyo_twn/playlist.m3u8?ct=17874&tid=m84c9b210bc7f11269156&tsum=51340c8fb7ca02ab978ee0791843501d
 #EXTINF:-1 tvg-id="" status="online",GOOD TV CH3 真情部落格 短版 (720p)
 https://live.streamingfast.net/osmflivech3.m3u8
@ -189,11 +189,11 @@ http://198.16.64.10:8278/jingtianintl_twn/playlist.m3u8?ct=19226&tid=ME4E7632479
 http://50.7.220.74:8278/meiyamovie_twn/playlist.m3u8?ct=19226&tid=MFEF1001328410013284&tsum=9839709ca0f37641c5d1ba962c3bc739
 #EXTINF:-1 tvg-id="" status="online",MNews (鏡電視新聞台)
 https://ythls.onrender.com/channel/UC4LjkybVKXCDlneVXlKAbmw.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",National Geographic HD (720p)
+#EXTINF:-1 tvg-id="NationalGeographicTaiwan.tw" status="blocked",National Geographic HD (720p)
 http://50.7.220.74:8278/natgeohd_twn/playlist.m3u8?ct=17874&tid=ma1f0b9808d5014467661&tsum=73dfb91284f5b1358251546e6f03da3d
 #EXTINF:-1 tvg-id="" status="blocked",SET Variety (三立綜合台) (720p)
 http://50.7.220.74:8278/sanlizhonghe/playlist.m3u8?ct=17874&tid=m3362167a08a014596868&tsum=4472a7c943b67bf52fe5e836ca9f3b6b
-#EXTINF:-1 tvg-id="" status="blocked",Sportcast Golf 2 (博斯高球2) (720p)
+#EXTINF:-1 tvg-id="SportcastGolf2.tw" status="blocked",Sportcast Golf 2 (博斯高球2) (720p)
 http://198.16.64.10:8278/bosigolf2_twn/playlist.m3u8?ct=19225&tid=MF5F9848925298489252&tsum=2600464749aadbcd55d1c32ec071e36e
 #EXTINF:-1 tvg-id="" status="blocked",Star Chinese Movies HD (星卫HD电影台) (720p)
 http://50.7.220.74:8278/xingwei_movie/playlist.m3u8?ct=17874&tid=ma80888ed462f18082236&tsum=2824e7b9d4ec19ce7b4f8f69d23d7ceb
--- a/streams/ua.m3u
+++ b/streams/ua.m3u
@ -112,7 +112,7 @@ http://cdn1.live-tv.od.ua:8081/dumska/dumska720p/playlist.m3u8
 http://cdn1.live-tv.od.ua:8081/1tvkr/1tvkr/playlist.m3u8
 #EXTINF:-1 tvg-id="",Первый Городской Одесса (720p)
 http://cdn1.live-tv.od.ua:8081/31chod/31chod-abr/31chod/31chod/playlist.m3u8
-#EXTINF:-1 tvg-id="",Тернопіль 1 (720p)
+#EXTINF:-1 tvg-id="Ternopil1.ua",Тернопіль 1 (720p)
 http://ott.columbus.te.ua/ternopil1/index.m3u8
 #EXTINF:-1 tvg-id="TRKKrug.ua",TRK Krug (576p)
 http://cdn1.live-tv.od.ua:8081/krugod/krugod-abr/krugod/krugod/playlist.m3u8
--- a/streams/ug.m3u
+++ b/streams/ug.m3u
@ -13,7 +13,7 @@ https://stream.hydeug.com/tvwest-flussonic/index.m3u8
 https://stream.hydeug.com/urban-flussonic/index.m3u8
 #EXTINF:-1 tvg-id="WanLuoTV.ug" status="online",Wan Luo TV (576p)
 https://stream.hydeug.com/luotv-flussonic/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",Dream TV
+#EXTINF:-1 tvg-id="DreamTV.ug" status="online",Dream TV
 http://128.199.114.2:8080/hls/stream.m3u8
 #EXTINF:-1 tvg-id="" status="online",Fort TV (480p)
 http://fort.co-works.org:8080/hls/live.stream.m3u8
--- a/streams/uk.m3u
+++ b/streams/uk.m3u
@ -197,9 +197,9 @@ https://vod2t.xpanded.com/x3tv2hq/index_wlan.m3u8
 #EXTINF:-1 tvg-id="XpandedTV.uk" status="online" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",Xpanded TV (1280p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36
 https://vod2t.xpanded.com/x3tvhq/index_wlan.m3u8
-#EXTINF:-1 tvg-id="" status="online",Afrobeats (1080p)
+#EXTINF:-1 tvg-id="AfrobeatTVEntertainment.uk" status="online",Afrobeats (1080p)
 https://stream.ecable.tv/afrobeats/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",Channel S (US Eastern) (720p)
+#EXTINF:-1 tvg-id="ChannelS.uk" status="online",Channel S (US Eastern) (720p)
 https://a.jsrdn.com/broadcast/22679_24MrQma9TX/-0500/c.m3u8
 #EXTINF:-1 tvg-id="" status="online",Hadi TV French (720p)
 https://live.ishiacloud.com/haditv.co.uk/haditv8.m3u8
--- a/streams/uk_pluto.m3u
+++ b/streams/uk_pluto.m3u
@ -57,15 +57,15 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5b68a1882
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5b68a18823ecb93393cba2f1/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5b68a18823ecb93393cba2f1&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=154&terminate=false&userId=
 #EXTINF:-1 tvg-id="" status="online",Pluto TV Classic Movies (England) (720p)
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d134a74ca91eedee1630faa/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d134a74ca91eedee1630faa&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=903&terminate=false&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Crime (England) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PlutoTVCrimeUK.uk" status="online",Pluto TV Crime (England) (720p) [Not 24/7]
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ea18cd42ee5410007e349dc/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5ea18cd42ee5410007e349dc&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=200&terminate=false&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Food (England) (720p)
+#EXTINF:-1 tvg-id="PlutoTVFoodUK.uk" status="online",Pluto TV Food (England) (720p)
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ddf930548ff9b00090d5686/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5ddf930548ff9b00090d5686&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=500&terminate=false&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Inside (England) (720p)
+#EXTINF:-1 tvg-id="PlutoTVInsideUK.uk" status="online",Pluto TV Inside (England) (720p)
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d767857f65029ce2385b217/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d767857f65029ce2385b217&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=302&terminate=false&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Movies (England) (684p)
+#EXTINF:-1 tvg-id="PlutoTVMoviesUK.uk" status="online",Pluto TV Movies (England) (684p)
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ad8d3a31b95267e225e4e09/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5ad8d3a31b95267e225e4e09&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=50&terminate=false&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Paranormal (England) (720p)
+#EXTINF:-1 tvg-id="PlutoTVParanormalUK.uk" status="online",Pluto TV Paranormal (England) (720p)
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d4af2ffa9506ab29cf38c38/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d4af2ffa9506ab29cf38c38&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=216&terminate=false&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Retro Drama (England) (720p)
+#EXTINF:-1 tvg-id="PlutoTVRetroDramaUK.uk" status="online",Pluto TV Retro Drama (England) (720p)
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ddf91f19c2c3300098ce961/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5ddf91f19c2c3300098ce961&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=415&terminate=false&userId=
--- a/streams/uk_samsung.m3u
+++ b/streams/uk_samsung.m3u
@ -45,7 +45,7 @@ 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="FashionTelevision.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)
 https://elevensports-uk.samsung.wurl.com/manifest/playlist.m3u8
--- a/streams/us.m3u
+++ b/streams/us.m3u
@ -866,9 +866,9 @@ https://content.uplynk.com/channel/3324f2467c414329b3b0cc5cd987b6be.m3u8
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5c7e25a1932c8368bdbfd87d/playlist.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",AXS TV NOW
+#EXTINF:-1 tvg-id="AXSTVNOW.us" status="online",AXS TV NOW
 https://dikcfc9915kp8.cloudfront.net/hls/1080p/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",AXS TV Now (1080p)
+#EXTINF:-1 tvg-id="AXSTVNOW.us" status="online",AXS TV NOW (1080p)
 https://dikcfc9915kp8.cloudfront.net/hls/main.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Brazzers Latinoamérica [Geo-blocked]
 http://45.5.8.78:8000/play/a029
@ -886,7 +886,7 @@ 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",El Conflecto (480p)
+#EXTINF:-1 tvg-id="ElConflictoTV.us" status="online",El Conflicto TV (480p)
 https://content.uplynk.com/channel/c56a6c94a53843c79d3eca411d39f96f.m3u8
 #EXTINF:-1 tvg-id="" status="online",ESR 24x7 eSports Network (1080p)
 https://eyeonesports.com/ES2RA-628g.m3u8
@ -904,15 +904,15 @@ https://sc.id-tv.kz/FOX_HD.m3u8
 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="timeout",Genesis TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="GenesisTelevision.us" status="timeout",Genesis TV (720p) [Not 24/7]
 http://201.144.184.98:1935/genesis/smil:television.smil/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",Impact Wrestling (1080p)
+#EXTINF:-1 tvg-id="IMPACTWrestling.us" status="online",Impact Wrestling (1080p)
 https://d2tuwvs0ja335j.cloudfront.net/hls/1080p/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",IMPACT! Wrestling (1080p)
+#EXTINF:-1 tvg-id="IMPACTWrestling.us" status="online",IMPACT Wrestling (1080p)
 https://d2p372oxiwmcn1.cloudfront.net/hls/main.m3u8
-#EXTINF:-1 tvg-id="" status="online",MCN6 (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="MCN6MainChannel.us" status="online",MCN6 (1080p) [Not 24/7]
 https://d18fcxaqfnwjhj.cloudfront.net/CDN_Ingest/MCN6_MAIN.smil/Playlist.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",MTV Hits Latinoamérica (576p)
 http://209.91.213.10:8088/play/a00z
@ -920,7 +920,7 @@ http://209.91.213.10:8088/play/a00z
 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",NESN National (1080p)
+#EXTINF:-1 tvg-id="NESN.us" status="blocked",NESN National (1080p)
 https://bcovlive-a.akamaihd.net/bea11a7dfef34b08be06aaca4a72bcdf/us-east-1/6141518204001/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",News4JAX+
 https://dai.google.com/linear/hls/event/RDmbn03GRCOLNG1eetEKhg/master.m3u8
@ -932,7 +932,7 @@ https://unilivemtveu-lh.akamaihd.net/i/nickde_1@448749/master.m3u8
 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 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)
+#EXTINF:-1 tvg-id="NTDTVWest.us" status="online",NTD TV West (New Tang Dynasty Television)
 https://ntd02.akamaized.net/NTD-West/index.m3u8
 #EXTINF:-1 tvg-id="" status="online",QVC Beauty (German) (540p)
 https://d2mn03dhv5o3g8.cloudfront.net/live/qvcde_beauty_clean/bitrate1.isml/live.m3u8
@ -942,36 +942,36 @@ https://d2mn03dhv5o3g8.cloudfront.net/live/qvcde_plus_clean/bitrate1.isml/live.m
 https://stream.rjtv.stream/live/smil:rjtv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Radio Javan TV (1080p)
 https://stream.rjtv.tv/live/smil:rjtv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Radio Ritmo (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="RetroTVEast.us" status="online",Radio Ritmo (1080p) [Not 24/7]
 https://59514edd5dd8e.streamlock.net/lax/lax/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Retro TV (720p)
+#EXTINF:-1 tvg-id="RetroTVEast.us" status="online",Retro TV (720p)
 https://bcovlive-a.akamaihd.net/5e531be3ed6c41229b2af2d9bffba88d/us-east-1/6183977686001/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Rev'n (720p)
+#EXTINF:-1 tvg-id="REVNEastern.us" status="online",Rev'n (720p)
 https://bcovlive-a.akamaihd.net/a71236fdda1747999843bd3d55bdd6fa/us-east-1/6183977686001/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Scream Factory TV (720p)
+#EXTINF:-1 tvg-id="ScreamFactoryTV.us" status="online",Scream Factory TV (720p)
 https://shoutfactory-screamfactorytv-1-us.ono.wurl.tv/playlist.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",The Grapevine
 https://ov.ottera.tv/live/master.m3u8?channel=mcom_gv_us
-#EXTINF:-1 tvg-id="" status="online",Toonami Aftermath East (480p)
+#EXTINF:-1 tvg-id="ToonamiAftermathEast.us" status="online",Toonami Aftermath East (480p)
 http://api.toonamiaftermath.com:3000/est/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Toonami Aftermath Movies (540p)
 http://api.toonamiaftermath.com:3000/movies/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Toonami Aftermath Radio (480p)
 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]
+#EXTINF:-1 tvg-id="KTCADT5.us" 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="online",TUDN [Geo-blocked]
+#EXTINF:-1 tvg-id="TUDN.us" status="online",TUDN [Geo-blocked]
 https://unidfp-nlds141.global.ssl.fastly.net/nlds/univisionnow/udn2/as/live/udn2_hd_pc.m3u8?t1=
-#EXTINF:-1 tvg-id="" status="online",Vice East
+#EXTINF:-1 tvg-id="VICETV.us" status="online",Vice East
 https://d2do1g43aq7264.cloudfront.net/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Village of Hastings-On-Hudson NY (WHOH-TV) (360p)
+#EXTINF:-1 tvg-id="WHOHTV.us" 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",Watch It Kid (486p)
+#EXTINF:-1 tvg-id="WatchitKID.us" status="online",Watch It Kid (486p)
 https://content.uplynk.com/channel/ce3b524c342247549e996e7d3a977157.m3u8
-#EXTINF:-1 tvg-id="" status="online",Watch It Scream! (720p)
+#EXTINF:-1 tvg-id="WatchitScream.us" status="online",Watch It Scream! (720p)
 https://content.uplynk.com/channel/29aff31fecb848ab9044369db2d61642.m3u8
 #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
--- a/streams/us_adultswim.m3u
+++ b/streams/us_adultswim.m3u
@ -35,7 +35,7 @@ https://adultswim-vodlive.cdn.turner.com/live/test-2/stream.m3u8
 http://adultswim-vodlive.cdn.turner.com/live/mr-pickles/stream.m3u8
 #EXTINF:-1 tvg-id="" status="online",Adult Swim Primal (1080p) [Geo-blocked]
 https://adultswim-vodlive.cdn.turner.com/live/primal/stream.m3u8
-#EXTINF:-1 tvg-id="" status="online",Adult Swim Rick and Morty (1080p) [Geo-blocked]
+#EXTINF:-1 tvg-id="AdultSwimRickandMorty.us" status="online",Adult Swim Rick and Morty (1080p) [Geo-blocked]
 http://adultswim-vodlive.cdn.turner.com/live/rick-and-morty/stream.m3u8
 #EXTINF:-1 tvg-id="" status="online",Adult Swim Squidbillies (1080p) [Geo-blocked]
 https://adultswim-vodlive.cdn.turner.com/live/squidbillies/stream.m3u8
--- a/streams/us_glewedtv.m3u
+++ b/streams/us_glewedtv.m3u
@ -5,13 +5,13 @@ https://linear-11.frequency.stream/dist/glewedtv/11/hls/master/playlist.m3u8
 https://estrellanews-glewed.amagi.tv/playlist.m3u8
 #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",CampusLore (720p)
+#EXTINF:-1 tvg-id="CampusLore.us" status="online",CampusLore (720p)
 https://linear-235.frequency.stream/dist/glewedtv/235/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 TV (1080p)
+#EXTINF:-1 tvg-id="EstrellaTV.us" status="online",Estrella TV (1080p)
 https://estrellatv-glewed.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Swerve Sports (1080p)
+#EXTINF:-1 tvg-id="SwerveSports.us" status="online",Swerve Sports (1080p)
 https://linear-253.frequency.stream/dist/glewedtv/253/hls/master/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",True History (720p)
+#EXTINF:-1 tvg-id="TrueHistory.us" status="online",True History (720p)
 https://linear-188.frequency.stream/dist/glewedtv/188/hls/master/playlist.m3u8
--- a/streams/us_klowdtv.m3u
+++ b/streams/us_klowdtv.m3u
@ -29,7 +29,7 @@ https://redseat-thefirst-klowdtv.amagi.tv/playlist.m3u8
 https://cdn.klowdtv.net/803B48A/n1.klowdtv.net/live2/france24_720p/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Horse TV
 https://cdn.klowdtv.net/803B48A/n1.klowdtv.net/live3/horsetv_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Sony Movie Channel (720p)
+#EXTINF:-1 tvg-id="SonyMovies.us" status="online",Sony Movie Channel (720p)
 https://cdn.klowdtv.net/803B48A/n1.klowdtv.net/live1/smc_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",SportsGrid (720p)
+#EXTINF:-1 tvg-id="SportsGrid.us" status="online",SportsGrid (720p)
 https://sportsgrid-klowdtv.amagi.tv/playlist.m3u8
--- a/streams/us_local.m3u
+++ b/streams/us_local.m3u
@ -717,11 +717,11 @@ https://securestream6.champds.com/hlssstc/YumaCoAZLIVE/master.m3u8
 https://yuma-az.secure.footprint.net/egress/bhandler/yumaaz/streama/playlist.m3u8
 #EXTINF:-1 tvg-id="YumaChannel73.us" status="online",Yuma AZ CH 73
 https://yuma-az.secure.footprint.net/egress/bhandler/yumaaz/streamb/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",CCX Media North Brooklyn Park MN (1080p)
+#EXTINF:-1 tvg-id="CCX1.us" status="online",CCX Media North Brooklyn Park MN (1080p)
 http://156.142.85.152/live/live.m3u8
-#EXTINF:-1 tvg-id="" status="online",Channel 11
+#EXTINF:-1 tvg-id="ScootsdaleChannel11.us" status="online",Channel 11
 https://cdn3.wowza.com/5/RXJNMFI3VlVkOEFP/scottsdale/G0040_007/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="online",KRCA-TV Estrella Los Angeles (720p)
+#EXTINF:-1 tvg-id="KRCADT1.us" status="online",KRCA-TV Estrella Los Angeles (720p)
 https://content.uplynk.com/channel/81bcd5789d8d48ae8b6b0a559db1c7d6.m3u8
-#EXTINF:-1 tvg-id="" status="online",KVEA-TV Telemundo Los Angeles (720p)
+#EXTINF:-1 tvg-id="KVEADT1.us" status="online",KVEA-TV Telemundo Los Angeles (720p)
 https://content.uplynk.com/channel/c1698e3bc70e429a887301d8831400f8.m3u8
--- a/streams/us_plex.m3u
+++ b/streams/us_plex.m3u
@ -69,21 +69,21 @@ 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",AccuWeather Now (1080p)
+#EXTINF:-1 tvg-id="AccuWeatherNOW.us" status="online",AccuWeather Now (1080p)
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg00684-accuweather-accuweather-plex/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",AFV en Español (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AFVEspanol.us" status="online",AFV en Español (720p) [Not 24/7]
 https://linear-46.frequency.stream/dist/plex/46/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",EDGEsport (1080p)
 https://edgesports-plex.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Estrella TV East (1080p)
+#EXTINF:-1 tvg-id="EstrellaTV.us" status="online",Estrella TV East (1080p)
 https://estrellatv-plex.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Freebie TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="FreebieTV.us" 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",Real Stories (1080p)
 https://lds-realstories-plex.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",RetroCrush TV (1080p)
+#EXTINF:-1 tvg-id="RetroCrush.us" status="online",RetroCrush TV (1080p)
 https://45034ce1cbb7489ab1499301f6274415.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Plex_RetroCrush/playlist.m3u8?ads.app_bundle=&ads.app_store_url=&ads.consent=0&ads.gdpr=0&ads.plex_id=5ef4e1b40d9ad000423c442a&ads.plex_token=z1MCPUpbxYcHru-5hdyq&ads.psid=&ads.targetopt=1&ads.ua=Mozilla/5.0+(Windows+NT+10.0;+Win64;+x64)+AppleWebKit/537.36+(KHTML,+like+Gecko)+Chrome/84.0.4147.89+Safari/537.36+OPR/70.0.3728.71&ads.us_privacy=1---&ads.wurl_channel=491&ads.wurl_name=RetroCrush
-#EXTINF:-1 tvg-id="" status="online",Reuters (1080p)
+#EXTINF:-1 tvg-id="ReutersTV.us" status="online",Reuters (1080p)
 https://reuters-reutersnow-1.plex.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",SportsGrid (1080p)
+#EXTINF:-1 tvg-id="SportsGrid.us" status="online",SportsGrid (1080p)
 https://sportsgrid-plex.amagi.tv/playlist.m3u8
--- a/streams/us_pluto.m3u
+++ b/streams/us_pluto.m3u
@ -1085,7 +1085,7 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ad9b7aae738977e2c
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8ecfb9db6c180007a6d1b0/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="YuGiOh.us" status="online",Pluto TV Yu-Gi-Oh (720p)
 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",Cheddar News (720p)
+#EXTINF:-1 tvg-id="CheddarNews.us" status="online",Cheddar News (720p)
 http://stitcher.pluto.tv/stitch/hls/channel/5268abcd0ce20a8472000114/master.m3u8?appVersion=5.2.7&deviceDNT=web&deviceId=web24163643069&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=1&serverSideAds=false&sid=web24157571521
 #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=
--- a/streams/us_redbox.m3u
+++ b/streams/us_redbox.m3u
@ -19,5 +19,5 @@ http://shoutfactory-redbox.amagi.tv/playlist.m3u8
 https://shoutfactory-redbox.amagi.tv/hls/amagi_hls_data_redboxAAA-shoutfactorytv/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="TastemadeFrance.fr" status="online",Tastemade France (1080p)
 https://tastemadefr16min-redbox.amagi.tv/hls/amagi_hls_data_tastemade-tastemadefreetv16-redbox/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Pac 12 Insider (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="Pac12Insider.us" status="online",Pac 12 Insider (1080p) [Not 24/7]
 https://pac12-redbox.amagi.tv/hls/amagi_hls_data_pac-12AAA-pac12-redbox/CDN/playlist.m3u8
--- a/streams/us_roku.m3u
+++ b/streams/us_roku.m3u
@ -65,23 +65,23 @@ https://weathernationtv.roku.wurl.com/manifest/playlist.m3u8
 https://xplore-roku.amagi.tv/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",AccuWeather Now (1080p) [Geo-blocked]
+#EXTINF:-1 tvg-id="AccuWeatherNOW.us" status="online",AccuWeather Now (1080p) [Geo-blocked]
 https://amg00684-accuweather-accuweather-rokuus-0endj.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",AFV en Español (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AFVEspanol.us" status="online",AFV en Español (720p) [Not 24/7]
 https://linear-46.frequency.stream/dist/roku/46/hls/master/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Cheddar News (720p)
+#EXTINF:-1 tvg-id="CheddarNews.us" status="online",Cheddar News (720p)
 https://cheddar.roku.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Cheddar News (1080p)
+#EXTINF:-1 tvg-id="CheddarNews.us" status="online",Cheddar News (1080p)
 https://cheddar-cheddar-3.roku.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Estrella TV East (1080p)
+#EXTINF:-1 tvg-id="EstrellaTV.us" status="online",Estrella TV East (1080p)
 https://estrellatv-roku.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Juntos (1080p)
+#EXTINF:-1 tvg-id="JuntosTV.us" status="online",Juntos (1080p)
 https://olympusamagi.pc.cdn.bitgravity.com/Juntos-roku/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",MyTime movie network (1080p)
+#EXTINF:-1 tvg-id="MyTimeMovieNetworkEast.us" status="online",MyTime Movie Network (1080p)
 https://mytime-roku-ingest.cinedigm.com/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Pac 12 Insider (1080p)
+#EXTINF:-1 tvg-id="Pac12Insider.us" status="online",Pac 12 Insider (1080p)
 https://pac12-roku-us.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Pinkfong Baby Shark (1080p)
+#EXTINF:-1 tvg-id="BabySharkTV.us" status="online",Baby Shark TV (1080p)
 https://fc2f8d2d3cec45bb9187e8de15532838.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Roku_BabySharkTV/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",RCN Mas
 https://rcntv-rcnmas-1-us.roku.wurl.tv/playlist.m3u8
--- a/streams/us_samsung.m3u
+++ b/streams/us_samsung.m3u
@ -91,7 +91,7 @@ http://xlpore-samsungus.amagi.tv/playlist.m3u8
 https://yahoo-samsung.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="YoungHollywood.us" status="online",Young Hollywood (720p)
 https://younghollywood-rakuten-samsung.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Cheddar News (720p)
+#EXTINF:-1 tvg-id="CheddarNews.us" status="online",Cheddar News (720p)
 https://cheddar.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",EDGEsport (1080p)
 https://edgesport-rakuten-samsung.amagi.tv/playlist.m3u8
@ -99,15 +99,15 @@ 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",Fuel TV (720p)
 https://fueltv-fueltv-1.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Gusto TV (720p)
+#EXTINF:-1 tvg-id="GustoTV.us" status="online",Gusto TV (720p)
 https://gustotv.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",MyTime movie network (1080p)
+#EXTINF:-1 tvg-id="MyTimeMovieNetworkEast.us" status="online",MyTime Movie Network (1080p)
 https://mytimeuk-rakuten-samsung.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Pac 12 Insider (1080p)
+#EXTINF:-1 tvg-id="Pac12Insider.us" status="online",Pac 12 Insider (1080p)
 https://pac12-samsungus.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",SportsGrid (1080p)
+#EXTINF:-1 tvg-id="SportsGrid.us" status="online",SportsGrid (1080p)
 https://sportsgrid-samsungus.amagi.tv/playlist.m3u8
--- a/streams/us_stirr.m3u
+++ b/streams/us_stirr.m3u
@ -353,11 +353,11 @@ https://dai.google.com/linear/hls/event/im0MqOKRTHy9nVa1sirQSg/master.m3u8
 https://dai.google.com/linear/hls/event/vZB78SsNSXWOR63VJrNC2Q/master.m3u8
 #EXTINF:-1 tvg-id="WipeoutXtra.us" status="online",STIRR Wipeout Xtra (720p)
 https://dai.google.com/linear/hls/event/0DG8p66IRES7ZzEe1WJS-w/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",beIN Sports Xtra (1080p)
+#EXTINF:-1 tvg-id="beINSPORTSXTRA.us" status="online",beIN Sports Xtra (1080p)
 https://dai.google.com/linear/hls/event/3e-9BOvHQrCI9hboMYjb6w/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",Cheddar News (1080p)
+#EXTINF:-1 tvg-id="CheddarNews.us" status="online",Cheddar News (1080p)
 https://dai.google.com/linear/hls/event/frfwucAPTVunrpitYiymwg/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",Chicken Soup For The Soul (1080p)
+#EXTINF:-1 tvg-id="ChickenSoupfortheSoul.us" status="online",Chicken Soup For The Soul (1080p)
 https://dai.google.com/linear/hls/event/2C5P0JGUSj65s8KpeyIDcQ/master.m3u8
 #EXTINF:-1 tvg-id="" status="online",Qello Concerts (1080p)
 https://dai.google.com/linear/hls/event/BakMHO8xRSmGKYeiyhsq3A/master.m3u8
@ -387,5 +387,5 @@ https://dai.google.com/linear/hls/event/0jRU1DBXSW6a_TFheLfAUQ/master.m3u8
 https://ott-linear-channels.stingray.com/hls/stirr/104.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="online",USA Today (1080p)
+#EXTINF:-1 tvg-id="USATODAY.us" status="online",USA Today (1080p)
 https://dai.google.com/linear/hls/event/gJJhuFTCRo-HAHYsffb3Xg/master.m3u8
--- a/streams/us_tcl.m3u
+++ b/streams/us_tcl.m3u
@ -13,5 +13,5 @@ https://soreal-tcl.amagi.tv/playlist.m3u8
 https://unbeaten-tcl.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="YoungHollywood.us" status="online",Young Hollywood (720p)
 https://younghollywood-tcl.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",MyTime movie network (1080p)
+#EXTINF:-1 tvg-id="MyTimeMovieNetworkEast.us" status="online",MyTime Movie Network (1080p)
 https://mytime-tcl.amagi.tv/playlist.m3u8
--- a/streams/us_tubi.m3u
+++ b/streams/us_tubi.m3u
@ -107,9 +107,9 @@ https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,p-WTXF-Monetizer.m3u8
 https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,Cloudfront-WVTM.m3u8
 #EXTINF:-1 tvg-id="" status="online",CBC News Highlights (720p)
 https://csm-e-eb.csm.tubi.video/csm/live/243017997.m3u8
-#EXTINF:-1 tvg-id="" status="online",Today All Day (720p)
+#EXTINF:-1 tvg-id="TODAYAllDay.us" status="online",Today All Day (720p)
 https://live-news-manifest.tubi.video/live-news-manifest/csm/extlive/tubiprd01,Cloudfront-Today.m3u8
-#EXTINF:-1 tvg-id="" status="online",USA Today (720p)
+#EXTINF:-1 tvg-id="USATODAY.us" status="online",USA Today (720p)
 https://live-news-manifest.tubi.video/live-news-manifest/csm/extlive/tubiprd01,Cloudfront-USA-Today.m3u8
 #EXTINF:-1 tvg-id="" status="online",USA Today SportsWire
 https://live-news-manifest.tubi.video/live-news-manifest/csm/extlive/tubiprd01,Sportswire.m3u8
--- a/streams/us_vizio.m3u
+++ b/streams/us_vizio.m3u
@ -65,13 +65,13 @@ 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",MyTime movie network (1080p)
+#EXTINF:-1 tvg-id="MyTimeMovieNetworkEast.us" status="online",MyTime Movie Network (1080p)
 https://mytime-vizio-ingest.cinedigm.com/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Pac 12 Insider (720p)
+#EXTINF:-1 tvg-id="Pac12Insider.us" status="online",Pac 12 Insider (720p)
 https://pac12-vizio.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",pocket.watch (720p)
+#EXTINF:-1 tvg-id="pocketwatch.us" status="online",pocket.watch (720p)
 https://pocketwatch-vizio.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",SportsGrid (1080p)
+#EXTINF:-1 tvg-id="SportsGrid.us" 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_wfmz.m3u
+++ b/streams/us_wfmz.m3u
@ -7,5 +7,5 @@ https://cdn.jaybirdtv.com/wfmz/6/live/master.m3u8
 https://cdn.jaybirdtv.com/wfmz/channel/9/master.m3u8
 #EXTINF:-1 tvg-id="" status="online",WFMZ Traffic
 https://cdn.jaybirdtv.com/wfmz/channel/7/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",WFMZ-TV Channel 69
+#EXTINF:-1 tvg-id="WFMZDT1.us" status="online",WFMZ-TV Channel 69
 https://cdn.jaybirdtv.com/wfmz/channel/1/master.m3u8
--- a/streams/us_xumo.m3u
+++ b/streams/us_xumo.m3u
@ -191,19 +191,19 @@ 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",CBC News (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxcbcnews/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Cheddar News (1080p)
+#EXTINF:-1 tvg-id="CheddarNews.us" status="online",Cheddar News (1080p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxcheddar/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",NBC News Now (1080p)
+#EXTINF:-1 tvg-id="NBCNewsNOW.us" status="online",NBC News Now (1080p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-xumo-nbcnewsnow/CDN/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",pocket.watch (1080p)
+#EXTINF:-1 tvg-id="pocketwatch.us" status="online",pocket.watch (1080p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxpocketwatch/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",SportsGrid (1080p)
+#EXTINF:-1 tvg-id="SportsGrid.us" status="online",SportsGrid (1080p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-xumosportsgrid/CDN/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",SportsGrid (1080p)
+#EXTINF:-1 tvg-id="SportsGrid.us" status="online",SportsGrid (1080p)
 https://sportsgrid-xumo-us.amagi.tv/xumo.m3u8
 #EXTINF:-1 tvg-id="" status="online",Stingray Qello Concerts (1080p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-vizioqelloconcerts/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",USA Today (720p)
+#EXTINF:-1 tvg-id="USATODAY.us" status="online",USA Today (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxusatoday/CDN/playlist.m3u8