Merge branch 'master' into LaneSh4d0w-patch-1

channels/us.m3u

@@ -1,7 +1,7 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="KOTR-LD.us" tvg-name="11 MyTV (KOTR-LD)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/b/bd/Kotrlp.jpg" group-title="Local",11 MyTV (KOTR-LD) (480i)
+#EXTINF:-1 tvg-id="KOTR-LD.us" tvg-name="myTV 11 Monteray (KOTR-LD)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/b/bd/Kotrlp.jpg" group-title="Local",myTV 11 Monteray (KOTR-LD) (480i)
 https://cdnapisec.kaltura.com/p/2630451/sp/2630451/playManifest/entryId/1_hq4vlk40/deliveryProfileId/672/protocol/https/format/applehttp/a.m3u8
-#EXTINF:-1 tvg-id="KEROTV.us" tvg-name="23 ABC (KERO)" tvg-country="US" tvg-language="English" tvg-logo="https://scripps.com/wp-content/uploads/2019/01/local_media_23_abc.png" group-title="Local",23 ABC (KERO) (720p)
+#EXTINF:-1 tvg-id="23ABCBakerfieldKERO.us" tvg-name="23ABC Bakerfield (KERO)" tvg-country="US" tvg-language="English" tvg-logo="https://scripps.com/wp-content/uploads/2019/01/local_media_23_abc.png" group-title="Local",23ABC Bakerfield (KERO) (720p)
 https://content.uplynk.com/channel/ff809e6d9ec34109abfb333f0d4444b5.m3u8
 #EXTINF:-1 tvg-id="24HourFreeMovies.us" tvg-name="24 Hour Free Movies" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/FiTdDp1.png" group-title="Movies",24 Hour Free Movies
 https://d15690s323oesy.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/UDU-Plex/158.m3u8
@@ -41,15 +41,15 @@ https://moiptvhls-i.akamaihd.net/hls/live/554145/secure/playlist.m3u8
 https://moiptvhls-i.akamaihd.net/hls/live/652317/secure/master.m3u8
 #EXTINF:-1 tvg-id="3ABNRussia.us" tvg-name="3ABN Russia" tvg-country="US" tvg-language="Russian" tvg-logo="https://i.imgur.com/8fKWpo3.png" group-title="Religious",3ABN Russia
 https://moiptvhls-i.akamaihd.net/hls/live/652316/secure/master.m3u8
-#EXTINF:-1 tvg-id="KMTVTV.us" tvg-name="3News Now (KMTV-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/e/ea/KMTV3.png" group-title="News",3News Now (KMTV-TV) (720p)
+#EXTINF:-1 tvg-id="3NewsNowKMTVTV.us" tvg-name="3News Now (KMTV-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/e/ea/KMTV3.png" group-title="News",3News Now (KMTV-TV) (720p)
 https://content.uplynk.com/channel/328d1434fb51476cb6567c74d5b2cc70.m3u8
-#EXTINF:-1 tvg-id="KNBC.us" tvg-name="4 NBC (KNBC)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/ed/KNBC_%282011_-_Flat%29.svg/1280px-KNBC_%282011_-_Flat%29.svg.png" group-title="Local",4 NBC (KNBC) (1080p)
+#EXTINF:-1 tvg-id="NBC4LosAngelesKNBC.us" tvg-name="NBC 4 Los Angeles (KNBC)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/ed/KNBC_%282011_-_Flat%29.svg/1280px-KNBC_%282011_-_Flat%29.svg.png" group-title="Local",NBC 4 Los Angeles (KNBC) (1080p)
 https://cdnapisec.kaltura.com/p/2630451/sp/2630451/playManifest/entryId/1_61e7x33e/deliveryProfileId/672/protocol/https/format/applehttp/a.m3u8
-#EXTINF:-1 tvg-id="KNSD.us" tvg-name="KNSD-DT1" tvg-country="US" tvg-language="English" tvg-logo="https://media.nbcsandiego.com/2021/04/San-Diego.png" group-title="Local",7 NBC San Diego (KNSD-DT1)
+#EXTINF:-1 tvg-id="NBC7SanDiegoKNSDDT1.us" tvg-name="NBC 7 San Diego (KNSD-DT1)" tvg-country="US" tvg-language="English" tvg-logo="https://media.nbcsandiego.com/2021/04/San-Diego.png" group-title="Local",NBC 7 San Diego (KNSD-DT1)
 https://streams.the6tv.duckdns.org:2443/locals/SanDiego/knsd-dt1.m3u8
-#EXTINF:-1 tvg-id="WHDH.us" tvg-name="7News Boston (WHDH)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/b/b5/WHDH_7_logo.png" group-title="Local",7News Boston (WHDH) (540p)
+#EXTINF:-1 tvg-id="WHDHTV7NewsBostonWHDH.us" tvg-name="WHDH TV 7 News Boston (WHDH)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/b/b5/WHDH_7_logo.png" group-title="Local",WHDH TV 7 News Boston (WHDH) (540p)
 https://bcsecurelivehls-i.akamaihd.net/hls/live/598046/4744899807001_1/livestream/master.m3u8
-#EXTINF:-1 tvg-id="9PBS.us" tvg-name="9 PBS" tvg-country="US" tvg-language="English" tvg-logo="https://imgur.com/rMdJ5DP.png" group-title="General",9 PBS [Geo-blocked]
+#EXTINF:-1 tvg-id="NinePBSStLouis.us" tvg-name="Nine PBS St. Louis" tvg-country="US" tvg-language="English" tvg-logo="https://imgur.com/rMdJ5DP.png" group-title="General",Nine PBS St. Louis [Geo-blocked]
 https://ketcdt.lls.cdn.pbs.org/ketcdt/0436e066-85c7-408b-a4fd-5b492ccb5fd8/primary.m3u8
 #EXTINF:-1 tvg-id="AEBestof.us" tvg-name="A&E (Best of)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/zl7Gzwm.png" group-title="Entertainment",A&E (Best of) (1080p)
 https://bk7l2w4nlx53-hls-live.5centscdn.com/AETV/514c04b31b5f01cf00dd4965e197fdda.sdp/playlist.m3u8
@@ -332,7 +332,7 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ebac49ce4dc8b0007
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxbaeble/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="BatteryPopXUMO.us" tvg-name="Battery Pop (XUMO)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/5VUZTa1.png" group-title="Kids",Battery Pop (XUMO)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxbatterypop/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="KNTV.us" tvg-name="Bay Area NBC (KNTV)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/77/KNTV_11_NBC_Bay_Area.svg/1920px-KNTV_11_NBC_Bay_Area.svg.png" group-title="Local",Bay Area NBC (KNTV)
+#EXTINF:-1 tvg-id="NBCBayAreaKNTV.us" tvg-name="NBC Bay Area (KNTV)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/77/KNTV_11_NBC_Bay_Area.svg/1920px-KNTV_11_NBC_Bay_Area.svg.png" group-title="Local",NBC Bay Area (KNTV)
 https://streams.the6tv.duckdns.org:2443/locals/BayArea/kntv-dt1.m3u8
 #EXTINF:-1 tvg-id="BCCGaming.us" tvg-name="BCC Gaming" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/60qMpEK.png" group-title="Comedy",BCC Gaming (720p)
 https://arcade-cloud.samsung.wurl.com/manifest/playlist.m3u8
