Merge branch 'master' into patch-27

2021-07-29 00:50:39 +02:00 · 2021-07-29 00:50:39 +02:00 · 228880da76
parent 1c027077b0 f3bd33865a
commit 228880da76
2 changed files with 73 additions and 103 deletions
--- a/channels/qa.m3u
+++ b/channels/qa.m3u
@ -38,42 +38,12 @@ https://linkastream.co/headless?url=https://www.youtube.com/user/AlRassoulChanne
 https://svs.itworkscdn.net/alrayyanlive/alrayyan.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="AlRayyanAlQadeem.qa" tvg-name="Al Rayyan Al Qadeem" tvg-country="QA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/mVwHGbc.png" group-title="Classic",Al Rayyan Al Qadeem (1080p)
 https://svs.itworkscdn.net/alrayyanqadeemlive/alrayyanqadeem.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="beINPremium1.qa" tvg-name="beIN Premium 1" tvg-country="QA" tvg-language="Arabic" tvg-logo="" group-title="Sports",beIN Premium 1
 http://212.224.98.207:2200/EX/bein8hd-ar/index.m3u8?token=
 #EXTINF:-1 tvg-id="beINPremium2.qa" tvg-name="beIN Premium 2" tvg-country="QA" tvg-language="Arabic" tvg-logo="" group-title="Sports",beIN Premium 2
 http://212.224.98.207:2200/EX/bein9hd-ar/index.m3u8?token=
 #EXTINF:-1 tvg-id="beINPremium3.qa" tvg-name="beIN Premium 3" tvg-country="QA" tvg-language="Arabic" tvg-logo="" group-title="Sports",beIN Premium 3
 http://212.224.98.207:2200/EX/bein10hd-ar/index.m3u8?token=
 #EXTINF:-1 tvg-id="beINSports1.qa" tvg-name="beIN Sports 1" tvg-country="QA" tvg-language="Arabic" tvg-logo="" group-title="Sports",beIN Sports 1
 http://212.224.98.207:2200/EX/bein1hd-ar/index.m3u8?token=
 #EXTINF:-1 tvg-id="beINSports1Asia.qa" tvg-name="beIN Sports 1 Asia" tvg-country="QA" tvg-language="" tvg-logo="https://static.epg.best/qa/beINSports1.qa.png" group-title="Sports",beIN Sports 1 Asia
 https://liveanevia.mncnow.id/live/eds/BeIN1/sa_dash_vmx/BeIN1.mpd
 #EXTINF:-1 tvg-id="beINSports1English.qa" tvg-name="beIN Sports 1 English" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="Sports",beIN Sports 1 English
 http://212.224.98.207:2200/EX/bein11hd-ar/index.m3u8?token=
 #EXTINF:-1 tvg-id="beINSports1English.qa" tvg-name="beIN Sports 1 English" tvg-country="TH" tvg-language="English" tvg-logo="https://www.lyngsat.com/logo/tv/bb/bein-sports-english-1-qa.png" group-title="Sports",beIN Sports 1 English [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/76.0.3809.25 Safari/537.36
 https://www.livedoomovie.com/02_epl1_720p_UK/chunklist.m3u8
 #EXTINF:-1 tvg-id="beINSports1French.qa" tvg-name="beIN Sports 1 French" tvg-country="FR" tvg-language="French" tvg-logo="" group-title="Sports",beIN Sports 1 French
 http://212.224.98.207:2200/EX/bein14hd-ar/index.m3u8?token=
 #EXTINF:-1 tvg-id="beINSports2.qa" tvg-name="beIN Sports 2" tvg-country="QA" tvg-language="Arabic" tvg-logo="" group-title="Sports",beIN Sports 2
 http://212.224.98.207:2200/EX/bein2hd-ar/index.m3u8?token=
 #EXTINF:-1 tvg-id="beINSports2English.qa" tvg-name="beIN Sports 2 English" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="Sports",beIN Sports 2 English
 http://212.224.98.207:2200/EX/bein12hd-ar/index.m3u8?token=
 #EXTINF:-1 tvg-id="beINSports2English.qa" tvg-name="beIN Sports 2 English" tvg-country="TH" tvg-language="English" tvg-logo="https://www.lyngsat.com/logo/tv/bb/bein-sports-english-2-qa.png" group-title="Sports",beIN Sports 2 English [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/76.0.3809.25 Safari/537.36
 https://www.livedoomovie.com/02_epl2_720p_UK/chunklist.m3u8
 #EXTINF:-1 tvg-id="beINSports2French.qa" tvg-name="beIN Sports 2 French" tvg-country="FR" tvg-language="French" tvg-logo="" group-title="Sports",beIN Sports 2 French
 http://212.224.98.207:2200/EX/bein15hd-ar/index.m3u8?token=
 #EXTINF:-1 tvg-id="beINSports3.qa" tvg-name="beIN Sports 3" tvg-country="QA" tvg-language="Arabic" tvg-logo="" group-title="Sports",beIN Sports 3
 http://212.224.98.207:2200/EX/bein3hd-ar/index.m3u8?token=
 #EXTINF:-1 tvg-id="beINSports4.qa" tvg-name="beIN Sports 4" tvg-country="QA" tvg-language="Arabic" tvg-logo="" group-title="Sports",beIN Sports 4
 http://212.224.98.207:2200/EX/bein4hd-ar/index.m3u8?token=
 #EXTINF:-1 tvg-id="beINSports5.qa" tvg-name="beIN Sports 5" tvg-country="QA" tvg-language="Arabic" tvg-logo="" group-title="Sports",beIN Sports 5
 http://212.224.98.207:2200/EX/bein5hd-ar/index.m3u8?token=
 #EXTINF:-1 tvg-id="beINSports6.qa" tvg-name="beIN Sports 6" tvg-country="QA" tvg-language="Arabic" tvg-logo="" group-title="Sports",beIN Sports 6
 http://212.224.98.207:2200/EX/bein6hd-ar/index.m3u8?token=
 #EXTINF:-1 tvg-id="beINSports7.qa" tvg-name="beIN Sports 7" tvg-country="QA" tvg-language="Arabic" tvg-logo="" group-title="Sports",beIN Sports 7
 http://212.224.98.207:2200/EX/bein7hd-ar/index.m3u8?token=
 #EXTINF:-1 tvg-id="BeINSportsXtra.qa" tvg-name="BeIN Sports Xtra" tvg-country="QA" tvg-language="" tvg-logo="" group-title="Sports",BeIN Sports Xtra
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5df975e2b27cf5000921c102/master.m3u8?deviceType=web&deviceMake=Opera&deviceModel=Opera&sid=855d6801-c912-428d-b620-ede4dd0c3b15&deviceId=b702181a-c1d6-4ee2-9481-753f471e2ce7&deviceVersion=66.0.3515.44&appVersion=2.9.3-b879e400d5df7a969d4bff8863fe5cb02c7120e6&deviceDNT=0&userId=&advertisingId=&deviceLat=40.8364&deviceLon=-74.1403&app_name=&appName=web&buildVersion=&appStoreUrl=&architecture=&includeExtendedEvents=false&serverSideAds=true
 #EXTINF:-1 tvg-id="BeINSportsXtra.qa" tvg-name="BeIN Sports Xtra" tvg-country="QA" tvg-language="" tvg-logo="" group-title="Sports",BeIN Sports Xtra
