diff --git a/streams/ae.m3u b/streams/ae.m3u
index 1e03d28e18..f95590a6fc 100644
--- a/streams/ae.m3u
+++ b/streams/ae.m3u
@@ -99,7 +99,7 @@ https://shls-mbcpersia-prod-dub.shahid.net/out/v1/bdc7cd0d990e4c54808632a52c3969
 https://vo-live.cdb.cdn.orange.com/Content/Channel/NationalGeographicHDChannel/HLS/index.m3u8
 #EXTINF:-1 tvg-id="NoorDubai.ae",Noor Dubai (1080p)
 https://dmiffthftl.cdn.mangomolo.com/noordubaitv/smil:noordubaitv.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="NourTV.ae",Nour TV (720p)
+#EXTINF:-1 tvg-id="NourTV.ae",Nour TV
 https://cdn.bestream.io:19360/elfaro4/elfaro4.m3u8
 #EXTINF:-1 tvg-id="PeaceTVBangla.ae",Peace TV Bangla (1080p)
 https://dzkyvlfyge.erbvr.com/PeaceTvBangla/index.m3u8
@@ -109,10 +109,6 @@ https://dzkyvlfyge.erbvr.com/PeaceTvChinese/index.m3u8
 https://dzkyvlfyge.erbvr.com/PeaceTvEnglish/index.m3u8
 #EXTINF:-1 tvg-id="PeaceTVUrdu.ae",Peace TV Urdu (1080p)
 https://dzkyvlfyge.erbvr.com/PeaceTvUrdu/index.m3u8
-#EXTINF:-1 tvg-id="PMC.ae",PMC (1080p)
-https://hls.pmc.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PMCRoyale.ae",PMC Royale (720p) [Not 24/7]
-https://rohls.pmc.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="Pulse95Radio.ae",Pulse95 Radio (1080p)
 https://svs.itworkscdn.net/pulse95live/pulse96vision/playlist.m3u8
 #EXTINF:-1 tvg-id="SamaDubai.ae",Sama Dubai (1080p)
@@ -155,3 +151,9 @@ https://weyyak-live.akamaized.net/weyyak_zee_aflam/index.m3u8
 https://weyyak-live.akamaized.net/weyyak_zee_alwan/index.m3u8
 #EXTINF:-1 tvg-id="SpacetoonArabic.ae",Spacetoon Arabic (1080p)
 https://shd-gcp-live.edgenextcdn.net/live/bitmovin-spacetoon/d8382fb9ab4b2307058f12c7ea90db54/index.m3u8
+#EXTINF:-1 tvg-id="MBCPersia.ae",MBC Persia (720p)
+https://hls.mbcpersia.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PMC.ae",PMC (1080p)
+https://hls.pmc.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PMCRoyale.ae",PMC Royale (720p)
+https://rohls.pmc.live/hls/stream.m3u8
diff --git a/streams/af.m3u b/streams/af.m3u
index 0546cbb7c3..ce00d059dd 100644
--- a/streams/af.m3u
+++ b/streams/af.m3u
@@ -17,8 +17,6 @@ http://51.210.199.58/hls/stream.m3u8
 https://live.relentlessinnovations.net:1936/imantv/imantv/playlist.m3u8
 #EXTINF:-1 tvg-id="KayhanTV.af",Kayhan TV (720p)
 https://playout395.livestreamingcdn.com/live/Stream1/playlist.m3u8
-#EXTINF:-1 tvg-id="NoorTV.af",Noor TV (720p)
-https://www.hewadwal.com:19360/noortv_abr/noortv_abr.m3u8
 #EXTINF:-1 tvg-id="RTA.af",RTA (1080p)
 https://rtatv.akamaized.net/Content/HLS/Live/channel(RTA1)/index.m3u8
 #EXTINF:-1 tvg-id="RTAEducation.af",RTA Education (1080p)
diff --git a/streams/ca.m3u b/streams/ca.m3u
index a142de53a2..e649967035 100644
--- a/streams/ca.m3u
+++ b/streams/ca.m3u
@@ -89,8 +89,6 @@ http://cdn12.henico.net:8080/live/dncal/index.m3u8
 https://streamer12.vdn.dstreamone.net/saazoawaz/saazoawaz/playlist.m3u8
 #EXTINF:-1 tvg-id="EETTV.ca",EET TV (1080p) [Not 24/7]
 https://eu.streamjo.com/eetlive/eettv.m3u8
-#EXTINF:-1 tvg-id="ErfanHalghehTV.ca",Erfan Halgheh TV (720p)
-https://hls.erfanhalgheh.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="EWTN.us@Canada",EWTN Canada (720p) [Not 24/7]
 https://cdn3.wowza.com/1/YW5wSWZiRGd2eFlU/bGV0aVBq/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="FightNetwork.ca",Fight Network (1080p)
@@ -187,8 +185,6 @@ http://live.stream.cdn.pamirtv.com/ptv/d0dbe915091d400bd8ee7f27f0791303.sdp/inde
 http://stream.pardesitv.online/pardesi/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="PardesiTV.ca",Pardesi TV (720p) [Not 24/7]
 http://stream.pardesitv.online/pardesi/index.m3u8
-#EXTINF:-1 tvg-id="ParnianTV.ca",Parnian TV (720p)
-https://live2.parnian.tv/hls/.m3u8
 #EXTINF:-1 tvg-id="PlymouthRockTV.ca",Plymouth Rock TV (1080p)
 https://vse2-eu-all59.secdn.net/barakyah-channel/live/plymouthtv/playlist.m3u8
 #EXTINF:-1 tvg-id="PlymouthRockTV.ca",Plymouth Rock TV (1080p)
@@ -245,6 +241,12 @@ https://fl3.moveonjoy.com/CA_GLOBAL/index.m3u8
 http://158.69.24.53:8080/probashi_tv/index.m3u8
 #EXTINF:-1 tvg-id="NACTV.ca@SD",NACTV
 https://stream2.pivotalelements.com/memfs/2d2e1038-9eb2-44df-a9b9-109de5752f3b_output_0.m3u8
+#EXTINF:-1 tvg-id="ErfanHalghehTV.ca",Erfan Halgheh TV (720p)
+https://hls.erfanhalgheh.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="ParnianTV.ca",Parnian TV (720p)
+https://live2.parnian.tv/hls/.m3u8
+#EXTINF:-1 tvg-id="ParnianTV.ca",Parnian TV
+https://live2.parnian.tv/hls/live/play.m3u8
 #EXTINF:-1 tvg-id="IIPCTV.ca@SD",IIPC TV
 https://rpn.bozztv.com/dvrfl03/iipctv/index.m3u8
 #EXTINF:-1 tvg-id="QuoVadisTV.ca@SD",Quo Vadis TV
diff --git a/streams/ca_onetv.m3u b/streams/ca_onetv.m3u
deleted file mode 100644
index 1e97795676..0000000000
--- a/streams/ca_onetv.m3u
+++ /dev/null
@@ -1,35 +0,0 @@
-#EXTM3U
-#EXTINF:-1 tvg-id="GEMTV.ca",GEM TV
-https://ca-rt.onetv.app/gemb/index-0.m3u8
-#EXTINF:-1 tvg-id="GEMSeries.ca",GEM Series
-https://ca-rt.onetv.app/gemseriesbb/index-0.m3u8
-#EXTINF:-1 tvg-id="GEMSeries.ca",GEM Series
-https://ca-rt.onetv.app/gemseries/index-0.m3u8
-#EXTINF:-1 tvg-id="GEMBollywood.ca",GEM Bollywood
-https://ca-rt.onetv.app/gembollywood/index-0.m3u8
-#EXTINF:-1 tvg-id="GEMFilm.ca",GEM Film
-https://ca-rt.onetv.app/gemfilm/index-0.m3u8
-#EXTINF:-1 tvg-id="GEMClassic.ca",GEM Classic
-https://ca-rt.onetv.app/gemclassic/index-0.m3u8
-#EXTINF:-1 tvg-id="GEMDrama.ca",GEM Drama
-https://ca-rt.onetv.app/gemdrama/index-0.m3u8
-#EXTINF:-1 tvg-id="GEMJunior.ca",GEM Junior
-https://ca-rt.onetv.app/gemjunior/index-0.m3u8
-#EXTINF:-1 tvg-id="GEMKids.ca",GEM Kids
-https://ca-rt.onetv.app/gemkids/index-0.m3u8
-#EXTINF:-1 tvg-id="GEMFood.ca",GEM Food
-https://ca-rt.onetv.app/gemfood/index-0.m3u8
-#EXTINF:-1 tvg-id="GEMMifa.ca",GEM Mifa
-https://ca-rt.onetv.app/gemmifa/index-0.m3u8
-#EXTINF:-1 tvg-id="GEMRiver.ca",GEM River
-https://ca-rt.onetv.app/gemriver/index-0.m3u8
-#EXTINF:-1 tvg-id="GEMRubix.ca",GEM Rubix
-https://ca-rt.onetv.app/gemrubix/index-0.m3u8
-#EXTINF:-1 tvg-id="GEMComedy.ca",GEM Comedy
-https://ca-rt.onetv.app/gemcomedy/index-0.m3u8
-#EXTINF:-1 tvg-id="GEMNature.ca",GEM Nature
-https://ca-rt.onetv.app/gemnature/index-0.m3u8
-#EXTINF:-1 tvg-id="GEMLife.ca",GEM Life
-https://ca-rt.onetv.app/gemlife/index-0.m3u8
-#EXTINF:-1 tvg-id="GEMFit.ca",GEM Fit
-https://ca-rt.onetv.app/gemfit/index-0.m3u8
diff --git a/streams/cy.m3u b/streams/cy.m3u
index a214a31376..82c9f12a32 100644
--- a/streams/cy.m3u
+++ b/streams/cy.m3u
@@ -52,8 +52,6 @@ https://l3.cloudskep.com/cybcsat/abr/playlist.m3u8
 https://svs.itworkscdn.net/sat7arabiclive/sat7arabic.smil/playlist_dvr.m3u8
 #EXTINF:-1 tvg-id="Sat7Kids.cy",Sat 7 Kids (1080p)
 https://svs.itworkscdn.net/sat7kidslive/sat7kids.smil/playlist_dvr.m3u8
