From 9b9d62773913be1db650dab986254224a8fea001 Mon Sep 17 00:00:00 2001
From: Alstruit <34786806+Alstruit@users.noreply.github.com>
Date: Tue, 26 Dec 2023 05:07:43 -0600
Subject: [PATCH 01/15] Update streams.

Remove tokenized links.
Re-add streams.
Fix streams.
---
 streams/bd.m3u       |  4 ----
 streams/br.m3u       |  2 --
 streams/cy.m3u       | 12 ------------
 streams/jp.m3u       | 18 ++++++++----------
 streams/nl.m3u       |  2 +-
 streams/ro.m3u       |  2 +-
 streams/tw.m3u       |  8 --------
 streams/us.m3u       |  2 --
 streams/us_local.m3u |  6 +-----
 streams/us_plex.m3u  |  6 ------
 10 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/streams/bd.m3u b/streams/bd.m3u
index f01459b5e..905b56d82 100644
--- a/streams/bd.m3u
+++ b/streams/bd.m3u
@@ -5,9 +5,5 @@ https://amigofx.com:1936/channelsreporter/channelsreporter/playlist.m3u8
 https://iptvbd.live/test/1080.m3u8
 #EXTINF:-1 tvg-id="EkusheyTV.bd",Ekushey TV (480p)
 https://ekusheyserver.com/etvlivesn.m3u8
-#EXTINF:-1 tvg-id="GaziTV.bd",Gazi tv (1080p)
-http://otv.ftpbd.net:8082/Gazi-Tv-HD/index.m3u8?token=a4199114b6fc779743d33abdec00bd180d86e683-e57b6adc14e8ec4c323a3b162cbc79b5-1699718133-169970
 #EXTINF:-1 tvg-id="NandanTV.ca",Nandan TV (1080p)
 https://web.nandansyst.com/hls/nandan.m3u8
-#EXTINF:-1 tvg-id="TSports.bd",T Sports (1080p)
-http://otv.ftpbd.net:8082/T-Sports-HD/tracks-v1a1/mono.m3u8?token=837d6cde2dfde582d330b904d85a710f26bf0579-2ed99eed96e9fb2be53c7421c6eeeb4e-1699700331-1699689531
diff --git a/streams/br.m3u b/streams/br.m3u
index 3824b8585..1cc2dbc4a 100644
--- a/streams/br.m3u
+++ b/streams/br.m3u
@@ -375,8 +375,6 @@ https://livefocamundo.com:8081/tvcidada/index.m3u8
 https://59f1cbe63db89.streamlock.net:1443/tvcidade/tvcidade/playlist.m3u8
 #EXTINF:-1 tvg-id="TVCidadedePetropolis.br",TV Cidade de Petrópolis (1080p) [Not 24/7]
 https://video01.kshost.com.br:4443/inside2133/inside2133/playlist.m3u8
-#EXTINF:-1 tvg-id="TVCidadeOeste.br",TV Cidade Oeste (720p)
-http://radios.primedata.com.br:5080/LiveApp/streams/872258137935361699746456.m3u8?token=undefined
 #EXTINF:-1 tvg-id="TVCidadeVerde.br",TV Cidade Verde (720p)
 https://stmv1.transmissaodigital.com/cidadeverdenovo/cidadeverdenovo/playlist.m3u8
 #EXTINF:-1 tvg-id="TVCinec.br",TV Cinec (240p) [Not 24/7]
diff --git a/streams/cy.m3u b/streams/cy.m3u
index 5d2c156d6..9c428ee83 100644
--- a/streams/cy.m3u
+++ b/streams/cy.m3u
@@ -1,10 +1,6 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="AdaTV.cy",ADA TV (576p)
 https://sc-kuzeykibrissmarttv.ercdn.net/adatv/bant1/playlist.m3u8
-#EXTINF:-1 tvg-id="AlfaSport.cy",Alfa Sport (1080p) [Not 24/7]
-https://dev.aftermind.xyz/edge-hls/unitrust/alfasports/index.m3u8?token=8TXWzhY3h6jrzqEqu
-#EXTINF:-1 tvg-id="AlfaSport.cy",Alfa Sport (1080p) [Not 24/7]
-https://dev.aftermind.xyz/hls/unitrust/alfasports/index.m3u8?token=8TXWzhY3h6jrzqEqu
 #EXTINF:-1 tvg-id="AlphaTVCyprus.cy",Alpha TV Cyprus (720p) [Geo-blocked]
 #EXTVLCOPT:http-referrer=http://player.cloudskep.com/alphatmp/alphacy
 http://l4.cloudskep.com/alphatmp/acy/playlist.m3u8
@@ -14,10 +10,6 @@ http://l2.cloudskep.com/ant1cm2/abr/playlist.m3u8
 https://sc-kuzeykibrissmarttv.ercdn.net/brt1hd/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="BRT2.cy",BRT 2 (720p) [Not 24/7]
 https://sc-kuzeykibrissmarttv.ercdn.net/brt2hd/bant1/playlist.m3u8
-#EXTINF:-1 tvg-id="CityChannel.cy",City Channel (720p) [Not 24/7]
-https://dev.aftermind.xyz/edge-hls/unitrust/citychannel/index.m3u8?token=8TXWzhY3h6jrzqEqu
-#EXTINF:-1 tvg-id="CityChannel.cy",City Channel (720p) [Not 24/7]
-https://dev.aftermind.xyz/hls/unitrust/citychannel/index.m3u8?token=8TXWzhY3h6jrzqEqu
 #EXTINF:-1 tvg-id="TVGunes.cy",GÜNEŞ TV (576p) [Not 24/7]
 https://sc-kuzeykibrissmarttv.ercdn.net/gunestv/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="KanalSim.cy",Kanal Sim (576p) [Not 24/7]
@@ -50,7 +42,3 @@ https://svs.itworkscdn.net/sat7turklive/sat7turk.smil/playlist_dvr.m3u8
 https://sl2.sigmatv.com/hls/live.m3u8
 #EXTINF:-1 tvg-id="TV2020.cy",TV 2020 (576p) [Not 24/7]
 https://sc-kuzeykibrissmarttv.ercdn.net/tv2020/bantp1/playlist.m3u8
-#EXTINF:-1 tvg-id="VouliTV.cy",Vouli TV (1080p) [Not 24/7]
-https://dev.aftermind.xyz/edge-hls/unitrust/voulitv/index.m3u8?token=8TXWzhY3h6jrzqEqu
-#EXTINF:-1 tvg-id="VouliTV.cy",Vouli TV (1080p) [Not 24/7]
-https://dev.aftermind.xyz/hls/unitrust/voulitv/index.m3u8?token=8TXWzhY3h6jrzqEqu
diff --git a/streams/jp.m3u b/streams/jp.m3u
index b3c4a1f14..3d0a4bfa9 100644
--- a/streams/jp.m3u
+++ b/streams/jp.m3u
@@ -3,6 +3,10 @@
 http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx02
 #EXTINF:-1 tvg-id="Animax.jp",Animax (544p)
 http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs15
+#EXTINF:-1 tvg-id="ATX.jp",AT-X (720p)
+http://asia.vthanhtivi.pw/AT-X/index.m3u8
+#EXTINF:-1 tvg-id="BS11.jp",BS11 (720p)
+http://asia.vthanhtivi.pw/BS11/index.m3u8
 #EXTINF:-1 tvg-id="BSAsahi.jp",BS Asahi (544p)
 http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs03
 #EXTINF:-1 tvg-id="BSFuji.jp",BS Fuji TV (544p)
@@ -177,19 +181,15 @@ http://asia.vthanhtivi.pw/TBS/index.m3u8
 http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd04
 #EXTINF:-1 tvg-id="ToeiChannel.jp",Toei Channel (1080p)
 http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs27
-#EXTINF:-1 tvg-id="TokyoMX1.jp",Tokyo MX1 (720p)
+#EXTINF:-1 tvg-id="JOMXDTV.jp",Tokyo MX1 (720p)
 http://asia.vthanhtivi.pw/Tokyo_MX1/index.m3u8
-#EXTINF:-1 tvg-id="TokyoMX1.jp",Tokyo MX1 (720p)
-https://movie.mcas.jp/mcas/mx1_2/master.m3u8
-#EXTINF:-1 tvg-id="TokyoMX1.jp",Tokyo MX1 (720p)
-https://movie.mcas.jp/mcas/mx_live_2/master.m3u8
-#EXTINF:-1 tvg-id="TokyoMX1.jp",Tokyo MX1 (544p)
+#EXTINF:-1 tvg-id="JOMXDTV.jp",Tokyo MX1 (544p)
 http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd08
 #EXTINF:-1 tvg-id="TokyoMX1.jp",Tokyo MX1 (360p)
-https://movie.mcas.jp/mcas/smil:mx1_prod.smil/master.m3u8
+https://mcas-eqms-mx2-live.hls.davlive.stream.ne.jp/mt/master/340f27cd590451b1e7d0034b85b5175ddaf05454/EQMS_MX1/master.m3u8
 #EXTINF:-1 tvg-id="TokyoMX2.jp",Tokyo MX2 (720p)
 https://movie.mcas.jp/mcas/mx2_2/master.m3u8
-#EXTINF:-1 tvg-id="TokyoMX2.jp",Tokyo MX2 (360p)
+https://mcas-eqms-mx2-live.hls.davlive.stream.ne.jp/mt/master/340f27cd590451b1e7d0034b85b5175ddaf05454/EQMS_MX2/master.m3u8
 https://movie.mcas.jp/mcas/smil:mx2_prod.smil/master.m3u8
 #EXTINF:-1 tvg-id="JOEXDTV.jp",TV Asahi (720p)
 http://203.162.235.41:17097
@@ -206,8 +206,6 @@ http://asia.vthanhtivi.pw/TV_Tokyo/index.m3u8
 #EXTINF:-1 tvg-id="JOTXDTV.jp",TV Tokyo (544p)
 http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd07
 #EXTINF:-1 tvg-id="Weathernews.jp",Weathernews (720p)
-https://movie.mcas.jp/mcas/wn1_2/master.m3u8
-#EXTINF:-1 tvg-id="Weathernews.jp",Weathernews (720p)
 https://weather-live-hls01e.akamaized.net/ade36978-4ad3-48de-91ab-7d6edd0b6388/11ed8ed8ca.ism/manifest(format=m3u8-aapl-v3,audio-only=false).m3u8
 #EXTINF:-1 tvg-id="WOWOWCinema.jp",WOWOW Cinema (544p)
 http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs07
diff --git a/streams/nl.m3u b/streams/nl.m3u
index db423b672..da5d213e6 100644
--- a/streams/nl.m3u
+++ b/streams/nl.m3u
@@ -196,7 +196,7 @@ https://rsdh.cloud-streams.com/rsdh/rsdh/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioVeronica.nl",Radio Veronica (270p)
 https://radioveronica.prd1.talpatvcdn.nl/a1115cc610fd42418e2f6d7e29a01c3c/index.m3u8
 #EXTINF:-1 tvg-id="RadioNLTV.nl",RadioNL TV (1080p) [Not 24/7]
-https://61ae39677a1ab.streamlock.net/radionl/radionl_1080p/playlist.m3u8?ref=Hoofdwebsite&token_endtime=1661322499&token_hash=yPCofcNBmbfuVCU4UqsLrQ6GgnKJGC5gQ0tn5_F9FSE=&token_starttime=0
+https://stream.radionl.tv/radionltv/radionltv/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioToppers.nl",RadioToppers (720p)
 https://server-67.stream-server.nl:1936/RadioToppers/RadioToppers/playlist.m3u8
 #EXTINF:-1 tvg-id="Rararadio.nl",Rararadio (720p)
diff --git a/streams/ro.m3u b/streams/ro.m3u
index af5ca7c6b..03692e611 100644
--- a/streams/ro.m3u
+++ b/streams/ro.m3u
@@ -1,6 +1,6 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="AgroTV.ro",AgroTV (404p) [Not 24/7]
-https://stream1.1616.ro:1945/agro/livestream/playlist.m3u8?wowzatokenhash=NqSD4qaHc94SbTW05NBB-lXC78ZiAOIbnbUBOHj1DAM=
+https://stream1.1616.ro:1945/agro/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="AgroTV.ro",AgroTV (360p) [Not 24/7]
 https://agrotv.streamnet.ro/mobile_tv/agrotv.m3u8
 #EXTINF:-1 tvg-id="AlephBusiness.ro",Aleph Business (720p)
diff --git a/streams/tw.m3u b/streams/tw.m3u
index db2c3216f..2552180a0 100644
--- a/streams/tw.m3u
+++ b/streams/tw.m3u
@@ -97,14 +97,6 @@ https://raw.githubusercontent.com/ChiSheng9/iptv/master/TV78.m3u8
 http://38.64.72.148/hls/modn/list/4005/playlist.m3u8
 #EXTINF:-1 tvg-id="TVBSNews.tw",TVBS News (TVBS新聞台) [Geo-blocked]
 http://seb.sason.top/sc/tvbsxw_fhd.m3u8
-#EXTINF:-1 tvg-id="SETTaiwan.tw",三立台灣 (1080p)
-http://sanlihalive1-a.akamaihd.net/5ffd3a166f7241d9b489b7d7241db96f/ap-northeast-1/4338955585001/profile_0/chunklist.m3u8?hdnea=st=1664042391~exp=9007200918783382~acl=/5ffd3a166f7241d9b489b7d7241db96f/*/profile_0/chunklist.m3u8*~hmac=29538a1877a3c3728afe61bcd55b5a7b98f517bb3e2c75f8433b9338fda5b3e3
-#EXTINF:-1 tvg-id="SETTaiwan.tw",三立台灣 (1080p)
-https://sanlihalive1-a.akamaihd.net/5ffd3a166f7241d9b489b7d7241db96f/ap-northeast-1/4338955585001/profile_0/chunklist.m3u8?hdnea=st=1664678506~exp=9007200919419497~acl=/5ffd3a166f7241d9b489b7d7241db96f/*/profile_0/chunklist.m3u8*~hmac=cfd432e7da8eece68fe4a4da3a3bc08ab1bbc50b147a84c95ae3d4a569e932b1
-#EXTINF:-1 tvg-id="SETMetro.tw",三立都會 (1080p)
-https://sanlihalive1-a.akamaihd.net/4c3bb0ccad574d0e9b507c2dcd2dfabc/ap-northeast-1/4338955585001/profile_0/chunklist.m3u8?hdnea=st=1664678487~exp=9007200919419478~acl=/4c3bb0ccad574d0e9b507c2dcd2dfabc/*/profile_0/chunklist.m3u8*~hmac=1a3986bd8fb660eacbcc9954c67fb674fa810779ddc2fab5fa77188868ca3686
-#EXTINF:-1 tvg-id="SETMetro.tw",三立都會台 (1080p)
-http://sanlihalive1-a.akamaihd.net/4c3bb0ccad574d0e9b507c2dcd2dfabc/ap-northeast-1/4338955585001/profile_0/chunklist.m3u8?hdnea=st=1664042191~exp=9007200918783182~acl=/4c3bb0ccad574d0e9b507c2dcd2dfabc/*/profile_0/chunklist.m3u8*~hmac=957e95920f87270a35afde9e5bd3d25c96af4c19596f0f2cc44ff968b89165c1
 #EXTINF:-1 tvg-id="CTiNews.tw",中天新聞台 (1080p)
 https://raw.githubusercontent.com/ChiSheng9/iptv/master/TV28.m3u8
 #EXTINF:-1 tvg-id="TTV.tw",台视 (720p)
diff --git a/streams/us.m3u b/streams/us.m3u
index 82ac26494..157e7efd3 100644
--- a/streams/us.m3u
+++ b/streams/us.m3u
@@ -678,8 +678,6 @@ https://livestream.telvue.com/nashuanh3/f7b44cfafd5c52223d5498196c8a2e7b.sdp/pla
 https://ssai.castify.ai/media/cbe59a36-2334-4f34-bca0-6c7c2ae5989c/mainManifest.m3u8
 #EXTINF:-1 tvg-id="NBATV.us",NBA TV (720p)
 http://line.gofast-tv.me/play/live.php?extension=ts&mac=00:1A:79:6F:5A:5D&stream=749756
-#EXTINF:-1 tvg-id="WMCDT1.us",NBC 5 Memphis TN (WMC)
-https://dai2-playlistserver.aws.syncbak.com/playlist/18497172/master.m3u8?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IkdyYXkyMDE2MDgyOSJ9.eyJtaWQiOiIxODQ5NzE3MiIsIm1kNSI6IjYzOWYxNjJjOTZjZjJmZWFmYjQ1YWY1NTA4MzhmMGQ4IiwiaWF0IjoxNTk0MDU4Mjc4LCJpc3MiOiJTeW5jYmFrIChURykifQ.m34pXxraDlVLkgkAtFOwXbZ4DqUaAXQjOrumoMi2Fso
 #EXTINF:-1 tvg-id="WXIADT1.us",NBC 11 Atlanta GA (11Alive)
 https://livevideo.tegnadigital.com/wxia/v1/master/f9c1bf9ffd6ac86b6173a7c169ff6e3f4efbd693/WXIA/elvs/live.m3u8
 #EXTINF:-1 tvg-id="",NBC Chicago News 24/7 (1080p)
diff --git a/streams/us_local.m3u b/streams/us_local.m3u
index 9b5d84bae..8c4e6660e 100644
--- a/streams/us_local.m3u
+++ b/streams/us_local.m3u
@@ -16,7 +16,7 @@ https://content.uplynk.com/40cec2bf074c40f08932da03ab4510be.m3u8
 #EXTINF:-1 tvg-id="WFAADT1.us",ABC 8 Dallas TX (WFAA) (1080p)
 https://livevideo01.wfaa.com/hls/live/2014541/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="WFTVDT1.us",ABC 9 Orlando FL (WFTV) (720p)
-https://d3qm7vzp07vxse.cloudfront.net/v1/master/77872db67918a151b697b5fbc23151e5765767dc/cmg_PROD_cmg-tv-10070_fe1f5f6c-cd0b-4993-a4a4-6db66be4f313_LE/in/cmg-wftvtv-hls-v3/live.m3u8
+https://amg00327-coxmediagroup-wftvbreaking-ono-hec7b.amagi.tv/playlist/amg00327-coxmediagroup-wftvbreaking-ono/playlist.m3u8
 #EXTINF:-1 tvg-id="KTNVDT1.us",ABC 13 Las Vegas NV (KTNV) (720p)
 https://content.uplynk.com/channel/39919d3f7a074eefa8bf579214e952f9.m3u8
 #EXTINF:-1 tvg-id="KNXVDT1.us",ABC 15 Phoenix AZ (KNXV-TV) (720p)
@@ -401,8 +401,6 @@ https://ampmedia.secure.footprint.net/egress/bhandler/ampmedia/streamc/manifest.
 https://cdn3.wowza.com/5/cXdyRHF0Z3kxN0k2/moorpark/G0086_003/playlist.m3u8
 #EXTINF:-1 tvg-id="MorroBayChannel20.us",Morro Bay Channel 20 (480p)
 https://agp-nimble.streamguys1.com/MBCh20/MBCh20/playlist.m3u8