@@ -664,7 +664,7 @@ https://bcliveunivsecure-lh.akamaihd.net/i/news_1@500579/master.m3u8
 https://content.uplynk.com/channel/0123b306191a4307a31b9fb573213fd3.m3u8
 #EXTINF:-1 tvg-id="CBS46WGCLTV.us" tvg-name="CBS 46 (WGCL-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/XuzRQjy.png" group-title="Local",CBS 46 (WGCL-TV) (720p)
 https://live.field59.com/wgcl/ngrp:wgcl1_all/playlist.m3u8
-#EXTINF:-1 tvg-id="WRGB.us" tvg-name="CBS 6 WRGB (Albany)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ByPFQGp.png" group-title="Local",CBS 6 WRGB (Albany) (720p)
+#EXTINF:-1 tvg-id="CBS6AlbanyWRGB.us" tvg-name="CBS 6 Albany (WRGB) " tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ByPFQGp.png" group-title="Local",CBS 6 Albany (WRGB) (720p)
 https://content.uplynk.com/channel/bba3e7da884a49bba96341ecf5128f0f.m3u8
 #EXTINF:-1 tvg-id="CBS9WashingtonDCWUSAHD.us" tvg-name="CBS 9 Washington DC (WUSA-HD)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Ekt1an0.png" group-title="Local",CBS 9 Washington DC (WUSA-HD) (720p)
 https://livevideo01.wusa9.com/hls/live/2015498/newscasts/live.m3u8
@@ -1984,9 +1984,9 @@ https://simultv.s.llnwi.net/n4s4/KartoonCircus/interlink.m3u8
 https://live-k2302-kbp.1plus1.video/sport/smil:sport.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="KBSVAssyriaSat.us" tvg-name="KBSV/AssyriaSat" tvg-country="US" tvg-language="Assyrian Neo-Aramaic;English" tvg-logo="https://i.imgur.com/zEWSSdf.jpg" group-title="",KBSV/AssyriaSat
 http://66.242.170.53/hls/live/temp/index.m3u8
-#EXTINF:-1 tvg-id="KCAL9KCALTV.us" tvg-name="KCAL 9 (KCAL-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Q8IwOiL.jpg" group-title="Local",KCAL 9 (KCAL-TV) (720p)
+#EXTINF:-1 tvg-id="CBS9LosAngelesKCALTV.us" tvg-name="CBS 9 Los Angeles (KCAL-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Q8IwOiL.jpg" group-title="Local",CBS 9 Los Angeles (KCAL-TV) (720p)
 https://cbsn-la-cedexis.cbsnstream.cbsnews.com/out/v1/57b6c4534a164accb6b1872b501e0028/master.m3u8
-#EXTINF:-1 tvg-id="KCPQFoxQ13Seattle.us" tvg-name="KCPQ Fox Q13 Seattle" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/4xs5ERr.jpg" group-title="News",KCPQ Fox Q13 Seattle (720p)
+#EXTINF:-1 tvg-id="FOXQ13SeattleKCPQ.us" tvg-name="FOX Q13 Seattle (KCPQ)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/4xs5ERr.jpg" group-title="News",FOX Q13 Seattle (KCPQ) (720p)
 https://lnc-kcpq-fox-aws.tubi.video/index.m3u8
 #EXTINF:-1 tvg-id="KCRTTV.us" tvg-name="KCRT-TV" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/mNK5D5k.jpg" group-title="",KCRT-TV
 http://granicusliveus3-a.akamaihd.net/richmond/G0034_002/chunklist.m3u8
@@ -2048,9 +2048,9 @@ https://v-ca.mybtv.net/event/125/1280x720.m3u8?start_time=2021-05-16T23%3A45%3A0
 https://v-ca.mybtv.net/event/125/768x432.m3u8?start_time=2021-05-16T23%3A45%3A00%2B00%3A00&end_time=2023-05-17T05%3A00%3A00%2B00%3A00&env=prd&uid=33630
 #EXTINF:-1 tvg-id="KOFY.us" tvg-name="KOFY" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/8/84/KOFY_TV20_logo_2019.png" group-title="Local",KOFY-TV
 https://streams.the6tv.duckdns.org:2443/locals/BayArea/kofy-dt1.m3u8
-#EXTINF:-1 tvg-id="FOX23TulsaOKKOKITV.us" tvg-name="FOX 23 Tulsa OK (KOKI-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pRKEMb1.jpg" group-title="Local",KOKI-TV FOX 23 Tulsa OK (720p)
+#EXTINF:-1 tvg-id="FOX23TulsaOKKOKITV.us" tvg-name="FOX 23 Tulsa OK (KOKI-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/pRKEMb1.jpg" group-title="Local",FOX 23 Tulsa OK (KOKI-TV) (720p)
 https://d3nzocdfkx2ybv.cloudfront.net/in/cmg-kokitv-hls-v3/live.m3u8
-#EXTINF:-1 tvg-id="KOMONewsKOMOTV.us" tvg-name="KOMO News (KOMO-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/8vXRrRe.jpg" group-title="Local",KOMO News (KOMO-TV) (720p)
+#EXTINF:-1 tvg-id="ABC4KOMONewsKOMOTV.us" tvg-name="ABC 4 KOMO News (KOMO-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/8vXRrRe.jpg" group-title="Local",ABC 4 KOMO News (KOMO-TV) (720p)
 https://content.uplynk.com/2c88dfe19e1447e6a6aa27e8e143a140.m3u8
 #EXTINF:-1 tvg-id="KoolTVHD.us" tvg-name="Kool TV HD" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/aILvazd.jpg" group-title="Local",Kool TV HD
 http://209.182.219.50:1935/roku/roku/playlist.m3u8
@@ -2072,33 +2072,33 @@ https://v-ca.mybtv.net/event/718/768x432.m3u8?start_time=2021-05-16T23%3A45%3A00
 https://v-ca.mybtv.net/event/719/768x432.m3u8?start_time=2021-05-16T23%3A45%3A00%2B00%3A00&end_time=2023-05-17T05%3A00%3A00%2B00%3A00&env=prd&uid=33630
 #EXTINF:-1 tvg-id="KRCBDT3.us" tvg-name="KRCB-DT3" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/22.3-NHK.png" group-title="",KRCB-DT3 (720p)
 https://v-ca.mybtv.net/event/720/1920x1080.m3u8?start_time=2021-05-16T23%3A45%3A00%2B00%3A00&end_time=2023-05-17T05%3A00%3A00%2B00%3A00&env=prd&uid=33630
-#EXTINF:-1 tvg-id="KRIVFox26Houston.us" tvg-name="KRIV Fox 26 Houston" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/AZ8MWRp.jpg" group-title="News",KRIV Fox 26 Houston (720p)
+#EXTINF:-1 tvg-id="FOX26HoustonKRIV.us" tvg-name="FOX 26 Houston (KRIV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/AZ8MWRp.jpg" group-title="News",FOX 26 Houston (KRIV) (720p)
 https://lnc-kriv-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="KTBCFox7Austin.us" tvg-name="KTBC Fox 7 Austin" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ugLwGEY.png" group-title="News",KTBC Fox 7 Austin (720p)