-#EXTINF:-1 tvg-id="Sat7Pars.cy",Sat 7 Pars (720p)
-https://svs.itworkscdn.net/sat7parslive/sat7pars.smil/playlist_dvr.m3u8
 #EXTINF:-1 tvg-id="Sat7Turk.cy",Sat 7 Türk (720p)
 https://svs.itworkscdn.net/sat7turklive/sat7turk.smil/playlist_dvr.m3u8
 #EXTINF:-1 tvg-id="SigmaTV.cy",Sigma TV (576p) [Not 24/7]
@@ -64,3 +62,5 @@ https://sc-kuzeykibrissmarttv.ercdn.net/tv2020/bantp1/playlist.m3u8
 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
+#EXTINF:-1 tvg-id="Sat7Pars.cy",Sat7 Pars (1080p)
+https://svs.itworkscdn.net/sat7parslive/sat7pars.smil/playlist.m3u8
diff --git a/streams/de.m3u b/streams/de.m3u
index 011b90fbc2..74b7c892d7 100644
--- a/streams/de.m3u
+++ b/streams/de.m3u
@@ -135,8 +135,6 @@ https://58de7a369a9c4.streamlock.net/sprembergtv/live/playlist.m3u8
 https://api-tv27.yayin.com.tr/kanalavrupa/index.m3u8
 #EXTINF:-1 tvg-id="KaufBeiTV.de",KaufBei TV (576p)
 https://api.alpaca.t62a.com/hls/9103/index.m3u8
-#EXTINF:-1 tvg-id="KhaterehTV.de",Khatereh TV (720p)
-https://castor.streamthatvideo.co:8081/khaterehtv/index.m3u8
 #EXTINF:-1 tvg-id="KiKA.de",KiKA (1080p) [Geo-blocked]
 https://kikageohls.akamaized.net/hls/live/2022693/livetvkika_de/master.m3u8
 #EXTINF:-1 tvg-id="KiKA.de",KiKA (1080p) [Not 24/7]
diff --git a/streams/fi.m3u b/streams/fi.m3u
index 553fb1fa71..fe718c359e 100644
--- a/streams/fi.m3u
+++ b/streams/fi.m3u
@@ -32,8 +32,6 @@ https://live.streaming.a2d.tv/asset/20025962.isml/.m3u8
 https://streaming.nartv.fi/live/ngrp:NAR_TV.stream_all/playlist.m3u8
 #EXTINF:-1 tvg-id="NationalGeographic.fi",National Geographic (Finland) (720p) [Geo-blocked]
 https://live-fi.tvkaista.net/national-geographic/live.m3u8?hd=true
-#EXTINF:-1 tvg-id="NavahangTV.fi",Navahang TV (720p)
-https://hls.navahang.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="Nelonen.fi",Nelonen (720p)
 https://live-fi.tvkaista.net/nelonen/live.m3u8
 #EXTINF:-1 tvg-id="NopolaNews.fi",Nopola News (1080p) [Not 24/7]
@@ -62,3 +60,5 @@ https://yletv.akamaized.net/hls/live/622367/yletvteemafemfin/playlist.m3u8
 https://yletvworld.akamaized.net/hls/live/622547/yletvteemafemw/index.m3u8
 #EXTINF:-1 tvg-id="YleX.fi",YleX Studio Live (720p)
 https://ylestudiolive.akamaized.net/hls/live/2007826/ylestudiolive-YleX/master.m3u8
+#EXTINF:-1 tvg-id="NavahangTV.fi",Navahang TV (720p)
+https://hls.navahang.live/hls/stream.m3u8
\ No newline at end of file
diff --git a/streams/fr.m3u b/streams/fr.m3u
index 223a494d7a..dcc2b7b435 100644
--- a/streams/fr.m3u
+++ b/streams/fr.m3u
@@ -117,8 +117,6 @@ http://mv2.tvfrancophonie.org/live/Stream1/playlist.m3u8
 https://5421175365ea3.streamlock.net/live/smil:switch.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="FunRadio.fr",Fun Radio (720p)
 https://livevideo.infomaniak.com/streaming/livecast/funradiovisionhd/playlist.m3u8
-#EXTINF:-1 tvg-id="FX2.fr",FX2 Farsi
-https://toonixhls.wns.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="GenerationsTV.fr",Generations TV (576p)
 https://edge.vedge.infomaniak.com/livecast/ik:generation-tv/manifest.m3u8
 #EXTINF:-1 tvg-id="HANDICAPTV.fr",HANDICAP TV France
@@ -169,10 +167,6 @@ https://edge.vedge.infomaniak.com/livecast/ik:nancy-webtv/manifest.m3u8
 https://ktismaservers.in:3394/stream/play.m3u8
 #EXTINF:-1 tvg-id="P2MTV.fr",P2M TV (720p)
 https://vdo2.pro-fhi.net:3207/stream/play.m3u8
-#EXTINF:-1 tvg-id="PersianaLatino.fr",Persiana Latino (720p)
-https://latinohls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PersianaTwo.fr",Persiana Two (720p)
-https://twohls.persiana.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="RMCDecouverte.fr",RMC Découverte (1080p)
 https://d2mt8for1pddy4.cloudfront.net/v1/master/3722c60a815c199d9c0ef36c5b73da68a62b09d1/cc-6uronj7gzvy4j/index.m3u8
 #EXTINF:-1 tvg-id="RMCStory.fr",RMC Story (1080p)
@@ -276,4 +270,4 @@ https://live20.bozztv.com/dvrfl06/astv/astv-traceafrica/index.m3u8
 #EXTINF:-1 tvg-id="NationalGeographic.fr@SD",National Geographic
 https://live20.bozztv.com/dvrfl06/astv/astv-natgeofr/index.m3u8
 #EXTINF:-1 tvg-id="TV5MondeAfrica.fr@SD",TV5Monde Africa
-https://live20.bozztv.com/dvrfl06/astv/astv-tv5mondeafrique/index.m3u8
+https://live20.bozztv.com/dvrfl06/astv/astv-tv5mondeafrique/index.m3u8
\ No newline at end of file
diff --git a/streams/fr_persiana.m3u b/streams/fr_persiana.m3u
index 1643b9c699..cadf2c2454 100644
--- a/streams/fr_persiana.m3u
+++ b/streams/fr_persiana.m3u
@@ -1,37 +1,39 @@
-#EXTM3U
-#EXTINF:-1 tvg-id="4KurdHD.fr",Persiana 4Kurd
-https://4kuhls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PersianaCinema.fr",Persiana Cinema
-https://cinehls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PersianaComedy.fr",Persiana Comedy
-https://comedyhls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PersianaFamily.fr",Persiana Family
-https://familyhls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PersianaHD.fr",Persiana HD
-https://euhls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PersianaIranian.fr",Persiana Iranian
-https://irhls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PersianaJunior.fr",Persiana Junior
-https://junhls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PersianaKorea.fr",Persiana Korea
-https://korhls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PersianaMusic.fr",Persiana Music
-https://musichls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PersianaNostalgia.fr",Persiana Nostalgia
-https://noshls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="Persiana1.fr",Persiana One
-https://onehls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PersianaRap.fr",Persiana Rap
-https://raphls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PersianaScience.fr",Persiana Science
-https://scihls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PersianaSonnati.fr",Persiana Sonnati
-https://sonhls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PersianaSports.fr",Persiana Sport
-https://persiana.mastercast.cloud/memfs/f1accec0-3b52-476b-ada9-65f74ead985e.m3u8
-#EXTINF:-1 tvg-id="PersianaSports.fr",Persiana Sports (720p)
-https://af.ayas.ir/hls2/persiana.m3u8
-#EXTINF:-1 tvg-id="PersianaTurkiye.fr",Persiana Turkiye
-https://turkhls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PokerTV.fr",Poker TV (720p)
-https://hls.pokertvfa.live/hls/stream.m3u8
+#EXTM3U
+#EXTINF:-1 tvg-id="4Kurd.fr",Persiana 4Kurd
+https://4kuhls.persiana.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PersianaCinema.fr",Persiana Cinema
+https://cinehls.persiana.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PersianaCinema.fr",Persiana Cinema
+https://todayhls.wns.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PersianaComedy.fr",Persiana Comedy
+https://comedyhls.persiana.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PersianaFamily.fr",Persiana Family
+https://familyhls.persiana.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PersianaHD.fr",Persiana HD
+https://euhls.persiana.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PersianaIranian.fr",Persiana Iranian
+https://irhls.persiana.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PersianaJunior.fr",Persiana Junior
+https://junhls.persiana.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PersianaKorea.fr",Persiana Korea
+https://korhls.persiana.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PersianaMusic.fr",Persiana Music
+https://musichls.persiana.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PersianaNostalgia.fr",Persiana Nostalgia
+https://noshls.persiana.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="Persiana1.fr",Persiana One
+https://onehls.persiana.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PersianaRap.fr",Persiana Rap
+https://raphls.persiana.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PersianaScience.fr",Persiana Science
+https://scihls.persiana.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PersianaSonnati.fr",Persiana Sonnati
+https://sonhls.persiana.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PersianaSports.fr",Persiana Sport
+https://edge06.776740.ir.cdn.ir/hls2/persiana.m3u8
+#EXTINF:-1 tvg-id="PersianaTurkiye.fr",Persiana Turkiye
+https://turkhls.persiana.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PersianaLatino.fr",Persiana Latino (720p)
+https://latinohls.persiana.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PersianaTwo.fr",Persiana Two (720p)
+https://twohls.persiana.live/hls/stream.m3u8
\ No newline at end of file
diff --git a/streams/il.m3u b/streams/il.m3u
index ce06ee55dc..63a01f113c 100644
--- a/streams/il.m3u
+++ b/streams/il.m3u
@@ -35,8 +35,6 @@ https://makan.media.kan.org.il/hls/live/2024680/2024680/master.m3u8
 http://wowza.media-line.co.il/Musayof-Live/livestream.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="Now14.il",Now 14 (720p)
 https://now14.g-mana.live/media/91517161-44ab-4e46-af70-e9fe26117d2e/mainManifest.m3u8