-#EXTINF:-1 tvg-id="WISCDT2.us",My Madison TV (WISC-DT2) (720p)
-https://ad-playlistserver.aws.syncbak.com/playlist/13613390/master.m3u8?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IkdyYXkyMDE2MDgyOSJ9.eyJtaWQiOjEzNjEzMzkwLCJtZDUiOiI2Y2M5MzczYjIxZWIwNzQ4ZDA0YTRlYzYyMjU2YjBhMiIsImlhdCI6MTQ5NzM4MTU5NywiaXNzIjoiU3luY2JhayIsInN1YiI6IkdyYXkifQ.qJPiMCbnGjAn9wgPrGjVl3M9Xfc4CVSyoZTZ5OH-1jo
 #EXTINF:-1 tvg-id="MyEncinitasTV.us",MyEncinitasTV (Encinitas CA) (360p)
 https://cdn3.wowza.com/5/RXJNMFI3VlVkOEFP/encinitas/G0322_002/playlist.m3u8
 #EXTINF:-1 tvg-id="WHVLLD1.us",MyNetwork (WHVL-DT1) State College PA (720p)
@@ -417,8 +415,6 @@ https://cdn3.wowza.com/5/WDIrTW5sM1JEY1NN/napatv/G0360_004/playlist.m3u8
 https://livevideo01.king5.com/hls/live/2006665/live/live.m3u8
 #EXTINF:-1 tvg-id="KUSADT1.us",NBC 9 Denver CO (KUSA) (1080p)
 https://livevideo.tegnadigital.com/kusa/v1/master/f9c1bf9ffd6ac86b6173a7c169ff6e3f4efbd693/KUSA/elvs/live.m3u8
-#EXTINF:-1 tvg-id="WMTVDT1.us",NBC 15 Madison WI (WMTV) (720p)
-https://ad-playlistserver.aws.syncbak.com/playlist/899088/master.m3u8?access_token=eyJhbGciOiJIUzI1NiIsImtpZCI6IkdyYXkyMDE2MDgyOSIsInN1YiI6IioiLCJ0eXAiOiJKV1QifQ.eyJleHAiOjE3OTAzNjkxMDUsImlzcyI6IldMUyIsIm1kNSI6ImJhZTU4Y2ZlZWM2NmU1MjZkNmVjZmE1YmUzNTQxMzQ4IiwibWlkIjoiODk5MDg4In0.vBWkHmqS3z3dpq8UWfbk4wFd-vQlj6B0up-rpt7X_7Q
 #EXTINF:-1 tvg-id="WGBADT1.us",NBC 26 Green Bay WI (WGBA) (720p)
 https://content.uplynk.com/channel/1fbfb28ae5044f619f75ae0adb011989.m3u8
 #EXTINF:-1 tvg-id="WCNCDT1.us",NBC 36 Charlotte NC (WCNC-TV) (1080p)
diff --git a/streams/us_plex.m3u b/streams/us_plex.m3u
index 515cbfdd7..fba75e2a4 100644
--- a/streams/us_plex.m3u
+++ b/streams/us_plex.m3u
@@ -43,8 +43,6 @@ https://ign-plex.amagi.tv/hls/amagi_hls_data_ignAAAAAA-ign-plexA/CDN/playlist.m3
 https://ign-plex.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="KMTV.kr",KMTV
 https://kmtvnow-samsung-us.plex.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="MidnightPulp.us",Midnight Pulp (1080p)
-https://369f2966f62841f4affe37d0b330a13c.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Plex_MidnightPulp/playlist.m3u8?ads.app_bundle=&ads.app_store_url=&ads.consent=0&ads.gdpr=0&ads.plex_id=5ef4e1b40d9ad000423c4427&ads.plex_token=z1MCPUpbxYcHru-5hdyq&ads.psid=&ads.targetopt=1&ads.ua=Mozilla/5.0+(Windows+NT+10.0;+Win64;+x64)+AppleWebKit/537.36+(KHTML,+like+Gecko)+Chrome/84.0.4147.89+Safari/537.36+OPR/70.0.3728.71&ads.us_privacy=1---&ads.wurl_channel=263&ads.wurl_name=MidnightPulp
 #EXTINF:-1 tvg-id="MovieSphere.us",MovieSphere (1080p)
 https://moviesphere-plex.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="MuseumTVFast.us",Museum TV Fast (1080p)
@@ -53,8 +51,6 @@ https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01492-secomsasmediart-museumtv-en-p
 https://newsmax-plex.amagi.tv/hls/amagi_hls_data_plexAAAAA-newsmax-plex/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="OutdoorAmerica.us",Outdoor America (720p) [Not 24/7]
 https://d18toqrnfyz3v1.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/OutdoorAmerica-PLEX/159.m3u8
-#EXTINF:-1 tvg-id="PlayWorks.us",Play.Works (720p)
-https://b12eca572da7423284734ca3a6242ea2.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Plex_PlayWorks/playlist.m3u8?ads.app_bundle=com.plexapp.desktop&ads.app_store_url=https://app.plex.tv&ads.consent=0&ads.gdpr=1&ads.plex_id=5f0ff263d71dcb00449ec01e&ads.plex_token=MorUy57ijWhGe4ixZb_T&ads.psid=df8e1a36-847d-5096-86a7-3803ed330ede&ads.targetopt=0&ads.ua=Mozilla/5.0+(Windows+NT+6.1;+rv:83.0)+Gecko/20100101+Firefox/83.0&ads.us_privacy=1---&ads.wurl_channel=512&ads.wurl_name=PlayWorks
 #EXTINF:-1 tvg-id="PopstarTV.us",Popstar! TV (1080p) [Not 24/7]
 https://linear-10.frequency.stream/dist/plex/10/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="RCNMas.co",RCN Más (1080p)
@@ -63,8 +59,6 @@ https://rcntv-rcnmas-1-us.plex.wurl.tv/playlist.m3u8
 https://lds-realfamilies-plex.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="RealStories.uk",Real Stories (1080p)
 https://lds-realstories-plex.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="RetroCrush.us",RetroCrush TV (1080p)
-https://45034ce1cbb7489ab1499301f6274415.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Plex_RetroCrush/playlist.m3u8?ads.app_bundle=&ads.app_store_url=&ads.consent=0&ads.gdpr=0&ads.plex_id=5ef4e1b40d9ad000423c442a&ads.plex_token=z1MCPUpbxYcHru-5hdyq&ads.psid=&ads.targetopt=1&ads.ua=Mozilla/5.0+(Windows+NT+10.0;+Win64;+x64)+AppleWebKit/537.36+(KHTML,+like+Gecko)+Chrome/84.0.4147.89+Safari/537.36+OPR/70.0.3728.71&ads.us_privacy=1---&ads.wurl_channel=491&ads.wurl_name=RetroCrush
 #EXTINF:-1 tvg-id="ReutersTV.us",Reuters (1080p)
 https://reuters-reutersnow-1.plex.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="ReutersTV.us",Reuters TV

From 27d134a205615078d159b0d4fd8d6bb2594c8861 Mon Sep 17 00:00:00 2001
From: Alstruit <34786806+Alstruit@users.noreply.github.com>
Date: Tue, 26 Dec 2023 05:21:43 -0600
Subject: [PATCH 02/15] Update us_local.m3u

Move local streams.
---
 streams/us.m3u       | 38 --------------------------------------
 streams/us_local.m3u | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/streams/us.m3u b/streams/us.m3u
index 157e7efd3..79bb2d316 100644
--- a/streams/us.m3u
+++ b/streams/us.m3u
@@ -39,14 +39,8 @@ https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6176f39e709f160007ec6
 http://hlsdpi-cdn-chqtx02.totalstream.net/dpilive/247retro/ret/dai/playlist.m3u8
 #EXTINF:-1 tvg-id="",911 NETWORK
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=4152
-#EXTINF:-1 tvg-id="KRGVDT1.us",ABC 5
-https://stream.krgv.com/krgv-english/krgv-english.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="KXXVDT1.us",ABC 25 News Central Texas
-https://content.uplynk.com/channel/9d4e02c9c3544c269d32e6b316792c8f.m3u8
 #EXTINF:-1 tvg-id="ABCNewsLive.us",ABC News (720p)
 https://content.uplynk.com/channel/3324f2467c414329b3b0cc5cd987b6be.m3u8
-#EXTINF:-1 tvg-id="WWAYDT1.us",ABC WWAY 3
-https://wway.akamaized.net/hls/live/2029583/wway_ingest/master.m3u8
 #EXTINF:-1 tvg-id="ABNAfrica.us",ABN Africa (480p)
 https://rtmp2.abnvideos.com/hls/abnafrica.m3u8
 #EXTINF:-1 tvg-id="ABN.us",ABN Aramaic Broadcasting Network (540p)
@@ -169,8 +163,6 @@ https://dikcfc9915kp8.cloudfront.net/hls/1080p/playlist.m3u8
 https://dikcfc9915kp8.cloudfront.net/hls/main.m3u8
 #EXTINF:-1 tvg-id="AyenehTV.us",Ayeneh TV (720p)
 https://2nbyjjx7y53k-hls-live.5centscdn.com/cls040318/b0d2763968fd0bdd2dc0d44ba2abf9ce.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="KRGVDT2.us",Azteca Valle (KRGV 5.2)
-https://stream.krgv.com/krgv-english/krgv-somos.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="BabySharkTV.us",Baby Shark TV (1080p)
 https://newidco-babysharktv-1-us.roku.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="BabyFirst.us",BabyFirst
@@ -283,8 +275,6 @@ https://bcovlive-a.akamaihd.net/r21fb8503a4a74d098b798f16922b2a36/us-east-1/7345
 https://bcovlive-a.akamaihd.net/r602a47f47fee47bb83239eb1b1e1ac83/us-east-1/734546207001/playlist.m3u8
 #EXTINF:-1 tvg-id="CBNNews.us",CBN News National (1080p)
 https://bcovlive-a.akamaihd.net/re8d9f611ee4a490a9bb59e52db91414d/us-east-1/734546207001/playlist.m3u8
-#EXTINF:-1 tvg-id="KWCHDT1.us",CBS 12 KWCH Weather Channel / Always On Storm Team 12
-https://d2jni005khp8n7.cloudfront.net/out/gray-kwchwx-rtmp-v3/live.m3u8
 #EXTINF:-1 tvg-id="CBSSportsGolazoNetwork.us",CBS Sports Golazo Network
 https://dai.google.com/linear/hls/event/GxrCGmwST0ixsrc_QgB6qw/master.m3u8
 #EXTINF:-1 tvg-id="CelebritySceneTV.us",Celebrity Scene TV (720p)
@@ -443,23 +433,10 @@ https://a.jsrdn.com/broadcast/aee08372e5/+0000/c.m3u8
 https://a.jsrdn.com/broadcast/8b43a16c1e/+0000/c.m3u8
 #EXTINF:-1 tvg-id="Fite.us",Fite (720p) [Not 24/7]
 https://cdn-cf.fite.tv/linear/fite247/playlist.m3u8
-#EXTINF:-1 tvg-id="KVCRDT2.us",FNX [Geo-blocked]
-#EXTVLCOPT:http-referrer=https://fnx.org/
-https://castus-vod-dev.s3.amazonaws.com/vod_clients/kvcr/live/ch1/video.m3u8
 #EXTINF:-1 tvg-id="FolkTV.us",Folk TV
 http://584b0aa350b92.streamlock.net:1935/folk-tv/myStream.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="FolkTV.us",Folk TV East (480p) [Not 24/7]
 https://584b0aa350b92.streamlock.net/folk-tv/myStream.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="KXVADT1.us",Fox 15 West Texas Abilene TX (KXVA)
-https://livevideo01.myfoxzone.com/hls/live/2017381/elvs/live.m3u8
-#EXTINF:-1 tvg-id="WPMTDT1.us",Fox 43 Harrisburg PA (WPMT)
-https://livevideo01.fox43.com/hls/live/2011656/elvs/live.m3u8
-#EXTINF:-1 tvg-id="WZDXDT1.us",Fox 54.1 Huntsville
-https://livevideo01.rocketcitynow.com/hls/live/2011659/elvs/live.m3u8
-#EXTINF:-1 tvg-id="WTICDT1.us",Fox 61 News Hartford CT (WTIC-TV)
-https://livevideo01.fox61.com/hls/live/2011658/elvs/live.m3u8
-#EXTINF:-1 tvg-id="WTICDT1.us",Fox 61 News Hartford CT (WTIC-TV)
-https://livevideo.tegnadigital.com/wtic/v1/master/f9c1bf9ffd6ac86b6173a7c169ff6e3f4efbd693/WTIC/elvs/live.m3u8
 #EXTINF:-1 tvg-id="FoxNewsChannel.us",Fox News Channel
 http://247preview.foxnews.com/hls/live/2020027/fncv3preview/primary.m3u8
 #EXTINF:-1 tvg-id="FoxWeather.us",Fox Weather (720p)
@@ -586,8 +563,6 @@ https://jlt2104.cdn.nextologies.com/ebaed9568f2b8e61/ffaaf4b7e1d0e7a8/ea5f88d4e7
 https://johnnycarson-zype.amagi.tv/playlistR432p.m3u8
 #EXTINF:-1 tvg-id="JuventudRenovadaenelEspirituSanto.us",Juventud Renovada en el Espiritu Santo (720p) [Not 24/7]
 http://teleredmcp.com:1935/jrestv/jrestv/playlist.m3u8
-#EXTINF:-1 tvg-id="KXLNDT1.us",KXLN-DT1 (Univision West) [Geo-blocked]
-https://unidfp-nlds145.global.ssl.fastly.net/nlds/univisionnow/univision_hou2/as/live/univision_hou2_hd_pc.m3u8?t1=
 #EXTINF:-1 tvg-id="LaRosadeGuadalupe.us",La Rosa de Guadalupe
 https://linear-344.frequency.stream/dist/vix/344/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="LacrosseTV.us",Lacrosse TV (720p)
@@ -678,8 +653,6 @@ https://livestream.telvue.com/nashuanh3/f7b44cfafd5c52223d5498196c8a2e7b.sdp/pla
 https://ssai.castify.ai/media/cbe59a36-2334-4f34-bca0-6c7c2ae5989c/mainManifest.m3u8
 #EXTINF:-1 tvg-id="NBATV.us",NBA TV (720p)
 http://line.gofast-tv.me/play/live.php?extension=ts&mac=00:1A:79:6F:5A:5D&stream=749756
-#EXTINF:-1 tvg-id="WXIADT1.us",NBC 11 Atlanta GA (11Alive)
-https://livevideo.tegnadigital.com/wxia/v1/master/f9c1bf9ffd6ac86b6173a7c169ff6e3f4efbd693/WXIA/elvs/live.m3u8
 #EXTINF:-1 tvg-id="",NBC Chicago News 24/7 (1080p)
 https://nbculocalfast.akamaized.net/hls/live/2096797/nbcchicago/master.m3u8
 #EXTINF:-1 tvg-id="NBCNewsNOW.us",NBC News Now (1080p)
@@ -690,8 +663,6 @@ https://nbcnews2.akamaized.net/hls/live/723426/NBCNewsPlaymaker24x7Linear99a3a82
 https://nbculocallive.akamaized.net/hls/live/2037096/lx/use1.m3u8
 #EXTINF:-1 tvg-id="NESN.us",NESN National (1080p)
 https://bcovlive-a.akamaihd.net/bea11a7dfef34b08be06aaca4a72bcdf/us-east-1/6141518204001/playlist.m3u8
-#EXTINF:-1 tvg-id="WJXTDT1.us",News4JAX+
-https://dai.google.com/linear/hls/event/RDmbn03GRCOLNG1eetEKhg/master.m3u8
 #EXTINF:-1 tvg-id="NewsmaxTV.us",Newsmax (720p)
 https://nmxairy.akamaized.net/hls/live/529965/Live_1/index.m3u8
 #EXTINF:-1 tvg-id="NewsNet.us",NewsNet (720p) [Not 24/7]
@@ -899,8 +870,6 @@ http://210.210.155.37/qwr9ew/s/s39/index.m3u8
 https://d7ge95bb03xsu.cloudfront.net/out/v1/0c95a89614194912834019fc37d741ef/tbn-freecast.m3u8
 #EXTINF:-1 tvg-id="TBNInspire.us",TBN Inspire (720p)
 https://tbn-jw.cdn.vustreams.com/live/inspire/live.isml/.m3u8
-#EXTINF:-1 tvg-id="KTBNDT3.us",TBN Smile (480p)
-https://tbn-jw.cdn.vustreams.com/live/smile/live.isml/.m3u8
 #EXTINF:-1 tvg-id="TBNUkraine.us",TBN Украина (720p)
 http://62.32.67.187:1935/WEB_Ukraine24/Ukraine24.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="TBSEast.us",TBS East (720p) [Geo-blocked]
@@ -949,8 +918,6 @@ https://ov.ottera.tv/live/master.m3u8?channel=mcom_gv_us
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=43
 #EXTINF:-1 tvg-id="TheNowNetwork.us",The Now Network (480p) [Not 24/7]
 https://link.frontlayer.com/services/hls2/fl619843/index.m3u8
-#EXTINF:-1 tvg-id="WVIZDT2.us",The Ohio Channel (WVIZ DT-2)
-https://5ebe6889de541.streamlock.net/live/stream_10/playlist.m3u8
 #EXTINF:-1 tvg-id="TSC.ca",The Shopping Channel (720p)
 https://tscstreaming-lh.akamaihd.net/i/TSCLiveStreaming_1@91031/master.m3u8
 #EXTINF:-1 tvg-id="TheSoutheasternChannel.us",The Southeastern Channel (540p)
@@ -1005,9 +972,6 @@ http://api.toonamiaftermath.com:3000/movies/playlist.m3u8
 http://api.toonamiaftermath.com:3000/radio/playlist.m3u8
 #EXTINF:-1 tvg-id="TopStoriesbyNewsy.us",Top Stories by Newsy (720p)
 https://content.uplynk.com/channel/33c48f602cfd4474b957eb4ad999caf8.m3u8
-#EXTINF:-1 tvg-id="KTCADT5.us" user-agent="Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",TPT Now KTCA-DT5 (720p) [Not 24/7]
-#EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36
-https://api.new.livestream.com/accounts/12638076/events/8488790/live.m3u8
 #EXTINF:-1 tvg-id="",Travel Adventures with Jeff Swan (1080p)
 https://app.viloud.tv/hls/channel/0d984388834adac967a4ec4e69bc8271.m3u8
 #EXTINF:-1 tvg-id="truTVEast.us",truTV East (720p) [Geo-blocked]
@@ -1150,8 +1114,6 @@ https://hls-live-media.cdn01.net/default/stream_10327.m3u8?source=othersites
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=73
 #EXTINF:-1 tvg-id="WWONTVChannel48.us",WWON TV CH 48
 https://hls-cdn.tvstartup16.net/tvstartup16-channel/live/mp4:jimbobklynedge/playlist.m3u8
-#EXTINF:-1 tvg-id="WXTVDT1.us",WXTV-DT1 (Univision New York) [Geo-blocked]
-https://unidfp-nlds143.global.ssl.fastly.net/nlds/univisionnow/univision_ny2/as/live/univision_ny2_hd_pc.m3u8?t1=
 #EXTINF:-1 tvg-id="WZRACD1.us",WZRA-CD1 (480p)
 http://wpso.com:1936/hls/wzra.m3u8
 #EXTINF:-1 tvg-id="YahooFinance.us",Yahoo! Finance (1080p)
