diff --git a/channels/us.m3u b/channels/us.m3u
index f5fb1f30ed..90aef15aa3 100644
--- a/channels/us.m3u
+++ b/channels/us.m3u
@@ -120,8 +120,6 @@ https://content.uplynk.com/channel/ext/72750b711f704e4a94b5cfe6dc99f5e1/wabc_24x
 http://encodercdn1.frontline.ca/yavin/output/ABC_Seattle_720p/playlist.m3u8
 #EXTINF:-1 tvg-id="KXLYTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-states/abc-logo-2013-butterscotch-us.png" group-title="Local",ABC Spokane WA (KXLY-TV1) (720p)
 http://encodercdn1.frontline.ca/kamino/output/ABC_Spokane_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="KXLY-TV.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-states/abc-logo-2013-butterscotch-us.png" group-title="Local",ABC Spokane WA (KXLY-TV1) (720p)
-http://encodercdn1.frontline.ca/kamino/output/ABC_Spokane_720p/playlist.m3u8
 #EXTINF:-1 tvg-id="KXLY-TV.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-states/abc-logo-2013-butterscotch-us.png" group-title="Local",ABC Spokane WA (KXLY-TV1) (480p)
 http://encodercdn1.frontline.ca/kamino/output/ABC_Spokane/playlist.m3u8
 #EXTINF:-1 tvg-id="WTXLTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-states/abc-logo-2013-butterscotch-us.png" group-title="Local",ABC Tallahassee FL (WTXL-TV1) (720p) [Not 24/7]
@@ -1235,26 +1233,14 @@ http://encodercdn1.frontline.ca/encoder184/output/NBC_Spokane_720p/playlist.m3u8
 https://5e6cea03e25b6.streamlock.net/live/WTWC-NB.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="WVITNews.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Local",NBC-CT WVIT-TV News Hartford CT (1080p)
 https://wvitlive-f.akamaihd.net/i/HARTFORD_STREAM1@22924/master.m3u8
-#EXTINF:-1 tvg-id="WVITNews.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Local",NBC-CT WVIT-TV News Hartford CT (1080p)
-https://wvitlive-f.akamaihd.net/i/HARTFORD_STREAM1@22924/master.m3u8
-#EXTINF:-1 tvg-id="KNBCNews.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Local",NBC4 KNBC-TV News (1080p) [Not 24/7]
-https://knbclive-f.akamaihd.net/i/LA_STREAM1@13988/master.m3u8
-#EXTINF:-1 tvg-id="KNBCNews.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Local",NBC4 KNBC-TV News (1080p) [Not 24/7]
-https://knbclive-f.akamaihd.net/i/LA_STREAM1@13988/master.m3u8
 #EXTINF:-1 tvg-id="KNBCNews.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Local",NBC4 KNBC-TV News (1080p) [Not 24/7]
 https://knbclive-f.akamaihd.net/i/LA_STREAM1@13988/master.m3u8
 #EXTINF:-1 tvg-id="WNBCNews.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/Tapiosinn/tv-logos/raw/master/countries/united-states/us-local/nbc-4-wnbc-us.png" group-title="Local",NBC4 WNBC-TV New York News (1080p) [Not 24/7]
 https://wnbclive-f.akamaihd.net/i/NY_STREAM1@13992/master.m3u8
-#EXTINF:-1 tvg-id="WNBCNews.us" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/Tapiosinn/tv-logos/raw/master/countries/united-states/us-local/nbc-4-wnbc-us.png" group-title="Local",NBC4 WNBC-TV New York News (1080p) [Offline]
-https://wnbclive-f.akamaihd.net/i/NY_STREAM1@13992/master.m3u8
 #EXTINF:-1 tvg-id="WRCNews.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Local",NBC4 WRC-TV Washington News (1080p)
 https://wrclive-f.akamaihd.net/i/DC_STREAM1@22925/master.m3u8
 #EXTINF:-1 tvg-id="KXASNews.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Local",NBC5 KXAS-TV News Dallas TX (1080p) [Not 24/7]
 https://kxaslive-f.akamaihd.net/i/DALLAS_STREAM5@5495/master.m3u8
-#EXTINF:-1 tvg-id="KXASNews.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Local",NBC5 KXAS-TV News Dallas TX (1080p) [Not 24/7]
-https://kxaslive-f.akamaihd.net/i/DALLAS_STREAM5@5495/master.m3u8
-#EXTINF:-1 tvg-id="WTVJNews.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Local",NBC6 WTVJ-TV News Miami FL (1080p) [Not 24/7]
-https://wtvjlive-f.akamaihd.net/i/MIAMI_STREAM1@19309/master.m3u8
 #EXTINF:-1 tvg-id="WTVJNews.us" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Local",NBC6 WTVJ-TV News Miami FL (1080p) [Not 24/7]
 https://wtvjlive-f.akamaihd.net/i/MIAMI_STREAM1@19309/master.m3u8
 #EXTINF:-1 tvg-id="NBCLX.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/JSCsJc5.png" group-title="Entertainment",NBCLX (1080p)