+#EXTINF:-1 tvg-id="FOX7AustinKTBC.us" tvg-name="FOX 7 Austin (KTBC)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ugLwGEY.png" group-title="News",FOX 7 Austin (KTBC) (720p)
 https://lnc-ktbc-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="KTLA5.us" tvg-name="KTLA 5" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/JH99Psi.jpg" group-title="Local",KTLA 5 (720p)
+#EXTINF:-1 tvg-id="KTLA5LosAngeles.us" tvg-name="KTLA 5 (Los Angeles)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/JH99Psi.jpg" group-title="Local",KTLA 5 (Los Angeles) (720p)
 https://content.uplynk.com/channel/6cbf2d32a5384dc1b787539b1102433c.m3u8
-#EXTINF:-1 tvg-id="KTLA5.us" tvg-name="KTLA 5" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/JH99Psi.jpg" group-title="Local",KTLA 5 (Los Angeles) (720p)
+#EXTINF:-1 tvg-id="KTLA5LosAngeles.us" tvg-name="KTLA 5 (Los Angeles)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/JH99Psi.jpg" group-title="Local",KTLA 5 (Los Angeles) (720p)
 https://bozztv.com/teleyupp1/teleup-N8qwnqgUq2/playlist.m3u8
-#EXTINF:-1 tvg-id="KTTVFox11LosAngeles.us" tvg-name="KTTV Fox 11 Los Angeles" tvg-country="US" tvg-language="English" tvg-logo="http://live-tv-channels.org/pt-data/uploads/logo/us-fox-11-los-angeles.jpg" group-title="News",KTTV Fox 11 Los Angeles (720p)
+#EXTINF:-1 tvg-id="FOX11LosAngelesKTTV.us" tvg-name="FOX 11 Los Angeles (KTTV)" tvg-country="US" tvg-language="English" tvg-logo="http://live-tv-channels.org/pt-data/uploads/logo/us-fox-11-los-angeles.jpg" group-title="News",FOX 11 Los Angeles (KTTV) (720p)
 https://lnc-kttv-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="KTVKDT5.us" tvg-name="KTVK-DT5" tvg-country="US" tvg-language="English" tvg-logo="https://meredith-img.s3.amazonaws.com/listings/KTVK-DT5.png" group-title="",KTVK-DT5 (480i)
+#EXTINF:-1 tvg-id="CBS5PhoenixWeatherKTVKDT5.us" tvg-name="CBS 5 Phoenix Weather (KTVK-DT5)" tvg-country="US" tvg-language="English" tvg-logo="https://meredith-img.s3.amazonaws.com/listings/KTVK-DT5.png" group-title="Weather",CBS 5 Phoenix Weather (KTVK-DT5) (480i)
 https://v-px.mybtv.net/event/725/768x432.m3u8?start_time=2021-05-16T23%3A45%3A00%2B00%3A00&end_time=2023-05-17T05%3A00%3A00%2B00%3A00&env=prd&uid=33630
-#EXTINF:-1 tvg-id="KTVPLD1.us" tvg-name="KTVP-LD" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/U4bDHHt.png" group-title="",KTVP-LD (480i)
+#EXTINF:-1 tvg-id="KTVPLDPhoenix.us" tvg-name="KTVP-LD Phoenix" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/U4bDHHt.png" group-title="Local",KTVP-LD Phoenix (480i)
 https://v-px.mybtv.net/event/726/768x432.m3u8?start_time=2021-05-16T23%3A45%3A00%2B00%3A00&end_time=2023-05-17T05%3A00%3A00%2B00%3A00&env=prd&uid=33630
-#EXTINF:-1 tvg-id="KTVUFox2SanFrancisco.us" tvg-name="KTVU Fox 2 San Francisco" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/18isSVd.png" group-title="News",KTVU Fox 2 San Francisco (720p)
+#EXTINF:-1 tvg-id="FOX2SanFranciscoKTVU.us" tvg-name="FOX 2 San Francisco (KTVU)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/18isSVd.png" group-title="News",FOX 2 San Francisco (KTVU) (720p)
 https://lnc-ktvu-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="KUSI.us" tvg-name="KUSI-DT1" tvg-country="US" tvg-language="English" tvg-logo="https://yt3.ggpht.com/58o6dSeIv5j0byajnK95NeR_FPMY7G1QXXD1FBeV8z_pl4xJqgVz_YvEO0ZSJc1jdza4WJvNow" group-title="Local",KUSI-DT1
+#EXTINF:-1 tvg-id="KUSI51SanDiegoKUSIDT1.us" tvg-name="KUSI 51 San Diego (KUSI-DT1)" tvg-country="US" tvg-language="English" tvg-logo="https://yt3.ggpht.com/58o6dSeIv5j0byajnK95NeR_FPMY7G1QXXD1FBeV8z_pl4xJqgVz_YvEO0ZSJc1jdza4WJvNow" group-title="Local",KUSI 51 San Diego (KUSI-DT1)
 https://streams.the6tv.duckdns.org:2443/locals/SanDiego/kusi-dt1.m3u8
-#EXTINF:-1 tvg-id="KVPALD1.us" tvg-name="KVPA-LD" tvg-country="US" tvg-language="English" tvg-logo="https://media-uspx.mybtv.net/logos/42.1.png" group-title="",KVPA-LD (720p)
+#EXTINF:-1 tvg-id="EstrellaTV42KVPALD.us" tvg-name="Estrella TV 42 (KVPA-LD)" tvg-country="US" tvg-language="Spanish" tvg-logo="https://media-uspx.mybtv.net/logos/42.1.png" group-title="Local",Estrella TV 42 (KVPA-LD) (720p)
 https://v-px.mybtv.net/event/45/1280x720.m3u8?start_time=2021-05-16T23%3A45%3A00%2B00%3A00&end_time=2023-05-17T05%3A00%3A00%2B00%3A00&env=prd&uid=33630
-#EXTINF:-1 tvg-id="KVPALD1.us" tvg-name="KVPA-LD" tvg-country="US" tvg-language="English" tvg-logo="https://media-uspx.mybtv.net/logos/42.1.png" group-title="",KVPA-LD (480i)
+#EXTINF:-1 tvg-id="EstrellaTV42KVPALD.us" tvg-name="Estrella TV 42 (KVPA-LD)" tvg-country="US" tvg-language="Spanish" tvg-logo="https://media-uspx.mybtv.net/logos/42.1.png" group-title="Local",Estrella TV 42 (KVPA-LD) (480i)
 https://v-px.mybtv.net/event/45/768x432.m3u8?start_time=2021-05-16T23%3A45%3A00%2B00%3A00&end_time=2023-05-17T05%3A00%3A00%2B00%3A00&env=prd&uid=33630