diff --git a/streams/us_local.m3u b/streams/us_local.m3u
index 8c4e6660e..eec36b8d0 100644
--- a/streams/us_local.m3u
+++ b/streams/us_local.m3u
@@ -695,3 +695,40 @@ https://securestream6.champds.com/hlssstc/YumaCoAZLIVE/master.m3u8
 https://yuma-az.secure.footprint.net/egress/bhandler/yumaaz/streama/playlist.m3u8
 #EXTINF:-1 tvg-id="YumaChannel73.us",Yuma AZ CH 73
 https://yuma-az.secure.footprint.net/egress/bhandler/yumaaz/streamb/playlist.m3u8
+#EXTINF:-1 tvg-id="WZDXDT1.us",Fox 54.1 Huntsville
+https://livevideo01.rocketcitynow.com/hls/live/2011659/elvs/live.m3u8
+#EXTINF:-1 tvg-id="WXTVDT1.us",WXTV-DT1 (Univision New York) [Geo-blocked]
+https://unidfp-nlds143.global.ssl.fastly.net/nlds/univisionnow/univision_ny2/as/live/univision_ny2_hd_pc.m3u8?t1=
+#EXTINF:-1 tvg-id="WXIADT1.us",NBC 11 Atlanta GA (11Alive)
+https://livevideo.tegnadigital.com/wxia/v1/master/f9c1bf9ffd6ac86b6173a7c169ff6e3f4efbd693/WXIA/elvs/live.m3u8
+#EXTINF:-1 tvg-id="WWAYDT1.us",ABC WWAY 3
+https://wway.akamaized.net/hls/live/2029583/wway_ingest/master.m3u8
+#EXTINF:-1 tvg-id="WVIZDT2.us",The Ohio Channel (WVIZ DT-2)
+https://5ebe6889de541.streamlock.net/live/stream_10/playlist.m3u8
+#EXTINF:-1 tvg-id="KXVADT1.us",Fox 15 West Texas Abilene TX (KXVA)
+https://livevideo01.myfoxzone.com/hls/live/2017381/elvs/live.m3u8
+#EXTINF:-1 tvg-id="WPMTDT1.us",Fox 43 Harrisburg PA (WPMT)
+https://livevideo01.fox43.com/hls/live/2011656/elvs/live.m3u8
+#EXTINF:-1 tvg-id="WTICDT1.us",Fox 61 News Hartford CT (WTIC-TV)
+https://livevideo01.fox61.com/hls/live/2011658/elvs/live.m3u8
+#EXTINF:-1 tvg-id="WTICDT1.us",Fox 61 News Hartford CT (WTIC-TV)
+https://livevideo.tegnadigital.com/wtic/v1/master/f9c1bf9ffd6ac86b6173a7c169ff6e3f4efbd693/WTIC/elvs/live.m3u8
+#EXTINF:-1 tvg-id="WJXTDT1.us",News4JAX+
+https://dai.google.com/linear/hls/event/RDmbn03GRCOLNG1eetEKhg/master.m3u8
+#EXTINF:-1 tvg-id="KRGVDT1.us",ABC 5
+https://stream.krgv.com/krgv-english/krgv-english.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="KXXVDT1.us",ABC 25 News Central Texas
+https://content.uplynk.com/channel/9d4e02c9c3544c269d32e6b316792c8f.m3u8
+#EXTINF:-1 tvg-id="KXLNDT1.us",KXLN-DT1 (Univision West) [Geo-blocked]
+https://unidfp-nlds145.global.ssl.fastly.net/nlds/univisionnow/univision_hou2/as/live/univision_hou2_hd_pc.m3u8?t1=
+#EXTINF:-1 tvg-id="KWCHDT1.us",CBS 12 KWCH Weather Channel / Always On Storm Team 12
+https://d2jni005khp8n7.cloudfront.net/out/gray-kwchwx-rtmp-v3/live.m3u8
+#EXTINF:-1 tvg-id="KVCRDT2.us",FNX [Geo-blocked]
+#EXTVLCOPT:http-referrer=https://fnx.org/
+https://castus-vod-dev.s3.amazonaws.com/vod_clients/kvcr/live/ch1/video.m3u8
+#EXTINF:-1 tvg-id="KTCADT5.us",TPT Now KTCA-DT5 (720p) [Not 24/7]
+https://api.new.livestream.com/accounts/12638076/events/8488790/live.m3u8
+#EXTINF:-1 tvg-id="KTBNDT3.us",TBN Smile (480p)
+https://tbn-jw.cdn.vustreams.com/live/smile/live.isml/.m3u8
+#EXTINF:-1 tvg-id="KRGVDT2.us",Azteca Valle (KRGV 5.2)
+https://stream.krgv.com/krgv-english/krgv-somos.smil/playlist.m3u8

From 5a3b138bb9facf3054bd28103dd457e32bb59386 Mon Sep 17 00:00:00 2001
From: Alstruit <34786806+Alstruit@users.noreply.github.com>
Date: Tue, 26 Dec 2023 05:25:47 -0600
Subject: [PATCH 03/15] Update streams

---
 streams/jp.m3u | 2 --
 1 file changed, 2 deletions(-)

diff --git a/streams/jp.m3u b/streams/jp.m3u
index 3d0a4bfa9..2664b393b 100644
--- a/streams/jp.m3u
+++ b/streams/jp.m3u
@@ -188,9 +188,7 @@ http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd08
 #EXTINF:-1 tvg-id="TokyoMX1.jp",Tokyo MX1 (360p)
 https://mcas-eqms-mx2-live.hls.davlive.stream.ne.jp/mt/master/340f27cd590451b1e7d0034b85b5175ddaf05454/EQMS_MX1/master.m3u8
 #EXTINF:-1 tvg-id="TokyoMX2.jp",Tokyo MX2 (720p)
-https://movie.mcas.jp/mcas/mx2_2/master.m3u8
 https://mcas-eqms-mx2-live.hls.davlive.stream.ne.jp/mt/master/340f27cd590451b1e7d0034b85b5175ddaf05454/EQMS_MX2/master.m3u8
-https://movie.mcas.jp/mcas/smil:mx2_prod.smil/master.m3u8
 #EXTINF:-1 tvg-id="JOEXDTV.jp",TV Asahi (720p)
 http://203.162.235.41:17097
 #EXTINF:-1 tvg-id="JOEXDTV.jp",TV Asahi (720p)

From 342555a8e02835ae377d14a822631c0a87a5a76a Mon Sep 17 00:00:00 2001
From: Alstruit <34786806+Alstruit@users.noreply.github.com>
Date: Tue, 26 Dec 2023 05:38:43 -0600
Subject: [PATCH 04/15] Update streams

---
 streams/jp.m3u | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/streams/jp.m3u b/streams/jp.m3u
index 2664b393b..88f40318a 100644
--- a/streams/jp.m3u
+++ b/streams/jp.m3u
@@ -179,6 +179,8 @@ http://203.162.235.41:18097
 http://asia.vthanhtivi.pw/TBS/index.m3u8
 #EXTINF:-1 tvg-id="JORXDTV.jp",TBS (544p)
 http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd04
+#EXTINF:-1 tvg-id="JORXDTV.jp",TBS (540p)
+https://tbs4.mov3.co/hls/tbs.m3u8
 #EXTINF:-1 tvg-id="ToeiChannel.jp",Toei Channel (1080p)
 http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs27
 #EXTINF:-1 tvg-id="JOMXDTV.jp",Tokyo MX1 (720p)

From b93bd792ed2f37a17e9b0c5f5998bbae842c2c29 Mon Sep 17 00:00:00 2001
From: Alstruit <34786806+Alstruit@users.noreply.github.com>
Date: Tue, 26 Dec 2023 06:16:39 -0600
Subject: [PATCH 05/15] Fix formatting.

---
 streams/kz.m3u       | 4 ++--
 streams/mx.m3u       | 4 +---
 streams/us_ythls.m3u | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/streams/kz.m3u b/streams/kz.m3u
index 25a177ff4..ce8ec6c05 100644
--- a/streams/kz.m3u
+++ b/streams/kz.m3u
@@ -55,9 +55,9 @@ https://tvcdn01.oktv.kz/tv/mtrk/playlist.m3u8
 http://serv25.vintera.tv:8081/novoetv/nov_tv/playlist.m3u8
 #EXTINF:-1 tvg-id="ChannelOneEurasia.kz",Первый канал Евразия (720p)
 https://1tvkz-stream.daitsuna.net/1tvkz/1tvkz/playlist.m3u8
-#EXTINF:-1 tvg-id="Khabar24.kz",Хабар 24 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="24KZ.kz",Хабар 24 (720p) [Not 24/7]
 http://serv30.vintera.tv:8081/habar/habar24/playlist.m3u8
-#EXTINF:-1 tvg-id="Khabar24.kz",Хабар 24 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="24KZ.kz",Хабар 24 (720p) [Not 24/7]
 https://live-24kz.cdnvideo.ru/24kz/24kz.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="AlauTV.kz",Alau TV (576p)
 https://otv.wotom.net/alau/stream.m3u8
diff --git a/streams/mx.m3u b/streams/mx.m3u
index fc9c1342c..9f0de54d5 100644
--- a/streams/mx.m3u
+++ b/streams/mx.m3u
@@ -180,8 +180,6 @@ https://channel07-notusa.akamaized.net/hls/live/2036971/event01/index.m3u8
 https://channel04-notusa.akamaized.net/hls/live/2029754-b/event01/index.m3u8
 #EXTINF:-1 tvg-id="NPlusMedia.mx",NMás Media (1080p)
 https://channel04-notusa.akamaized.net/hls/live/2029754/event01/index.m3u8
-#EXTINF:-1 tvg-id="NoticiasCanal10.mx",Noticias Canal 10 (360p) [Not 24/7]
-https://canal10.mediaflix.istream.mx/wza_live/live/movil/playlist.m3u8
 #EXTINF:-1 tvg-id="NRTMexicoRegionCentro.mx",NRT México Región Centro (720p)
 https://59e88b197fb16.streamlock.net:4443/live/canal4/playlist.m3u8
 #EXTINF:-1 tvg-id="NRTMexicoInternacional.mx",NRT México Internacional (720p)
@@ -302,7 +300,7 @@ https://5ca9af4645e15.streamlock.net/rtv/videortv/playlist.m3u8
 https://5ca3e84a76d30.streamlock.net/gpacifico1/smil:gpculiacan.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TVPLosMochis.mx",TVP Los Mochis (720p) [Not 24/7]
 https://5ca3e84a76d30.streamlock.net/gpacifico2/mochis.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="TVP.mx",TVP Mazatlán (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVPMazatlan.mx",TVP Mazatlán (720p) [Not 24/7]
 https://5ca3e84a76d30.streamlock.net/gpacifico4/smil:mazatlan.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TVPObregon.mx",TVP Obregón (720p) [Not 24/7]
 https://5ca3e84a76d30.streamlock.net/gpacifico3/obregon.smil/playlist.m3u8
diff --git a/streams/us_ythls.m3u b/streams/us_ythls.m3u
index f38174195..961221e72 100644
--- a/streams/us_ythls.m3u
+++ b/streams/us_ythls.m3u
@@ -1419,7 +1419,7 @@ https://ythls.armelin.one/channel/UC5V8mErVFOpcQXEb3y9IMZw.m3u8
 https://ythls.armelin.one/channel/UCH9H_b9oJtSHBovh94yB5HA.m3u8
 #EXTINF:-1 tvg-id="UNIANTV.ua",УНІАН (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCKCVeAihEfJr-pGH7B73Wyg.m3u8
-#EXTINF:-1 tvg-id="Khabar24.kz",Хабар 24 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="24KZ.kz",Хабар 24 (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCnAFKvDuqBGkIfV8Vn0J_CQ.m3u8
 #EXTINF:-1 tvg-id="CENTR.ua",Центр (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCQeGq915GhiFlOE-fuoXGKQ.m3u8

From b906c3c19fd057e33030b6d3a390eb75ea7740b8 Mon Sep 17 00:00:00 2001
From: Alstruit <34786806+Alstruit@users.noreply.github.com>
Date: Tue, 26 Dec 2023 06:17:11 -0600
Subject: [PATCH 06/15] Format streams

---
 streams/ae.m3u         |  4 +--
 streams/au.m3u         |  4 +--
 streams/co.m3u         | 12 +++----
 streams/cr.m3u         |  6 ++--
 streams/fi.m3u         |  4 +--
 streams/fr.m3u         |  4 +--
 streams/id.m3u         | 20 ++++++------
 streams/in.m3u         |  8 ++---
 streams/kz.m3u         |  4 +--
 streams/mx.m3u         | 14 ++++----
 streams/pe.m3u         |  4 +--
 streams/pl.m3u         |  4 +--
 streams/rs.m3u         |  4 +--
 streams/ru.m3u         |  8 ++---
 streams/ru_catcast.m3u | 24 +++++++-------
 streams/ru_smotrim.m3u | 12 +++----
 streams/ua.m3u         |  4 +--
 streams/us.m3u         | 12 +++----
 streams/us_local.m3u   | 74 +++++++++++++++++++++---------------------
 19 files changed, 112 insertions(+), 114 deletions(-)

diff --git a/streams/ae.m3u b/streams/ae.m3u
index ccdc90036..ee9e6a8aa 100644
--- a/streams/ae.m3u
+++ b/streams/ae.m3u
@@ -75,6 +75,8 @@ https://weyyak-live.akamaized.net/weyyak_dubai_tv/index.m3u8
 http://210.210.155.37/uq2663/h/h152/index2.m3u8
 #EXTINF:-1 tvg-id="DubaiZaman.ae",Dubai Zaman (1080p) [Not 24/7]
 https://dmiffthvll.cdn.mangomolo.com/dubaizaman/smil:dubaizaman.stream.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="FujairahTV.ae",Fujairah TV (720p)
+https://live.kwikmotion.com/fujairahlive/fujairah.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Majid.ae",Majid TV (1080p)
 https://admdn5.cdn.mangomolo.com/majid/smil:majid.stream.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="MBC1.ae",MBC 1 (1080p)
@@ -155,5 +157,3 @@ https://admdn1.cdn.mangomolo.com/yastv/smil:yastv.stream.smil/playlist.m3u8
 https://weyyak-live.akamaized.net/weyyak_zee_aflam/index.m3u8
 #EXTINF:-1 tvg-id="ZeeAlwan.in",Zee Alwan (720p) [Geo-blocked]
 https://weyyak-live.akamaized.net/weyyak_zee_alwan/index.m3u8
-#EXTINF:-1 tvg-id="FujairahTV.ae",Fujairah TV (720p)
-https://live.kwikmotion.com/fujairahlive/fujairah.smil/playlist.m3u8
diff --git a/streams/au.m3u b/streams/au.m3u
index 21a87679b..3534889ba 100644
--- a/streams/au.m3u
+++ b/streams/au.m3u
@@ -51,6 +51,8 @@ https://d1k6kax80wecy5.cloudfront.net/RLnAKY/index.m3u8
 https://npc.cdn.7livecloud.io/hls/live/SYD1/master.m3u8
 #EXTINF:-1 tvg-id="Channel9Melbourne.au",Channel 9 (720p) [Geo-blocked]
 https://9now-livestreams.akamaized.net/hls/live/2008322/ch9-mel/master.m3u8
+#EXTINF:-1 tvg-id="10Sydney.au",Channel 10 (720p) [Geo-blocked]
+https://i.mjh.nz/10-nsw.m3u8
 #EXTINF:-1 tvg-id="Channel44.au",Channel 44 (480p)
 https://d1k6kax80wecy5.cloudfront.net/WFqZJc/index.m3u8
 #EXTINF:-1 tvg-id="ExpoChannel.au",Expo Channel (360p)
@@ -61,8 +63,6 @@ https://videodelivery.net/9fb3596948ddf463fde0ec4b85625b24/manifest/video.m3u8
 https://us170.jagobd.com:447/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/jonmobhumitv.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="M4TVMalayalam.au",M4TV Malayalam (1080p) [Not 24/7]
 https://app.m4stream.live/mfourmalayalamhls/live.m3u8
-#EXTINF:-1 tvg-id="10Sydney.au",Channel 10 (720p) [Geo-blocked]
-https://i.mjh.nz/10-nsw.m3u8
 #EXTINF:-1 tvg-id="",Race Central TV (720p) [Not 24/7]
 https://nrpus.bozztv.com/36bay2/gusa-racecentral/index.m3u8
 #EXTINF:-1 tvg-id="Racingcom.au",Racing.com (720p)
diff --git a/streams/co.m3u b/streams/co.m3u
index 587595a28..7f490aa72 100644
--- a/streams/co.m3u
+++ b/streams/co.m3u
@@ -20,9 +20,9 @@ https://tvlatina.live:1936/8012/8012/playlist.m3u8
 #EXTINF:-1 tvg-id="Cablenoticias.co",Cablenoticias (1080p)
 https://5ea86ddd14ce7.streamlock.net/live/cable09061970/playlist.m3u8
 #EXTINF:-1 tvg-id="CaliTV.co",Cali TV (540p) [Not 24/7]
-https://5ab772334c39c.streamlock.net/live-calitv/calitv1/playlist.m3u8
-#EXTINF:-1 tvg-id="CaliTV.co",Cali TV (540p) [Not 24/7]
 http://vbox.cehis.net/live-calitv/calitv1/playlist.m3u8
+#EXTINF:-1 tvg-id="CaliTV.co",Cali TV (540p) [Not 24/7]
+https://5ab772334c39c.streamlock.net/live-calitv/calitv1/playlist.m3u8
 #EXTINF:-1 tvg-id="CampoTelevision.co",Campo Televisión (720p)
 https://video17.virtualtronics.com/streamer/canalcampotv.m3u8
 #EXTINF:-1 tvg-id="Canal1.co",Canal 1 (1080p) [Geo-blocked]
@@ -31,8 +31,6 @@ https://mdstrm.com/live-stream-playlist/5a5e1c2568b1910913db5fe2.m3u8
 https://stmv1.voxtvhd.com.br/alpavision/alpavision/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal2.co",Canal 2 Cali (720p)
 https://video13.virtualtronics.com/streamer/canal2.m3u8
-#EXTINF:-1 tvg-id="Canal55TelemoriscoTV.co",Canal 55 Telemorisco TV (720p)
-http://canal.mediaserver.com.co/live/telemorisco.m3u8
 #EXTINF:-1 tvg-id="Canal8TVPlus.co",Canal 8 TV+ (720p)
 https://movil.ejeserver.com/live/canal8tv.m3u8
 #EXTINF:-1 tvg-id="Canal8TVPlus.co",Canal 8 TV+ (720p)
@@ -41,6 +39,8 @@ https://video.ejeserver.com/live/canal8tv.m3u8
 https://video2.lhdserver.es/canal9cosespu/live.m3u8
 #EXTINF:-1 tvg-id="Canal14Codazzi.co",Canal 14 Codazzi (720p) [Not 24/7]
 https://eu1.servers10.com:8081/8056/index.m3u8