-#EXTINF:-1 tvg-id="RanTVIsrael.il",Ran TV Israel (720p)
-https://streaminglive.co.il:3730/live/raniamranilive.m3u8
 #EXTINF:-1 tvg-id="RelevantTV.il",Relevant TV (1080p)
 https://6180c994cb835402.mediapackage.eu-west-1.amazonaws.com/out/v1/f1339272dd24416ca60b00e69075d783/index.m3u8
 #EXTINF:-1 tvg-id="Channel13.il",Reshet 13 (1080p)
diff --git a/streams/iq.m3u b/streams/iq.m3u
index fe05a1a968..a9f780004a 100644
--- a/streams/iq.m3u
+++ b/streams/iq.m3u
@@ -62,8 +62,6 @@ http://77.36.160.164:1935/live4/thaghalayn/playlist.m3u8
 https://cloud.odysee.live/content/f92670235a1ce2bce4cf77671cc4dcc2188baa1d/master.m3u8
 #EXTINF:-1 tvg-id="AnwarTV2.iq",Anwar TV2 (288p)
 http://63b03f7689049.streamlock.net:1935/live/13/playlist.m3u8
-#EXTINF:-1 tvg-id="AVAFamily.iq",AVA Family
-https://ca-rt.onetv.app:8443/AVAFamily/index-0.m3u8
 #EXTINF:-1 tvg-id="BayyinatTV.iq",Bayyinat TV (404p)
 https://nl2.livekadeh.com/hls2/Bayyinat.m3u8
 #EXTINF:-1 tvg-id="BeitolAbbasTVChannel.iq",BeitolAbbas TV Channel (720p)
@@ -126,8 +124,6 @@ https://kurdsat-news.akamaized.net/hls/kurdsat-news.m3u8
 https://livefa.marjaeyattv.com/mtv_ar/playlist.m3u8
 #EXTINF:-1 tvg-id="MarjaeyatTVEnglish.iq",Marjaeyat TV English (1080p)
 https://livefa.marjaeyattv.com/mtv_en/playlist.m3u8
-#EXTINF:-1 tvg-id="MarjaeyatTVPersian.iq",Marjaeyat TV Persian (240p) [Not 24/7]
-https://livefa.marjaeyattv.com/mtv_fa/playlist.m3u8
 #EXTINF:-1 tvg-id="MBCIraq.iq",MBC Iraq (1080p)
 https://shd-gcp-live.edgenextcdn.net/live/bitmovin-mbc-iraq/e38c44b1b43474e1c39cb5b90203691e/index.m3u8
 #EXTINF:-1 tvg-id="NRTTV.iq",NRT TV (720p) [Not 24/7]
@@ -160,3 +156,5 @@ https://avr.host247.net/live/Mix-kurdy/playlist.m3u8
 https://avr.host247.net/live/FarmodaTV/playlist.m3u8
 #EXTINF:-1 tvg-id="IraqFuture.iq@SD",Iraq Future
 https://viewmedia7219.bozztv.com/wmedia/viewmedia100/web_040/Stream/playlist.m3u8
+#EXTINF:-1 tvg-id="MarjaeyatTVPersian.iq",Marjaeyat TV Persian (240p) [Not 24/7]
+https://livefa.marjaeyattv.com/mtv_fa/playlist.m3u8
diff --git a/streams/ir.m3u b/streams/ir.m3u
index 650152560a..126f6284ef 100644
--- a/streams/ir.m3u
+++ b/streams/ir.m3u
@@ -1,36 +1,24 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="towheedtv.ir@HD",towheedtv (720p)
+#EXTINF:-1 tvg-id="towheedtv.ir",towheedtv (720p)
 https://avr.host247.net/live/towheedtv/playlist.m3u8
-#EXTINF:-1 tvg-id="",247 Box
+#EXTINF:-1 tvg-id="AssiratTV.ir",Assirat TV (576p)
+https://softverse.b-cdn.net/Assirat/assiratobs/playlist.m3u8
+#EXTINF:-1 tvg-id="247BoxTV.ir",247 Box TV
 https://hls.247box.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="AbalfadhlTV.ir",Abalfadhl TV (720p)
+#EXTINF:-1 tvg-id="AbalfadhlTV.ir",Abalfadhl TV
 https://t.northtelecom.org/ABALFADHLTV.m3u8
-#EXTINF:-1 tvg-id="",AFN Music
-https://bozztv.com/1gbw5/tintv2/tintv2/chunklist.m3u8
-#EXTINF:-1 tvg-id="AFNTV.ir",AFN TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AFNTV.ir",AFN TV (720p)
 https://bozztv.com/1gbw5/tintv2/tintv2/playlist.m3u8
-#EXTINF:-1 tvg-id="AlAlam.ir",Al Alam (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="AlAlam.ir",Al Alam (360p)
 https://live2.alalam.ir/alalam.m3u8
-#EXTINF:-1 tvg-id="AlWilayah.ir",Al Wilayah (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AlWilayah.ir",Al Wilayah (720p)
 https://nl.livekadeh.com/hls2/alwilayah_tv.m3u8
 #EXTINF:-1 tvg-id="AsilTV.ir",Asil TV (720p)
 https://live.asil.tv/asiltv/index.m3u8
-#EXTINF:-1 tvg-id="AssiratTV.ir@SD",Assirat TV (576p)
-https://softverse.b-cdn.net/Assirat/assiratobs/playlist.m3u8
-#EXTINF:-1 tvg-id="AVAFamily.iq",AVA Family (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AVAFamily.ir",AVA Family (720p)
 https://familyhls.avatv.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="HastiTV.uk",Hasti TV (1080p) [Not 24/7]
-https://live.hastitv.com/hls/livetv.m3u8
-#EXTINF:-1 tvg-id="",Health Media TV (720p)
-https://6n3yowknl9ok-hls-live.5centscdn.com/HMN/271ddf829afeece44d8732757fba1a66.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="HighVisionTV.us",High Vision
-https://streamer1.connectto.com/HIGHVISION_WEB_1205/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="HighVisionTV.us",High Vision (1080p) [Not 24/7]
-https://streamer1.connectto.com/HIGHVISION_WEB_1205/index.m3u8
 #EXTINF:-1 tvg-id="HispanTV.ir",Hispan TV
 https://cdnlive.presstv.ir/live/smil:live.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="HodHodFarsiTV.ir",HodHod Farsi
-https://hls.hodhod.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="iFilm2.ir",iFilm 2
 https://live.presstv.ir/hls/ifilm2.m3u8
 #EXTINF:-1 tvg-id="iFilmArabic.ir",iFilm Arabic
@@ -41,8 +29,8 @@ https://live.presstv.ir/hls/ifilmen.m3u8
 https://live.presstv.ir/hls/ifilmfa.m3u8
 #EXTINF:-1 tvg-id="IranJewishTV.ir",Iran Jewish TV (720p)
 http://iran620.com:1935/live/IranJewishTv/playlist.m3u8
-#EXTINF:-1 tvg-id="IranPress.ir",Iran Press (480p) [Not 24/7]
-https://ip2stream.iranpress.com/hls/ip2.m3u8
+#EXTINF:-1 tvg-id="IranPress.ir",Iran Press (720p)
+https://live.presstv.ir/hls/presstv_5_482/index.m3u8
 #EXTINF:-1 tvg-id="TVITN.ir",ITN [Not 24/7]
 https://ca-rt.onetv.app:8443/ITN/index-0.m3u8
 #EXTINF:-1 tvg-id="MihanTV.ir",Mihan TV (720p)
@@ -55,20 +43,14 @@ https://5acf9f9415a10.streamlock.net/live_transcoder/ngrp:mohabat.stream_all/pla
 https://iptv.negahtv.com/negahtv/playlist.m3u8
 #EXTINF:-1 tvg-id="OXIRTV.ir",OXIR TV (720p)
 https://hls.oxir.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="",Payam Javan TV (720p) [Not 24/7]
-https://uni01rtmp.tulix.tv/kensecure/pjtv.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="PayvandTV.ir",Payvand TV (720p) [Not 24/7]
 https://uni6rtmp.tulix.tv/ucur1/Payvand/playlist.m3u8