--- a/channels/us.m3u
+++ b/channels/us.m3u
@ -1,5 +1,5 @@
 #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="KOTRLD.us" tvg-name="My 11 Monterey (KOTR-LD)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/b/bd/Kotrlp.jpg" group-title="Local",My 11 Monterey (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)
 https://content.uplynk.com/channel/ff809e6d9ec34109abfb333f0d4444b5.m3u8
@ -45,11 +45,11 @@ https://moiptvhls-i.akamaihd.net/hls/live/652316/secure/master.m3u8
 https://content.uplynk.com/channel/328d1434fb51476cb6567c74d5b2cc70.m3u8
 #EXTINF:-1 tvg-id="KNBC.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="KNSD.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)
 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="KETC.us" tvg-name="Nine PBS St. Louis (KETC)" tvg-country="US" tvg-language="English" tvg-logo="https://imgur.com/rMdJ5DP.png" group-title="General",Nine PBS St. Louis (KETC) [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
@ -71,7 +71,7 @@ https://content.uplynk.com/2c88dfe19e1447e6a6aa27e8e143a140.m3u8
 https://live-news-manifest.tubi.video/live-news-manifest/csm/extlive/tubiprd01,Cloudfront-WEWS.m3u8
 #EXTINF:-1 tvg-id="WEWSTV.us" tvg-name="ABC 5 Cleveland News (WEWSTV)" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/606e0f9a9739652ec518e8c1" group-title="Local",ABC 5 Cleveland News (WEWSTV)
 https://wews-syndication.ewscloud.com/out/v1/72729e3f4dbe4aafbab93d6b1117e5f1/index.m3u8
-#EXTINF:-1 tvg-id="KGO.us" tvg-name="ABC7 (KGO)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/64/KGOTVABC7.png" group-title="Local",ABC 7 (KGO)
+#EXTINF:-1 tvg-id="KGO.us" tvg-name="ABC7 News San Francisco (KGO)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/64/KGOTVABC7.png" group-title="Local",ABC7 News San Francisco (KGO)
 https://streams.the6tv.duckdns.org:2443/locals/BayArea/kgo-dt1.m3u8
 #EXTINF:-1 tvg-id="KMGHTV.us" tvg-name="ABC 7 Denver (KMGH)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/JExsI09.png" group-title="Local",ABC 7 Denver (KMGH) (720p)
 https://content.uplynk.com/channel/64ca339f04964a5e961c3207a7771bf1.m3u8
@ -646,9 +646,9 @@ https://htv-drm-live-cdn.fptplay.net/CDN-FPT02/CARTOON-SD-720p/playlist.m3u8
 http://catholictvhd-lh.akamaihd.net:80/i/ctvhd_1@88148/master.m3u8
 #EXTINF:-1 tvg-id="CatholicTV.us" tvg-name="Catholic TV" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/RI9GbLX.jpg" group-title="Religious",Catholic TV (720p)
 https://catholictvhd-lh.akamaihd.net/i/ctvhd_1@88148/master.m3u8
-#EXTINF:-1 tvg-id="CBCNews.us" tvg-name="CBC News" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Vxn2w78.png" group-title="News",CBC News
+#EXTINF:-1 tvg-id="CBCNews.us" tvg-name="CBC News" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/6TmWzvk.jpg" group-title="News",CBC News
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxcbcnews/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="CBCNewsXUMO.us" tvg-name="CBC News  (XUMO)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Vxn2w78.png" group-title="News",CBC News  (XUMO)
+#EXTINF:-1 tvg-id="CBCNewsXUMO.us" tvg-name="CBC News (XUMO)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/6TmWzvk.jpg" group-title="News",CBC News (XUMO)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-cbcnews/CDN/master.m3u8
 #EXTINF:-1 tvg-id="CBNEspanol.us" tvg-name="CBN Español" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/Gm4fs9W.png" group-title="Religious",CBN Español (1080p)
 https://bcliveuniv-lh.akamaihd.net/i/iptv2_1@194050/master.m3u8
@ -688,31 +688,31 @@ https://cbsnewshd-lh.akamaihd.net/i/CBSNHD_7@199302/master.m3u8
 https://cbsnhls-i.akamaihd.net/hls/live/264710/CBSN_mdialog/prodstream/master.m3u8
 #EXTINF:-1 tvg-id="CBSNews.us" tvg-name="CBS News" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Qu9NAwe.png" group-title="News",CBS News (720p)
 https://dai.google.com/linear/hls/event/Sid4xiTQTkCT1SLu6rjUSQ/master.m3u8
-#EXTINF:-1 tvg-id="CBSNewsBayArea.us" tvg-name="CBS News (Bay Area)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Qu9NAwe.png" group-title="Local",CBS News (Bay Area) (720p)
+#EXTINF:-1 tvg-id="KPIX.us" tvg-name="CBSN 5 SF Bay Area (KPIX)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Qu9NAwe.png" group-title="Local",CBSN 5 SF Bay Area (KPIX) (720p)
 https://dai.google.com/linear/hls/event/VE8b4n-YStusEGv5Z2NmsQ/master.m3u8
-#EXTINF:-1 tvg-id="CBSNewsBoston.us" tvg-name="CBS News (Boston)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Qu9NAwe.png" group-title="Local",CBS News (Boston) (720p)
+#EXTINF:-1 tvg-id="WBZTV.us" tvg-name="CBSN 4 Boston (WBZ-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Qu9NAwe.png" group-title="Local",CBSN 4 Boston (WBZ-TV) (720p)
 https://dai.google.com/linear/hls/event/26FJK7wRSo6RhPsK70XS_w/master.m3u8
-#EXTINF:-1 tvg-id="CBSNewsChicago.us" tvg-name="CBS News (Chicago)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Qu9NAwe.png" group-title="Local",CBS News (Chicago) (720p)
+#EXTINF:-1 tvg-id="WBBM.us" tvg-name="CBSN 2 Chicago (WBBM)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Qu9NAwe.png" group-title="Local",CBSN 2 Chicago (WBBM) (720p)
 https://dai.google.com/linear/hls/event/DWt8iR1YQ-OJQsxczu8KfQ/master.m3u8
-#EXTINF:-1 tvg-id="CBSNewsDallasFtW.us" tvg-name="CBS News (Dallas-Ft.W.)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Qu9NAwe.png" group-title="Local",CBS News (Dallas-Ft.W.)
+#EXTINF:-1 tvg-id="KTVT.us" tvg-name="CBSN 11 Dallas / Fort Worth (KTVT)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Qu9NAwe.png" group-title="Local",CBSN 11 Dallas / Fort Worth (KTVT)
 https://dai.google.com/linear/hls/event/o5J3g4U9T16CvYnS7Qd86Q/master.m3u8
-#EXTINF:-1 tvg-id="CBSNewsDenver.us" tvg-name="CBS News (Denver)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Qu9NAwe.png" group-title="Local",CBS News (Denver)
+#EXTINF:-1 tvg-id="KCNCTV.us" tvg-name="CBSN 4 Denver (KCNC-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Qu9NAwe.png" group-title="Local",CBSN 4 Denver (KCNC-TV)
 https://dai.google.com/linear/hls/event/EUo67MWSRh6toPi0heJKnQ/master.m3u8
-#EXTINF:-1 tvg-id="CBSNewsLosAngeles.us" tvg-name="CBS News (Los Angeles)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Qu9NAwe.png" group-title="Local",CBS News (Los Angeles) (720p)
+#EXTINF:-1 tvg-id="KCBS.us" tvg-name="CBSN 2 Los Angeles (KCBS)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Qu9NAwe.png" group-title="Local",CBSN 2 Los Angeles (KCBS) (720p)
 https://dai.google.com/linear/hls/event/TxSbNMu4R5anKrjV02VOBg/master.m3u8
-#EXTINF:-1 tvg-id="CBSNewsPittsburgh.us" tvg-name="CBS News (Pittsburgh)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Qu9NAwe.png" group-title="Local",CBS News (Pittsburgh)
+#EXTINF:-1 tvg-id="KDKA.us" tvg-name="CBSN 2 Pittsburgh (KDKA)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Qu9NAwe.png" group-title="Local",CBSN 2 Pittsburgh (KDKA)
 https://dai.google.com/linear/hls/event/i5SXVKI4QIuV-eF2XAH4FQ/master.m3u8
-#EXTINF:-1 tvg-id="CBSN3Philly.us" tvg-name="CBS News 3 Philly" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/zq1zXeo.png" group-title="Local",CBS News 3 Philly
+#EXTINF:-1 tvg-id="KYWTV.us" tvg-name="CBSN 3 Philly (KYW-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/zq1zXeo.png" group-title="Local",CBSN 3 Philly (KYW-TV)
 https://dai.google.com/linear/hls/event/Xu-ITJ2GTNGaxGn893mmWg/master.m3u8
-#EXTINF:-1 tvg-id="CBSNewsBoston.us" tvg-name="CBS News Boston" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/a2Qjf7T.png" group-title="Local",CBS News Boston
+#EXTINF:-1 tvg-id="WBZTV.us" tvg-name="CBSN 4 Boston (WBZ-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/a2Qjf7T.png" group-title="Local",CBSN 4 Boston (WBZ-TV)
 https://cbsn-bos-cedexis.cbsnstream.cbsnews.com/out/v1/589d66ec6eb8434c96c28de0370d1326/master.m3u8
 #EXTINF:-1 tvg-id="CBSNewsLiveEvent.us" tvg-name="CBS News Live Event" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Qu9NAwe.png" group-title="Local",CBS News Live Event
 https://cbsnewshd-lh.akamaihd.net/i/cbsnewsLivePlayer_1@196305/master.m3u8
-#EXTINF:-1 tvg-id="CBSNMinnesota.us" tvg-name="CBS News Minnesota" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/HiEBhR4.png" group-title="Local",CBS News Minnesota
+#EXTINF:-1 tvg-id="WCCO.us" tvg-name="CBSN 4 Minnesota (WCCO)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/HiEBhR4.png" group-title="Local",CBSN 4 Minnesota (WCCO)
 https://dai.google.com/linear/hls/event/zcWPVCfURNSPxeidcckQLA/master.m3u8
-#EXTINF:-1 tvg-id="CBSNNewYork.us" tvg-name="CBS News New York" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ubsNr5F.jpg" group-title="Local",CBS News New York (720p)
+#EXTINF:-1 tvg-id="WLNYTV.us" tvg-name="CBSN 2 New York (WLNY-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ubsNr5F.jpg" group-title="Local",CBSN 2 New York (WLNY-TV) (720p)
 http://dai.google.com/linear/hls/event/rtcMlf4RTvOEkaudeany5w/master.m3u8
-#EXTINF:-1 tvg-id="CBSNNewYork.us" tvg-name="CBS News New York" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ubsNr5F.jpg" group-title="Local",CBS News New York (720p)
+#EXTINF:-1 tvg-id="WLNYTV.us" tvg-name="CBSN 2 New York (WLNY-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ubsNr5F.jpg" group-title="Local",CBSN 2 New York (WLNY-TV) (720p)
 https://cbsn-ny-cedexis.cbsnstream.cbsnews.com/out/v1/ec3897d58a9b45129a77d67aa247d136/master.m3u8
 #EXTINF:-1 tvg-id="CCTV.us" tvg-name="CC-TV" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/feFWTb8.jpg" group-title="Local",CC-TV
 https://granicusliveus3-a.akamaihd.net/charlotte/G0055_002/playlist.m3u8
@ -989,7 +989,7 @@ https://cdn-katz-networks-01.vos360.video/Content/HLS/Live/channel(courttv)/inde
 https://content.uplynk.com/channel/6c0bd0f94b1d4526a98676e9699a10ef.m3u8
 #EXTINF:-1 tvg-id="CourtTVMystery.us" tvg-name="Court TV Mystery" tvg-country="US" tvg-language="English" tvg-logo="https://d229kpbsb5jevy.cloudfront.net/teleup/content/common/logos/channel/logos/court-tv-mystery.png" group-title="Entertainment",Court TV Mystery
 https://bozztv.com/teleyupp/teleup-mystery/playlist.m3u8
-#EXTINF:-1 tvg-id="KNSD.us" tvg-name="KNSD-DT2" tvg-country="US" tvg-language="English" tvg-logo="https://media.nbcsandiego.com/2021/04/San-Diego.png" group-title="Classic",COZI TV (KNSD-DT2)
+#EXTINF:-1 tvg-id="KNSDDT2.us" tvg-name="KNSD-DT2" tvg-country="US" tvg-language="English" tvg-logo="https://media.nbcsandiego.com/2021/04/San-Diego.png" group-title="Classic",COZI TV (KNSD-DT2)
 https://streams.the6tv.duckdns.org:2443/locals/SanDiego/knsd-dt2.m3u8
 #EXTINF:-1 tvg-id="Crackle.us" tvg-name="Crackle" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjUyNDQ4NjZf/Crackle_365x365.png" group-title="Movies",Crackle
 https://crackle-plex.amagi.tv/playlist.m3u8
@ -1452,11 +1452,11 @@ https://lnc-kttv-fox-aws.tubi.video/index.m3u8
 https://live-news-manifest.tubi.video/live-news-manifest/csm/extlive/tubiprd01,Cloudfront-WHBQ.m3u8
 #EXTINF:-1 tvg-id="WTVT.us" tvg-name="FOX 13 Tampa Bay (WTVT)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Bvkri2L.png" group-title="Local",FOX 13 Tampa Bay (WTVT) (720p)
 https://lnc-wtvt-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="WJBK.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 (720p)
+#EXTINF:-1 tvg-id="WJBK.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="KTVU.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="KTVI.us" tvg-name="FOX 2 St. Louis (KTVI)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Hednfc9.png" group-title="Local",FOX 2 St. Louis
+#EXTINF:-1 tvg-id="KTVI.us" tvg-name="FOX 2 St. Louis (KTVI)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Hednfc9.png" group-title="Local",FOX 2 St. Louis (KTVI)
 https://iptv-all.lanesh4d0w.codes/united-states/ktvi-tv
 #EXTINF:-1 tvg-id="KOKITV.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
@ -2016,7 +2016,7 @@ https://dai2.xumo.com/amagi_hls_data_xumo1212A-viziojustforlaughsgags/CDN/playli
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/60afa1508284e60007163c08/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=35fcc6e0-e986-11eb-a0af-c3b401f46211&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&sid=a8b6a6bb-4f8c-438e-a638-d4cfa72ae69a&serverSideAds=false
 #EXTINF:-1 tvg-id="JuventudRenovadaenelEspirituSanto.us" tvg-name="Juventud Renovada en el Espiritu Santo" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/9Brfh2M.png" group-title="Religious",Juventud Renovada en el Espiritu Santo
 http://teleredmcp.com:1935/jrestv/jrestv/playlist.m3u8
-#EXTINF:-1 tvg-id="K38IZ-D.us" tvg-name="K38IZ-D" tvg-country="US" tvg-language="" tvg-logo="https://media-uspx.mybtv.net/logos/38.1.png" group-title="",K38IZ-D (480i)
+#EXTINF:-1 tvg-id="K38IZD.us" tvg-name="IZ TV RitmoVision Phoenix (K38IZ-D)" tvg-country="US" tvg-language="" tvg-logo="https://media-uspx.mybtv.net/logos/38.1.png" group-title="",IZ TV RitmoVision Phoenix (K38IZ-D) (480i)
 https://v-px.mybtv.net/event/32/640x480.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="kabillion.us" tvg-name="kabillion" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/2Ybvtlg.png" group-title="Kids",kabillion
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxkabillion/CDN/playlist.m3u8
@ -2024,17 +2024,17 @@ https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxkabillion/CDN/playlist.m3u8
 http://184.75.208.98:1935/live/kalemeh/playlist.m3u8
 #EXTINF:-1 tvg-id="KartoonCircus.us" tvg-name="Kartoon Circus" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/KartoonFunTime_209x209.png?raw=true" group-title="Kids",Kartoon Circus
 https://simultv.s.llnwi.net/n4s4/KartoonCircus/interlink.m3u8
-#EXTINF:-1 tvg-id="KAZTDT3.us" tvg-name="KAZT-DT3" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/6nXpZqz.png" group-title="News",KAZT-DT3 (HSN)
+#EXTINF:-1 tvg-id="KAZTDT3.us" tvg-name="HSN Phoenix (KAZT-DT3)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/6nXpZqz.png" group-title="News",HSN Phoenix (KAZT-DT3)
 https://streams.the6tv.duckdns.org:2443/locals/Pheonix/kazt-dt3.m3u8
-#EXTINF:-1 tvg-id="KAZTDT5.us" tvg-name="KAZT-DT5" tvg-country="US" tvg-language="English" tvg-logo="" group-title="News",KAZT-DT5 (AZTV 7 - Encore)
+#EXTINF:-1 tvg-id="KAZTDT5.us" tvg-name="Encore AZTV 7 Phoenix (KAZT-DT5)" tvg-country="US" tvg-language="English" tvg-logo="" group-title="News",Encore AZTV 7 Phoenix (KAZT-DT5)
 https://streams.the6tv.duckdns.org:2443/locals/Pheonix/kazt-dt5.m3u8
 #EXTINF:-1 tvg-id="KBPSports.us" tvg-name="KBP Sports" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/QleHNMl.png" group-title="Sports",KBP Sports (720p)
 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="KCALTV.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="KCALTV.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="KCPQ.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="KCPQ.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 28 Richmond CA (KCRT)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/mNK5D5k.jpg" group-title="",KCRT-TV 28 Richmond CA (KCRT)
 http://granicusliveus3-a.akamaihd.net/richmond/G0034_002/chunklist.m3u8
@ -2080,7 +2080,7 @@ https://kidzbop-rokuus.amagi.tv/hls/amagi_hls_data_kidzbopAA-kidzbop-roku-us/CDN
 https://svc-lvanvato-cxtv-kiro.cmgvideo.com/kiro/1864k/index.m3u8
 #EXTINF:-1 tvg-id="KitchenNightmaresSTIRR.us" tvg-name="Kitchen Nightmares (STIRR)" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/d3fa0a6c-3f76-46e0-b4d6-5039ee16f5a3-small3x1_stirr_1219_epg_kitchennightmares_1920x1080.png?cb=eccbc87e4b5ce2fe28308fd9f2a7baf3" group-title="Cooking",Kitchen Nightmares (STIRR) (720p)
 https://dai.google.com/linear/hls/event/23QIslh0TOqygKz-M9W29Q/master.m3u8
-#EXTINF:-1 tvg-id="KMSP.us" tvg-name="KMSP Fox 9 Minneapolis ST Paul" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/WBgiaiB.jpg" group-title="News",KMSP Fox 9 Minneapolis ST Paul (720p)
+#EXTINF:-1 tvg-id="KMSP.us" tvg-name="FOX 9 ST Paul Minneapolis (KMSP)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/WBgiaiB.jpg" group-title="News",FOX 9 ST Paul Minneapolis (KMSP) (720p)
 https://lnc-kmsp-fox-aws.tubi.video/index.m3u8
 #EXTINF:-1 tvg-id="KMTV.us" tvg-name="CBS 3 Omaha (KMTV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/80WxTxG.png" group-title="Local",CBS 3 Omaha (KMTV)
 https://content.uplynk.com/4a09fbea28ef4f32bce095e9eae04bd8.m3u8
@ -2098,33 +2098,33 @@ https://v-ca.mybtv.net/event/125/768x432.m3u8?start_time=2021-05-16T23%3A45%3A00
 https://streams.the6tv.duckdns.org:2443/locals/BayArea/kofy-dt1.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
-#EXTINF:-1 tvg-id="KPBS.us" tvg-name="KPBS-DT1" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/5/5b/New_KPBS_logo_2019_%282%29.png" group-title="General",KPBS-DT1
+#EXTINF:-1 tvg-id="KPBS.us" tvg-name="PBS San Diego (KPBS-DT1)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/5/5b/New_KPBS_logo_2019_%282%29.png" group-title="General",PBS San Diego (KPBS-DT1)
 https://streams.the6tv.duckdns.org:2443/locals/SanDiego/kpbs-dt1.m3u8
-#EXTINF:-1 tvg-id="KPBS.us" tvg-name="KPBS-DT2" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/5/5b/New_KPBS_logo_2019_%282%29.png" group-title="General",KPBS-DT2
+#EXTINF:-1 tvg-id="KPBS.us" tvg-name="PBS San Diego (KPBS-DT2)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/5/5b/New_KPBS_logo_2019_%282%29.png" group-title="General",PBS World San Diego (KPBS-DT2)
 https://streams.the6tv.duckdns.org:2443/locals/SanDiego/kpbs-dt2.m3u8
-#EXTINF:-1 tvg-id="KPBS.us" tvg-name="KPBS-DT4" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/5/5b/New_KPBS_logo_2019_%282%29.png" group-title="Kids",KPBS-DT4
+#EXTINF:-1 tvg-id="KPBS.us" tvg-name="PBS San Diego (KPBS-DT4)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/5/5b/New_KPBS_logo_2019_%282%29.png" group-title="Kids",PBS Kids San Diego (KPBS-DT4)
 https://streams.the6tv.duckdns.org:2443/locals/SanDiego/kpbs-dt4.m3u8
-#EXTINF:-1 tvg-id="KQSL.us" tvg-name="KQSL-DT1" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/8.1.png" group-title="",KQSL-DT1 (480i)
+#EXTINF:-1 tvg-id="KQSLDT1.us" tvg-name="KQSL 8 Fort Bragg-San Francisco (KQSL-DT1)" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/8.1.png" group-title="Local",KQSL 8 Fort Bragg-San Francisco (KQSL-DT1) (480i)
 https://v-ca.mybtv.net/event/740/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="KRCB.us" tvg-name="KRCB-DT1" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/22.1.png" group-title="",KRCB-DT1 (720p)
+#EXTINF:-1 tvg-id="KRCB.us" tvg-name="PBS 22.1 Cotati California (KRCB-DT1)" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/22.1.png" group-title="Local",PBS 22.1 Cotati California (KRCB-DT1) (720p)
 https://v-ca.mybtv.net/event/718/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="KRCB.us" tvg-name="KRCB-DT1" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/22.1.png" group-title="",KRCB-DT1 (1080i)
+#EXTINF:-1 tvg-id="KRCB.us" tvg-name="PBS 22.1 Cotati California (KRCB-DT1)" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/22.1.png" group-title="Local",PBS 22.1 Cotati California (KRCB-DT1) (1080i)
 https://v-ca.mybtv.net/event/718/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="KRCB.us" tvg-name="KRCB-DT1" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/22.1.png" group-title="",KRCB-DT1 (480i)
+#EXTINF:-1 tvg-id="KRCB.us" tvg-name="PBS 22.1 Cotati California (KRCB-DT1)" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/22.1.png" group-title="Local",PBS 22.1 Cotati California (KRCB-DT1) (480i)
 https://v-ca.mybtv.net/event/718/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="KRCBDT2.us" tvg-name="KRCB-DT2" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/22.2-Create.png" group-title="",KRCB-DT2 (480i)
+#EXTINF:-1 tvg-id="KRCBDT2.us" tvg-name="PBS 22.2 Create Cotati California (KRCB-DT2)" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/22.2-Create.png" group-title="Local",PBS 22.2 Create Cotati California (KRCB-DT2) (480i)
 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)