+#EXTINF:-1 tvg-id="Canal55TelemoriscoTV.co",Canal 55 Telemorisco TV (720p)
+http://canal.mediaserver.com.co/live/telemorisco.m3u8
 #EXTINF:-1 tvg-id="CanalCapital.co",Canal Capital (1080p)
 https://play.cdn.enetres.net/C99D9A0676F3401589C768D47D31605C021/021/playlist.m3u8
 #EXTINF:-1 tvg-id="CanalDos.co",Canal Dos Yopal (720p) [Not 24/7]
@@ -196,8 +196,6 @@ https://video.ejeserver.com/live/telesanjacinto.m3u8
 #EXTINF:-1 tvg-id="TeleVid.co",Tele Vid (1080p)
 #EXTVLCOPT:http-referrer=https://player.instantvideocloud.net/
 https://liveingesta118.cdnmedia.tv/televidtvlive/smil:dvrlive.smil/playlist.m3u8?DVR=
-#EXTINF:-1 tvg-id="Televilla.co",Televilla (720p) [Not 24/7]
-https://cp.panelchs.com:1936/8060/8060/playlist.m3u8
 #EXTINF:-1 tvg-id="Teleantioquia.co",Teleantioquia (1080p)
 https://d1xgz5r2yxvjwj.cloudfront.net/out/v1/49d5fdc5370d4f43aab4930ec7a9cbf8/index.m3u8
 #EXTINF:-1 tvg-id="Teleantioquia.co",Teleantioquia (360p) [Not 24/7]
@@ -227,6 +225,8 @@ https://canal.mediaserver.com.co/live/telemusica.m3u8
 https://stream.logicideas.media/telepacifico-live/smil:live.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Telesangil.co",Telesangil (720p) [Not 24/7]
 https://hvtraficonew.ddns.net/tvsangil/tvsangil/index.m3u8
+#EXTINF:-1 tvg-id="Televilla.co",Televilla (720p) [Not 24/7]
+https://cp.panelchs.com:1936/8060/8060/playlist.m3u8
 #EXTINF:-1 tvg-id="Trece.co",Trece (720p)
 https://stream.logicideas.media/canaltrece-live/smil:live.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TrecePlus.co",Trece + (720p)
diff --git a/streams/cr.m3u b/streams/cr.m3u
index 07a12c2a7..36884616f 100644
--- a/streams/cr.m3u
+++ b/streams/cr.m3u
@@ -106,9 +106,9 @@ https://video20.klm99.com:3558/live/teleredlive.m3u8
 #EXTINF:-1 tvg-id="Telesistema.cr",Telesistema (480p) [Not 24/7]
 https://59ef525c24caa.streamlock.net/ARBtv/ARBtv/playlist.m3u8
 #EXTINF:-1 tvg-id="TeleSURCostaRica.cr",TeleSUR Costa Rica (720p) [Not 24/7]
-https://s1.tvdatta.com:3582/live/telesurlive.m3u8
-#EXTINF:-1 tvg-id="TeleSURCostaRica.cr",TeleSUR Costa Rica (720p) [Not 24/7]
 https://59ef525c24caa.streamlock.net/telesur/telesur/playlist.m3u8
+#EXTINF:-1 tvg-id="TeleSURCostaRica.cr",TeleSUR Costa Rica (720p) [Not 24/7]
+https://s1.tvdatta.com:3582/live/telesurlive.m3u8
 #EXTINF:-1 tvg-id="Teletica7.cr",Teletica 7 (720p) [Geo-blocked]
 #EXTVLCOPT:http-referrer=https://bradmax.com
 https://cdn01.teletica.com/TeleticaLiveStreamCR/Stream/playlist_dvr.m3u8
@@ -116,8 +116,6 @@ https://cdn01.teletica.com/TeleticaLiveStreamCR/Stream/playlist_dvr.m3u8
 https://593b04c4c5670.streamlock.net/portalfoxmix/portalfoxmix/.m3u8
 #EXTINF:-1 tvg-id="TVCurre.cr",TV Curré (720p) [Not 24/7]
 http://k6.usastreams.online/Tvcurre/Tvcurre/playlist.m3u8
-#EXTINF:-1 tvg-id="TVSantaCruz.cr",TV Santa Cruz (720p) [Not 24/7]
-https://rtmp.info/tvsantacruz/envivo/playlist.m3u8
 #EXTINF:-1 tvg-id="TVSurCanal9.cr",TV Sur Canal 9 (480p) [Not 24/7]
 http://tv.ticosmedia.com:1935/TVSUR/TVSUR/playlist.m3u8
 #EXTINF:-1 tvg-id="TVSurCanal14.cr",TV Sur Canal 14 (720p)
diff --git a/streams/fi.m3u b/streams/fi.m3u
index 45e221d09..484a6af47 100644
--- a/streams/fi.m3u
+++ b/streams/fi.m3u
@@ -40,7 +40,7 @@ https://yletv.akamaized.net/hls/live/622365/yletv1fin/playlist.m3u8
 https://yletv.akamaized.net/hls/live/622366/yletv2fin/playlist.m3u8
 #EXTINF:-1 tvg-id="YleTeemaFem.fi",YLE TV Teema & Fem (720p) [Geo-blocked]
 https://yletv.akamaized.net/hls/live/622367/yletvteemafemfin/playlist.m3u8
-#EXTINF:-1 tvg-id="NebesaTV7.ru",Небеса ТВ7 (720p)
-https://vod.tv7.fi/tv7-ru/tv7-ru.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="YleX.fi",YleX (720p)
 https://ylestudiolive.akamaized.net/hls/live/2007826/ylestudiolive-YleX/master.m3u8
+#EXTINF:-1 tvg-id="NebesaTV7.ru",Небеса ТВ7 (720p)
+https://vod.tv7.fi/tv7-ru/tv7-ru.smil/playlist.m3u8
diff --git a/streams/fr.m3u b/streams/fr.m3u
index d32428b4d..c1097773a 100644
--- a/streams/fr.m3u
+++ b/streams/fr.m3u
@@ -145,6 +145,8 @@ https://figarotv-live.freecaster.com/live/freecaster/figarotv.m3u8
 https://static.lefigaro.fr/secom/tnt.m3u8
 #EXTINF:-1 tvg-id="",Le Media
 https://raw.githubusercontent.com/Sphinxroot/HSL/main/DM/fr/LeMedia.m3u8
+#EXTINF:-1 tvg-id="LittoralFMTV.fr",Littoral FM (720p)
+https://live.creacast.com/littoralfm-ch1/stream/playlist.m3u8
 #EXTINF:-1 tvg-id="LyonCapitaleTV.fr",Lyon Capitale TV
 https://raw.githubusercontent.com/Sphinxroot/HSL/main/DM/fr/LyonCapitale.m3u8
 #EXTINF:-1 tvg-id="MaisonTravauxTV.fr",Maison&Travaux
@@ -269,5 +271,3 @@ https://vosgestv.live-kd.com/live/vosgestv/vosgestv/playlist.m3u8
 https://live.digiteka.com/1/WGQ1NnhEN0lzM0NU/dk1EOHhw/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="Weo.fr",Wéo (Picardie) (480p) [Not 24/7]
 https://live.digiteka.com/1/Zks2L0VsM2V0T242/QTBqcFly/hls/live/playlist.m3u8
-#EXTINF:-1 tvg-id="LittoralFMTV.fr",Littoral FM (720p)
-https://live.creacast.com/littoralfm-ch1/stream/playlist.m3u8
diff --git a/streams/id.m3u b/streams/id.m3u
index 872658162..7e863e748 100644
--- a/streams/id.m3u
+++ b/streams/id.m3u
@@ -53,7 +53,7 @@ http://livestream.biznetvideo.net/biznet_kids/smil:kids.smil/chunklist_w41736285
 #EXTINF:-1 tvg-id="BiznetLifestyle.id",Biznet Lifestyle (480p)
 http://livestream.biznetvideo.net/biznet_lifestyle/smil:lifestyle.smil/chunklist_w109806785_b2256000_slen_tkYml6a2V5bGl2ZXN0YXJ0dGltZT0wJmJpemtleWxpdmVlbmR0aW1lPTAmYml6a2V5bGl2ZUN1c3RvbVBhcmFtZXRlcj1teVBhcmFtZXRlciZiaXprZXlsaXZlaGFzaD1qZ0RLUGNsY0dkWmZ2cklEeGZNZHBUN3Zfc3JNV0NidWJudEdvOWNDWVdwY0JCUWFsTWxMUXhIc3dtNDNQYlZS.m3u8
 #EXTINF:-1 tvg-id="BNTV.id",BNTV [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch394%29/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch394)/index.m3u8
 #EXTINF:-1 tvg-id="BRTV.id",BRTV (1080p) [Not 24/7]
 https://e1.siar.us/badartv/live/playlist.m3u8
 #EXTINF:-1 tvg-id="BTV.id",BTV (720p)
@@ -65,11 +65,11 @@ https://wowza.convergen.co/ctv/ctv.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="CelebesTV.id",Celebes TV [Not 24/7]
 https://ams.juraganstreaming.com:5443/LiveApp/streams/celebesmedia.m3u8
 #EXTINF:-1 tvg-id="CitraDangdut.id",Citra Dangdut [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch377%29/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch377)/index.m3u8
 #EXTINF:-1 tvg-id="CitraDrama.id",Citra Drama (720p) [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch378%29/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch378)/index.m3u8
 #EXTINF:-1 tvg-id="CitraMuslim.id",Citra Muslim [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch334%29/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch334)/index.m3u8
 #EXTINF:-1 tvg-id="CNBCIndonesia.id",CNBC Indonesia (720p)
 https://live.cnbcindonesia.com/livecnbc/smil:cnbctv.smil/master.m3u8
 #EXTINF:-1 tvg-id="CNNIndonesia.id",CNN Indonesia (720p) [Geo-blocked]
@@ -98,7 +98,7 @@ https://v3.siar.us/ficomchannel/live/playlist.m3u8
 #EXTINF:-1 tvg-id="GarudaTV.id",Garuda TV (1080p)
 http://stream.garuda.tv/live/garudatv/playlist.m3u8
 #EXTINF:-1 tvg-id="GarudaTV.id",Garuda TV (1080p) [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch45%29/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch45)/index.m3u8
 #EXTINF:-1 tvg-id="GPRTV.id",GPR TV (720p)
 https://alfa.kugo.id/gprtv/rtmp.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="GPRTV.id",GPR TV (720p)
@@ -107,7 +107,7 @@ https://wowza.convergen.co/gprtv/myLive/playlist.m3u8
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (X11; Linux x86_64)
 https://h1.intechmedia.net/intech/ch8.m3u8
 #EXTINF:-1 tvg-id="Horee.id",Horee! (720p) [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch375%29/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch375)/index.m3u8
 #EXTINF:-1 tvg-id="HumaBetangTV.id",Huma Betang TV (720p) [Not 24/7]
 https://v3.siar.us/humabetangtv/live/playlist.m3u8
 #EXTINF:-1 tvg-id="IAmChannel.id",I AM CHANNEL (576p) [Not 24/7]
@@ -115,7 +115,7 @@ http://iamchannel.org:1935/tes/1/playlist.m3u8
 #EXTINF:-1 tvg-id="IDTV.id",IDTV (720p) [Not 24/7]
 https://b1world.beritasatumedia.com/Beritasatu/B1World_manifest.m3u8
 #EXTINF:-1 tvg-id="IDXChannel.id",IDX Channel (720p) [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch389%29/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch389)/index.m3u8
 #EXTINF:-1 tvg-id="IndonesianaTV.id",Indonesiana.TV (720p)
 https://kbtv.akamaized.net/hls/live/2031188/kanalbuya/playlist.m3u8
 #EXTINF:-1 tvg-id="InsanTV.id" user-agent="Mozilla/5.0 (X11; Linux x86_64)",Insan TV (360p) [Geo-blocked]
@@ -126,7 +126,7 @@ https://inspiratv.siar.us/inspiratv/live/playlist.m3u8
 #EXTINF:-1 tvg-id="IzzahTV.id",Izzah TV (480p)
 https://streaming.radiosalamjambi.com/izzahtv.m3u8
 #EXTINF:-1 tvg-id="JakTV.id",Jak TV (480p) [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch392%29/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch392)/index.m3u8
 #EXTINF:-1 tvg-id="JambiTV.id",Jambi TV (576p) [Not 24/7]
 http://122.248.43.138:1935/ch23/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="JawaPosTV.id",Jawa Pos TV (720p) [Not 24/7]
@@ -147,7 +147,7 @@ https://h1.intechmedia.net/intech/ch65.m3u8
 #EXTINF:-1 tvg-id="JogjaTV.id",Jogja TV (720p) [Not 24/7]
 https://stream.jogjatv.co.id/jtvlive/stream/index.m3u8
 #EXTINF:-1 tvg-id="JTV.id",JTV (720p) [Not 24/7] [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch17%29/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch17)/index.m3u8
 #EXTINF:-1 tvg-id="",kugo Star (576i)
 https://alfa.kugo.id/playout/KugoStar.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="LingkarTV.id",Lingkar TV
@@ -406,4 +406,4 @@ https://cdn-telkomsel-01.akamaized.net/Content/HLS/Live/channel(18564c27-ff44-4d
 #EXTINF:-1 tvg-id="WesalTV.id",Wesal TV (720p) [Not 24/7]
 https://ams.juraganstreaming.com:5443/LiveApp/streams/wesaltv.m3u8
 #EXTINF:-1 tvg-id="ZeeBioskop.id",Zee Bioskop (360p) [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch161%29/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch161)/index.m3u8
diff --git a/streams/in.m3u b/streams/in.m3u
index ef549e7d2..e36c073b9 100644
--- a/streams/in.m3u
+++ b/streams/in.m3u
@@ -138,6 +138,8 @@ https://prod-sports-north-gm.jiocinema.com/bpk-tv/Colors_Super_voot_MOB/Fallback
 https://prod-sports-north-gm.jiocinema.com/bpk-tv/Colors_Tamil_HD_voot_MOB/Fallback/index.m3u8
 #EXTINF:-1 tvg-id="ComedyCentral.in",Comedy Central India (1080p)
 https://prod-sports-north-gm.jiocinema.com/bpk-tv/Comedy_Central_HD_voot_MOB/Fallback/index.m3u8
+#EXTINF:-1 tvg-id="DDNews.in",DD News (1080p)
+https://hls.media.nic.in/hls/live/ddnews/ddnews.m3u8
 #EXTINF:-1 tvg-id="DDSports.in",DD Sports (576p)
 http://103.199.161.254/Content/ddsports/Live/Channel(DDSPORTS)/index.m3u8
 #EXTINF:-1 tvg-id="DesiChannel.in",Desi Channel (720p)
@@ -154,8 +156,6 @@ https://vidcdn.vidgyor.com/dighvijay-origin/liveabr/playlist.m3u8
 https://live.hungama.com/linear/dil-se/playlist.m3u8
 #EXTINF:-1 tvg-id="DoctorLive.in",Doctor Live (720p)
 https://5a1178b42cc03.streamlock.net/8250/8250/playlist.m3u8
-#EXTINF:-1 tvg-id="DDNews.in",DD News (1080p)
-https://hls.media.nic.in/hls/live/ddnews/ddnews.m3u8
 #EXTINF:-1 tvg-id="DY365.in",DY 365 (360p)
 https://cdn.smartstream.video/smartstream-us/dy365/dy365/playlist.m3u8
 #EXTINF:-1 tvg-id="EagleOneNews.in",Eagle One News (576p)
@@ -609,11 +609,11 @@ http://103.85.204.205:1935/VISIONMEDIA/live/playlist.m3u8
 https://5b48d7e1b4bce.streamlock.net/myapp/vtvlive/playlist.m3u8
 #EXTINF:-1 tvg-id="VTVNews.in",VTV News (360p)
 https://cdn.smartstream.video/smartstream-us/vtvlive/vtvlive/playlist.m3u8
+#EXTINF:-1 tvg-id="VyasChannel.in",Vyas NIC (576p)
+https://playhls.media.nic.in/hls/live/vyas/vyas.m3u8
 #EXTINF:-1 tvg-id="VyasChannel.in",Vyas NIC (480p)
 #EXTVLCOPT:http-referrer=https://webcast.gov.in/
 https://hls.media.nic.in/hls/live/vyas/vyas.m3u8
-#EXTINF:-1 tvg-id="VyasChannel.in",Vyas NIC (576p)
-https://playhls.media.nic.in/hls/live/vyas/vyas.m3u8
 #EXTINF:-1 tvg-id="WeOneKerala.in",We One Kerala (720p) [Geo-blocked]
 http://kl.logicwebs.in:1935/sreemedia/sreemedia/playlist.m3u8
 #EXTINF:-1 tvg-id="WION.in",WION (1080p)
diff --git a/streams/kz.m3u b/streams/kz.m3u
index ce8ec6c05..34d6813cc 100644
--- a/streams/kz.m3u
+++ b/streams/kz.m3u
@@ -1,6 +1,8 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="AbaiTV.kz",Abai TV
 https://abaitv-stream.qazcdn.com/abaitv/abaitv/playlist.m3u8
+#EXTINF:-1 tvg-id="AlauTV.kz",Alau TV (576p)
+https://otv.wotom.net/alau/stream.m3u8
 #EXTINF:-1 tvg-id="Aqjaiyq.kz",Aqjaiyq (576p)
 https://stream.kaztrk.kz/regional/oraltv/index.m3u8
 #EXTINF:-1 tvg-id="Aqtobe.kz",Aqtóbe (576p)
@@ -59,5 +61,3 @@ https://1tvkz-stream.daitsuna.net/1tvkz/1tvkz/playlist.m3u8
 http://serv30.vintera.tv:8081/habar/habar24/playlist.m3u8
 #EXTINF:-1 tvg-id="24KZ.kz",Хабар 24 (720p) [Not 24/7]
 https://live-24kz.cdnvideo.ru/24kz/24kz.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="AlauTV.kz",Alau TV (576p)
-https://otv.wotom.net/alau/stream.m3u8
diff --git a/streams/mx.m3u b/streams/mx.m3u
index 9f0de54d5..eace920e8 100644
--- a/streams/mx.m3u
+++ b/streams/mx.m3u
@@ -172,18 +172,18 @@ https://stream8.mexiserver.com:1936/misurtv/misurtv/playlist.m3u8
 https://616eee1852d6c.streamlock.net/live/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="MVMNoticias.mx",MVM Noticias [Geo-blocked]
 https://dish.akamaized.net/Content/HLS_HLS_CLR/Live/channel(mvs)/variant.m3u8
-#EXTINF:-1 tvg-id="NNVeracruz.mx",NNVeracruz (640p)
-https://s.emisoras.tv:8081/nnveracruz/index.m3u8
 #EXTINF:-1 tvg-id="NPlus.mx",NMás (1080p)
 https://channel07-notusa.akamaized.net/hls/live/2036971/event01/index.m3u8
 #EXTINF:-1 tvg-id="NPlusMedia.mx",NMás Media (1080p)
 https://channel04-notusa.akamaized.net/hls/live/2029754-b/event01/index.m3u8
 #EXTINF:-1 tvg-id="NPlusMedia.mx",NMás Media (1080p)
 https://channel04-notusa.akamaized.net/hls/live/2029754/event01/index.m3u8