-#EXTINF:-1 tvg-id="",PBC Tapesh TV (720p) [Not 24/7]
-https://iptv.tapesh.tv/tapesh/playlist.m3u8
 #EXTINF:-1 tvg-id="PressTV.ir",Press TV
 https://live.presstv.ir/hls/presstv.m3u8
 #EXTINF:-1 tvg-id="PressTVFrench.ir",Press TV French (1080p)
 https://live4.presstv.ir/live/smil:presstvfr.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="SNNTV.ir",SNN TV (720p) [Not 24/7]
-https://live2.snn.ir/hls/snn.m3u8
-#EXTINF:-1 tvg-id="",Tapesh Iran
-https://iptv.tapesh.tv/tapeshiran/playlist.m3u8
+https://live2.snn.ir/hls/snn2_hd720/index.m3u8
 #EXTINF:-1 tvg-id="TBNNejatTV.ir",TBN Nejat TV (720p)
 https://hls.nejat.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="VOX1.ir",VOX1 (720p) [Not 24/7]
@@ -81,6 +63,12 @@ https://stream.sainaertebat.com/hls2/varzeshtest.m3u8
 https://avr.host247.net/live/WiseHumanTv/playlist.m3u8
 #EXTINF:-1 tvg-id="RasoulallahTv.ir",RasoulallahTv (1080p)
 https://avr.host247.net/live/rasoulallahtv/playlist.m3u8
+#EXTINF:-1 tvg-id="CaltexTV.ir",Caltex Music (720p)
+https://video.caltexmusic.com/hls/caltextv.m3u8
+#EXTINF:-1 tvg-id="ITVPersianMusic.ir",ITV Persian Music (1080p)
+https://ca1.buximedia.com/itv/persian/tracks-v1a1/mono.m3u8
+#EXTINF:-1 tvg-id="ITVLife.ir",ITV Life (1080p)
+https://ca1.buximedia.com/itv/life/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="PooyaTV.ir@SD",Pooya TV
 http://dvrfl05.bozztv.com/gin-iribpooya/index.m3u8
 #EXTINF:-1 tvg-id="SaharUrdu.ir@SD",Sahar Urdu
diff --git a/streams/ir_lenz.m3u b/streams/ir_lenz.m3u
index dff2c0fa2c..6676ff9068 100644
--- a/streams/ir_lenz.m3u
+++ b/streams/ir_lenz.m3u
@@ -7,7 +7,7 @@ https://lenz.splus.ir/PLTV/88888888/224/3221226675/index.m3u8
 https://lenz.splus.ir/PLTV/88888888/224/3221226899/index.m3u8
 #EXTINF:-1 tvg-id="AlAlam.ir",AlAlam
 https://lenz.splus.ir/PLTV/88888888/224/3221226157/index.m3u8
-#EXTINF:-1 tvg-id="",AlKawthar
+#EXTINF:-1 tvg-id="AlKawtharTV.ir",AlKawthar
 https://lenz.splus.ir/PLTV/88888888/224/3221226158/index.m3u8
 #EXTINF:-1 tvg-id="AmouzeshTV.ir",Amouzesh
 https://lenz.splus.ir/PLTV/88888888/224/3221226151/index.m3u8
@@ -23,20 +23,18 @@ https://lenz.splus.ir/PLTV/88888888/224/3221226842/index.m3u8
 https://lenz.splus.ir/PLTV/88888888/224/3221226637/index.m3u8
 #EXTINF:-1 tvg-id="IRIB2.ir",IRIB2
 https://lenz.splus.ir/PLTV/88888888/224/3221226176/index.m3u8
-#EXTINF:-1 tvg-id="IRINN2.ir",IRIB2
-https://lenz.splus.ir/PLTV/88888888/224/3221227020/index.m3u8
-#EXTINF:-1 tvg-id="IRIB3.ir",IRIB3
+#EXTINF:-1 tvg-id="IRIB3.ir",IRIB3 (1080p)
 https://lenz.splus.ir/PLTV/88888888/224/3221226868/index.m3u8
 #EXTINF:-1 tvg-id="IRIB4.ir",IRIB4
 https://lenz.splus.ir/PLTV/88888888/224/3221226140/index.m3u8
-#EXTINF:-1 tvg-id="",IRIB5
+#EXTINF:-1 tvg-id="TehranTV.ir",IRIB5 Tehran TV
 https://lenz.splus.ir/PLTV/88888888/224/3221226141/index.m3u8
 #EXTINF:-1 tvg-id="IRINN.ir",IRINN
 https://lenz.splus.ir/PLTV/88888888/224/3221226142/index.m3u8
+#EXTINF:-1 tvg-id="IRINN2.ir",IRINN2
+https://lenz.splus.ir/PLTV/88888888/224/3221227020/index.m3u8
 #EXTINF:-1 tvg-id="IsfahanTV.ir",Isfahan
 https://lenz.splus.ir/PLTV/88888888/224/3221226652/index.m3u8
-#EXTINF:-1 tvg-id="JameJamTV1.ir",JameJam
-https://lenz.splus.ir/PLTV/88888888/224/3221226178/index.m3u8
 #EXTINF:-1 tvg-id="KermanTV.ir",Kerman
 https://lenz.splus.ir/PLTV/88888888/224/3221226856/index.m3u8
 #EXTINF:-1 tvg-id="KhozestanTV.ir",KhozestanTV
@@ -45,7 +43,7 @@ https://lenz.splus.ir/PLTV/88888888/224/3221226415/index.m3u8
 https://lenz.splus.ir/PLTV/88888888/224/3221226647/index.m3u8
 #EXTINF:-1 tvg-id="",LenzAnimation
 https://lenz.splus.ir/PLTV/88888888/224/3221227043/index.m3u8
-#EXTINF:-1 tvg-id="",Mazandaran
+#EXTINF:-1 tvg-id="TabarestanTV.ir",Mazandaran TV
 https://lenz.splus.ir/PLTV/88888888/224/3221226786/index.m3u8
 #EXTINF:-1 tvg-id="IRIBMostanad.ir",Mostanad
 https://lenz.splus.ir/PLTV/88888888/224/3221226901/index.m3u8
diff --git a/streams/ir_telewebion.m3u b/streams/ir_telewebion.m3u
index c0d1031b48..3d0b646d71 100644
--- a/streams/ir_telewebion.m3u
+++ b/streams/ir_telewebion.m3u
@@ -7,7 +7,7 @@ https://ncdn.telewebion.com/aftab/live/playlist.m3u8
 https://ncdn.telewebion.com/alborz/live/playlist.m3u8
 #EXTINF:-1 tvg-id="AmouzeshTV.ir",Amouzesh
 https://ncdn.telewebion.com/amouzesh/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",Ara
+#EXTINF:-1 tvg-id="AraTV.ir",Ara
 https://ncdn.telewebion.com/ara/live/playlist.m3u8
 #EXTINF:-1 tvg-id="AtrakTV.ir",Atrak
 https://ncdn.telewebion.com/atrak/live/playlist.m3u8
@@ -19,11 +19,11 @@ https://ncdn.telewebion.com/baran/live/playlist.m3u8
 https://ncdn.telewebion.com/bushehr/live/playlist.m3u8
 #EXTINF:-1 tvg-id="DenaTV.ir",Dena
 https://ncdn.telewebion.com/dena/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",Eshragh
+#EXTINF:-1 tvg-id="EshraghNetwork.ir",Eshragh
 https://ncdn.telewebion.com/eshragh/live/playlist.m3u8
 #EXTINF:-1 tvg-id="FarsTV.ir",Fars
 https://ncdn.telewebion.com/fars/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",Habib
+#EXTINF:-1 tvg-id="HabibTV.ir",Habib TV
 https://ncdn.telewebion.com/habib/live/playlist.m3u8
 #EXTINF:-1 tvg-id="HamedanTV.ir",Hamedan
 https://ncdn.telewebion.com/sina/live/playlist.m3u8
@@ -43,20 +43,16 @@ https://ncdn.telewebion.com/tv2/live/playlist.m3u8
 https://ncdn.telewebion.com/tv3/live/playlist.m3u8
 #EXTINF:-1 tvg-id="IRIB4.ir",IRIB4
 https://ncdn.telewebion.com/tv4/live/playlist.m3u8
-#EXTINF:-1 tvg-id="IRINN.ir",IRINN
+#EXTINF:-1 tvg-id="IRINN.ir",IRINN Live Farsi News
 https://ncdn.telewebion.com/irinn/live/playlist.m3u8
-#EXTINF:-1 tvg-id="IRINN2.ir",IRINN2
+#EXTINF:-1 tvg-id="IRINN2.ir",IRINN2 Live Farsi News
 https://ncdn.telewebion.com/irinn2/live/playlist.m3u8
 #EXTINF:-1 tvg-id="IsfahanTV.ir",Isfahan
 https://ncdn.telewebion.com/esfahan/live/playlist.m3u8
 #EXTINF:-1 tvg-id="JahanbinTV.ir",Jahanbin
 https://ncdn.telewebion.com/jahanbin/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",Jam
+#EXTINF:-1 tvg-id="JamTV.ir",Jam TV
 https://ncdn.telewebion.com/jam/live/playlist.m3u8