-#EXTINF:-1 tvg-id="KVVBTV33.us" tvg-name="KVVB-TV 33" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/FzxuNhl.png" group-title="Local",KVVB-TV 33 (1080p)
+#EXTINF:-1 tvg-id="KVVBTV33VictorValley.us" tvg-name="KVVB-TV 33 Victor Valley" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/FzxuNhl.png" group-title="Local",KVVB-TV 33 Victor Valley (1080p)
 https://2-fss-2.streamhoster.com/pl_138/amlst:201950-1309230/playlist.m3u8
 #EXTINF:-1 tvg-id="KweliTV.us" tvg-name="Kweli TV" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/x9tjDhu.png" group-title="Culture",Kweli TV
 https://a.jsrdn.com/broadcast/9c897f1973/+0000/c.m3u8
-#EXTINF:-1 tvg-id="KZASFox10Phoenix.us" tvg-name="KZAS Fox 10 Phoenix" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/TCzjchS.jpg" group-title="News",KZAS Fox 10 Phoenix (720p)
+#EXTINF:-1 tvg-id="FOX10PhoenixKZAS.us" tvg-name="FOX 10 Phoenix (KZAS)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/TCzjchS.jpg" group-title="News",FOX 10 Phoenix (KZAS) (720p)
 https://lnc-ksaz-fox-aws.tubi.video/index.m3u8
 #EXTINF:-1 tvg-id="LaMegaMundial.us" tvg-name="La Mega Mundial" tvg-country="US" tvg-language="Spanish" tvg-logo="https://pbs.twimg.com/profile_images/742490028559982592/ddFmTivZ_400x400.jpg" group-title="Music",La Mega Mundial (720p)
 http://68.235.35.243:1935/lamegamundial/lamegamundial2/playlist.m3u8
@@ -2615,13 +2615,13 @@ https://www.livedoomovie.com/02_nbahd_720p/chunklist.m3u8
 https://svc-lvanvato-cxtv-wpxi.cmgvideo.com/wpxi/2564k/index.m3u8
 #EXTINF:-1 tvg-id="NBC15MadisonWIWMTVNBC.us" tvg-name="NBC 15 Madison WI (WMTVNBC)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/qOO32m6.png" group-title="Local",NBC 15 Madison WI (WMTVNBC) (720p)
 https://ad-playlistserver.aws.syncbak.com/playlist/899088/master.m3u8?access_token=eyJhbGciOiJIUzI1NiIsImtpZCI6IkdyYXkyMDE2MDgyOSIsInN1YiI6IioiLCJ0eXAiOiJKV1QifQ.eyJleHAiOjE3OTAzNjkxMDUsImlzcyI6IldMUyIsIm1kNSI6ImJhZTU4Y2ZlZWM2NmU1MjZkNmVjZmE1YmUzNTQxMzQ4IiwibWlkIjoiODk5MDg4In0.vBWkHmqS3z3dpq8UWfbk4wFd-vQlj6B0up-rpt7X_7Q
-#EXTINF:-1 tvg-id="NBC26WGBA.us" tvg-name="NBC 26 (WGBA)" tvg-country="US" tvg-language="English" tvg-logo="https://ewscripps.brightspotcdn.com/dims4/default/31cd86c/2147483647/strip/true/crop/600x200+0+0/resize/400x133!/quality/90/?url=https%3A%2F%2Fewscripps.brightspotcdn.com%2F09%2F30%2F6709482a41ef96f6ba6259d6ae66%2Fwgba-geographic-locator-600x200.png" group-title="Local",NBC 26 (WGBA) (720p)
+#EXTINF:-1 tvg-id="NBC26GreenBayWGBA.us" tvg-name="NBC 26 Green Bay (WGBA)" tvg-country="US" tvg-language="English" tvg-logo="https://ewscripps.brightspotcdn.com/dims4/default/31cd86c/2147483647/strip/true/crop/600x200+0+0/resize/400x133!/quality/90/?url=https%3A%2F%2Fewscripps.brightspotcdn.com%2F09%2F30%2F6709482a41ef96f6ba6259d6ae66%2Fwgba-geographic-locator-600x200.png" group-title="Local",NBC 26 Green Bay (WGBA) (720p)
 https://content.uplynk.com/channel/1fbfb28ae5044f619f75ae0adb011989.m3u8
 #EXTINF:-1 tvg-id="NBC4NewsWashingtonDC.us" tvg-name="NBC 4 News (Washington DC)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/0/0f/Logo_of_WRC-TV.png" group-title="Local",NBC 4 News (Washington DC)
 https://wrclive-f.akamaihd.net/i/wrcb1_1@46880/master.m3u8
-#EXTINF:-1 tvg-id="NBC5KSDK.us" tvg-name="NBC 5 (KSDK)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/4zQaZBX.jpg" group-title="Local",NBC 5 (KSDK)
+#EXTINF:-1 tvg-id="NBC5StLouisKSDK.us" tvg-name="NBC 5 St. Louis (KSDK)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/4zQaZBX.jpg" group-title="Local",NBC 5 St. Louis (KSDK)
 https://livevideo01.ksdk.com/hls/live/2014965/newscasts/live.m3u8
-#EXTINF:-1 tvg-id="NBC5NewsChicago.us" tvg-name="NBC 5 News (Chicago)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/a/ac/WMAQ_Logo_2012.png" group-title="Local",NBC 5 News (Chicago)
+#EXTINF:-1 tvg-id="NBC5NewsChicagoWMAQTV.us" tvg-name="NBC 5 News Chicago (WMAQ-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/a/ac/WMAQ_Logo_2012.png" group-title="Local",NBC 5 News Chicago (WMAQ-TV)
 http://wmaqlive-f.akamaihd.net/i/wmaqa1_1@22923/master.m3u8
 #EXTINF:-1 tvg-id="NBCNewsNow.us" tvg-name="NBC News Now" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/geonsey/Free2ViewTV/master/images/logos/NBCNewsNow.png" group-title="News",NBC News Now
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokunbcnewsnow/CDN/playlist.m3u8
@@ -3083,13 +3083,13 @@ https://newidco-babysharktv-1.roku.wurl.com/manifest/playlist.m3u8
 https://content.uplynk.com/channel/98828f7707b84dc496472d5789143df2.m3u8
 #EXTINF:-1 tvg-id="PlantBasedNetwork.us" tvg-name="Plant Based Network" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/iwd9Jxb.png" group-title="",Plant Based Network
 https://hls-cdn.tvstartup.net/barakyah-channel/live/pbtv/playlist.m3u8
-#EXTINF:-1 tvg-id="PlayWorks.us" tvg-name="Play.Works" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/xnIdSaS.png" group-title="Entertainment",Play.Works
+#EXTINF:-1 tvg-id="PlayWorks.us" tvg-name="Play.Works" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/McoboB1.png" group-title="Entertainment",Play.Works
 https://b12eca572da7423284734ca3a6242ea2.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Plex_PlayWorks/playlist.m3u8?ads.wurl_channel=512&ads.wurl_name=PlayWorks&ads.us_privacy=1---&ads.psid=df8e1a36-847d-5096-86a7-3803ed330ede&ads.targetopt=0&ads.plex_token=MorUy57ijWhGe4ixZb_T&ads.plex_id=5f0ff263d71dcb00449ec01e&ads.ua=Mozilla%2F5.0%20(Windows%20NT%206.1%3B%20rv%3A83.0)%20Gecko%2F20100101%20Firefox%2F83.0&ads.app_bundle=com.plexapp.desktop&ads.app_store_url=https%3A%2F%2Fapp.plex.tv&ads.gdpr=1&ads.consent=0