-#EXTINF:-1 tvg-id="NRTMexicoRegionCentro.mx",NRT México Región Centro (720p)
-https://59e88b197fb16.streamlock.net:4443/live/canal4/playlist.m3u8
+#EXTINF:-1 tvg-id="NNVeracruz.mx",NNVeracruz (640p)
+https://s.emisoras.tv:8081/nnveracruz/index.m3u8
 #EXTINF:-1 tvg-id="NRTMexicoInternacional.mx",NRT México Internacional (720p)
 https://59e88b197fb16.streamlock.net:4443/live/canal24/playlist.m3u8
+#EXTINF:-1 tvg-id="NRTMexicoRegionCentro.mx",NRT México Región Centro (720p)
+https://59e88b197fb16.streamlock.net:4443/live/canal4/playlist.m3u8
 #EXTINF:-1 tvg-id="NRTMexicoRegionSureste.mx",NRT México Región Sureste (720p)
 https://59e88b197fb16.streamlock.net:4443/live/canal6/playlist.m3u8
 #EXTINF:-1 tvg-id="NueveTV.mx",Nueve TV San Luís Potosí (720p)
@@ -238,13 +238,15 @@ https://mdstrm.com/live-stream-playlist/62f2c855f7981b5a5a2d8763.m3u8
 https://5e50264bd6766.streamlock.net/telemarcampeche/videotelemarcampeche/playlist.m3u8
 #EXTINF:-1 tvg-id="XEWHTDT.mx",Telemax (XEWH-TDT) (1080p)
 http://s5.mexside.net:1935/telemax/telemax/playlist.m3u8
+#EXTINF:-1 tvg-id="TeleplaySureste.mx",Teleplay Sureste (720p)
+https://teleplay.mediaflix.istream.mx/livestream/teleplay/livehd/playlist.m3u8
 #EXTINF:-1 tvg-id="TeleplaySureste.mx",Teleplay Sureste (360p)
 https://teleplay.mediaflix.istream.mx/livestream/teleplay/livesd/playlist.m3u8
 #EXTINF:-1 tvg-id="Teleritmo.mx",Teleritmo (720p) [Not 24/7]
 https://mdstrm.com/live-stream-playlist/57b4dc126338448314449d0c.m3u8
 #EXTINF:-1 tvg-id="TlaxcalaTV.mx",Tlaxcala Televisión (360p) [Not 24/7]
 https://vid.mega00.com:5443/LiveApp/streams/928111829917388844551988/928111829917388844551988.m3u8?token=null
-#EXTINF:-1 tvg-id="TN23.mx",TN23 México (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="",TN23 México (720p) [Not 24/7]
 https://dbdfj5y8nz2u4.cloudfront.net/TN23/139a1b22959c10235fe85f3db0041ecf.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="TransmediaTelevisionMorelia.mx",Transmedia Televisión Morelia (614p) [Geo-blocked]
 http://streamingcws20.com:1935/tmtv/videotmtv/playlist.m3u8
@@ -332,5 +334,3 @@ https://d1f3q72l8uy8ur.cloudfront.net/v1/master/3722c60a815c199d9c0ef36c5b73da68
 https://stream.oursnetworktv.com/latin/encoder73/playlist.m3u8
 #EXTINF:-1 tvg-id="XtiNetwork.mx",Xti Network (288p)
 https://stream8.mexiserver.com:1936/xtinetwork/xtinetwork/playlist.m3u8
-#EXTINF:-1 tvg-id="TeleplaySureste.mx",Teleplay Sureste (720p)
-https://teleplay.mediaflix.istream.mx/livestream/teleplay/livehd/playlist.m3u8
diff --git a/streams/pe.m3u b/streams/pe.m3u
index 9c69984d9..362e0961c 100644
--- a/streams/pe.m3u
+++ b/streams/pe.m3u
@@ -107,6 +107,8 @@ https://streamtv.onliv3.online:1936/karibtv/karibtv/playlist.m3u8
 http://ott.streann.com:8080/loadbalancer/services/public/channels/59ce7f292cdc7ba015a93b82/playlist.m3u8
 #EXTINF:-1 tvg-id="LaRiberena.pe",La Ribereña (Pucallpa) (480p) [Not 24/7]
 https://cloudvideo.servers10.com:8081/8070/index.m3u8
+#EXTINF:-1 tvg-id="Latina.pe",Latina (720p)
+https://redirector.rudo.video/hls-video/567ffde3fa319fadf3419efda25619456231dfea/latina/latina.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Latina.pe",Latina (720p) [Geo-blocked]
 https://live-latinav2-mdstrm.secure.footprint.net/live-stream-mp/d1aden84nxx8u4/3330943a0248407faa8c6f5f5c874fa4/5ce7109c7398b977dc0744cd/index.m3u8
 #EXTINF:-1 tvg-id="LimaLive.pe",LimaLive (720p) [Not 24/7]
@@ -279,5 +281,3 @@ https://live.obslivestream.com/vztv/index.m3u8
 https://live.obslivestream.com/wtv/index.m3u8
 #EXTINF:-1 tvg-id="XTVChachapoyas.pe",X TV Chachapoyas (720p)
 https://vdo.grupolimalive.com:3087/live/xtvlive.m3u8
-#EXTINF:-1 tvg-id="Latina.pe",Latina (720p)
-https://redirector.rudo.video/hls-video/567ffde3fa319fadf3419efda25619456231dfea/latina/latina.smil/playlist.m3u8
diff --git a/streams/pl.m3u b/streams/pl.m3u
index 9dd081a33..a1d137014 100644
--- a/streams/pl.m3u
+++ b/streams/pl.m3u
@@ -9,6 +9,8 @@ https://cdn-main.lolokoko.tv/DisneyXD.stream/playlist.m3u8
 http://94.246.128.53:1935/tv/dlaCiebieTv/playlist.m3u8
 #EXTINF:-1 tvg-id="dlaCiebietv.pl",dlaCiebie.tv (1080p) [Not 24/7]
 https://6034e09794f07.streamlock.net/tv/dlaCiebieTv/playlist.m3u8
+#EXTINF:-1 tvg-id="EWTNPoland.pl",EWTN Poland (1080p)
+https://cdn3.wowza.com/1/ZHdrMWt1NjlDSzFu/bzdDVG10/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="EzoTV.pl",Ezo TV (576p) [Not 24/7]
 http://live.ezotv.pl:1935/live/EZOTV/playlist.m3u8
 #EXTINF:-1 tvg-id="HopeChannelPolska.pl",Hope Channel Polska (720p)
@@ -109,5 +111,3 @@ http://hbbtvlive.v3.tvp.pl/hbbtvlive/livestream.php?app_id=tvpinfo
 https://live.streamtvt.pl/LiveAppStreamTVT/streams/853271271313930867905724.m3u8
 #EXTINF:-1 tvg-id="TVTZgorzelec.pl",TVT Zgorzelec (576p) [Not 24/7]
 http://gargoyle.tomkow.pl/hls/tvt.m3u8
-#EXTINF:-1 tvg-id="EWTNPoland.pl",EWTN Poland (1080p)
-https://cdn3.wowza.com/1/ZHdrMWt1NjlDSzFu/bzdDVG10/hls/live/playlist.m3u8
diff --git a/streams/rs.m3u b/streams/rs.m3u
index 4849d016f..25a07256b 100644
--- a/streams/rs.m3u
+++ b/streams/rs.m3u
@@ -39,6 +39,8 @@ http://109.105.201.198/PINKWORLD/playlist.m3u8
 http://109.105.201.198/PINKWORLDCINEMA/playlist.m3u8
 #EXTINF:-1 tvg-id="PinkZabava.rs",Pink Zabava (360p)
 http://109.105.201.198/PINKZABAVA/playlist.m3u8
+#EXTINF:-1 tvg-id="RadioLolaTV.rs",Radio Lola (720p) [Not 24/7]
+https://peer2.tdiradio.com/static/streaming-playlists/hls/7c3ea8d3-49dc-4e1b-8b1e-dc6fab71f5cf/0.m3u8
 #EXTINF:-1 tvg-id="RedTV.rs",Red TV (720p)
 https://live.rednet.rs/providus/redtv_multi.m3u8
 #EXTINF:-1 tvg-id="RedTV.rs",Red TV (720p)
@@ -83,5 +85,3 @@ https://stream.pikanal.rs/pikanal/pgm.m3u8
 https://5bc45691ca49f.streamlock.net/tvpirot/uzivo/playlist.m3u8
 #EXTINF:-1 tvg-id="TelevizijaPruga.rs",TV Pruga (1080p)
 https://stream.pruga.rs:8443/live/pruga/index.m3u8
-#EXTINF:-1 tvg-id="RadioLolaTV.rs",Radio Lola (720p) [Not 24/7]
-https://peer2.tdiradio.com/static/streaming-playlists/hls/7c3ea8d3-49dc-4e1b-8b1e-dc6fab71f5cf/0.m3u8
diff --git a/streams/ru.m3u b/streams/ru.m3u
index d60b16eb3..6f259565c 100644
--- a/streams/ru.m3u
+++ b/streams/ru.m3u
@@ -21,6 +21,10 @@ http://stream.backustv.ru/live/btv/index.m3u8
 http://176.74.80.162:8099/Cinema/index.m3u8
 #EXTINF:-1 tvg-id="",Cinema Classic
 https://api.alpaca.t62a.com/hls/9114/stream0.m3u8
+#EXTINF:-1 tvg-id="",DanceHits80
+http://92.255.108.46:8080/index.m3u8
+#EXTINF:-1 tvg-id="",DanceHits80
+http://dancehits80.denvs.ru:8080/index.m3u8
 #EXTINF:-1 tvg-id="FAN.ru",FAN
 http://94.230.240.17:8080/fan/index.m3u8
 #EXTINF:-1 tvg-id="FilmBox.ru",FilmBox Russia (576p)
@@ -270,7 +274,3 @@ http://stream0.tv41.ru/live.m3u8
 https://live-echotv.cdnvideo.ru/echotv/echotv.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="Yuvelirochka.ru",Ювелирочка ТВ (576p)
 https://live-uvelirochka.cdnvideo.ru/uvelirochka/uvelirochka_720p3/playlist.m3u8
-#EXTINF:-1 tvg-id="",DanceHits80
-http://dancehits80.denvs.ru:8080/index.m3u8
-#EXTINF:-1 tvg-id="",DanceHits80
-http://92.255.108.46:8080/index.m3u8
diff --git a/streams/ru_catcast.m3u b/streams/ru_catcast.m3u
index 05ba3d34c..c5bcd98fb 100644
--- a/streams/ru_catcast.m3u
+++ b/streams/ru_catcast.m3u
@@ -1,31 +1,31 @@
 #EXTM3U
+#EXTINF:-1 tvg-id="",A21 Network | Russian Motorsport Television
+https://autopilot.catcast.tv/content/37909/index.m3u8
+#EXTINF:-1 tvg-id="",Dance Hits Of The 90s
+https://autopilot.catcast.tv/content/39500/index.m3u8
 #EXTINF:-1 tvg-id="",Eurodance 90 HD (1080p) [Not 24/7]
 https://eurodance90.catcast.tv/content/36987/index.m3u8
 #EXTINF:-1 tvg-id="FreshTV.am",Fresh TV (720p)
 https://freshtv.catcast.tv/content/33718/index.m3u8
 #EXTINF:-1 tvg-id="VIVARussia.ru",VIVA Russia (1080p)
 http://autopilot.catcast.tv/content/39575/index.m3u8
-#EXTINF:-1 tvg-id="",Кино 1 International
-http://kino-1.catcast.tv/content/38617/index.m3u8
-#EXTINF:-1 tvg-id="",КИНО-1 INTERNATIONAL
-https://autopilot.catcast.tv/content/38617/index.m3u8
-#EXTINF:-1 tvg-id="",A21 Network | Russian Motorsport Television
-https://autopilot.catcast.tv/content/37909/index.m3u8
-#EXTINF:-1 tvg-id="",Dance Hits Of The 90s
-https://autopilot.catcast.tv/content/39500/index.m3u8
-#EXTINF:-1 tvg-id="",Сити Эдем TV
-https://autopilot.catcast.tv/content/34246/index.m3u8
 #EXTINF:-1 tvg-id="",Детское кино International
 https://autopilot.catcast.tv/content/38720/index.m3u8
+#EXTINF:-1 tvg-id="",Кино 1 International
+http://kino-1.catcast.tv/content/38617/index.m3u8
 #EXTINF:-1 tvg-id="Kino18PlusInternational.ru",Кино 18+ International
 https://autopilot.catcast.tv/content/40381/index.m3u8
+#EXTINF:-1 tvg-id="",КИНО-1 INTERNATIONAL
+https://autopilot.catcast.tv/content/38617/index.m3u8
+#EXTINF:-1 tvg-id="",Любимое Индийское Кино
+https://autopilot.catcast.tv/content/41596/index.m3u8
 #EXTINF:-1 tvg-id="",Музыка 1 International
 https://kino-1.catcast.tv/content/37745/index.m3u8
 #EXTINF:-1 tvg-id="",Музыка 2 International
 https://kino-1.catcast.tv/content/37742/index.m3u8
 #EXTINF:-1 tvg-id="",Музыка Кино International
 https://kino-1.catcast.tv/content/37739/index.m3u8
+#EXTINF:-1 tvg-id="",Сити Эдем TV
+https://autopilot.catcast.tv/content/34246/index.m3u8
 #EXTINF:-1 tvg-id="",ТВ «ШАНС»
 https://autopilot.catcast.tv/content/34776/index.m3u8
-#EXTINF:-1 tvg-id="",Любимое Индийское Кино
-https://autopilot.catcast.tv/content/41596/index.m3u8
diff --git a/streams/ru_smotrim.m3u b/streams/ru_smotrim.m3u
index 71136d8f4..c070137d9 100644
--- a/streams/ru_smotrim.m3u
+++ b/streams/ru_smotrim.m3u
@@ -1,12 +1,6 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="Carousel.ru",Карусель
 https://farm-vgtrk.rfn.ru/hls/karusel/playlist.m3u8
-#EXTINF:-1 tvg-id="RussiaK.ru",Россия-К
-https://farm-vgtrk.rfn.ru/hls/russia_k/playlist.m3u8
-#EXTINF:-1 tvg-id="RussiaK.ru",Россия-К
-https://farm-vgtrk.rfn.ru/live/smil:rk.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="RussiaK.ru",Россия-К
-https://farm-vgtrk.rfn.ru/live/smil:russiak.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="LenTV24.ru",ЛенТВ 24
 https://farm-vgtrk.rfn.ru/hls2/lentv24/playlist.m3u8
 #EXTINF:-1 tvg-id="Moskva24.ru",Москва 24
@@ -27,6 +21,12 @@ https://farm-vgtrk.rfn.ru/live/smil:rhd.smil/playlist.m3u8
 https://farm-vgtrk.rfn.ru/hls/russia_24/playlist.m3u8
 #EXTINF:-1 tvg-id="Russia24.ru",Россия 24
 https://farm-vgtrk.rfn.ru/live/smil:r24.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="RussiaK.ru",Россия-К
+https://farm-vgtrk.rfn.ru/hls/russia_k/playlist.m3u8
+#EXTINF:-1 tvg-id="RussiaK.ru",Россия-К
+https://farm-vgtrk.rfn.ru/live/smil:rk.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="RussiaK.ru",Россия-К
+https://farm-vgtrk.rfn.ru/live/smil:russiak.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="RTRPlaneta.ru",РТР Планета
 https://farm-vgtrk.rfn.ru/live/smil:rtrp.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="RTRPlanetaAsia.ru",РТР Планета Азия
diff --git a/streams/ua.m3u b/streams/ua.m3u
index 6b8755b07..f0b75f30a 100644
--- a/streams/ua.m3u
+++ b/streams/ua.m3u
@@ -27,6 +27,8 @@ http://portal.ott.pink/watch/7494/video.m3u8?geo=auto&token=CFEADF9789D77A45B3B3
 http://vcdn1.produck.company:1935/out/dtv/playlist.m3u8
 #EXTINF:-1 tvg-id="DumskayaTV.ua",Dumskaya TV (720p)
 http://cdn1.live-tv.od.ua:8081/dumska/dumska720p/playlist.m3u8
+#EXTINF:-1 tvg-id="EWTNUkraine.ua",EWTN Ukraine (1080p)
+https://cdn3.wowza.com/1/WjduMm1tYnlwNXQx/M01NV3Uz/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="FirstBusiness.ua" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:97.0) Gecko/20100101 Firefox/97.0",First Business (720p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:97.0) Gecko/20100101 Firefox/97.0
 https://pershij-dlovij.cdn-01.cosmonova.net.ua/hls/pershij-dlovij_ua_hi/index.m3u8
@@ -200,5 +202,3 @@ http://46.175.163.130/ks_plus/index.m3u8
 http://portal.ott.pink/watch/131/video.m3u8?geo=auto&token=CFEADF9789D77A45B3B359EE168CCCA6
 #EXTINF:-1 tvg-id="ChPinfo.ua",ЧП Инфо (576p)
 http://edge3.iptv.macc.com.ua/life/magnolia_3/index.m3u8
-#EXTINF:-1 tvg-id="EWTNUkraine.ua",EWTN Ukraine (1080p)
-https://cdn3.wowza.com/1/WjduMm1tYnlwNXQx/M01NV3Uz/hls/live/playlist.m3u8
diff --git a/streams/us.m3u b/streams/us.m3u
index 79bb2d316..696a45688 100644
--- a/streams/us.m3u
+++ b/streams/us.m3u
@@ -403,14 +403,20 @@ https://livecdn.live247stream.com/eternallife/tv/playlist.m3u8
 https://a.jsrdn.com/broadcast/7b1451fa52/+0000/c.m3u8
 #EXTINF:-1 tvg-id="EVTVMiami.us",EVTV Miami (720p) [Not 24/7]
 https://streannliveevtv.cachefly.net/Protected/sp=1;dirmatch=true/3be25dc13406bf70ff0208230e6fa803b88b95013fad257c025e481e2be3e214/evtv1/evtv1/playlist.m3u8
+#EXTINF:-1 tvg-id="EWTNAfricaAsia.us",EWTN Africa Asia (720p)
+https://cdn3.wowza.com/1/ZVBYYXFLLzE0c3NC/Qk1FMURC/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="EWTNAsiaPacific.us",EWTN Asia-Pacific (720p) [Not 24/7]
 https://cdn3.wowza.com/1/QmVNUVhTNTZSS3Uz/YWQ0aHpi/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="EWTNCanada.ca",EWTN Canada (720p) [Not 24/7]
 https://cdn3.wowza.com/1/YW5wSWZiRGd2eFlU/bGV0aVBq/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="EWTNEspanaLatinAmerica.us",EWTN el Canal Católico (720p) [Not 24/7]
 https://cdn3.wowza.com/1/SmVrQmZCUXZhVDgz/b3J3MFJv/hls/live/playlist.m3u8
+#EXTINF:-1 tvg-id="EWTNEstadosUnidos.us",EWTN Estados Unidos (Spanish) (720p)
+https://cdn3.wowza.com/1/TUI5dU5ucnUxdGFD/ZFlVeGRl/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="EWTNEurope.us",EWTN Europe (720p) [Not 24/7]
 https://cdn3.wowza.com/1/T2NXeHF6UGlGbHY3/WFluRldQ/hls/live/playlist.m3u8