+#EXTINF:-1 tvg-id="KRCBDT3.us" tvg-name="PBS 22.3 NHK World Cotati California (KRCB-DT3)" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/22.3-NHK.png" group-title="Local",PBS 22.3 NHK World Cotati California (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="KRIV.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="KRIV.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="KTBC.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="KTBC.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 (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 (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="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="KTVKDT5.us" tvg-name="ABC 3.5 Arizona Weather Authority (KTVK-DT5)" tvg-country="US" tvg-language="English" tvg-logo="https://meredith-img.s3.amazonaws.com/listings/KTVK-DT5.png" group-title="Weather",ABC 3.5 Arizona Weather Authority (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="KTLA5.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
@ -2134,7 +2134,7 @@ https://content.uplynk.com/channel/6cbf2d32a5384dc1b787539b1102433c.m3u8
 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="KUSIDT1.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="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)
+#EXTINF:-1 tvg-id="KVVBTV.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
@ -2598,7 +2598,7 @@ https://appletree-mytime-samsungbrazil.amagi.tv/playlist.m3u8
 https://appletree-mytime-samsungmexico.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="MyTimemovienetworkSpain.us" tvg-name="MyTime movie network (Spain)" tvg-country="US" tvg-language="Spanish" tvg-logo="https://od.lk/s/MF8yMjU5ODE1MzJf/MyTime_260x260.png" group-title="Movies",MyTime movie network (Spain)
 https://appletree-mytimespain-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="KRON.us" tvg-name="myTV (KRON)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/ad/KRON_4_Main_Logo.svg/1920px-KRON_4_Main_Logo.svg.png" group-title="Local",myTV (KRON)