@@ -1886,3 +1872,31 @@ https://thegateway.app/YouToo/CueTones/playlist.m3u8
 https://thegateway.app/YouToo/YTamerica/playlist.m3u8
 #EXTINF:-1 tvg-id="KanalDisney.us" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/Q9KoVy9.png" group-title="Kids",Канал Disney (576p) [Not 24/7]
 http://188.40.68.167/russia/disney/playlist.m3u8
+#EXTINF:-1 tvg-id="WXYZTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-states/abc-logo-2013-butterscotch-us.png" group-title="Local",ABC Detroit MI (WXYZ-TV1) (480p)
+http://encodercdn1.frontline.ca/kamino/output/ABC_Burlington/playlist.m3u8
+#EXTINF:-1 tvg-id="KOMOTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-states/abc-logo-2013-butterscotch-us.png" group-title="Local",ABC Seattle WA (KOMO-TV1) (480p)
+http://encodercdn1.frontline.ca/yavin/output/ABC_Seattle/playlist.m3u8
+#EXTINF:-1 tvg-id="WWJ-TV.us" tvg-country="US" tvg-language="English" tvg-logo="https://www.nicepng.com/png/full/443-4431727_cbs-logo-png.png" group-title="Local",CBS Detroit MI (WWJ-TV1) (480p)
+http://encodercdn1.frontline.ca/encoder183/output/CBS_Detroit/playlist.m3u8
+#EXTINF:-1 tvg-id="KIRO-TV.us" tvg-country="US" tvg-language="English" tvg-logo="https://www.nicepng.com/png/full/443-4431727_cbs-logo-png.png" group-title="Local",CBS Seattle WA (KIRO-TV1) (480p)
+http://encodercdn1.frontline.ca/geonosis/output/CBS_Seattle/playlist.m3u8
+#EXTINF:-1 tvg-id="WFXT.us" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/95/FOX_wordmark-red.svg/320px-FOX_wordmark-red.svg.png" group-title="Local",Fox Boston MA (WFXT1) (480p)
+http://encodercdn1.frontline.ca/encoder182/output/FOX_Boston/playlist.m3u8
+#EXTINF:-1 tvg-id="KCPQ.us" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/95/FOX_wordmark-red.svg/320px-FOX_wordmark-red.svg.png" group-title="Local",Fox Seattle WA (KCPQ1) (480p)
+http://encodercdn1.frontline.ca/geonosis/output/FOX_Seattle/playlist.m3u8
+#EXTINF:-1 tvg-id="KAYUTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/95/FOX_wordmark-red.svg/320px-FOX_wordmark-red.svg.png" group-title="Local",FOX Spokane WA (KAYU-TV1) (480p)
+http://encodercdn1.frontline.ca/encoder182/output/FOX_Spokane/playlist.m3u8
+#EXTINF:-1 tvg-id="WBTS-CD.us" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9f/NBC_Peacock_1986.svg/320px-NBC_Peacock_1986.svg.png" group-title="Local",NBC Boston MA (WBTS-CD1) (480p)
+http://encodercdn1.frontline.ca/encoder183/output/NBC_Boston/playlist.m3u8
+#EXTINF:-1 tvg-id="KING-TV.us" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9f/NBC_Peacock_1986.svg/320px-NBC_Peacock_1986.svg.png" group-title="Local",NBC Seattle WA (KING-TV1) (480p)
+http://encodercdn1.frontline.ca/bespin/output/NBC_Seattle/playlist.m3u8
+#EXTINF:-1 tvg-id="KHQTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/9f/NBC_Peacock_1986.svg/320px-NBC_Peacock_1986.svg.png" group-title="Local",NBC Spokane WA (KHQ-TV1) (480p)
+http://encodercdn1.frontline.ca/encoder184/output/NBC_Spokane/playlist.m3u8
+#EXTINF:-1 tvg-id="KCTSTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.ibb.co/2KqyGjL/PBS-logo.png" group-title="Education;Local",PBS Seattle WA (KCTS-TV1) (480p)
+http://encodercdn1.frontline.ca/bespin/output/PBS_Seattle/playlist.m3u8
+#EXTINF:-1 tvg-id="KSPSTV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.ibb.co/2KqyGjL/PBS-logo.png" group-title="Education;Local",PBS Spokane WA (KSPS-TV1) (480p)
+http://encodercdn1.frontline.ca/encoder183/output/PBS_Spokane/playlist.m3u8
+#EXTINF:-1 tvg-id="WGN-TV.us" tvg-country="US" tvg-language="English" tvg-logo="https://raw.githubusercontent.com/Tapiosinn/tv-logos/master/countries/united-states/wgn-america-us.png" group-title="Local",WGN Chicago IL (WGN-TV1) (480p)
+http://encodercdn1.frontline.ca/encoder182/output/WGN/playlist.m3u8
+#EXTINF:-1 tvg-id="Peachtree.us" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/b/b7/WPCH-TV_logo.svg/320px-WPCH-TV_logo.svg.png" group-title="General",Peachtree TV Atlanta GA (WPCH-TV1) (480p)
+http://encodercdn1.frontline.ca/encoder181/output/Peachtree/playlist.m3u8