+#EXTINF:-1 tvg-id="EWTN.us",EWTN United States (720p)
+https://cdn3.wowza.com/1/QjRzVXJtVml5SUVx/WGJRSWxz/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="",External Ottera (720p)
 https://otteravision-tg.ottera.tv/live/master.m3u8?channel=tg_tg_us
 #EXTINF:-1 tvg-id="ExtremaTV.us",Extrema TV (720p)
@@ -1126,9 +1132,3 @@ https://a.jsrdn.com/broadcast/e0f99ab19c/+0000/c.m3u8
 https://thegateway.app/YouToo/CueTones/playlist.m3u8
 #EXTINF:-1 tvg-id="YoutooAmerica.us",Youtoo America (1080p)
 https://thegateway.app/YouToo/YTamerica/playlist.m3u8
-#EXTINF:-1 tvg-id="EWTN.us",EWTN United States (720p)
-https://cdn3.wowza.com/1/QjRzVXJtVml5SUVx/WGJRSWxz/hls/live/playlist.m3u8
-#EXTINF:-1 tvg-id="EWTNEstadosUnidos.us",EWTN Estados Unidos (Spanish) (720p)
-https://cdn3.wowza.com/1/TUI5dU5ucnUxdGFD/ZFlVeGRl/hls/live/playlist.m3u8
-#EXTINF:-1 tvg-id="EWTNAfricaAsia.us",EWTN Africa Asia (720p)
-https://cdn3.wowza.com/1/ZVBYYXFLLzE0c3NC/Qk1FMURC/hls/live/playlist.m3u8
diff --git a/streams/us_local.m3u b/streams/us_local.m3u
index eec36b8d0..5299e7e61 100644
--- a/streams/us_local.m3u
+++ b/streams/us_local.m3u
@@ -7,6 +7,8 @@ https://streamer1.connectto.com/AABC_WEB_1201/index.m3u8
 http://cms-wowza.lunabyte.io/wbrz-live-1/_definst_/smil:wbrz-live.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="KOMODT1.us",ABC 4 Seattle WA (KOMO-TV) (720p)
 https://content.uplynk.com/2c88dfe19e1447e6a6aa27e8e143a140.m3u8
+#EXTINF:-1 tvg-id="KRGVDT1.us",ABC 5
+https://stream.krgv.com/krgv-english/krgv-english.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="KMGHDT1.us",ABC 7 Denver CO (KMGH) (720p)
 https://content.uplynk.com/channel/64ca339f04964a5e961c3207a7771bf1.m3u8
 #EXTINF:-1 tvg-id="KABCDT1.us",ABC 7 Los Angeles CA (KABC-TV) (720p)
@@ -23,6 +25,8 @@ https://content.uplynk.com/channel/39919d3f7a074eefa8bf579214e952f9.m3u8
 https://content.uplynk.com/channel/9deaf22aaa33461f9cac22e030ed00ec.m3u8
 #EXTINF:-1 tvg-id="WNEPDT1.us",ABC 16 Wilkes Barre PA (WNEP) (1080p)
 https://livevideo01.wnep.com/hls/live/2011655/newscasts/live.m3u8
+#EXTINF:-1 tvg-id="KXXVDT1.us",ABC 25 News Central Texas
+https://content.uplynk.com/channel/9d4e02c9c3544c269d32e6b316792c8f.m3u8
 #EXTINF:-1 tvg-id="WPLGDT1.us",ABC (WPLG-DT1) Miami FL (720p)
 https://16live00.akamaized.net/ABC_EAST/index.m3u8
 #EXTINF:-1 tvg-id="WSBDT1.us",ABC Atlanta-GA (WSB-DT1) (720p)
@@ -31,6 +35,8 @@ https://trn10.tulix.tv/WSB-ABC/index.m3u8
 https://content.uplynk.com/channel/ext/72750b711f704e4a94b5cfe6dc99f5e1/wabc_24x7_news.m3u8
 #EXTINF:-1 tvg-id="WTXLDT1.us",ABC Tallahassee (720p) [Not 24/7]
 https://5e6cea03e25b6.streamlock.net/live/WTXLHD.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="WWAYDT1.us",ABC WWAY 3
+https://wway.akamaized.net/hls/live/2029583/wway_ingest/master.m3u8
 #EXTINF:-1 tvg-id="AccessHumboldt.us",Access Humboldt (1080p)
 https://dacastmmd.mmdlive.lldns.net/dacastmmd/66dfbe35ca1a418c87e3cf18ca46bd57/index.m3u8
 #EXTINF:-1 tvg-id="AMP1.us",Access Media Productions Community (AMP) 1 (Monterey CA) (720p)
@@ -61,6 +67,8 @@ https://uni01rtmp.tulix.tv/watc57/watc57/playlist.m3u8
 https://uni01rtmp.tulix.tv/watc57-2/watc57-2/playlist.m3u8
 #EXTINF:-1 tvg-id="AuroraTV.us",AuroraTV (Aurora CO) (720p)
 https://reflect-aurora.cablecast.tv/live-8/live/live.m3u8
+#EXTINF:-1 tvg-id="KRGVDT2.us",Azteca Valle (KRGV 5.2)
+https://stream.krgv.com/krgv-english/krgv-somos.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="BHTV10.us",Beverly Hills Television 10 (720p)
 https://cdn3.wowza.com/5/V2Y2VmhqMEFDTUkx/beverlyhills/G0072_006/playlist.m3u8
 #EXTINF:-1 tvg-id="BHTV35.us",Beverly Hills Television 35 (720p)
@@ -103,6 +111,8 @@ https://content.uplynk.com/channel/bba3e7da884a49bba96341ecf5128f0f.m3u8
 https://livevideo01.wusa9.com/hls/live/2015498/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="KHOUDT1.us",CBS 11 Houston TX (KHOU) (1080p)
 https://livevideo01.khou.com/hls/live/2014966/newscasts/live.m3u8
+#EXTINF:-1 tvg-id="KWCHDT1.us",CBS 12 KWCH Weather Channel / Always On Storm Team 12
+https://d2jni005khp8n7.cloudfront.net/out/gray-kwchwx-rtmp-v3/live.m3u8
 #EXTINF:-1 tvg-id="WPECDT1.us",CBS 12 West Palm Beach FL (WPEC) (720p)
 https://content.uplynk.com/channel/0123b306191a4307a31b9fb573213fd3.m3u8
 #EXTINF:-1 tvg-id="WWJDT1.us",CBS (WWJ-DT1) Detroit MI (720p)
@@ -189,6 +199,9 @@ https://reflect-fcpublicmedia.cablecast.tv/live-3/live/live.m3u8
 https://edge-f.swagit.com/live/fernandinabeachfl/live-1-a/playlist.m3u8
 #EXTINF:-1 tvg-id="CityofFlagstaff.us",Flagstaff City Council Meeting (Flagstaff AZ) (720p)
 https://edge-f.swagit.com/live/flagstaffaz/live-1-a/playlist.m3u8
+#EXTINF:-1 tvg-id="KVCRDT2.us",FNX [Geo-blocked]
+#EXTVLCOPT:http-referrer=https://fnx.org/
+https://castus-vod-dev.s3.amazonaws.com/vod_clients/kvcr/live/ch1/video.m3u8
 #EXTINF:-1 tvg-id="KFONTV.us",Fontana Community Television (720p) [Geo-blocked]
 https://reflect-watchkfon-fontana.cablecast.tv/live-3/live/live.m3u8
 #EXTINF:-1 tvg-id="FCPublicMedia.us",Fort Collins Cable TV (FCTV) (Fort Collins CO) (1080p)
@@ -197,8 +210,18 @@ https://reflect-vod-fcgov.cablecast.tv/live-9/live/live.m3u8
 https://cdn3.wowza.com/5/cFh0V0QwUVc4SDl2/fortlauderdale/G1118_002/playlist.m3u8
 #EXTINF:-1 tvg-id="CityofFortPierce.us",Fort Pierce Live Stream (Fort Pierce FL) (720p)
 https://edge-f.swagit.com/live/fortpiercefl/live-1-a/playlist.m3u8
+#EXTINF:-1 tvg-id="KXVADT1.us",Fox 15 West Texas Abilene TX (KXVA)
+https://livevideo01.myfoxzone.com/hls/live/2017381/elvs/live.m3u8
 #EXTINF:-1 tvg-id="WTGSDT1.us",Fox 28 News Savannah GA (WTGS) (720p)
 https://content.uplynk.com/channel/e56ba52a1b9d45ad8c8a033fd83fe480.m3u8
+#EXTINF:-1 tvg-id="WPMTDT1.us",Fox 43 Harrisburg PA (WPMT)
+https://livevideo01.fox43.com/hls/live/2011656/elvs/live.m3u8
+#EXTINF:-1 tvg-id="WZDXDT1.us",Fox 54.1 Huntsville
+https://livevideo01.rocketcitynow.com/hls/live/2011659/elvs/live.m3u8
+#EXTINF:-1 tvg-id="WTICDT1.us",Fox 61 News Hartford CT (WTIC-TV)
+https://livevideo01.fox61.com/hls/live/2011658/elvs/live.m3u8
+#EXTINF:-1 tvg-id="WTICDT1.us",Fox 61 News Hartford CT (WTIC-TV)
+https://livevideo.tegnadigital.com/wtic/v1/master/f9c1bf9ffd6ac86b6173a7c169ff6e3f4efbd693/WTIC/elvs/live.m3u8
 #EXTINF:-1 tvg-id="WWCPDT1.us",FOX Altoona PA (WWCP1) (720p)
 http://trn03.tulix.tv/teleup-fox-wpmt-new1/playlist.m3u8
 #EXTINF:-1 tvg-id="WAGADT1.us",FOX Atlanta-GA (WAGA-DT1) (720p)
@@ -303,6 +326,8 @@ https://content.uplynk.com/channel/c1698e3bc70e429a887301d8831400f8.m3u8
 https://2-fss-2.streamhoster.com/pl_138/amlst:201950-1309230/playlist.m3u8
 #EXTINF:-1 tvg-id="KweliTV.us",Kweli TV (720p)
 https://a.jsrdn.com/broadcast/9c897f1973/+0000/c.m3u8
+#EXTINF:-1 tvg-id="KXLNDT1.us",KXLN-DT1 (Univision West) [Geo-blocked]
+https://unidfp-nlds145.global.ssl.fastly.net/nlds/univisionnow/univision_hou2/as/live/univision_hou2_hd_pc.m3u8?t1=
 #EXTINF:-1 tvg-id="KFMBDT1.us",KXTV 11
 https://livevideo.tegnadigital.com/kthv/v1/master/f9c1bf9ffd6ac86b6173a7c169ff6e3f4efbd693/KTHV/elvs/live.m3u8
 #EXTINF:-1 tvg-id="KFMBDT1.us",KXTV ABC 10
@@ -415,6 +440,8 @@ https://cdn3.wowza.com/5/WDIrTW5sM1JEY1NN/napatv/G0360_004/playlist.m3u8
 https://livevideo01.king5.com/hls/live/2006665/live/live.m3u8
 #EXTINF:-1 tvg-id="KUSADT1.us",NBC 9 Denver CO (KUSA) (1080p)
 https://livevideo.tegnadigital.com/kusa/v1/master/f9c1bf9ffd6ac86b6173a7c169ff6e3f4efbd693/KUSA/elvs/live.m3u8
+#EXTINF:-1 tvg-id="WXIADT1.us",NBC 11 Atlanta GA (11Alive)
+https://livevideo.tegnadigital.com/wxia/v1/master/f9c1bf9ffd6ac86b6173a7c169ff6e3f4efbd693/WXIA/elvs/live.m3u8
 #EXTINF:-1 tvg-id="WGBADT1.us",NBC 26 Green Bay WI (WGBA) (720p)
 https://content.uplynk.com/channel/1fbfb28ae5044f619f75ae0adb011989.m3u8
 #EXTINF:-1 tvg-id="WCNCDT1.us",NBC 36 Charlotte NC (WCNC-TV) (1080p)
@@ -439,6 +466,8 @@ https://s3-us-west-2.amazonaws.com/newington.castus-vod/live/ch1/video.m3u8
 https://s3-us-west-2.amazonaws.com/newington.castus-vod/live/ch2/video.m3u8
 #EXTINF:-1 tvg-id="NBTV.us",Newport Beach Television (720p)
 https://cdn3.wowza.com/5/RXJNMFI3VlVkOEFP/newportbeach/G0064_003/playlist.m3u8
+#EXTINF:-1 tvg-id="WJXTDT1.us",News4JAX+
+https://dai.google.com/linear/hls/event/RDmbn03GRCOLNG1eetEKhg/master.m3u8
 #EXTINF:-1 tvg-id="KCKSLD2.us",NewsNet (KCKS-LD2) (480p) [Not 24/7]
 https://cdn.igocast.com/channel2_hls/channel2_master.m3u8
 #EXTINF:-1 tvg-id="NMBTV.us",North Miami Beach TV (NMBTV) (North Miami Beach FL) (720p)
@@ -571,6 +600,8 @@ https://cdn3.wowza.com/5/RXJNMFI3VlVkOEFP/stpete/G0187_002/playlist.m3u8
 https://6305c8676ce84.streamlock.net/live/live/playlist.m3u8
 #EXTINF:-1 tvg-id="TBCN.us",Tampa Bay Communnity Network TBCN (Tampa Bay FL) (480p)
 https://reflect-tampa-bay-community.cablecast.tv/live-16/live/live.m3u8
+#EXTINF:-1 tvg-id="KTBNDT3.us",TBN Smile (480p)
+https://tbn-jw.cdn.vustreams.com/live/smile/live.isml/.m3u8
 #EXTINF:-1 tvg-id="TemeculaTV.us",Temecula TV (Temecula CA) (1080p)
 https://reflect-temecula.cablecast.tv/live-2/live/live.m3u8
 #EXTINF:-1 tvg-id="Tempe11.us",Tempe Channel 11
@@ -587,10 +618,14 @@ https://5e6cea03e25b6.streamlock.net/live/WTLHCW.stream/playlist.m3u8
 https://cdnapisec.kaltura.com/p/2593311/sp/259331100/playManifest/entryId/1_ta2cmesd/format/applehttp/protocol/https/a.m3u8
 #EXTINF:-1 tvg-id="KCKSLD8.us",The Grio (KCKS-LD8) (480p)
 https://cdn.igocast.com/channel8_hls/channel8_master.m3u8
+#EXTINF:-1 tvg-id="WVIZDT2.us",The Ohio Channel (WVIZ DT-2)
+https://5ebe6889de541.streamlock.net/live/stream_10/playlist.m3u8
 #EXTINF:-1 tvg-id="Thornton8.us",Thornton Government Access Channel 17 (Thornton CO) (1080p)
 https://reflect-thornton.cablecast.tv/live-4/live/live.m3u8
 #EXTINF:-1 tvg-id="CitiCABLE.us",Torrance CitiCABLE (Torrance CA) (360p)
 https://cdn3.wowza.com/5/dk84U1p2UUdoMGxT/torrance/G0057_005/playlist.m3u8
+#EXTINF:-1 tvg-id="KTCADT5.us",TPT Now KTCA-DT5 (720p) [Not 24/7]
+https://api.new.livestream.com/accounts/12638076/events/8488790/live.m3u8
 #EXTINF:-1 tvg-id="CityofTracyChannel26.us",Tracy Education and Governmental Access Channel (Tracy CA) (720p)
 https://cdn3.wowza.com/5/M0lyamVmM2JWcjhQ/tracy-ca/G0950_002/playlist.m3u8
 #EXTINF:-1 tvg-id="CommunityTVChannel189.us",Traverse Area Community Media CommunityTV Channel 189 (Traverse City MI) (1080p) [Geo-blocked]
@@ -685,6 +720,8 @@ https://dai.google.com/linear/hls/event/7xSxXPG1RqKkNva1wIWlVw/master.m3u8
 https://content.uplynk.com/channel/aa92b664ac5941de81cd410803329da2.m3u8
 #EXTINF:-1 tvg-id="WWAYDT1.us",WWAY News Willmington NC (720p)
 https://dai.google.com/linear/hls/event/A7CgcBYNTuKfvFvW8rmiJA/master.m3u8
+#EXTINF:-1 tvg-id="WXTVDT1.us",WXTV-DT1 (Univision New York) [Geo-blocked]
+https://unidfp-nlds143.global.ssl.fastly.net/nlds/univisionnow/univision_ny2/as/live/univision_ny2_hd_pc.m3u8?t1=
 #EXTINF:-1 tvg-id="WXXVDT1.us",WXXV-TV News Biloxi MS (720p)
 https://dai.google.com/linear/hls/event/cJXgmHHTQIGMhSzDk7TBsA/master.m3u8
 #EXTINF:-1 tvg-id="WZDXDT1.us",WZDX Fox 54
@@ -695,40 +732,3 @@ https://securestream6.champds.com/hlssstc/YumaCoAZLIVE/master.m3u8
 https://yuma-az.secure.footprint.net/egress/bhandler/yumaaz/streama/playlist.m3u8
 #EXTINF:-1 tvg-id="YumaChannel73.us",Yuma AZ CH 73
 https://yuma-az.secure.footprint.net/egress/bhandler/yumaaz/streamb/playlist.m3u8
-#EXTINF:-1 tvg-id="WZDXDT1.us",Fox 54.1 Huntsville
-https://livevideo01.rocketcitynow.com/hls/live/2011659/elvs/live.m3u8
-#EXTINF:-1 tvg-id="WXTVDT1.us",WXTV-DT1 (Univision New York) [Geo-blocked]
-https://unidfp-nlds143.global.ssl.fastly.net/nlds/univisionnow/univision_ny2/as/live/univision_ny2_hd_pc.m3u8?t1=
-#EXTINF:-1 tvg-id="WXIADT1.us",NBC 11 Atlanta GA (11Alive)
-https://livevideo.tegnadigital.com/wxia/v1/master/f9c1bf9ffd6ac86b6173a7c169ff6e3f4efbd693/WXIA/elvs/live.m3u8
-#EXTINF:-1 tvg-id="WWAYDT1.us",ABC WWAY 3
-https://wway.akamaized.net/hls/live/2029583/wway_ingest/master.m3u8
-#EXTINF:-1 tvg-id="WVIZDT2.us",The Ohio Channel (WVIZ DT-2)
-https://5ebe6889de541.streamlock.net/live/stream_10/playlist.m3u8
-#EXTINF:-1 tvg-id="KXVADT1.us",Fox 15 West Texas Abilene TX (KXVA)
-https://livevideo01.myfoxzone.com/hls/live/2017381/elvs/live.m3u8
-#EXTINF:-1 tvg-id="WPMTDT1.us",Fox 43 Harrisburg PA (WPMT)
-https://livevideo01.fox43.com/hls/live/2011656/elvs/live.m3u8
-#EXTINF:-1 tvg-id="WTICDT1.us",Fox 61 News Hartford CT (WTIC-TV)
-https://livevideo01.fox61.com/hls/live/2011658/elvs/live.m3u8
-#EXTINF:-1 tvg-id="WTICDT1.us",Fox 61 News Hartford CT (WTIC-TV)
-https://livevideo.tegnadigital.com/wtic/v1/master/f9c1bf9ffd6ac86b6173a7c169ff6e3f4efbd693/WTIC/elvs/live.m3u8
-#EXTINF:-1 tvg-id="WJXTDT1.us",News4JAX+
-https://dai.google.com/linear/hls/event/RDmbn03GRCOLNG1eetEKhg/master.m3u8
-#EXTINF:-1 tvg-id="KRGVDT1.us",ABC 5
-https://stream.krgv.com/krgv-english/krgv-english.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="KXXVDT1.us",ABC 25 News Central Texas
-https://content.uplynk.com/channel/9d4e02c9c3544c269d32e6b316792c8f.m3u8
-#EXTINF:-1 tvg-id="KXLNDT1.us",KXLN-DT1 (Univision West) [Geo-blocked]
-https://unidfp-nlds145.global.ssl.fastly.net/nlds/univisionnow/univision_hou2/as/live/univision_hou2_hd_pc.m3u8?t1=
-#EXTINF:-1 tvg-id="KWCHDT1.us",CBS 12 KWCH Weather Channel / Always On Storm Team 12
-https://d2jni005khp8n7.cloudfront.net/out/gray-kwchwx-rtmp-v3/live.m3u8
-#EXTINF:-1 tvg-id="KVCRDT2.us",FNX [Geo-blocked]
-#EXTVLCOPT:http-referrer=https://fnx.org/
-https://castus-vod-dev.s3.amazonaws.com/vod_clients/kvcr/live/ch1/video.m3u8
-#EXTINF:-1 tvg-id="KTCADT5.us",TPT Now KTCA-DT5 (720p) [Not 24/7]
-https://api.new.livestream.com/accounts/12638076/events/8488790/live.m3u8
-#EXTINF:-1 tvg-id="KTBNDT3.us",TBN Smile (480p)
-https://tbn-jw.cdn.vustreams.com/live/smile/live.isml/.m3u8
-#EXTINF:-1 tvg-id="KRGVDT2.us",Azteca Valle (KRGV 5.2)
-https://stream.krgv.com/krgv-english/krgv-somos.smil/playlist.m3u8