-#EXTINF:-1 tvg-id="JameJamTV1.ir",JameJam
-https://ncdn.telewebion.com/jjtv1/live/playlist.m3u8
-#EXTINF:-1 tvg-id="JameJamTV3.ir",JameJam3
-https://ncdn.telewebion.com/jjtv3/live/playlist.m3u8
 #EXTINF:-1 tvg-id="KermanTV.ir",Kerman
 https://ncdn.telewebion.com/kerman/live/playlist.m3u8
 #EXTINF:-1 tvg-id="KhalijeFarsTV.ir",Khalij-e Fars
@@ -75,13 +71,13 @@ https://ncdn.telewebion.com/kordestan/live/playlist.m3u8
 https://ncdn.telewebion.com/mahabad/live/playlist.m3u8
 #EXTINF:-1 tvg-id="IRIBMostanad.ir",Mostanad
 https://ncdn.telewebion.com/mostanad/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",Nama
+#EXTINF:-1 tvg-id="NamaTV.ir",Nama TV
 https://ncdn.telewebion.com/nama/live/playlist.m3u8
 #EXTINF:-1 tvg-id="NamayeshTV.ir",Namayesh
 https://ncdn.telewebion.com/namayesh/live/playlist.m3u8
 #EXTINF:-1 tvg-id="Nasim.ir",Nasim
 https://ncdn.telewebion.com/nasim/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",Nava
+#EXTINF:-1 tvg-id="TVANava.ir",TVA Nava
 https://ncdn.telewebion.com/nava/live/playlist.m3u8
 #EXTINF:-1 tvg-id="NoorTV.ir",Noor
 https://ncdn.telewebion.com/noor/live/playlist.m3u8
@@ -89,7 +85,7 @@ https://ncdn.telewebion.com/noor/live/playlist.m3u8
 https://ncdn.telewebion.com/ofogh/live/playlist.m3u8
 #EXTINF:-1 tvg-id="IRIBOmid.ir",Omid
 https://ncdn.telewebion.com/omid/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",Palestine
+#EXTINF:-1 tvg-id="Palestinetv.ir",Palestine
 https://ncdn.telewebion.com/palestine/live/playlist.m3u8
 #EXTINF:-1 tvg-id="PooyaTV.ir",Pooya & Nahal
 https://ncdn.telewebion.com/pooya/live/playlist.m3u8
@@ -105,7 +101,7 @@ https://ncdn.telewebion.com/sabalan/live/playlist.m3u8
 https://ncdn.telewebion.com/sabz/live/playlist.m3u8
 #EXTINF:-1 tvg-id="SahandTV.ir",Sahand
 https://ncdn.telewebion.com/sahand/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",SaharAfghan
+#EXTINF:-1 tvg-id="SaharAfghanistan.ir",SaharAfghan
 https://ncdn.telewebion.com/saharafghan/live/playlist.m3u8
 #EXTINF:-1 tvg-id="SalamatTV.ir",Salamat
 https://ncdn.telewebion.com/salamat/live/playlist.m3u8
@@ -119,11 +115,11 @@ https://ncdn.telewebion.com/tabarestan/live/playlist.m3u8
 https://ncdn.telewebion.com/hdtest/live/playlist.m3u8
 #EXTINF:-1 tvg-id="TehranTV.ir",Tehran
 https://ncdn.telewebion.com/tehran/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",Telewebion Sport 1
+#EXTINF:-1 tvg-id="TelewebionSport.ir",Telewebion Sport
 https://ncdn.telewebion.com/twsport/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",Telewebion Sport 2
+#EXTINF:-1 tvg-id="TelewebionSport2.ir",Telewebion Sport 2
 https://ncdn.telewebion.com/twsport2/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",Telewebion Sport 3
+#EXTINF:-1 tvg-id="TelewebionSport3.ir",Telewebion Sport 3
 https://ncdn.telewebion.com/twsport3/live/playlist.m3u8
 #EXTINF:-1 tvg-id="VarzeshTV.ir",Varzesh
 https://ncdn.telewebion.com/varzesh/live/playlist.m3u8
@@ -132,4 +128,4 @@ https://ncdn.telewebion.com/taban/live/playlist.m3u8
 #EXTINF:-1 tvg-id="ZagrosTV.ir",Zagros
 https://ncdn.telewebion.com/zagros/live/playlist.m3u8
 #EXTINF:-1 tvg-id="IRIBUHD.ir",IRIB UHD (2160p)
-https://ncdn.telewebion.com/faratar/live/playlist.m3u8
+https://ncdn.telewebion.com/faratar/live/playlist.m3u8
\ No newline at end of file
diff --git a/streams/ir_wnslive.m3u b/streams/ir_wnslive.m3u
index c2c6dc5848..8888752d9e 100644
--- a/streams/ir_wnslive.m3u
+++ b/streams/ir_wnslive.m3u
@@ -3,19 +3,33 @@
 https://avaserieshls.wns.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="BravoFarsiTV.ir",Bravo Farsi TV (360p)
 https://bravoohls.wns.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="FX1.ir",FX1 Farsi (720p)
+#EXTINF:-1 tvg-id="FX1.ir",FX TV 1
 https://fxtvhls.wns.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="TVITN.ir",ITN (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="FX2.ir",FX TV 2
+https://toonixhls.wns.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="TVITN.ir",ITN (720p)
 https://itnhls.wns.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="MetaFilmTV.ir",Meta Film TV (1080p)
+#EXTINF:-1 tvg-id="MetaFilmTV.ir",Meta Film TV (720p)
 https://metafilmhls.wns.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="",Omide Iran (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="OmideIranTV.us",Omide Iran (720p)
 https://oitnhls.wns.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="",Pars
+#EXTINF:-1 tvg-id="ParsTV.us",Pars TV 
 https://parshls.wns.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="PersianFilm.ir",Persian Film (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PersianFilm.ir",Persian Film (720p)
 https://pfilmhls.wns.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="SL1.ir",SL 1 (720p)
 https://slonehls.wns.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="SL2.ir",SL 2 (720p)
 https://sltwohls.wns.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="T2TV.ir",T2 TV (720p)
+https://t2hls.wns.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="ICCplus.us",ICC Plus (1080p)
+https://icchls.wns.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="GrandCinema.tr",Grand Cinema
+https://gcinemahls.wns.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="MTC.us",MTC (720p)
+https://mtchls.wns.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="CafeTradeTV.ir",Cafe Trade TV (720p)
+https://cafetradehls.wns.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="KanalJadid.uk",Kanal Jadid (720p)
+https://kjhls.wns.live/hls/stream.m3u8
\ No newline at end of file
diff --git a/streams/my.m3u b/streams/my.m3u
index 2fc50880b8..ccd879c704 100644
--- a/streams/my.m3u
+++ b/streams/my.m3u
@@ -14,8 +14,6 @@ http://210.210.155.37/dr9445/h/h04/index.m3u8
 http://210.210.155.35/dr9445/h/h04/index.m3u8
 #EXTINF:-1 tvg-id="eGGNetwork.my",Egg Network (720p)
 http://210.210.155.37/uq2663/h/h22/index.m3u8
-#EXTINF:-1 tvg-id="MaahTV.my",Maah TV (720p) [Not 24/7]
-https://hls.maahtv.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="NTV7.my",NTV7
 https://tonton-live-switch-ssar.akamaized.net/stream-ntv7/master.m3u8?bpkio_serviceid=6c0958d82a830a02ca0936d9cfab8311
 #EXTINF:-1 tvg-id="Okey.my" http-referrer="https://rtm-player.glueapi.io/",Okey [Geo-blocked]
@@ -58,6 +56,8 @@ https://live.mana2.my/Tv2/index.m3u8?auth_key=1745177833-e4f0090e3d3b4ed1b2b4f5d
 https://live.mana2.my/SelangorTv/index.m3u8?auth_key=1745177902-0210d7bbc24749879b1c370bfbd2b512-0-1a02652c616fd55ef43edbcf07d9c7dd&token=1745177902-0210d7bbc24749879b1c370bfbd2b512-0-1a02652c616fd55ef43edbcf07d9c7dd
 #EXTINF:-1 tvg-id="TV1.my",TV1 (1080p)
 https://live.mana2.my/Tv1/index.m3u8?auth_key=1745177809-03fbff3dfc194161829ff0dbf94a205a-0-c6dcdd3499b8b5488b7de0f6613b8047&token=1745177809-03fbff3dfc194161829ff0dbf94a205a-0-c6dcdd3499b8b5488b7de0f6613b8047
+#EXTINF:-1 tvg-id="MaahTV.my",Maah TV (720p)
+https://hls.maahtv.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="8TV.my@SD",8TV
 https://cdn6.163189.xyz/live/8tv/stream.m3u8
 #EXTINF:-1 tvg-id="AstroVaanavil.my@SD",Astro Vaanavil
diff --git a/streams/ng.m3u b/streams/ng.m3u
index 959828c2b5..90dbd9b2af 100644
--- a/streams/ng.m3u
+++ b/streams/ng.m3u
@@ -61,8 +61,6 @@ https://j78dp6reyq5r-hls-live.5centscdn.com/kview/5c6d78cffa59e129f040fcec2d7885
 https://cdnstack.internetmultimediaonline.org/auxano/Cespain/index.m3u8
 #EXTINF:-1 tvg-id="LoveWorldItalia.ng",LoveWorld Italia (1080p)
 https://cdnstack.internetmultimediaonline.org/auxano/italianlanx/index.m3u8