-#EXTINF:-1 tvg-id="PlayWorks.us" tvg-name="Play.Works" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/xnIdSaS.png" group-title="Entertainment",Play.Works
+#EXTINF:-1 tvg-id="PlayWorks.us" tvg-name="Play.Works" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/McoboB1.png" group-title="Entertainment",Play.Works
 https://playworksdigital-playworks-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="PlayWorks.us" tvg-name="Play.Works" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/xnIdSaS.png" group-title="Entertainment",Play.Works
+#EXTINF:-1 tvg-id="PlayWorks.us" tvg-name="Play.Works" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/McoboB1.png" group-title="Entertainment",Play.Works
 https://playworksdigital-playworks-1.plex.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="PlayWorks.us" tvg-name="Play.Works" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/xnIdSaS.png" group-title="Entertainment",Play.Works
+#EXTINF:-1 tvg-id="PlayWorks.us" tvg-name="Play.Works" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/McoboB1.png" group-title="Entertainment",Play.Works
 https://playworksdigital-playworks-1.vizio.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="PlayboyTV.us" tvg-name="Playboy TV" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/cQDAzDF.jpg" group-title="XXX",Playboy TV
 http://187.188.147.165:8000/play/a00l/index.m3u8
@@ -3381,7 +3381,7 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5eb1b1214
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dc481cda1d430000948a1b4/master.m3u8?terminate=false&deviceType=web&deviceMake=web&deviceModel=web&sid=207&deviceId=5dc481cda1d430000948a1b4&deviceVersion=DNT&appVersion=DNT&deviceDNT=0&userId=&advertisingId=&deviceLat=&deviceLon=&app_name=&appName=web&buildVersion=&appStoreUrl=&architecture=&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false
 #EXTINF:-1 tvg-id="PlutoTVCBSNNewYork.us" tvg-name="Pluto TV CBS News New York" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ubsNr5F.jpg" group-title="Local",Pluto TV CBS News New York
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5dc48170e280c80009a861ab/master.m3u8?terminate=false&deviceType=web&deviceMake=web&deviceModel=web&sid=206&deviceId=5dc48170e280c80009a861ab&deviceVersion=DNT&appVersion=DNT&deviceDNT=0&userId=&advertisingId=&deviceLat=&deviceLon=&app_name=&appName=web&buildVersion=&appStoreUrl=&architecture=&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false
-#EXTINF:-1 tvg-id="PlutoTVCBSN2.us" tvg-name="Pluto TV CBSN 2" tvg-country="US" tvg-language="English" tvg-logo="" group-title="General",Pluto TV CBSN 2
+#EXTINF:-1 tvg-id="PlutoTVCBSN2.us" tvg-name="Pluto TV CBSN 2" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/bvSjkeB.jpg" group-title="General",Pluto TV CBSN 2
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5a6b92f6e22a617379789618/master.m3u8?terminate=false&deviceType=web&deviceMake=web&deviceModel=web&sid=204&deviceId=5a6b92f6e22a617379789618&deviceVersion=DNT&appVersion=DNT&deviceDNT=0&userId=&advertisingId=&deviceLat=&deviceLon=&app_name=&appName=web&buildVersion=&appStoreUrl=&architecture=&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false
 #EXTINF:-1 tvg-id="PlutoTVCBSNMinnesota.us" tvg-name="Pluto TV CBSN Minnesota" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5eb1b0bf2240d8000732a09c/colorLogoPNG.png" group-title="Local",Pluto TV CBSN Minnesota (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5eb1b0bf2240d8000732a09c/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&genre=ROKU_ADS_CONTENT_GENRE&content_rating=ROKU_ADS_CONTENT_RATING&studio_id=viacom&channel_id=channel
@@ -5345,11 +5345,11 @@ https://pocketwatch-ryanandfriends-1.roku.wurl.com/manifest/playlist.m3u8
 http://18.191.91.130:1935/live/safetv/playlist.m3u8
 #EXTINF:-1 tvg-id="SamsungWildlife.us" tvg-name="Samsung Wildlife" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/x06npU2.png" group-title="",Samsung Wildlife
 https://d23gend7a1exlu.cloudfront.net/playlist.m3u8
-#EXTINF:-1 tvg-id="SamuelGoldwynChannel.us" tvg-name="Samuel Goldwyn Channel" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjM4NTg2MTFf/TheRokuChannel_880x880.png" group-title="",Samuel Goldwyn Channel
+#EXTINF:-1 tvg-id="SamuelGoldwynChannel.us" tvg-name="Samuel Goldwyn Channel" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oCjZS0v.jpg" group-title="",Samuel Goldwyn Channel
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxsamuelgoldwyn/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="SamuelGoldwynChannel.us" tvg-name="Samuel Goldwyn Channel" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjM4NTg2MTFf/TheRokuChannel_880x880.png" group-title="",Samuel Goldwyn Channel
+#EXTINF:-1 tvg-id="SamuelGoldwynChannel.us" tvg-name="Samuel Goldwyn Channel" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oCjZS0v.jpg" group-title="",Samuel Goldwyn Channel
 https://samuelgoldwyn-films-roku.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="SamuelGoldwynClassics.us" tvg-name="Samuel Goldwyn Classics" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjM4NTg2MTFf/TheRokuChannel_880x880.png" group-title="Classic",Samuel Goldwyn Classics
+#EXTINF:-1 tvg-id="SamuelGoldwynClassics.us" tvg-name="Samuel Goldwyn Classics" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oCjZS0v.jpg" group-title="Classic",Samuel Goldwyn Classics
 https://samuelgoldwyn-classic-roku.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="SamuraiJack.us" tvg-name="Samurai Jack (Adult Swim 24/7 Stream)" tvg-country="US" tvg-language="English" tvg-logo="" group-title="",Samurai Jack (Adult Swim 24/7 Stream) [Geo-blocked]
 https://adultswim-vodlive.cdn.turner.com/live/samurai-jack/stream.m3u8
@@ -6223,7 +6223,7 @@ https://stream.rcncdn.com/live/vsinproxy.m3u8
 https://ad-playlistserver.aws.syncbak.com/playlist/13613390/master.m3u8?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IkdyYXkyMDE2MDgyOSJ9.eyJtaWQiOjEzNjEzMzkwLCJtZDUiOiI2Y2M5MzczYjIxZWIwNzQ4ZDA0YTRlYzYyMjU2YjBhMiIsImlhdCI6MTQ5NzM4MTU5NywiaXNzIjoiU3luY2JhayIsInN1YiI6IkdyYXkifQ.qJPiMCbnGjAn9wgPrGjVl3M9Xfc4CVSyoZTZ5OH-1jo
 #EXTINF:-1 tvg-id="WABI5BangorMaineSTIRR.us" tvg-name="WABI 5 - Bangor - Maine (STIRR)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/D8uMAuV.png" group-title="Local",WABI 5 - Bangor - Maine (STIRR)
 https://ad-playlistserver.aws.syncbak.com/playlist/13613390/master.m3u8?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IkdyYXkyMDE2MDgyOSJ9.eyJtaWQiOjEzNjEzMzkwL (STIRR)CJtZDUiOiI2Y2M5MzczYjIxZWIwNzQ4ZDA0YTRlYzYyMjU2YjBhMiIsImlhdCI6MTQ5NzM4MTU5NywiaXNzIjoiU3luY2JhayIsInN1YiI6IkdyYXkifQ.qJPiMCbnGjAn9wgPrGjVl3M9Xfc4CVSyoZTZ5OH-1jo