From ea2ef76a7c23c0d9c78e80fbcc2bb3821dbb7b8b Mon Sep 17 00:00:00 2001
From: Alstruit <34786806+Alstruit@users.noreply.github.com>
Date: Tue, 26 Dec 2023 16:25:35 -0600
Subject: [PATCH 07/15] Update id.m3u

Bug on playlist:format.
---
 streams/id.m3u | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/streams/id.m3u b/streams/id.m3u
index 7e863e748..dafbe3660 100644
--- a/streams/id.m3u
+++ b/streams/id.m3u
@@ -53,7 +53,7 @@ http://livestream.biznetvideo.net/biznet_kids/smil:kids.smil/chunklist_w41736285
 #EXTINF:-1 tvg-id="BiznetLifestyle.id",Biznet Lifestyle (480p)
 http://livestream.biznetvideo.net/biznet_lifestyle/smil:lifestyle.smil/chunklist_w109806785_b2256000_slen_tkYml6a2V5bGl2ZXN0YXJ0dGltZT0wJmJpemtleWxpdmVlbmR0aW1lPTAmYml6a2V5bGl2ZUN1c3RvbVBhcmFtZXRlcj1teVBhcmFtZXRlciZiaXprZXlsaXZlaGFzaD1qZ0RLUGNsY0dkWmZ2cklEeGZNZHBUN3Zfc3JNV0NidWJudEdvOWNDWVdwY0JCUWFsTWxMUXhIc3dtNDNQYlZS.m3u8
 #EXTINF:-1 tvg-id="BNTV.id",BNTV [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch394)/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch394%29/index.m3u8
 #EXTINF:-1 tvg-id="BRTV.id",BRTV (1080p) [Not 24/7]
 https://e1.siar.us/badartv/live/playlist.m3u8
 #EXTINF:-1 tvg-id="BTV.id",BTV (720p)
@@ -65,11 +65,11 @@ https://wowza.convergen.co/ctv/ctv.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="CelebesTV.id",Celebes TV [Not 24/7]
 https://ams.juraganstreaming.com:5443/LiveApp/streams/celebesmedia.m3u8
 #EXTINF:-1 tvg-id="CitraDangdut.id",Citra Dangdut [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch377)/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch377%29/index.m3u8
 #EXTINF:-1 tvg-id="CitraDrama.id",Citra Drama (720p) [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch378)/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch378%29/index.m3u8
 #EXTINF:-1 tvg-id="CitraMuslim.id",Citra Muslim [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch334)/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch334%29/index.m3u8
 #EXTINF:-1 tvg-id="CNBCIndonesia.id",CNBC Indonesia (720p)
 https://live.cnbcindonesia.com/livecnbc/smil:cnbctv.smil/master.m3u8
 #EXTINF:-1 tvg-id="CNNIndonesia.id",CNN Indonesia (720p) [Geo-blocked]
@@ -98,7 +98,7 @@ https://v3.siar.us/ficomchannel/live/playlist.m3u8
 #EXTINF:-1 tvg-id="GarudaTV.id",Garuda TV (1080p)
 http://stream.garuda.tv/live/garudatv/playlist.m3u8
 #EXTINF:-1 tvg-id="GarudaTV.id",Garuda TV (1080p) [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch45)/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch45%29/index.m3u8
 #EXTINF:-1 tvg-id="GPRTV.id",GPR TV (720p)
 https://alfa.kugo.id/gprtv/rtmp.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="GPRTV.id",GPR TV (720p)
@@ -107,7 +107,7 @@ https://wowza.convergen.co/gprtv/myLive/playlist.m3u8
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (X11; Linux x86_64)
 https://h1.intechmedia.net/intech/ch8.m3u8
 #EXTINF:-1 tvg-id="Horee.id",Horee! (720p) [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch375)/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch375%29/index.m3u8
 #EXTINF:-1 tvg-id="HumaBetangTV.id",Huma Betang TV (720p) [Not 24/7]
 https://v3.siar.us/humabetangtv/live/playlist.m3u8
 #EXTINF:-1 tvg-id="IAmChannel.id",I AM CHANNEL (576p) [Not 24/7]
@@ -115,7 +115,7 @@ http://iamchannel.org:1935/tes/1/playlist.m3u8
 #EXTINF:-1 tvg-id="IDTV.id",IDTV (720p) [Not 24/7]
 https://b1world.beritasatumedia.com/Beritasatu/B1World_manifest.m3u8
 #EXTINF:-1 tvg-id="IDXChannel.id",IDX Channel (720p) [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch389)/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch389%29/index.m3u8
 #EXTINF:-1 tvg-id="IndonesianaTV.id",Indonesiana.TV (720p)
 https://kbtv.akamaized.net/hls/live/2031188/kanalbuya/playlist.m3u8
 #EXTINF:-1 tvg-id="InsanTV.id" user-agent="Mozilla/5.0 (X11; Linux x86_64)",Insan TV (360p) [Geo-blocked]
@@ -126,7 +126,7 @@ https://inspiratv.siar.us/inspiratv/live/playlist.m3u8
 #EXTINF:-1 tvg-id="IzzahTV.id",Izzah TV (480p)
 https://streaming.radiosalamjambi.com/izzahtv.m3u8
 #EXTINF:-1 tvg-id="JakTV.id",Jak TV (480p) [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch392)/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch392%29/index.m3u8
 #EXTINF:-1 tvg-id="JambiTV.id",Jambi TV (576p) [Not 24/7]
 http://122.248.43.138:1935/ch23/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="JawaPosTV.id",Jawa Pos TV (720p) [Not 24/7]
@@ -147,7 +147,7 @@ https://h1.intechmedia.net/intech/ch65.m3u8
 #EXTINF:-1 tvg-id="JogjaTV.id",Jogja TV (720p) [Not 24/7]
 https://stream.jogjatv.co.id/jtvlive/stream/index.m3u8
 #EXTINF:-1 tvg-id="JTV.id",JTV (720p) [Not 24/7] [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch17)/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch17%29/index.m3u8
 #EXTINF:-1 tvg-id="",kugo Star (576i)
 https://alfa.kugo.id/playout/KugoStar.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="LingkarTV.id",Lingkar TV

From 765ad6d7bdb267a203c37275f8fef6d0187d0c4e Mon Sep 17 00:00:00 2001
From: Alstruit <34786806+Alstruit@users.noreply.github.com>
Date: Tue, 26 Dec 2023 16:35:35 -0600
Subject: [PATCH 08/15] Update id.m3u

---
 streams/id.m3u | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/streams/id.m3u b/streams/id.m3u
index dafbe3660..872658162 100644
--- a/streams/id.m3u
+++ b/streams/id.m3u
@@ -406,4 +406,4 @@ https://cdn-telkomsel-01.akamaized.net/Content/HLS/Live/channel(18564c27-ff44-4d
 #EXTINF:-1 tvg-id="WesalTV.id",Wesal TV (720p) [Not 24/7]
 https://ams.juraganstreaming.com:5443/LiveApp/streams/wesaltv.m3u8
 #EXTINF:-1 tvg-id="ZeeBioskop.id",Zee Bioskop (360p) [Geo-blocked]
-http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch161)/index.m3u8
+http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel%28ch161%29/index.m3u8

From 157a6e550760a8578daaa291bbae4cd6224b60de Mon Sep 17 00:00:00 2001
From: Alstruit <34786806+Alstruit@users.noreply.github.com>
Date: Tue, 26 Dec 2023 19:51:20 -0600
Subject: [PATCH 09/15] Create jp_primehome.m3u

---
 streams/jp.m3u           | 122 --------------------------------------
 streams/jp_primehome.m3u | 123 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 123 insertions(+), 122 deletions(-)
 create mode 100644 streams/jp_primehome.m3u