+#EXTINF:-1 tvg-id="KRON.us" tvg-name="myTV 4 San Francisco Bay Area (KRON-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/ad/KRON_4_Main_Logo.svg/1920px-KRON_4_Main_Logo.svg.png" group-title="Local",myTV 4 San Francisco Bay Area (KRON-TV)
 https://streams.the6tv.duckdns.org:2443/locals/BayArea/kron-dt1.m3u8
 #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
@ -2659,7 +2659,7 @@ https://svc-lvanvato-cxtv-wpxi.cmgvideo.com/wpxi/2564k/index.m3u8
 https://ad-playlistserver.aws.syncbak.com/playlist/899088/master.m3u8?access_token=eyJhbGciOiJIUzI1NiIsImtpZCI6IkdyYXkyMDE2MDgyOSIsInN1YiI6IioiLCJ0eXAiOiJKV1QifQ.eyJleHAiOjE3OTAzNjkxMDUsImlzcyI6IldMUyIsIm1kNSI6ImJhZTU4Y2ZlZWM2NmU1MjZkNmVjZmE1YmUzNTQxMzQ4IiwibWlkIjoiODk5MDg4In0.vBWkHmqS3z3dpq8UWfbk4wFd-vQlj6B0up-rpt7X_7Q
 #EXTINF:-1 tvg-id="WGBA.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)