-#EXTINF:-1 tvg-id="LoveWorldPersia.ng",LoveWorld Persia (480p)
-https://cdn3.wowza.com/5/aVJETlF0UFdmYTFu/LWPP/ngrp:persia.stream_all/playlist.m3u8
 #EXTINF:-1 tvg-id="LoveworldXP.ng",LoveWorld XP (480p)
 https://bus-asia-east-1-cimzmgnuu-cdn.sa.metacdn.com/live/ngrp:livestream2022_main_all_transcode/playlist.m3u8
 #EXTINF:-1 tvg-id="MastersTV.ng",Master's TV (720p)
@@ -131,3 +129,5 @@ https://live20.bozztv.com/dvrfl06/astv/astv-chosentv/index.m3u8
 https://live20.bozztv.com/dvrfl06/astv/astv-channel24africa/index.m3u8
 #EXTINF:-1 tvg-id="EmmanuelTV.ng@SD",Emmanuel TV
 https://live20.bozztv.com/dvrfl06/astv/astv-emmanuel/index.m3u8
+#EXTINF:-1 tvg-id="LoveWorldPersia.ng",LoveWorld Persia (720p)
+https://cdn3.wowza.com/5/aVJETlF0UFdmYTFu/LWPP/ngrp:persia.stream_all/playlist.m3u8
\ No newline at end of file
diff --git a/streams/tr.m3u b/streams/tr.m3u
index 5a2db4a24e..cdd344c637 100644
--- a/streams/tr.m3u
+++ b/streams/tr.m3u
@@ -1,6 +1,4 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="4UTV.tr",4U TV (720p)
-https://hls.4utv.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="24TV.tr",24 TV
 https://kanal24.blutv.com/blutv_kanal24_live/live.m3u8
 #EXTINF:-1 tvg-id="24TV.tr",24 TV (1080p)
@@ -232,8 +230,6 @@ https://mn-nl.mncdn.com/blutv_flashtv/live.m3u8
 https://edge1.socialsmart.tv/ftvturk/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="GoncaTV.tr",Gonca TV (720p)
 https://edge1.socialsmart.tv/goncatv/bant1/playlist.m3u8
-#EXTINF:-1 tvg-id="GrandCinema.tr",Grand Cinema
-https://gcinemahls.wns.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="GRT.tr",GRT (900p)
 https://live.artidijitalmedya.com/artidijital_grt/grt1/playlist.m3u8
 #EXTINF:-1 tvg-id="GRT.tr",GRT (576p)
@@ -426,7 +422,7 @@ http://185.234.111.229:8000/play/a04x
 https://live.artidijitalmedya.com/artidijital_mavikaradeniz/mavikaradeniz/playlist.m3u8
 #EXTINF:-1 tvg-id="MaviKaradenizTV.tr",MaviKaradeniz TV (576p)
 http://185.234.111.229:8000/play/a04p
-#EXTINF:-1 tvg-id="MedMuzik.tr",Med Muzik (720p)
+#EXTINF:-1 tvg-id="MedMuzik.tr",Med Muzik (1080p)
 http://54.36.110.140/live3/live3.m3u8
 #EXTINF:-1 tvg-id="MekameleenTV.tr",Mekameleen TV (1080p)
 https://mn-nl.mncdn.com/mekameleen/smil:mekameleentv.smil/playlist.m3u8
@@ -533,8 +529,6 @@ https://bcovlive-a.akamaihd.net/540fcb034b144b848e7ff887f61a293a/eu-central-1/64
 https://bcovlive-a.akamaihd.net/29c60f23ea4840ba8726925a77fcfd0b/eu-central-1/6415845530001/profile_0/chunklist.m3u8
 #EXTINF:-1 tvg-id="SariyerTV.tr",Sarıyer TV (360p)
 https://s01.vpis.io/sariyer/sariyer.m3u8
-#EXTINF:-1 tvg-id="Sat7Pars.cy",Sat7 Pars (1080p)
-https://svs.itworkscdn.net/sat7parslive/sat7pars.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Sat7Turk.cy",Sat7 Türk (1080p)
 https://live.artidijitalmedya.com/artidijital_sat7turk/sat7turk/playlist.m3u8
 #EXTINF:-1 tvg-id="Sat7Turk.cy",Sat7 Türk (1080p)
@@ -792,8 +786,6 @@ https://stream.yol.tv:9443/medialive/yol.m3u8
 https://zindikurmanci.zaroktv.com.tr/hls/stream.m3u8
 #EXTINF:-1 tvg-id="TYTTurk.tr",TYT Turk
 https://cdn-tytturk.yayin.com.tr/tytturk/index.m3u8
-#EXTINF:-1 tvg-id="MedMuzik.tr",Med Muzik (1080p)
-http://54.36.110.140/live3/live3.m3u8
 #EXTINF:-1 tvg-id="DisneyJr.tr",Disney Jr. (1080p) [Geo-blocked]
 https://saran-live.ercdn.net/disneyjunior/index.m3u8
 #EXTINF:-1 tvg-id="NationalGeographic.tr",National Geographic (1080p) [Geo-blocked]
@@ -834,8 +826,8 @@ http://77.83.120.135:8001/play/a0i6
 http://77.83.120.135:8001/play/a19x
 #EXTINF:-1 tvg-id="VavTV.tr@SD",Vav TV
 https://playlist.fasttvcdn.com/pl/rfrk9821hdy9dayo8wfyha/kltr-sanat-tv/playlist.m3u8
-#EXTINF:-1 tvg-id="FlashTV.tr@SD",Flash TV
-https://live20.bozztv.com/dvrfl05/gin-flashtv/index.m3u8
+#EXTINF:-1 tvg-id="4UTV.tr",4U TV (720p)
+https://hls.4utv.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="FBTV.tr@SD",FB TV
 https://live20.bozztv.com/trn03/gin-fbtv1/index.m3u8
 #EXTINF:-1 tvg-id="StarTV.tr@SD",Star TV
diff --git a/streams/tr_onetv.m3u b/streams/tr_onetv.m3u
new file mode 100644
index 0000000000..d9ed66a534
--- /dev/null
+++ b/streams/tr_onetv.m3u
@@ -0,0 +1,57 @@
+#EXTM3U
+#EXTINF:-1 tvg-id="GEMTV.tr",GEM TV
+https://ca-rt.onetv.app/gemb/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMSeries.tr",GEM Series
+https://ca-rt.onetv.app/gemseries/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMBollywood.tr",GEM Bollywood
+https://ca-rt.onetv.app/gembollywood/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMFilm.tr",GEM Film
+https://ca-rt.onetv.app/gemfilm/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMClassic.tr",GEM Classic
+https://ca-rt.onetv.app/gemclassic/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMDrama.tr",GEM Drama
+https://ca-rt.onetv.app/gemdrama/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMJunior.tr",GEM Junior
+https://ca-rt.onetv.app/gemjunior/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMKids.tr",GEM Kids
+https://ca-rt.onetv.app/gemkids/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMFood.tr",GEM Food
+https://ca-rt.onetv.app/gemfood/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMMifa.tr",GEM Mifa
+https://ca-rt.onetv.app/gemmifa/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMRiver.tr",GEM River
+https://ca-rt.onetv.app/gemriver/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMRubix.tr",GEM Rubix
+https://ca-rt.onetv.app/gemrubix/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMComedy.tr",GEM Comedy
+https://ca-rt.onetv.app/gemcomedy/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMNature.tr",GEM Nature
+https://ca-rt.onetv.app/gemnature/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMLife.tr",GEM Life
+https://ca-rt.onetv.app/gemlife/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMFit.tr",GEM Fit
+https://ca-rt.onetv.app/gemfit/index-0.m3u8
+#EXTINF:-1 tvg-id="EkranMovies.ir",Ekran Movies
+https://ca-rt.onetv.app/EkranMovies/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMOnyx.tr",GEM Onyx
+https://ca-rt.onetv.app/gemonyx/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMMifaPlus.tr",GEM Mifa Plus
+https://ca-rt.onetv.app/gemmifaplus/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMRiverPlus.tr",GEM River Plus
+https://ca-rt.onetv.app/gemriverplus/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMDramaPlus.tr",GEM Drama Plus
+https://ca-rt.onetv.app/gemdramaplus/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMRubixPlus.tr",GEM Rubix Plus
+https://ca-rt.onetv.app/gemrubixplus/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMSeriesPlus.tr",GEM Series Plus
+https://ca-rt.onetv.app/gemseriesplus/index-0.m3u8
+#EXTINF:-1 tvg-id="GEMPlus.tr",GEM Plus
+https://glserver.aparatlive.online/live/0HiQyLdLkEG10hVjsoW8Zw__/stream_0.m3u8
+#EXTINF:-1 tvg-id="",GEM Sport
+https://glserver.aparatlive.online/live/soTIwdLufLQtTolsng4bGA__/stream_0.m3u8
+#EXTINF:-1 tvg-id="GEMTravel.tr",GEM Travel
+https://gem2-website.aparatlive.online/live/BrLWIo91SQ_odTfw6uNl_A__/stream_0.m3u8
+#EXTINF:-1 tvg-id="GEMPixel.tr",GEM Pixel
+https://glserver1.tamashaland.com/live/aBCH96886YznRbGOiqTnnQ__/stream_0.m3u8
+#EXTINF:-1 tvg-id="AVAFamily.ir",AVA Family
+https://ca-rt.onetv.app:8443/AVAFamily/index-0.m3u8
\ No newline at end of file
diff --git a/streams/uk_bbc.m3u b/streams/uk_bbc.m3u
index 8080c434c5..f9d5224525 100644
--- a/streams/uk_bbc.m3u
+++ b/streams/uk_bbc.m3u
@@ -100,14 +100,6 @@ https://vs-hls-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_one_yo
 #EXTINF:-1 tvg-id="BBCParliament.uk",BBC Parliament (720p) [Geo-blocked]
 https://vs-cmaf-pushb-uk-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_parliament/iptv_hd_abr_v1.mpd
 #EXTINF:-1 tvg-id="BBCPersian.uk",BBC Persian (720p)