diff --git a/streams/jp.m3u b/streams/jp.m3u
index 88f40318a..9f55e64a2 100644
--- a/streams/jp.m3u
+++ b/streams/jp.m3u
@@ -1,122 +1,42 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="JOAYDTV.jp",ABC (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx02
-#EXTINF:-1 tvg-id="Animax.jp",Animax (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs15
 #EXTINF:-1 tvg-id="ATX.jp",AT-X (720p)
 http://asia.vthanhtivi.pw/AT-X/index.m3u8
 #EXTINF:-1 tvg-id="BS11.jp",BS11 (720p)
 http://asia.vthanhtivi.pw/BS11/index.m3u8
-#EXTINF:-1 tvg-id="BSAsahi.jp",BS Asahi (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs03
-#EXTINF:-1 tvg-id="BSFuji.jp",BS Fuji TV (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs06
-#EXTINF:-1 tvg-id="BSNipponTV.jp",BS Nippon TV (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs02
-#EXTINF:-1 tvg-id="BSTBS.jp",BS TBS (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs04
-#EXTINF:-1 tvg-id="BSTVTokyo.jp",BS TV Tokyo (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs05
-#EXTINF:-1 tvg-id="CartoonNetwork.jp",Cartoon Network Japan (400p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs25
 #EXTINF:-1 tvg-id="CGNTVJapan.jp",CGNTV Japan (1080p)
 https://cgntvliveweb-944.acs.wecandeo.com/ms/2850/944/index.m3u8
 #EXTINF:-1 tvg-id="CGNTVJapan.jp",CGNTV Japan (720p)
 http://cgntv-glive.ofsdelivery.net/live/cgntv_jp/playlist.m3u8
-#EXTINF:-1 tvg-id="ChannelGinga.jp",Channel Ginga (1080p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs29
-#EXTINF:-1 tvg-id="CNNj.jp",CNNj (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs16
-#EXTINF:-1 tvg-id="DisneyChannel.jp",Disney Channel Japan (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs24
-#EXTINF:-1 tvg-id="DisneyJunior.jp",Disney Junior (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs23
-#EXTINF:-1 tvg-id="EiseiGekijo.jp",Eisei Gekijo (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs22
-#EXTINF:-1 tvg-id="FamilyGekijyo.jp",Family Gekijo (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs20
-#EXTINF:-1 tvg-id="FishingVision.jp",Fishing Vision (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs25
 #EXTINF:-1 tvg-id="JOCXDTV.jp",Fuji TV (720p)
 http://203.162.235.41:15094
 #EXTINF:-1 tvg-id="JOCXDTV.jp",Fuji TV (720p)
 http://asia.vthanhtivi.pw/Fuji_TV/index.m3u8
-#EXTINF:-1 tvg-id="JOCXDTV.jp",Fuji TV (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd05
 #EXTINF:-1 tvg-id="JOCXDTV.jp",Fuji TV (540p)
 https://fujitv4.mov3.co/hls/fujitv.m3u8
-#EXTINF:-1 tvg-id="FujiTVNEXT.jp",Fuji TV NEXT (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs26
 #EXTINF:-1 tvg-id="",Gaki no Tsukai (English Subs) (720p)
 https://hamada.gaki-no-tsukai.stream/hls/test.m3u8
-#EXTINF:-1 tvg-id="GAORASPORTS.jp",Gaora Sports (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs17
 #EXTINF:-1 tvg-id="GolfNetwork.jp",Golf Network (720p)
 http://203.162.235.41:28107
-#EXTINF:-1 tvg-id="GolfNetwork.jp",Golf Network (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs03
 #EXTINF:-1 tvg-id="GolfNetwork.jp",Golf Network (540p)
 http://202.60.106.14:8080/1335/playlist.m3u8
-#EXTINF:-1 tvg-id="GreenChannel.jp",Green Channel (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs14
 #EXTINF:-1 tvg-id="GSTV.jp",GSTV (720p)
 https://gstv-tnz-gsmediastreaming.preview-jpea.channel.media.azure.net/dfd06b62-e9d1-4a7f-bcbb-89d2ecbc82ee/preview.ism/manifest(format=mpd-time-csf,audio-only=false)
 #EXTINF:-1 tvg-id="JOMLDTV.jp",Gunma TV (720p)
 https://movie.mcas.jp/switcher/smil:mcas8.smil/master.m3u8
-#EXTINF:-1 tvg-id="HomeDramaChannel.jp",Home Drama Channel (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs05
-#EXTINF:-1 tvg-id="JSPORTS1.jp",J Sports 1 (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs18
-#EXTINF:-1 tvg-id="JSPORTS2.jp",J Sports 2 (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs19
-#EXTINF:-1 tvg-id="JSPORTS3.jp",J Sports 3 (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs21
-#EXTINF:-1 tvg-id="JSPORTS4.jp",J Sports 4 (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs22
-#EXTINF:-1 tvg-id="JidaigekiSenmonChannel.jp",Jidaigeki Senmon (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs04
-#EXTINF:-1 tvg-id="JODXDTV.jp",Kansai TV (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx03
-#EXTINF:-1 tvg-id="KayoPops.jp",Kayo Pops (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs13
-#EXTINF:-1 tvg-id="KidsStation.jp",Kids Station (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs07
-#EXTINF:-1 tvg-id="LaLaTV.jp",LaLa TV (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs19
-#EXTINF:-1 tvg-id="JOOYDTV.jp",MBS (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx01
-#EXTINF:-1 tvg-id="MONDOTV.jp",Mondo TV (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs21
-#EXTINF:-1 tvg-id="MoviePlus.jp",Movie Plus (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs14
 #EXTINF:-1 tvg-id="MTV.jp",MTV Japan (720p)
 http://asia.vthanhtivi.pw/MTV/index.m3u8
-#EXTINF:-1 tvg-id="MTV.jp",MTV Japan (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs18
-#EXTINF:-1 tvg-id="MusicJapanTV.jp",Music Japan TV (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs06
 #EXTINF:-1 tvg-id="NewJapanProWrestlingWorld.jp",New Japan Pro Wrestling World (540p)
 https://aka-amd-njpwworld-hls-enlive.akamaized.net/hls/video/njpw_en/njpw_en_channel01_3/playlist_DVR.m3u8
 #EXTINF:-1 tvg-id="NHKBS.jp",NHK BS (720p)
 http://203.162.235.41:20099
-#EXTINF:-1 tvg-id="NHKBS.jp",NHK BS (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs11
-#EXTINF:-1 tvg-id="NHKBSP4K.jp",NHK BSP4K (1080p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs01
 #EXTINF:-1 tvg-id="NHKChinese.jp",NHK Chinese Vision (720p)
 https://nhkw-zh-hlscomp.akamaized.net/8thz5iufork8wjip/playlist.m3u8
 #EXTINF:-1 tvg-id="NHKChinese.jp",NHK Chinese Vision (720p)
 https://nhkw-zh-hlscomp.akamaized.net/ixxemlzk1vqvy44o/playlist.m3u8
-#EXTINF:-1 tvg-id="JOABDTV.jp",NHK E (Tokyo) (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd02
-#EXTINF:-1 tvg-id="JOBKDTV.jp",NHK G (Osaka) (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx06
 #EXTINF:-1 tvg-id="JOAKDTV.jp",NHK G (Tokyo) (720p)
 http://203.162.235.41:14093
 #EXTINF:-1 tvg-id="JOAKDTV.jp",NHK G (Tokyo) (576p)
 http://203.162.235.41:12091
-#EXTINF:-1 tvg-id="JOAKDTV.jp",NHK G (Tokyo) (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd01
 #EXTINF:-1 tvg-id="JOAKDTV.jp",NHK G (Tokyo) (540p) [Not 24/7]
 https://nhk4.mov3.co/hls/nhk.m3u8
 #EXTINF:-1 tvg-id="NHKKishouSaigai.jp",NHK Kishou Saigai (360p) [Not 24/7]
@@ -139,54 +59,26 @@ https://cdn.nhkworld.jp/www11/nhkworld-tv/bmcc-live/es/playlist.m3u8
 https://cdn.nhkworld.jp/www11/nhkworld-tv/pre/hlscomp.m3u8
 #EXTINF:-1 tvg-id="NHKWorldPremium.jp",NHK World Premium (480p)
 https://cdn.skygo.mn/live/disk1/NHK_World_Premium/HLSv3-FTA/NHK_World_Premium.m3u8
-#EXTINF:-1 tvg-id="NihonEigaSenmonChannel.jp",Nihon Eiga Senmon (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs23
 #EXTINF:-1 tvg-id="JOAXDTV.jp",Nippon TV (720p)
 http://203.162.235.41:16095
 #EXTINF:-1 tvg-id="JOAXDTV.jp",Nippon TV (720p)
 http://asia.vthanhtivi.pw/Nippon_TV/index.m3u8
-#EXTINF:-1 tvg-id="JOAXDTV.jp",Nippon TV (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd03
 #EXTINF:-1 tvg-id="JOAXDTV.jp",Nippon TV (540p) [Not 24/7]
 https://ntv4.mov3.co/hls/ntv.m3u8
-#EXTINF:-1 tvg-id="NitteleGPlus.jp",Nittele G Plus (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs02
 #EXTINF:-1 tvg-id="NTVNEWS24.jp",NTV News24 (480p)
 https://n24-cdn-live.ntv.co.jp/ch01/index.m3u8
 #EXTINF:-1 tvg-id="NTVNEWS24.jp",NTV News24 (480p)
 https://n24-cdn-live.ntv.co.jp/ch02/index.m3u8
 #EXTINF:-1 tvg-id="ShopChannel.jp",Shop Channel (1080p) [Not 24/7]
 https://stream3.shopch.jp/HLS/master.m3u8
-#EXTINF:-1 tvg-id="SkyA.jp",Sky A (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs01
-#EXTINF:-1 tvg-id="SpaceShowerTV.jp",Space Shower TV (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs26
-#EXTINF:-1 tvg-id="StarChannel1.jp",Star 1 (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs08
-#EXTINF:-1 tvg-id="StarChannel2.jp",Star 2 (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs27
-#EXTINF:-1 tvg-id="StarChannel3.jp",Star 3 (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs28
-#EXTINF:-1 tvg-id="JOUHDTV.jp",Sun TV (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx07
-#EXTINF:-1 tvg-id="TABIChannel.jp",Tabi Channel (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs12
-#EXTINF:-1 tvg-id="TAKARAZUKASKYSTAGE.jp",TAKARAZUKA SKY STAGE (1080p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs28
 #EXTINF:-1 tvg-id="JORXDTV.jp",TBS (720p)
 http://203.162.235.41:18097
 #EXTINF:-1 tvg-id="JORXDTV.jp",TBS (720p)
 http://asia.vthanhtivi.pw/TBS/index.m3u8
-#EXTINF:-1 tvg-id="JORXDTV.jp",TBS (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd04
 #EXTINF:-1 tvg-id="JORXDTV.jp",TBS (540p)
 https://tbs4.mov3.co/hls/tbs.m3u8
-#EXTINF:-1 tvg-id="ToeiChannel.jp",Toei Channel (1080p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs27
 #EXTINF:-1 tvg-id="JOMXDTV.jp",Tokyo MX1 (720p)
 http://asia.vthanhtivi.pw/Tokyo_MX1/index.m3u8
-#EXTINF:-1 tvg-id="JOMXDTV.jp",Tokyo MX1 (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd08
 #EXTINF:-1 tvg-id="TokyoMX1.jp",Tokyo MX1 (360p)
 https://mcas-eqms-mx2-live.hls.davlive.stream.ne.jp/mt/master/340f27cd590451b1e7d0034b85b5175ddaf05454/EQMS_MX1/master.m3u8
 #EXTINF:-1 tvg-id="TokyoMX2.jp",Tokyo MX2 (720p)
@@ -195,25 +87,11 @@ https://mcas-eqms-mx2-live.hls.davlive.stream.ne.jp/mt/master/340f27cd590451b1e7
 http://203.162.235.41:17097
 #EXTINF:-1 tvg-id="JOEXDTV.jp",TV Asahi (720p)
 http://asia.vthanhtivi.pw/TV_Asahi/index.m3u8
-#EXTINF:-1 tvg-id="JOEXDTV.jp",TV Asahi (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd06
-#EXTINF:-1 tvg-id="JOBHDTV.jp",TV Osaka (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx05
 #EXTINF:-1 tvg-id="JOTXDTV.jp",TV Tokyo (720p)
 http://203.162.235.41:19098
 #EXTINF:-1 tvg-id="JOTXDTV.jp",TV Tokyo (720p)
 http://asia.vthanhtivi.pw/TV_Tokyo/index.m3u8
-#EXTINF:-1 tvg-id="JOTXDTV.jp",TV Tokyo (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd07
 #EXTINF:-1 tvg-id="Weathernews.jp",Weathernews (720p)
 https://weather-live-hls01e.akamaized.net/ade36978-4ad3-48de-91ab-7d6edd0b6388/11ed8ed8ca.ism/manifest(format=m3u8-aapl-v3,audio-only=false).m3u8
-#EXTINF:-1 tvg-id="WOWOWCinema.jp",WOWOW Cinema (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs07
-#EXTINF:-1 tvg-id="WOWOWLive.jp",WOWOW Live (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs20
 #EXTINF:-1 tvg-id="WOWOWPrime.jp",WOWOW Prime (720p)
 http://203.162.235.41:27106
-#EXTINF:-1 tvg-id="WOWOWPrime.jp",WOWOW Prime (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs12
-#EXTINF:-1 tvg-id="JOIXDTV.jp",YTV (544p)
-http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx04
diff --git a/streams/jp_primehome.m3u b/streams/jp_primehome.m3u
new file mode 100644
index 000000000..a541ca396
--- /dev/null
+++ b/streams/jp_primehome.m3u
@@ -0,0 +1,123 @@
+#EXTM3U
+#EXTINF:-1 tvg-id="JOAYDTV.jp",ABC (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx02
+#EXTINF:-1 tvg-id="Animax.jp",Animax (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs15
+#EXTINF:-1 tvg-id="BSAsahi.jp",BS Asahi (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs03
+#EXTINF:-1 tvg-id="BSFuji.jp",BS Fuji TV (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs06
+#EXTINF:-1 tvg-id="BSNipponTV.jp",BS Nippon TV (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs02
+#EXTINF:-1 tvg-id="BSTBS.jp",BS TBS (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs04
+#EXTINF:-1 tvg-id="BSTVTokyo.jp",BS TV Tokyo (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs05
+#EXTINF:-1 tvg-id="CartoonNetwork.jp",Cartoon Network Japan (400p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs25
+#EXTINF:-1 tvg-id="ChannelGinga.jp",Channel Ginga (1080p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs29
+#EXTINF:-1 tvg-id="CNNj.jp",CNNj (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs16
+#EXTINF:-1 tvg-id="DisneyChannel.jp",Disney Channel Japan (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs24
+#EXTINF:-1 tvg-id="DisneyJunior.jp",Disney Junior (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs23
+#EXTINF:-1 tvg-id="EiseiGekijo.jp",Eisei Gekijo (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs22
+#EXTINF:-1 tvg-id="FamilyGekijyo.jp",Family Gekijo (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs20
+#EXTINF:-1 tvg-id="FishingVision.jp",Fishing Vision (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs25
+#EXTINF:-1 tvg-id="JOCXDTV.jp",Fuji TV (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd05
+#EXTINF:-1 tvg-id="FujiTVNEXT.jp",Fuji TV NEXT (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs26
+#EXTINF:-1 tvg-id="GAORASPORTS.jp",Gaora Sports (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs17
+#EXTINF:-1 tvg-id="GolfNetwork.jp",Golf Network (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs03
+#EXTINF:-1 tvg-id="GreenChannel.jp",Green Channel (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs14
+#EXTINF:-1 tvg-id="HomeDramaChannel.jp",Home Drama Channel (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs05
+#EXTINF:-1 tvg-id="JSPORTS1.jp",J Sports 1 (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs18
+#EXTINF:-1 tvg-id="JSPORTS2.jp",J Sports 2 (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs19
+#EXTINF:-1 tvg-id="JSPORTS3.jp",J Sports 3 (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs21
+#EXTINF:-1 tvg-id="JSPORTS4.jp",J Sports 4 (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs22
+#EXTINF:-1 tvg-id="JidaigekiSenmonChannel.jp",Jidaigeki Senmon (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs04
+#EXTINF:-1 tvg-id="JODXDTV.jp",Kansai TV (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx03
+#EXTINF:-1 tvg-id="KayoPops.jp",Kayo Pops (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs13
+#EXTINF:-1 tvg-id="KidsStation.jp",Kids Station (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs07
+#EXTINF:-1 tvg-id="LaLaTV.jp",LaLa TV (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs19
+#EXTINF:-1 tvg-id="JOOYDTV.jp",MBS (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx01
+#EXTINF:-1 tvg-id="MONDOTV.jp",Mondo TV (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs21
+#EXTINF:-1 tvg-id="MoviePlus.jp",Movie Plus (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs14
+#EXTINF:-1 tvg-id="MTV.jp",MTV Japan (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs18
+#EXTINF:-1 tvg-id="MusicJapanTV.jp",Music Japan TV (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs06
+#EXTINF:-1 tvg-id="NHKBS.jp",NHK BS (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs11
+#EXTINF:-1 tvg-id="NHKBSP4K.jp",NHK BSP4K (1080p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs01
+#EXTINF:-1 tvg-id="JOABDTV.jp",NHK E (Tokyo) (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd02
+#EXTINF:-1 tvg-id="JOBKDTV.jp",NHK G (Osaka) (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx06
+#EXTINF:-1 tvg-id="JOAKDTV.jp",NHK G (Tokyo) (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd01
+#EXTINF:-1 tvg-id="NihonEigaSenmonChannel.jp",Nihon Eiga Senmon (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs23
+#EXTINF:-1 tvg-id="JOAXDTV.jp",Nippon TV (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd03
+#EXTINF:-1 tvg-id="NitteleGPlus.jp",Nittele G Plus (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs02
+#EXTINF:-1 tvg-id="SkyA.jp",Sky A (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs01
+#EXTINF:-1 tvg-id="SpaceShowerTV.jp",Space Shower TV (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs26
+#EXTINF:-1 tvg-id="StarChannel1.jp",Star 1 (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs08
+#EXTINF:-1 tvg-id="StarChannel2.jp",Star 2 (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs27
+#EXTINF:-1 tvg-id="StarChannel3.jp",Star 3 (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs28
+#EXTINF:-1 tvg-id="JOUHDTV.jp",Sun TV (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx07
+#EXTINF:-1 tvg-id="TABIChannel.jp",Tabi Channel (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs12
+#EXTINF:-1 tvg-id="TAKARAZUKASKYSTAGE.jp",TAKARAZUKA SKY STAGE (1080p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs28
+#EXTINF:-1 tvg-id="JORXDTV.jp",TBS (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd04
+#EXTINF:-1 tvg-id="ToeiChannel.jp",Toei Channel (1080p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=cs27
+#EXTINF:-1 tvg-id="TokyoMX1.jp",Tokyo MX1 (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd08
+#EXTINF:-1 tvg-id="JOEXDTV.jp",TV Asahi (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd06
+#EXTINF:-1 tvg-id="JOBHDTV.jp",TV Osaka (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx05
+#EXTINF:-1 tvg-id="JOTXDTV.jp",TV Tokyo (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd07
+#EXTINF:-1 tvg-id="WOWOWCinema.jp",WOWOW Cinema (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs07
+#EXTINF:-1 tvg-id="WOWOWLive.jp",WOWOW Live (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs20
+#EXTINF:-1 tvg-id="WOWOWPrime.jp",WOWOW Prime (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs12
+#EXTINF:-1 tvg-id="JOIXDTV.jp",YTV (544p)
+http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx04

From 1d86f6f78f094cd46b7487721805c2711e92962d Mon Sep 17 00:00:00 2001
From: Alstruit <34786806+Alstruit@users.noreply.github.com>
Date: Tue, 26 Dec 2023 19:57:43 -0600
Subject: [PATCH 10/15] Add suggestion.

---
 streams/cy.m3u | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/streams/cy.m3u b/streams/cy.m3u
index 9c428ee83..04f50ca00 100644
--- a/streams/cy.m3u
+++ b/streams/cy.m3u
@@ -10,6 +10,8 @@ http://l2.cloudskep.com/ant1cm2/abr/playlist.m3u8
 https://sc-kuzeykibrissmarttv.ercdn.net/brt1hd/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="BRT2.cy",BRT 2 (720p) [Not 24/7]
 https://sc-kuzeykibrissmarttv.ercdn.net/brt2hd/bant1/playlist.m3u8
+#EXTINF:-1 tvg-id="CityChannel.cy",City Channel (720p) [Not 24/7]
+https://dev.aftermind.xyz/edge-hls/unitrust/citychannel/index.m3u8?token=8TXWzhY3h6jrzqEqx
 #EXTINF:-1 tvg-id="TVGunes.cy",GÜNEŞ TV (576p) [Not 24/7]
 https://sc-kuzeykibrissmarttv.ercdn.net/gunestv/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="KanalSim.cy",Kanal Sim (576p) [Not 24/7]

From 6fdbfe4e4d29889e4b257808495c679e81b63611 Mon Sep 17 00:00:00 2001
From: Alstruit <34786806+Alstruit@users.noreply.github.com>
Date: Tue, 26 Dec 2023 20:32:50 -0600
Subject: [PATCH 11/15] Update cy.m3u

---
 streams/cy.m3u | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/streams/cy.m3u b/streams/cy.m3u
index 04f50ca00..d650b5179 100644
--- a/streams/cy.m3u
+++ b/streams/cy.m3u
@@ -1,6 +1,10 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="AdaTV.cy",ADA TV (576p)
 https://sc-kuzeykibrissmarttv.ercdn.net/adatv/bant1/playlist.m3u8
+#EXTINF:-1 tvg-id="AlfaSport.cy",Alfa Sport (1080p) [Not 24/7]
+https://dev.aftermind.xyz/edge-hls/unitrust/alfasports/index.m3u8?token=8TXWzhY3h6jrzqEqx
+#EXTINF:-1 tvg-id="AlfaSport.cy",Alfa Sport (1080p) [Not 24/7]
+https://dev.aftermind.xyz/hls/unitrust/alfasports/index.m3u8?token=8TXWzhY3h6jrzqEqx
 #EXTINF:-1 tvg-id="AlphaTVCyprus.cy",Alpha TV Cyprus (720p) [Geo-blocked]
 #EXTVLCOPT:http-referrer=http://player.cloudskep.com/alphatmp/alphacy
 http://l4.cloudskep.com/alphatmp/acy/playlist.m3u8
@@ -44,3 +48,7 @@ https://svs.itworkscdn.net/sat7turklive/sat7turk.smil/playlist_dvr.m3u8
 https://sl2.sigmatv.com/hls/live.m3u8
 #EXTINF:-1 tvg-id="TV2020.cy",TV 2020 (576p) [Not 24/7]
 https://sc-kuzeykibrissmarttv.ercdn.net/tv2020/bantp1/playlist.m3u8
+#EXTINF:-1 tvg-id="VouliTV.cy",Vouli TV (1080p) [Not 24/7]
+https://dev.aftermind.xyz/edge-hls/unitrust/voulitv/index.m3u8?token=8TXWzhY3h6jrzqEqx
+#EXTINF:-1 tvg-id="VouliTV.cy",Vouli TV (1080p) [Not 24/7]
+https://dev.aftermind.xyz/hls/unitrust/voulitv/index.m3u8?token=8TXWzhY3h6jrzqEqx

From 783604286ffa2c4b7896ef72068cc817f2e3fa49 Mon Sep 17 00:00:00 2001
From: Dum4G <dumreview@gmail.com>
Date: Wed, 27 Dec 2023 05:43:20 +0300
Subject: [PATCH 12/15] Update streams/us_ythls.m3u

---
 streams/us_ythls.m3u | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/streams/us_ythls.m3u b/streams/us_ythls.m3u
index 961221e72..9c0675a7f 100644
--- a/streams/us_ythls.m3u
+++ b/streams/us_ythls.m3u
@@ -1419,7 +1419,7 @@ https://ythls.armelin.one/channel/UC5V8mErVFOpcQXEb3y9IMZw.m3u8
 https://ythls.armelin.one/channel/UCH9H_b9oJtSHBovh94yB5HA.m3u8
 #EXTINF:-1 tvg-id="UNIANTV.ua",УНІАН (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCKCVeAihEfJr-pGH7B73Wyg.m3u8
-#EXTINF:-1 tvg-id="24KZ.kz",Хабар 24 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="24KZ.kz",24KZ (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCnAFKvDuqBGkIfV8Vn0J_CQ.m3u8
 #EXTINF:-1 tvg-id="CENTR.ua",Центр (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCQeGq915GhiFlOE-fuoXGKQ.m3u8

From 7765bac55fc18d56dcc5baf4913e692d9bff4280 Mon Sep 17 00:00:00 2001
From: Dum4G <dumreview@gmail.com>
Date: Wed, 27 Dec 2023 05:50:55 +0300
Subject: [PATCH 13/15] Update streams/kz.m3u

---
 streams/kz.m3u | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/streams/kz.m3u b/streams/kz.m3u
index 34d6813cc..7ab8992fa 100644
--- a/streams/kz.m3u
+++ b/streams/kz.m3u
@@ -59,5 +59,5 @@ http://serv25.vintera.tv:8081/novoetv/nov_tv/playlist.m3u8
 https://1tvkz-stream.daitsuna.net/1tvkz/1tvkz/playlist.m3u8
 #EXTINF:-1 tvg-id="24KZ.kz",Хабар 24 (720p) [Not 24/7]
 http://serv30.vintera.tv:8081/habar/habar24/playlist.m3u8
-#EXTINF:-1 tvg-id="24KZ.kz",Хабар 24 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="24KZ.kz",24KZ (720p) [Not 24/7]
 https://live-24kz.cdnvideo.ru/24kz/24kz.sdp/playlist.m3u8

From 404753ae4f8ea0cbb35630448749aa8b811c023a Mon Sep 17 00:00:00 2001
From: Dum4G <dumreview@gmail.com>
Date: Wed, 27 Dec 2023 05:50:59 +0300
Subject: [PATCH 14/15] Update streams/kz.m3u

---
 streams/kz.m3u | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/streams/kz.m3u b/streams/kz.m3u
index 7ab8992fa..e0bc12b4a 100644
--- a/streams/kz.m3u
+++ b/streams/kz.m3u
@@ -57,7 +57,7 @@ https://tvcdn01.oktv.kz/tv/mtrk/playlist.m3u8
 http://serv25.vintera.tv:8081/novoetv/nov_tv/playlist.m3u8
 #EXTINF:-1 tvg-id="ChannelOneEurasia.kz",Первый канал Евразия (720p)
 https://1tvkz-stream.daitsuna.net/1tvkz/1tvkz/playlist.m3u8
-#EXTINF:-1 tvg-id="24KZ.kz",Хабар 24 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="24KZ.kz",24KZ (720p) [Not 24/7]
 http://serv30.vintera.tv:8081/habar/habar24/playlist.m3u8
 #EXTINF:-1 tvg-id="24KZ.kz",24KZ (720p) [Not 24/7]
 https://live-24kz.cdnvideo.ru/24kz/24kz.sdp/playlist.m3u8

From fe46ba67c9b5904ee0b02ad28031385a3a8325d2 Mon Sep 17 00:00:00 2001
From: Alstruit <34786806+Alstruit@users.noreply.github.com>
Date: Tue, 26 Dec 2023 21:12:54 -0600
Subject: [PATCH 15/15] Update jp.m3u

---
 streams/jp.m3u | 2 --
 1 file changed, 2 deletions(-)

diff --git a/streams/jp.m3u b/streams/jp.m3u
index 9f55e64a2..6dcb5a19d 100644
--- a/streams/jp.m3u
+++ b/streams/jp.m3u
@@ -21,8 +21,6 @@ http://203.162.235.41:28107
 http://202.60.106.14:8080/1335/playlist.m3u8
 #EXTINF:-1 tvg-id="GSTV.jp",GSTV (720p)
 https://gstv-tnz-gsmediastreaming.preview-jpea.channel.media.azure.net/dfd06b62-e9d1-4a7f-bcbb-89d2ecbc82ee/preview.ism/manifest(format=mpd-time-csf,audio-only=false)
-#EXTINF:-1 tvg-id="JOMLDTV.jp",Gunma TV (720p)
-https://movie.mcas.jp/switcher/smil:mcas8.smil/master.m3u8
 #EXTINF:-1 tvg-id="MTV.jp",MTV Japan (720p)
 http://asia.vthanhtivi.pw/MTV/index.m3u8
 #EXTINF:-1 tvg-id="NewJapanProWrestlingWorld.jp",New Japan Pro Wrestling World (540p)