-#EXTINF:-1 tvg-id="WAGAFox5Atlanta.us" tvg-name="WAGA Fox 5 Atlanta" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/DcZoeGw.jpg" group-title="News",WAGA Fox 5 Atlanta (720p)
+#EXTINF:-1 tvg-id="FOX5AtlantaWAGA.us" tvg-name="FOX 5 Atlanta (WAGA)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/DcZoeGw.jpg" group-title="News",FOX 5 Atlanta (WAGA) (720p)
 https://lnc-waga-fox-aws.tubi.video/index.m3u8
 #EXTINF:-1 tvg-id="WarnerTV.us" tvg-name="Warner TV" tvg-country="US" tvg-language="English" tvg-logo="http://static.epg.best/fr/WarnerTV.fr.png" group-title="Movies",Warner TV
 http://203.154.243.89:11205/
@@ -6252,15 +6252,15 @@ https://waypointtv-samsung.plex.wurl.com/manifest/1200.m3u8
 https://waypointtv-samsung.plex.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="WaypointTV.us" tvg-name="Waypoint TV" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/6r2YHtv.png" group-title="Outdoor",Waypoint TV (720p)
 https://waypointtv.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="WCAT15.us" tvg-name="WCAT 15" tvg-country="US" tvg-language="English" tvg-logo="https://frontdoor.wcat-tv.org/Cablecast/WebFiles/7385/wcatlogo.png" group-title="Local",WCAT 15 [Not 24/7]
+#EXTINF:-1 tvg-id="WinthropCommunityAccessTelevision15WCAT.us" tvg-name="Winthrop Community Access Television 15 (WCAT)" tvg-country="US" tvg-language="English" tvg-logo="https://frontdoor.wcat-tv.org/Cablecast/WebFiles/7385/wcatlogo.png" group-title="Local",Winthrop Community Access Television 15 (WCAT) [Not 24/7]
 https://edu-wcat.azureedge.net/live/live.m3u8
-#EXTINF:-1 tvg-id="WCAT22.us" tvg-name="WCAT 22" tvg-country="US" tvg-language="English" tvg-logo="https://frontdoor.wcat-tv.org/Cablecast/WebFiles/7385/wcatlogo.png" group-title="Local",WCAT 22
+#EXTINF:-1 tvg-id="WinthropCommunityAccessTelevision22WCAT.us" tvg-name="Winthrop Community Access Television 22 (WCAT)" tvg-country="US" tvg-language="English" tvg-logo="https://frontdoor.wcat-tv.org/Cablecast/WebFiles/7385/wcatlogo.png" group-title="Local",Winthrop Community Access Television 22 (WCAT)
 https://frontdoor.wcat-tv.org:8686/live/live.m3u8
-#EXTINF:-1 tvg-id="WCAT3.us" tvg-name="WCAT 3" tvg-country="US" tvg-language="English" tvg-logo="https://frontdoor.wcat-tv.org/Cablecast/WebFiles/7385/wcatlogo.png" group-title="Local",WCAT 3
+#EXTINF:-1 tvg-id="WinthropCommunityAccessTelevision3WCAT.us" tvg-name="Winthrop Community Access Television 3 (WCAT)" tvg-country="US" tvg-language="English" tvg-logo="https://frontdoor.wcat-tv.org/Cablecast/WebFiles/7385/wcatlogo.png" group-title="Local",Winthrop Community Access Television 3 (WCAT)
 https://frontdoor.wcat-tv.org:8787/live/live.m3u8
-#EXTINF:-1 tvg-id="WCCATVWorcester.us" tvg-name="WCCA-TV (Worcester)" tvg-country="US" tvg-language="English" tvg-logo="https://worcester.vod.castus.tv/wccalive.png" group-title="Local",WCCA-TV (Worcester)
+#EXTINF:-1 tvg-id="WCCATV194Worcester.us" tvg-name="WCCA-TV 194 (Worcester)" tvg-country="US" tvg-language="English" tvg-logo="https://worcester.vod.castus.tv/wccalive.png" group-title="Local",WCCA-TV 194 (Worcester)
 https://worcester.vod.castus.tv/live/ch1.m3u8
-#EXTINF:-1 tvg-id="WCTX.us" tvg-name="WCTX" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/QwuP3cX.png" group-title="Local",WCTX
+#EXTINF:-1 tvg-id="myTV9NewHavenWCTX.us" tvg-name="myTV 9 New Haven (WCTX)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/QwuP3cX.png" group-title="Local",myTV 9 New Haven (WCTX)
 https://bozztv.com/teleyupp/e5CGxWp8iU/tracks-v3a1/mono.m3u8
 #EXTINF:-1 tvg-id="WeatherGoneViral.us" tvg-name="Weather Gone Viral" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/5fdd3d8b9f3978154b03b203" group-title="Documentary",Weather Gone Viral
 https://linear-128.frequency.stream/dist/localnow/128/hls/master/playlist.m3u8
@@ -6294,19 +6294,19 @@ https://jukin-weatherspy-2-eu.rakuten.wurl.com/manifest/playlist.m3u8
 https://dai.google.com/linear/hls/event/fLqJePs_QR-FRTttC8fMIA/master.m3u8
 #EXTINF:-1 tvg-id="WETA.us" tvg-name="WETA-DT5" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/stations/weta-color-single-brand-logo-ZeUHAPm.png" group-title="General",WETA Metro (WETA) (Do Not Broadcast .1) [Geo-blocked]
 https://wetadt5.lls.cdn.pbs.org/wetadt5/92d89794-5ff0-4fe6-a443-cc888104e021/primary.m3u8
-#EXTINF:-1 tvg-id="WEWS5ABCClevelandNews.us" tvg-name="WEWS 5 ABC Cleveland News" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/606e0f9a9739652ec518e8c1" group-title="Local",WEWS 5 ABC Cleveland News
+#EXTINF:-1 tvg-id="ABC5ClevelandNewsWEWS.us" tvg-name="ABC 5 Cleveland News (WEWS)" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/606e0f9a9739652ec518e8c1" group-title="Local",ABC 5 Cleveland News (WEWS)
 https://wews-syndication.ewscloud.com/out/v1/72729e3f4dbe4aafbab93d6b1117e5f1/index.m3u8