-https://vs-cmaf-pushb-ww-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_persian_tv/pc_hd_abr_v2_akamai_dash_live.mpd
-#EXTINF:-1 tvg-id="BBCPersian.uk",BBC Persian (720p)
-https://vs-cmaf-pushb-ww-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_persian_tv/pc_hd_abr_v2_akamai_dash_live_http.mpd
-#EXTINF:-1 tvg-id="BBCPersian.uk",BBC Persian (720p)
-https://vs-cmaf-pushb-ww.live.cf.md.bbci.co.uk/x=3/i=urn:bbc:pips:service:bbc_persian_tv/pc_hd_abr_v2_cloudfrontms_live.mpd
-#EXTINF:-1 tvg-id="BBCPersian.uk",BBC Persian (720p)
-https://vs-cmaf-pushb-ww.live.cf.md.bbci.co.uk/x=3/i=urn:bbc:pips:service:bbc_persian_tv/pc_hd_abr_v2_cloudfrontms_live_http.mpd
-#EXTINF:-1 tvg-id="BBCPersian.uk",BBC Persian (720p)
 https://vs-hls-pushb-ww-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_persian_tv/t=3840/v=pv14/b=5070016/main.m3u8
 #EXTINF:-1 tvg-id="BBCRedButton1.uk@SD",BBC RB 1 (720p) [Geo-blocked]
 https://vs-cmaf-pushb-uk.live.cf.md.bbci.co.uk/x=4/i=urn:bbc:pips:service:red_button_one/iptv_hd_abr_v1.mpd
diff --git a/streams/us.m3u b/streams/us.m3u
index 7c44104a7f..9d26457a35 100644
--- a/streams/us.m3u
+++ b/streams/us.m3u
@@ -101,8 +101,6 @@ http://107.167.7.162:8081/playlist/amhor/playlist.m3u8
 https://2-fss-2.streamhoster.com/pl_138/201660-1270634-1/playlist.m3u8
 #EXTINF:-1 tvg-id="AMGATV.us",Amga TV (720p) [Not 24/7]
 https://streamer1.connectto.com/AMGA_WEB_1202/playlist.m3u8
-#EXTINF:-1 tvg-id="AvangTV.us",Avang TV (720p)
-https://hls.avang.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="AWEEncore.us",AWE Encore (720p) [Geo-blocked]
 https://a-cdn.herringnetwork.com/affiliate/awee/playlist.m3u8
 #EXTINF:-1 tvg-id="AXSTVNOW.us",AXS TV NOW
@@ -175,8 +173,6 @@ https://reflect-stream-bronxnet.cablecast.tv/live-18/live/live.m3u8
 https://reflect-stream-bronxnet.cablecast.tv/live-16/live/live.m3u8
 #EXTINF:-1 tvg-id="BYUTV.us",BYU TV (720p)
 https://content.uplynk.com/channel/2f29cb20fcb74f68a85c38b99ca384bc.m3u8
-#EXTINF:-1 tvg-id="CafeTradeTV.us",Cafe Trade TV (720p)
-https://cafetradehls.wns.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="CaliforniaMusicChannel.us",California Music Channel (720p) [Not 24/7]
 https://cmc-ono.amagi.tv/hls/amagi_hls_data_cmcAAAAAA-cmc-ono/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="CameraSmileTV.us",Camera Smile (480p)
@@ -329,8 +325,6 @@ https://edge.fstv-live-linear-channel.top.comcast.net/Content/HLS_HLSv3/Live/cha
 http://104.143.4.5:2080/funroads.m3u8
 #EXTINF:-1 tvg-id="",Fútbol
 https://dai.google.com/linear/hls/event/JgYgVMW8Szinkmm7dchlmQ/master.m3u8
-#EXTINF:-1 tvg-id="GanjeHozourTV.us",Ganj e Hozour TV (720p)
-https://media.parvizshahbazi.com/ganjehozour/Main_tv/playlist.m3u8
 #EXTINF:-1 tvg-id="GlobalBuddhistNetwork.us",GBN Global Buddhist Network (1080p)
 https://github.com/BellezaEmporium/IPTV_Exception/raw/master/channels/us/gbnus.m3u8
 #EXTINF:-1 tvg-id="GemShoppingNetwork.us",Gem Shopping Network (720p)
@@ -399,8 +393,6 @@ https://freespeech.akamaized.net/hls/live/2024573/live2/playlist.m3u8
 https://freespeech.akamaized.net/hls/live/2016873/live3/playlist.m3u8
 #EXTINF:-1 tvg-id="",InfoWars War Room With Owen Shroyer (1080p)
 https://freespeech.akamaized.net/hls/live/2024574/live4/playlist.m3u8
-#EXTINF:-1 tvg-id="",IraneFarda TV (576p)
-https://hls.iranfarda.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="ItsSupernaturalNetwork.us",It's Supernatural! Network (ISN Network) (1080p)
 https://content.uplynk.com/channel/fbc0f835332e476397b12216f9042f78.m3u8
 #EXTINF:-1 tvg-id="JBS.us",JBS (404p) [Not 24/7]
@@ -519,8 +511,6 @@ https://1422977263.rsc.cdn77.org/HLS/MOTOAMERICA.m3u8
 https://motors.playout.vju.tv/motors/main.m3u8
 #EXTINF:-1 tvg-id="MSNBC.us",MSNBC (720p)
 http://41.205.93.154/MSNBC/index.m3u8
-#EXTINF:-1 tvg-id="MTC.us",MTC (720p)
-https://mtchls.wns.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="NagoTV.us",Nago TV (240p)
 https://lakay.online/public/nagotv/index.fmp4.m3u8
 #EXTINF:-1 tvg-id="NashuaETV.us",Nashua ETV Channel 22 Nashua NH
@@ -571,8 +561,6 @@ https://d1p0bzoad08w6e.cloudfront.net/encode/nudu.m3u8
 https://reflect-stream-bronxnet.cablecast.tv/live-10/live/live.m3u8
 #EXTINF:-1 tvg-id="OANEncore.us",OAN Encore (720p) [Geo-blocked]
 https://a-cdn.herringnetwork.com/affiliate/oane/playlist.m3u8
-#EXTINF:-1 tvg-id="OmidJavedan.us",Omid Javedan (720p) [Not 24/7]
-http://livestream.5centscdn.com/shaditv/23abe62a446fc05ce0a6c810f4045308.sdp/index.m3u8
 #EXTINF:-1 tvg-id="OpcionTV.us",Opción TV (540p)
 https://5790d294af2dc.streamlock.net/8066/8066/playlist.m3u8
 #EXTINF:-1 tvg-id="OURTV.us",Opportunities in Urban Renaissance Television (OURTV) (720p)
@@ -581,8 +569,6 @@ https://hls-cdn.tvstartup.net/barakyah-channel/play/mp4:ourtvedge/playlist.m3u8
 https://us1.ottstream.live:17071/C279/index.m3u8?token=123TREWQ456
 #EXTINF:-1 tvg-id="PayameAfghanTV.us",Payam-e-Afghan TV (480p) [Not 24/7]
 https://g5nl6xx5lpq6-hls-live.5centscdn.com/live1234/2621b29e501b445fabf227b086123b70.sdp/mono.m3u8
-#EXTINF:-1 tvg-id="PayameArameshTV.us",Payame Aramesh TV (720p)
-https://hls.keshishhamid.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="PayvandTV.us",Payvand TV (720p) [Not 24/7]
 https://bozztv.com/cus01/ucur1/Payvand/index.m3u8
 #EXTINF:-1 tvg-id="PlutoTVMTVClassic.us",Pluto TV MTV Classic
@@ -601,8 +587,6 @@ https://qvc-amd-live.akamaized.net/hls/live/2034113/lsqvc2us/master.m3u8
 https://qvc-amd-live.akamaized.net/hls/live/2034113/lsqvc3us/master.m3u8
 #EXTINF:-1 tvg-id="",QVC West
 https://qvc-amd-live.akamaized.net/hls/live/2034113/lsqvc1uswest/master.m3u8
-#EXTINF:-1 tvg-id="RJTV.us",Radio Javan TV (1080p)
-https://rjtvhls.wns.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="RadioRitmoFM.cl",Radio Ritmo (1080p) [Not 24/7]
 https://panel.tvstream.cl:1936/8046/8046/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioUTV.us",Radio U TV (720p) [Not 24/7]
@@ -627,16 +611,12 @@ https://linear-142.frequency.stream/mt/brightcove/142/hls/master/playlist.m3u8
 https://linear-44.frequency.stream/mt/brightcove/44/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="RFDTV.us",RFD-TV
 https://rfdtv-jw.cdn.vustreams.com/live/7cba1a3b-318a-4097-8492-374478370b91/live.isml/7cba1a3b-318a-4097-8492-374478370b91.m3u8
-#EXTINF:-1 tvg-id="RoyalTimeTelevision.us",Royal Time Television (1080p)
-https://tixbolt.com/royaltv/index.fmp4.m3u8
 #EXTINF:-1 tvg-id="SadaEHaqTV.us",Sada-E-Haq TV (720p)
 https://live.relentlessinnovations.net:1936/sadaehaq/sadaehaq/playlist.m3u8
 #EXTINF:-1 tvg-id="SafeTV.us",SafeTV (1080p)
 http://18.191.91.130:1935/live/safetv/playlist.m3u8
 #EXTINF:-1 tvg-id="ScientologyNetwork.us",Scientology Network (1080p)
 https://stream6.scientology.org/master.m3u8