+#EXTINF:-1 tvg-id="WRCTV.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 (WRC-TV)
 https://wrclive-f.akamaihd.net/i/wrcb1_1@46880/master.m3u8
 #EXTINF:-1 tvg-id="WMAQTV.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
@ -2795,7 +2795,7 @@ http://5.255.90.184:2001/play/a04d
 http://c0.cdn.trinity-tv.net/stream/7tsewn83ddjifz69us9je7eftbm5nuausb4dsvz9g5aydin9672n734qbb9jgcfpiqtpwudvs9dpi2udjc3eh4h462eie5azjmfbfgfjeqfuhjmmgx9zuj736ijg7nffhf8rviq5svkgxbp639y9nfgc.m3u8
 #EXTINF:-1 tvg-id="NickelodeonHD.us" tvg-name="Nickelodeon HD" tvg-country="US" tvg-language="English" tvg-logo="https://static.epg.best/au/Nickelodeon.au.png" group-title="",Nickelodeon HD
 http://iptv-telik.usite.pro/load/0-0-1-125-20
-#EXTINF:-1 tvg-id="9PBS.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]
+#EXTINF:-1 tvg-id="KETC.us" tvg-name="Nine PBS St. Louis (KETC)" tvg-country="US" tvg-language="English" tvg-logo="https://imgur.com/rMdJ5DP.png" group-title="General",Nine PBS St. Louis (KETC) [Geo-blocked]
 https://ketcdt.lls.cdn.pbs.org/ketcdt/0436e066-85c7-408b-a4fd-5b492ccb5fd8/primary.m3u8
 #EXTINF:-1 tvg-id="NitroCircus.us" tvg-name="Nitro Circus" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Ri0sB6I.jpg" group-title="Sports",Nitro Circus
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxnitrocircus/CDN/playlist.m3u8?p=redbox&deviceid=&is_lat=&subp=RedboxdesktopWebWindows
@ -5343,7 +5343,7 @@ https://dai.google.com/linear/hls/event/gvO6-Y6TTjCxRf1QALU4VQ/master.m3u8
 https://0bef58ceebc44ecbba8ed46a4b17de0c.mediatailor.us-west-2.amazonaws.com/v1/manifest/ba62fe743df0fe93366eba3a257d792884136c7f/LINEAR-43-REVRY2-PLEX/09eef831-6e1a-4f60-a138-77c0a1da8e06/0.m3u8
 #EXTINF:-1 tvg-id="RevryNews.us" tvg-name="Revry News" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Lifestyle",Revry News
 https://0b4227d4da7e4ba4aa9d980f532fdc86.mediatailor.us-west-2.amazonaws.com/v1/manifest/ba62fe743df0fe93366eba3a257d792884136c7f/LINEAR-44-REVRYNOW-PLEX/384b6047-c4ba-41fa-93da-86bb345ec805/0.m3u8
-#EXTINF:-1 tvg-id="RevryNews.us" tvg-name="Revry News" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/5fc81131e591a036585913e9" group-title="Lifestyle",Revry News
+#EXTINF:-1 tvg-id="RevryNews.us" tvg-name="Revry News" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/AdIThwq.png" group-title="Lifestyle",Revry News
 https://linear-44.frequency.stream/dist/localnow/44/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="RevryNews.us" tvg-name="Revry News" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/AdIThwq.png" group-title="Lifestyle",Revry News
 https://linear-44.frequency.stream/dist/plex/44/hls/master/playlist.m3u8