-#EXTINF:-1 tvg-id="WEWSABC5.us" tvg-name="WEWS ABC 5" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/1YL0wkp.png" group-title="Local",WEWS ABC 5
+#EXTINF:-1 tvg-id="ABC5ClevelandNewsWEWS.us" tvg-name="ABC 5 Cleveland News (WEWS)" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/606e0f9a9739652ec518e8c1" group-title="Local",ABC 5 Cleveland News (WEWS)
 https://live-news-manifest.tubi.video/live-news-manifest/csm/extlive/tubiprd01,Cloudfront-WEWS.m3u8
-#EXTINF:-1 tvg-id="WFLDFOX32Chicago.us" tvg-name="WFLD FOX 32 Chicago" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/lf5sLNn.png" group-title="Local",WFLD FOX 32 Chicago (720p)
+#EXTINF:-1 tvg-id="FOX32ChicagoWFLD.us" tvg-name="FOX 32 Chicago (WFLD)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/lf5sLNn.png" group-title="Local",FOX 32 Chicago (WFLD) (720p)
 https://lnc-wfld-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="WFTVChannel9FloridaOrlando.us" tvg-name="WFTV Channel 9 - Florida - Orlando" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/S3fqmWY.png" group-title="Local",WFTV Channel 9 - Florida - Orlando (720p)
+#EXTINF:-1 tvg-id="Channel9FloridaOrlandoWFTV.us" tvg-name="Channel 9 - Florida - Orlando (WFTV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/S3fqmWY.png" group-title="Local",Channel 9 - Florida - Orlando (WFTV) (720p)
 https://d3nzocdfkx2ybv.cloudfront.net/in/cmg-wftve2-hls-v3/live.m3u8
 #EXTINF:-1 tvg-id="WGN9Chicago.us" tvg-name="WGN 9 (Chicago)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/dpI43Wg.png" group-title="Local",WGN 9 (Chicago)
 https://bozztv.com/teleyupp1/teleup-mBm5MQ50rA/playlist.m3u8
-#EXTINF:-1 tvg-id="WHBQFOX13Memphis.us" tvg-name="WHBQ FOX 13 Memphis" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/E9vX12j.jpg" group-title="Local",WHBQ FOX 13 Memphis
+#EXTINF:-1 tvg-id="FOX13MemphisWHBQ.us" tvg-name="FOX 13 Memphis (WHBQ)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/E9vX12j.jpg" group-title="Local",FOX 13 Memphis (WHBQ)
 https://live-news-manifest.tubi.video/live-news-manifest/csm/extlive/tubiprd01,Cloudfront-WHBQ.m3u8
-#EXTINF:-1 tvg-id="WHIO.us" tvg-name="WHIO" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/n38ZKuE.png" group-title="Local",WHIO
+#EXTINF:-1 tvg-id="CBS7DaytonWHIO.us" tvg-name="CBS 7 Dayton (WHIO)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/n38ZKuE.png" group-title="Local",CBS 7 Dayton (WHIO)
 https://svc-lvanvato-cxtv-whio.cmgvideo.com/whio/2596k/index.m3u8
 #EXTINF:-1 tvg-id="WhistleSports.us" tvg-name="Whistle Sports" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/CNO8eQ7.png" group-title="Sports",Whistle Sports
 https://whistle-1.plex.wurl.com/manifest/playlist.m3u8
@@ -6324,11 +6324,11 @@ https://whistletv-roku.cinedigm.com/midroll/amagi_hls_data_xumo-host-whistlespor
 https://dai.google.com/linear/hls/event/Wu11mwhnTKGNhwZimEK6Jg/master.m3u8
 #EXTINF:-1 tvg-id="WhitePlainsCommunityMedia.us" tvg-name="White Plains Community Media" tvg-country="US" tvg-language="English" tvg-logo="http://wpcommunitymedia.org/images/city-of-white-plains.png" group-title="Local",White Plains Community Media (360p)
 https://stream.swagit.com/live-edge/whiteplainsny/smil:std-4x3-1-b/playlist.m3u8
-#EXTINF:-1 tvg-id="WHOHTVHastingsOnHudsonNY.us" tvg-name="WHOH TV - Hastings-On-Hudson - NY" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oua9m6O.jpg" group-title="Local",WHOH TV - Hastings-On-Hudson - NY (360p)
+#EXTINF:-1 tvg-id="WHoHTVHastingsOnHudsonNY.us" tvg-name="WHoH TV - Hastings-On-Hudson - NY" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oua9m6O.jpg" group-title="Local",WHoH TV - Hastings-On-Hudson - NY (360p)
 http://stream.swagit.com/live-edge/hastingsonhudsonny/smil:std-4x3-1-a/playlist.m3u8
 #EXTINF:-1 tvg-id="WhoseLineIsItAnywaySTIRR.us" tvg-name="Whose Line Is It Anyway (STIRR)" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/ed57e0b9-7f78-4203-a1d9-b0f542ca856a-small3x1_stirr_1219_epg_whoselineisitanyway_1920x1080.png?cb=eccbc87e4b5ce2fe28308fd9f2a7baf3" group-title="",Whose Line Is It Anyway (STIRR) (720p)
 https://dai.google.com/linear/hls/event/SYob3ZZfTwyVW7LILC9ckw/master.m3u8
-#EXTINF:-1 tvg-id="WHPR.us" tvg-name="WHPR" tvg-country="US" tvg-language="English" tvg-logo="http://313watkins.com/images/logo.png" group-title="Local",WHPR (720p)
+#EXTINF:-1 tvg-id="WHPRTV33DetroitLiveWHPR.us" tvg-name="WHPR TV 33 Detroit Live (WHPR)" tvg-country="US" tvg-language="English" tvg-logo="http://313watkins.com/images/logo.png" group-title="Local",WHPR TV 33 Detroit Live (WHPR) (720p)
 http://162.244.81.156:1935/whprtv33roku/whprtv33roku/playlist.m3u8
 #EXTINF:-1 tvg-id="WildnoutMTV.us" tvg-name="Wild'n out MTV" tvg-country="US" tvg-language="English" tvg-logo="https://www.samsung.com/us/smg/content/dam/s7/home/televisions-and-home-theater/tvs/tv-plus/all-channels/08182020/Wild%20N%20Out_190x190.png?raw=true" group-title="Series",Wild'n out MTV
 http://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d48678d34ceb37d3c458a55/master.m3u8?deviceType=samsung-tvplus&deviceMake=samsung&deviceModel=samsung&deviceVersion=unknown&appVersion=unknown&deviceLat=0&deviceLon=0&deviceDNT=0&deviceId=91a6ae51-6f9d-4fbb-adb0-bdfffa44693e&deviceUA=samsung%2FSM-T720%2F10&advertisingId=91a6ae51-6f9d-4fbb-adb0-bdfffa44693e&us_privacy=1YNY&samsung_app_domain=https://play.google.com/store/apps/details?id=com.samsung.android.tvplus&samsung_app_name=Mobile%20TV%20Plus&profileLimit=&profileFloor=&embedPartner=samsung-tvplus