-#EXTINF:-1 tvg-id="Shabakeh7.us",Shabakeh 7 (576p)
-https://t.northtelecom.org/Shabakeh.m3u8
 #EXTINF:-1 tvg-id="ShalomAmerica.us",Shalom TV (720p) [Not 24/7]
 https://livestreamcdn.net:444/ShalomTV/ShalomTV/playlist.m3u8
 #EXTINF:-1 tvg-id="ShopHQ.us",Shop HQ (720p)
@@ -719,12 +699,10 @@ https://d155hi8td9k2ns.cloudfront.net/out/wapo-medialive3-rtmp/live.m3u8
 https://clouditize.piksel.tech/hls/live/2043070/ClouditizeStream1/playlist.m3u8
 #EXTINF:-1 tvg-id="TinTV.us",Tin TV (720p) [Not 24/7]
 https://bozztv.com/1gbw5/tintv/tintv/playlist.m3u8
-#EXTINF:-1 tvg-id="TMTV.us",TM TV (720p)
-https://hls.tmtv.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="TinTV.us",Tin TV (720p)
+https://tulixcdn.akamaized.net/tintv6/tintv/tintv/playlist.m3u8
 #EXTINF:-1 tvg-id="IMPACTWrestling.us",TNA Wrestling (1080p)
 https://d3mwqwqfak7y2q.cloudfront.net/v1/master/3722c60a815c199d9c0ef36c5b73da68a62b09d1/ImpactWrestling-prod/hls/main.m3u8
-#EXTINF:-1 tvg-id="TODAYTV.us",Today TV (720p)
-https://todayhls.wns.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="ToonGoggles.us",Toon Goggles (720p)
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=37
 #EXTINF:-1 tvg-id="ToonamiAftermath.us@East",Toonami Aftermath East (480p)
@@ -825,8 +803,6 @@ http://190.2.212.209:8050/play/a0q4
 https://server80.servistreaming.com:3884/hybrid/play.m3u8
 #EXTINF:-1 tvg-id="VBSTV.us",VBS TV (480p) [Not 24/7]
 http://uni6rtmp.tulix.tv:1935/vbstv/vbsabr.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="VelayatTVNetwork.us",Velayat TV (480p)
-https://nl.livekadeh.com/hls2/velayattv.m3u8
 #EXTINF:-1 tvg-id="VevoPop.us",Vevo Pop (1080p)
 https://jmp2.uk/sam-GBBC19000017V.m3u8
 #EXTINF:-1 tvg-id="VICETV.us",Vice East
@@ -835,8 +811,6 @@ https://d2do1g43aq7264.cloudfront.net/playlist.m3u8
 https://2-fss-2.streamhoster.com/pl_138/201950-5317556-1/playlist.m3u8
 #EXTINF:-1 tvg-id="WHOHTV.us",Village of Hastings-On-Hudson NY (WHOH-TV) (360p)
 https://stream.swagit.com/live-edge/hastingsonhudsonny/smil:std-4x3-1-a/playlist.m3u8
-#EXTINF:-1 tvg-id="VoATVPersian.us",VOA Persian
-https://voa-ingest.akamaized.net/hls/live/2033876/tvmc07/playlist.m3u8
 #EXTINF:-1 tvg-id="VoATV.us",VOA TV Africa (1080p)
 https://voa-ingest.akamaized.net/hls/live/2033874/tvmc06/playlist.m3u8
 #EXTINF:-1 tvg-id="VSiN.us",VSiN (720p)
@@ -900,12 +874,6 @@ https://live.zoomnews.info/live/Zoom_playlist.m3u8
 http://72.46.118.193/Laff/index.m3u8
 #EXTINF:-1 tvg-id="History2LatinAmerica.us",History 2 Latin America
 https://cors-proxy.cooks.fyi/https://streamer1.nexgen.bz/HISTORY2/index.m3u8
-#EXTINF:-1 tvg-id="DidgahTV.us",Didgah TV (576p)
-https://media.streambrothers.com:1936/8276/8276/playlist.m3u8
-#EXTINF:-1 tvg-id="TinTV.us",Tin TV (720p)
-https://tulixcdn.akamaized.net/tintv6/tintv/tintv/playlist.m3u8
-#EXTINF:-1 tvg-id="PBCTapeshTV.us",PBC Tapesh TV (480p)
-https://iptv.tapesh.tv/tapesh/playlist_mid/index.m3u8
 #EXTINF:-1 tvg-id="GlobalWorldTV.us",GlobalWorldTV (720p)
 https://media.streambrothers.com:1936/8052/8052/playlist.m3u8
 #EXTINF:-1 tvg-id="ShemarooBollywood.us",Shemaroo Bollywood (1080p)
@@ -1030,6 +998,38 @@ https://84e619480232400a842ce499d053458a.mediatailor.us-east-1.amazonaws.com/v1/
 https://5d12bc59c4748.streamlock.net/redirect/ocnbroadcasting.com/ocnbroadcasting2?type=m3u8
 #EXTINF:-1 tvg-id="AtlantaChannel.us@SD",Atlanta Channel
 https://live20.bozztv.com/dvrfl05/gin-atlantachannel/index.m3u8
+#EXTINF:-1 tvg-id="PayamJavanTV.us",Payam Javan TV (720p) [Not 24/7]
+https://uni01rtmp.tulix.tv/kensecure/pjtv.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="PBCTapeshTV.us",PBC Tapesh TV (720p)
+https://iptv.tapesh.tv/tapesh/playlist.m3u8
+#EXTINF:-1 tvg-id="Tapesh2.us",Tapesh Iran
+https://iptv.tapesh.tv/tapeshiran/playlist.m3u8
+#EXTINF:-1 tvg-id="AvangTV.us",Avang TV (1080p)
+https://hls.avang.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="PayameArameshTV.us",Payame Aramesh TV (720p)
+https://hls.keshishhamid.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="VoATVPersian.us",VOA Persian
+https://voa-ingest.akamaized.net/hls/live/2033876/tvmc07/playlist.m3u8
+#EXTINF:-1 tvg-id="GanjeHozourTV.us",Ganj e Hozour TV (1080p)
+https://media.parvizshahbazi.com/ganjehozour/Main_tv/playlist.m3u8
+#EXTINF:-1 tvg-id="HealthMediaTV.us",Health Media TV (720p)
+https://6n3yowknl9ok-hls-live.5centscdn.com/HMN/271ddf829afeece44d8732757fba1a66.sdp/playlist.m3u8
+#EXTINF:-1 tvg-id="OmidJavedan.us",Omid Javedan (720p) [Not 24/7]
+http://livestream.5centscdn.com/shaditv/23abe62a446fc05ce0a6c810f4045308.sdp/index.m3u8
+#EXTINF:-1 tvg-id="RJTV.us",Radio Javan TV (1080p)
+https://rjtvhls.wns.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="RoyalTimeTelevision.us",Royal Time Television (1080p)
+https://tixbolt.com/royaltv/index.fmp4.m3u8
+#EXTINF:-1 tvg-id="Shabakeh7.us",Shabakeh 7 (576p)
+https://t.northtelecom.org/Shabakeh.m3u8
+#EXTINF:-1 tvg-id="TMTV.us",TM TV (720p)
+https://hls.tmtv.live/hls/stream.m3u8
+#EXTINF:-1 tvg-id="VelayatTVNetwork.us",Velayat TV (480p)
+https://nl.livekadeh.com/hls2/velayattv.m3u8
+#EXTINF:-1 tvg-id="HighVisionTV.us",High Vision (1080p)
+https://streamer1.connectto.com/HIGHVISION_WEB_1205/index.m3u8
+#EXTINF:-1 tvg-id="DidgahTV.us",Didgah TV (576p)
+https://media.streambrothers.com:1936/8276/8276/playlist.m3u8
 #EXTINF:-1 tvg-id="PayvandTV.us@SD",Payvand TV
 https://tgn.bozztv.com/cus01/ucur1/Payvand/index.m3u8
 #EXTINF:-1 tvg-id="TBNArmenia.us@SD",TBN Armenia
diff --git a/streams/us_local.m3u b/streams/us_local.m3u
index 500eeb982e..9af0f6b687 100644
--- a/streams/us_local.m3u
+++ b/streams/us_local.m3u
@@ -169,8 +169,6 @@ https://video.oct.dc.gov/out/u/DCC.m3u8
 https://video.oct.dc.gov/out/u/DKN.m3u8
 #EXTINF:-1 tvg-id="Denver8TV.us",Denver 8 TV (Denver CO) (720p)
 https://cdn3.wowza.com/5/bGZUOHp2TnhudnM2/denver/G0080_002/playlist.m3u8
-#EXTINF:-1 tvg-id="DidgahTV.us",Didgah TV (280p)
-https://api.new.livestream.com/accounts/27146356/events/8209491/live.m3u8
 #EXTINF:-1 tvg-id="DistrictofColumbiaNetwork.us",District of Columbia Network (DCN) (1080p)
 https://video.oct.dc.gov/out/u/DCN.m3u8
 #EXTINF:-1 tvg-id="EscambiaCountyTV.us",Escambia County TV ECTV (Escambia County FL) (720p)