@ -5355,9 +5355,9 @@ https://4aafa23ec0a6477ca31466bd83a115a4.mediatailor.us-west-2.amazonaws.com/v1/
 https://dai.google.com/linear/hls/event/5hLTCUyrQcS3B-NF8fNp-g/master.m3u8
 #EXTINF:-1 tvg-id="RickAndMorty.us" tvg-name="Rick and Morty (Adult Swim 24/7 Stream)" tvg-country="US" tvg-language="English" tvg-logo="" group-title="",Rick and Morty (Adult Swim 24/7 Stream) [Geo-blocked]
 https://adultswim-vodlive.cdn.turner.com/live/rick-and-morty/stream.m3u8
-#EXTINF:-1 tvg-id="Rifftrax.us" tvg-name="Rifftrax" tvg-country="US" tvg-language="" tvg-logo="https://i.imgur.com/PZ9iGaO.png" group-title="",Rifftrax
+#EXTINF:-1 tvg-id="RiffTrax.us" tvg-name="RiffTrax" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/PZ9iGaO.png" group-title="Comedy",RiffTrax
 https://rifftrax-2.vizio.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="RiffTrax.us" tvg-name="RiffTrax" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/PZ9iGaO.png" group-title="",RiffTrax (720p)
+#EXTINF:-1 tvg-id="RiffTrax.us" tvg-name="RiffTrax" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/PZ9iGaO.png" group-title="Comedy",RiffTrax (720p)
 https://rifftrax.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="RightNowTV.us" tvg-name="Right Now TV" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/y9JXK2I.png" group-title="General",Right Now TV (720p)
 https://streams.the6tv.duckdns.org:2443/cable/rightnowtv.m3u8
@ -5433,9 +5433,9 @@ http://rtmp.abnsat.com/hls/txministry.m3u8
 http://api.new.livestream.com/accounts/25038049/events/7483919/live.m3u8
 #EXTINF:-1 tvg-id="ShalomTV.us" tvg-name="Shalom TV" tvg-country="INT" tvg-language="Spanish" tvg-logo="https://i3.wp.com/unored.tv/wp-content/uploads/2018/10/Shalom-TV-logo-oficial.jpg" group-title="Religious",Shalom TV
 https://livestreamcdn.net:444/ShalomTV/ShalomTV/playlist.m3u8
-#EXTINF:-1 tvg-id="ShopHQ.us" tvg-name="Shop HQ" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/6/69/ShopHQ_2019_Logo.png/200px-ShopHQ_2019_Logo.png" group-title="Shop",Shop HQ (720p)
+#EXTINF:-1 tvg-id="ShopHQ.us" tvg-name="Shop HQ" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/WVAQvvX.jpg" group-title="Shop",Shop HQ (720p)
 https://aos01-evine.secure.footprint.net/evine/cleanfeed/master.m3u8
-#EXTINF:-1 tvg-id="ShopHQTV.us" tvg-name="Shop HQ TV" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/nVDmVad.jpg" group-title="Shop",Shop HQ TV (720p)
+#EXTINF:-1 tvg-id="ShopHQ.us" tvg-name="Shop HQ" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/WVAQvvX.jpg" group-title="Shop",Shop HQ (720p)
 https://aos01-evine.secure.footprint.net/evine/clean/appleman.m3u8
 #EXTINF:-1 tvg-id="ShopLC.us" tvg-name="Shop LC" tvg-country="US" tvg-language="English" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/606f94fdf46bcb6017662744" group-title="Shop",Shop LC
 https://cdn-shop-lc-01.akamaized.net/Content/DASH_DASH/Live/channel(ott)/master.mpd
@ -5523,21 +5523,21 @@ https://viacomitalytest-lh.akamaihd.net/i/sbshdlive_1@829515/master.m3u8
 https://cdnlive.myspirit.tv/LS-ATL-43240-2/index.m3u8
 #EXTINF:-1 tvg-id="SportsChannelNetwork.us" tvg-name="Sports Channel Network" tvg-country="US" tvg-language="English" tvg-logo="https://i.ytimg.com/vi/2FtbPXeYTvo/maxresdefault.jpg" group-title="Sports",Sports Channel Network
 https://vod365-sports-channel-network-1-gb.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="SportsGrid.us" tvg-name="SportsGrid" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/Xumo_456x456.png?raw=true" group-title="Sports",Sports Grid
+#EXTINF:-1 tvg-id="SportsGrid.us" tvg-name="SportsGrid" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/46gdAeg.png" group-title="Sports",SportsGrid
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-xumosportsgrid/CDN/master.m3u8
-#EXTINF:-1 tvg-id="SportsGrid.us" tvg-name="Sports Grid" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/T2Opptd.jpg" group-title="Sports",Sports Grid (720p)
+#EXTINF:-1 tvg-id="SportsGrid.us" tvg-name="SportsGrid" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/46gdAeg.png" group-title="Sports",SportsGrid (720p)
 https://playout4multirtmp.tulix.tv/live6/Stream1/playlist.m3u8
-#EXTINF:-1 tvg-id="SportsGrid.us" tvg-name="SportsGrid" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/T2Opptd.jpg" group-title="Sports",Sports Grid
+#EXTINF:-1 tvg-id="SportsGrid.us" tvg-name="SportsGrid" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/46gdAeg.png" group-title="Sports",SportsGrid
 https://sportsgrid-klowdtv.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="SportsGrid.us" tvg-name="Sports Grid" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/T2Opptd.jpg" group-title="Sports",Sports Grid
+#EXTINF:-1 tvg-id="SportsGrid.us" tvg-name="SportsGrid" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/46gdAeg.png" group-title="Sports",SportsGrid
 https://sportsgrid-plex.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="Sportsgrid.us" tvg-name="SportsGrid" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/T2Opptd.jpg" group-title="Sports",Sports Grid
+#EXTINF:-1 tvg-id="SportsGrid.us" tvg-name="SportsGrid" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/46gdAeg.png" group-title="Sports",SportsGrid
 https://sportsgrid-vizio.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="SportsTVPlus.us" tvg-name="Sports TV Plus" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ZgFhOZ8.png" group-title="Sports",Sports TV Plus (1080p)
 https://dai.google.com/linear/hls/event/9FKrAqCfRvGfn3tPbVFO-g/master.m3u8
-#EXTINF:-1 tvg-id="SportsGrid.us" tvg-name="SportsGrid" 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/07072020/SportsGrid_190x190.png?raw=true" group-title="Sports",SportsGrid
+#EXTINF:-1 tvg-id="SportsGrid.us" tvg-name="SportsGrid" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/46gdAeg.png" group-title="Sports",SportsGrid
 https://sportsgrid-samsungus.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="SportsGridNetwork.us" tvg-name="SportsGrid Network" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/SportsGrid_512x512.png?raw=true" group-title="Sports",SportsGrid Network (1080p)
+#EXTINF:-1 tvg-id="SportsGrid.us" tvg-name="SportsGrid" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/46gdAeg.png" group-title="Sports",SportsGrid (1080p)
 https://sportsgrid-xumo-us.amagi.tv/xumo.m3u8
 #EXTINF:-1 tvg-id="SportskoolTV.us" tvg-name="Sportskool TV" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/DistroTV_250x250.png?raw=true" group-title="Sports",Sportskool TV (720p)
 https://a.jsrdn.com/broadcast/fabeab4b08/+0000/c.m3u8
@ -5639,7 +5639,7 @@ https://dai.google.com/linear/hls/event/3NTKKQBuQtaIrcUBj20lyg/master.m3u8
 https://dai.google.com/linear/hls/event/f-zA7b21Squ7M1_sabGfjA/master.m3u8
 #EXTINF:-1 tvg-id="STIRRMusic.us" tvg-name="STIRR Music" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SAfy1us.png" group-title="Music",STIRR Music (720p)
 https://dai.google.com/linear/hls/event/_e1csFnJR6W6y056PyiG6A/master.m3u8