@@ -6352,25 +6352,25 @@ https://dai.google.com/linear/hls/event/a6lsWNYDQwyM9fjytUCrcw/master.m3u8
 https://dai.google.com/linear/hls/event/jWaxnXHPQjGX1yTxuFxpuw/master.m3u8
 #EXTINF:-1 tvg-id="WiseguySTIRR.us" tvg-name="Wiseguy (STIRR)" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/5e3b98cb-3de9-4bb2-b775-e487f3a117ca-small3x1_stirr_1219_epg_wiseguy_1920x1080.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="",Wiseguy (STIRR) (720p)
 https://dai.google.com/linear/hls/event/kv03O_9RS8-uRahEGtDcjA/master.m3u8
-#EXTINF:-1 tvg-id="WITIFox6Milwaukee.us" tvg-name="WITI Fox 6 Milwaukee" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/qmOd9Yr.jpg" group-title="Local",WITI Fox 6 Milwaukee (720p)
+#EXTINF:-1 tvg-id="FOX6MilwaukeeWITI.us" tvg-name="FOX 6 Milwaukee (WITI)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/qmOd9Yr.jpg" group-title="Local",FOX 6 Milwaukee (WITI) (720p)
 https://lnc-witi-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="WJAXActionNewsJacksonville.us" tvg-name="WJAX Action News - Jacksonville" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/LW3Dfbt.png" group-title="Local",WJAX Action News - Jacksonville (720p)
+#EXTINF:-1 tvg-id="CBSActionNews47JacksonvilleWJAX.us" tvg-name="CBS Action News 47 - Jacksonville (WJAX)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/LW3Dfbt.png" group-title="Local",CBS Action News 47 - Jacksonville (WJAX) (720p)
 https://d2eit0bra9qkiw.cloudfront.net/v1/master/77872db67918a151b697b5fbc23151e5765767dc/cmg_PROD_cmg-tv-10050_b9ac3c93-be86-4f7e-82b8-796b7f8bfda3_LE/in/cmg-wjaxtv-hls-v3/live.m3u8
-#EXTINF:-1 tvg-id="WJBKFox2Detroit.us" tvg-name="WJBK Fox 2 Detroit" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/EL9Bwtf.png" group-title="News",WJBK Fox 2 Detroit (720p)
+#EXTINF:-1 tvg-id="FOX2DetroitWJBK.us" tvg-name="FOX 2 Detroit (WJBK)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/EL9Bwtf.png" group-title="News",FOX 2 Detroit (WJBK)(720p)
 https://lnc-wjbk-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="WJLA.us" tvg-name="WJLA" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/LttuGfq.png" group-title="Local",WJLA
+#EXTINF:-1 tvg-id="ABC7WashingtonDCWJLA.us" tvg-name="ABC 7 Washington D.C. (WJLA)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/LttuGfq.png" group-title="Local",ABC 7 Washington, D.C. (WJLA)
 https://content.uplynk.com/40cec2bf074c40f08932da03ab4510be.m3u8
 #EXTINF:-1 tvg-id="WLNGRadio.us" tvg-name="WLNG Radio" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/11r6tgW.png" group-title="Local",WLNG Radio
 http://wlngstudiowebcam.srfms.com:1935/wlngstudiowebcam/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="WLVT" tvg-name="WLVT PBS Allentown" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBS.png?raw=true" group-title="General",WLVT PBS Allentown
+#EXTINF:-1 tvg-id="PBS39AllentownWLVT" tvg-name="PBS 39 Allentown (WLVT)" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBS.png?raw=true" group-title="General",PBS 39 Allentown (WLVT)
 https://forerunnerrtmp.livestreamingcdn.com/output18/output18.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="WMFD.us" tvg-name="WMFD" tvg-country="US" tvg-language="English" tvg-logo="https://wmfd.com/images/logo.png" group-title="Local",WMFD (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="WMFDTV68Mansfield.us" tvg-name="WMFD-TV 68 Mansfield" tvg-country="US" tvg-language="English" tvg-logo="https://wmfd.com/images/logo.png" group-title="Local",WMFD-TV 68 Mansfield (720p) [Not 24/7]
 https://player-api.new.livestream.com/accounts/1194911/events/3466400/live.m3u8
-#EXTINF:-1 tvg-id="WMURNewHampshire.us" tvg-name="WMUR New Hampshire" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/6oNx5F0.png" group-title="Local",WMUR New Hampshire
+#EXTINF:-1 tvg-id="ABC9NewHampshireWMUR-TV.us" tvg-name="ABC 9 New Hampshire (WMUR-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/6oNx5F0.png" group-title="Local",ABC 9 New Hampshire (WMUR-TV)
 https://csm-e-eb.csm.tubi.video/csm/extlive/tubiprd01,Cloudfront-WMUR.m3u8
-#EXTINF:-1 tvg-id="WNWYFox5NewYork.us" tvg-name="WNYW Fox 5 New York" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/OfGcsUO.png" group-title="Local",WNYW Fox 5 New York (720p)
+#EXTINF:-1 tvg-id="FOX5NewYorkWNYW.us" tvg-name="FOX 5 New York (WNYW)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/OfGcsUO.png" group-title="Local",FOX 5 New York (WNYW) (720p)
 https://lnc-wnyw-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="WOFLFox35Orlando.us" tvg-name="WOFL Fox 35 Orlando" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/BOA8KKZ.jpg" group-title="Local",WOFL Fox 35 Orlando (720p)
+#EXTINF:-1 tvg-id="FOX35OrlandoWOFL.us" tvg-name="FOX 35 Orlando (WOFL)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/BOA8KKZ.jpg" group-title="Local",FOX 35 Orlando (WOFL) (720p)
 https://lnc-wofl-fox-aws.tubi.video/index.m3u8
 #EXTINF:-1 tvg-id="WorldFashionChannel.us" tvg-name="World Fashion Channel" tvg-country="INT" tvg-language="English" tvg-logo="https://wfc.tv/images/Logo-WF.png" group-title="Lifestyle",World Fashion Channel (1080p)
 https://wfcint.mediacdn.ru/cdn/wfcintweb/playlist.m3u8
@@ -6402,7 +6402,7 @@ https://world-poker-tour.samsung.wurl.com/manifest/playlist.m3u8
 http://cdn.elsalvadordigital.com:1935/wowtv/wowtv/playlist.m3u8
 #EXTINF:-1 tvg-id="wowkids.us" tvg-name="wow!! kids" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/AWXw9LW.jpg" group-title="Kids",wow!! kids
 https://wownow-wownowkids-1.vizio.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="WPPT.us" tvg-name="WPPT 39 Extra Philadelphia" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBS.png?raw=true" group-title="General",WPPT 39 Extra Philadelphia
+#EXTINF:-1 tvg-id="PBS39ExtraPhiladelphiaWPPT.us" tvg-name="PBS 39 Extra Philadelphia (WPPT)" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBS.png?raw=true" group-title="General",PBS 39 Extra Philadelphia (WPPT)
 https://forerunnerrtmp.livestreamingcdn.com/output18-2/output18-2.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="WSJ.us" tvg-name="WSJ" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/2IOP6LI.jpg" group-title="News",WSJ (1080p)
 https://wsjlivehls-lh.akamaihd.net/i/events1_1@174990/master.m3u8