-#EXTINF:-1 tvg-id="StirrNews247.us" tvg-name="Stirr News 24/7" tvg-country="US" tvg-language="English" tvg-logo="" group-title="News",Stirr News 24/7
+#EXTINF:-1 tvg-id="StirrNews247.us" tvg-name="Stirr News 24/7" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SAfy1us.png" group-title="News",Stirr News 24/7
 https://dai.google.com/linear/hls/event/8hUeiLMpTm-YNqk7kadUwA/master.m3u8
 #EXTINF:-1 tvg-id="STIRRSports.us" tvg-name="STIRR Sports" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SAfy1us.png" group-title="Sports",STIRR Sports (720p)
 https://dai.google.com/linear/hls/event/1B2yihdIR1mCL63rXzERag/master.m3u8
@ -5665,7 +5665,7 @@ https://janson-supersimplesongs-1.vizio.wurl.com/manifest/playlist.m3u8
 https://kedoo-supertoonstv-1-gb.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="SurfNowTV.us" tvg-name="Surf Now TV" tvg-country="US" tvg-language="English" tvg-logo="https://www.samsung.com/us/smg/content/dam/s7/home/televisions-and-home-theater/tvs/tvplus/06232020/SURF_NOW_TV_190x190.png?raw=true" group-title="Sports",Surf Now TV
 https://0e52d42a12b74a218576cd628069fa50.mediatailor.us-east-1.amazonaws.com/v1/manifest/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Plex_SurfNowTV/1e05afbf-0234-4d61-9406-20bf6719fce5/3.m3u8
-#EXTINF:-1 tvg-id="SurfNowTV.us" tvg-name="Surf Now TV" tvg-country="US" tvg-language="English" tvg-logo="https://www.samsung.com/us/smg/content/dam/s7/home/televisions-and-home-theater/tvs/tvplus/06232020/SURF_NOW_TV_190x190.png?raw=true" group-title="",Surf Now TV
+#EXTINF:-1 tvg-id="SurfNowTV.us" tvg-name="Surf Now TV" tvg-country="US" tvg-language="English" tvg-logo="https://www.samsung.com/us/smg/content/dam/s7/home/televisions-and-home-theater/tvs/tvplus/06232020/SURF_NOW_TV_190x190.png?raw=true" group-title="Sports",Surf Now TV
 https://1091-surfnowtv-1.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="SurvivorNetTV.us" tvg-name="SurvivorNetTV" tvg-country="US" tvg-language="" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/607723ec19daa1553816098b" group-title="Entertainment",SurvivorNetTV
 https://linear-165.frequency.stream/dist/localnow/165/hls/master/playlist.m3u8
@ -5765,7 +5765,7 @@ http://streaming.temple.edu/tutvlive/mp4:8BRYCQMB/playlist.m3u8
 https://dai.google.com/linear/hls/event/7_v7qMjnQWGZShy2eOvR5g/master.m3u8
 #EXTINF:-1 tvg-id="TennesseeNashvilleSTIRR.us" tvg-name="Tennessee: Nashville (STIRR)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7JgPJxx.png" group-title="Local",Tennessee: Nashville (STIRR) (720p)
 https://dai.google.com/linear/hls/event/IG9ThaPaTwCojeoEWVNZRQ/master.m3u8
-#EXTINF:-1 tvg-id="TennisChannelHD.us" tvg-name="Tennis Channel HD" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/wcmQ30R.png" group-title="Sports",Tennis Channel HD
+#EXTINF:-1 tvg-id="TennisChannelHD.us" tvg-name="Tennis Channel HD" tvg-country="US" tvg-language="English" tvg-logo="https://ott-gateway.sinclairstoryline.com/optimized/90/17ec0fba-d4ec-4421-a665-c8dcab0f80ee-small3x1_TheTChannel.png" group-title="Sports",Tennis Channel HD
 https://tennischannel-intl-samsung-uk.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="TexasAbileneSTIRR.us" tvg-name="Texas: Abilene (STIRR)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7JgPJxx.png" group-title="Local",Texas: Abilene (STIRR) (720p)
 https://dai.google.com/linear/hls/event/uxPBn5ErTQ-FOjxIYle2PA/master.m3u8
@ -5951,17 +5951,17 @@ http://granicusliveus12-a.akamaihd.net/rockvillemd/G0458_001/playlist.m3u8
 https://tscstreaming-lh.akamaihd.net/i/TSCLiveStreaming_1@91031/master.m3u8
 #EXTINF:-1 tvg-id="TheSoutheasternChannel.us" tvg-name="The Southeastern Channel" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/AG0wZml.jpg" group-title="Local",The Southeastern Channel
 http://147.174.13.196/live/WIFI-1296k-540p/WIFI-1296k-540p.m3u8
-#EXTINF:-1 tvg-id="TheTennisChannel.us" tvg-name="The Tennis Channel" tvg-country="US" tvg-language="English" tvg-logo="https://ott-gateway.sinclairstoryline.com/optimized/90/17ec0fba-d4ec-4421-a665-c8dcab0f80ee-small3x1_TheTChannel.png" group-title="Sports",The Tennis Channel [Geo-blocked]
+#EXTINF:-1 tvg-id="TennisChannel.us" tvg-name="Tennis Channel" tvg-country="US" tvg-language="English" tvg-logo="https://ott-gateway.sinclairstoryline.com/optimized/90/17ec0fba-d4ec-4421-a665-c8dcab0f80ee-small3x1_TheTChannel.png" group-title="Sports",Tennis Channel [Geo-blocked]
 https://playoutengine.sinclairstoryline.com/playout/9f87522c-5a0e-4ff4-b82c-d5564216132f/f.m3u8
-#EXTINF:-1 tvg-id="TheTennisChannel.us" tvg-name="The Tennis Channel" tvg-country="US" tvg-language="English" tvg-logo="https://ott-gateway.sinclairstoryline.com/optimized/90/17ec0fba-d4ec-4421-a665-c8dcab0f80ee-small3x1_TheTChannel.png" group-title="Sports",The Tennis Channel [Geo-blocked]
+#EXTINF:-1 tvg-id="TennisChannel.us" tvg-name="Tennis Channel" tvg-country="US" tvg-language="English" tvg-logo="https://ott-gateway.sinclairstoryline.com/optimized/90/17ec0fba-d4ec-4421-a665-c8dcab0f80ee-small3x1_TheTChannel.png" group-title="Sports",Tennis Channel [Geo-blocked]
 https://playoutengine.sinclairstoryline.com/playout/9f87522c-5a0e-4ff4-b82c-d5564216132f/g.m3u8
-#EXTINF:-1 tvg-id="TheTennisChannelSTIRR.us" tvg-name="The Tennis Channel (STIRR)" tvg-country="US" tvg-language="English" tvg-logo="https://ott-gateway.sinclairstoryline.com/optimized/90/17ec0fba-d4ec-4421-a665-c8dcab0f80ee-small3x1_TheTChannel.png" group-title="Sports",The Tennis Channel (STIRR) (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="TennisChannelSTIRR.us" tvg-name="Tennis Channel (STIRR)" tvg-country="US" tvg-language="English" tvg-logo="https://ott-gateway.sinclairstoryline.com/optimized/90/17ec0fba-d4ec-4421-a665-c8dcab0f80ee-small3x1_TheTChannel.png" group-title="Sports",Tennis Channel (STIRR) (720p) [Geo-blocked]
 https://playoutengine.sinclairstoryline.com/playout/9f87522c-5a0e-4ff4-b82c-d5564216132f.m3u8
-#EXTINF:-1 tvg-id="TheTennisChannelPlus1.us" tvg-name="The Tennis Channel+ 1" tvg-country="US" tvg-language="English" tvg-logo="https://ott-gateway.sinclairstoryline.com/optimized/90/17ec0fba-d4ec-4421-a665-c8dcab0f80ee-small3x1_TheTChannel.png" group-title="Sports",The Tennis Channel+ 1 [Geo-blocked]
+#EXTINF:-1 tvg-id="TennisChannelPlus1.us" tvg-name="Tennis Channel+ 1" tvg-country="US" tvg-language="English" tvg-logo="https://ott-gateway.sinclairstoryline.com/optimized/90/17ec0fba-d4ec-4421-a665-c8dcab0f80ee-small3x1_TheTChannel.png" group-title="Sports",Tennis Channel+ 1 [Geo-blocked]
 https://playoutengine.sinclairstoryline.com/playout/f2f8b269-dd85-4434-bdd3-b3a64ca9cd60.m3u8
-#EXTINF:-1 tvg-id="TheTennisChannelPlus2.us" tvg-name="The Tennis Channel+ 2" tvg-country="US" tvg-language="English" tvg-logo="https://ott-gateway.sinclairstoryline.com/optimized/90/17ec0fba-d4ec-4421-a665-c8dcab0f80ee-small3x1_TheTChannel.png" group-title="Sports",The Tennis Channel+ 2 [Geo-blocked]
+#EXTINF:-1 tvg-id="TennisChannelPlus2.us" tvg-name="Tennis Channel+ 2" tvg-country="US" tvg-language="English" tvg-logo="https://ott-gateway.sinclairstoryline.com/optimized/90/17ec0fba-d4ec-4421-a665-c8dcab0f80ee-small3x1_TheTChannel.png" group-title="Sports",Tennis Channel+ 2 [Geo-blocked]
 https://playoutengine.sinclairstoryline.com/playout/e1838c44-dcb6-47b5-93d4-a0547833518f.m3u8
-#EXTINF:-1 tvg-id="TheTennisChannelPlus2.us" tvg-name="The Tennis Channel+ 2" tvg-country="US" tvg-language="English" tvg-logo="https://ott-gateway.sinclairstoryline.com/optimized/90/17ec0fba-d4ec-4421-a665-c8dcab0f80ee-small3x1_TheTChannel.png" group-title="Sports",The Tennis Channel+ 2 [Geo-blocked]
+#EXTINF:-1 tvg-id="TennisChannelPlus2.us" tvg-name="Tennis Channel+ 2" tvg-country="US" tvg-language="English" tvg-logo="https://ott-gateway.sinclairstoryline.com/optimized/90/17ec0fba-d4ec-4421-a665-c8dcab0f80ee-small3x1_TheTChannel.png" group-title="Sports",Tennis Channel+ 2 [Geo-blocked]
 https://playoutengine.sinclairstoryline.com/playout/e1838c44-dcb6-47b5-93d4-a0547833518f/g.m3u8
 #EXTINF:-1 tvg-id="TheTitanicChannel.us" tvg-name="The Titanic Channel" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/w0P4DRZ.jpg" group-title="Series",The Titanic Channel
 https://a.jsrdn.com/broadcast/e6bdcb5ae9/+0000/c.m3u8
@ -6019,7 +6019,7 @@ https://toon-goggles-samsung.vizio.wurl.com/manifest/playlist.m3u8
 https://toon-goggles.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="ToonGoggles.us" tvg-name="Toon Goggles" tvg-country="US;AU" tvg-language="English" tvg-logo="https://i.imgur.com/oyIMxzM.png" group-title="Kids",Toon Goggles (720p)
 https://toongoggles-toongoggles-3-au.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="ToonGoogles.us" tvg-name="Toon Googles" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oyIMxzM.png" group-title="Kids",Toon Googles
+#EXTINF:-1 tvg-id="ToonGoggles.us" tvg-name="Toon Goggles" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/oyIMxzM.png" group-title="Kids",Toon Goggles
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=36
 #EXTINF:-1 tvg-id="TopCine.us" tvg-name="Top Cine" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/DFEKx5N.png" group-title="Movies",Top Cine
 https://olympusamagi.amagi.tv/hls/amagi_hls_data_olympusat-topcine-roku/CDN/playlist.m3u8
@ -6141,9 +6141,9 @@ https://rpn1.bozztv.com/36bay2/gusa-tvsturbo/index.m3u8
 https://rpn1.bozztv.com/36bay2/gusa-tvswesternmovies/index.m3u8
 #EXTINF:-1 tvg-id="TVSWomenSports.us" tvg-name="TVS Women Sports" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jQdBjyx.jpg" group-title="Sports",TVS Women Sports (480p)
 https://rpn1.bozztv.com/36bay2/gusa-tvswsn/index.m3u8
-#EXTINF:-1 tvg-id="TYT.us" tvg-name="TYT" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/XDNXJCl.png" group-title="News",TYT (720p)
+#EXTINF:-1 tvg-id="TheYoungTurksTYT.us" tvg-name="The Young Turks (TYT)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/XDNXJCl.png" group-title="News",The Young Turks (TYT) (720p)
 https://tyt-samsungus.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="TYTNetwork.us" tvg-name="TYT Network" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/XDNXJCl.png" group-title="News",TYT Network
+#EXTINF:-1 tvg-id="TheYoungTurksTYT.us" tvg-name="The Young Turks (TYT)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/XDNXJCl.png" group-title="News",The Young Turks (TYT)
 https://tyt-xumo-us.amagi.tv/hls/amagi_hls_data_tytnetwor-tyt-xumo/CDN/master.m3u8
 #EXTINF:-1 tvg-id="UALRTV.us" tvg-name="UALR TV" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/MrLTXL1.jpg" group-title="Local",UALR TV (720p)
 https://na-all23.secdn.net/pegstream3-live/play/65ea794b-dd82-41ce-8e98-a9177289a063/master.m3u8
@ -6410,17 +6410,17 @@ https://lnc-witi-fox-aws.tubi.video/index.m3u8
 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="WJBK.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="WJLA.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="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="WMFDTV.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="WMUR.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="WMURTV.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="WNWY.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="WNWY.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="WOFL.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="WOFL.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="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
@ -6460,7 +6460,7 @@ https://wownow-wownowkids-1.vizio.wurl.com/manifest/playlist.m3u8
 https://wsjlivehls-lh.akamaihd.net/i/events1_1@174990/master.m3u8
 #EXTINF:-1 tvg-id="WuTangCollection.us" tvg-name="Wu Tang Collection" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jbMmsjI.png" group-title="Music",Wu Tang Collection
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=73
-#EXTINF:-1 tvg-id="WZRACD.us" tvg-name="WZRA-CD1" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Entertainment",WZRA-CD1
+#EXTINF:-1 tvg-id="WZRACD.us" tvg-name="WZRA-CD1 Tampa Bay" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Entertainment",WZRA-CD1 Tampa Bay
 http://wpso.com:1936/hls/wzra.m3u8
 #EXTINF:-1 tvg-id="Xcorps.us" tvg-name="Xcorps" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SDKWWQu.png" group-title="Series",Xcorps (720p)
 https://rpn1.bozztv.com/36bay2/gusa-xcorps/playlist.m3u8