diff --git a/channels/ps.m3u b/channels/ps.m3u
index 0f8518346..35c42e164 100644
--- a/channels/ps.m3u
+++ b/channels/ps.m3u
@@ -15,7 +15,7 @@ http://vstream3.hadara.ps:8081/marahFM_web/web/playlist.m3u8
 http://htvpalsat.mada.ps:8888/musawa/index.m3u8
 #EXTINF:-1 tvg-id="OrientRadioPlusPalestineMubasher.ps" tvg-name="Orient Radio + Palestine Mubasher" tvg-country="PS" tvg-language="Arabic" tvg-logo="https://i.imgur.com/EKGnd0S.png" group-title="Music",Orient Radio + Palestine Mubasher
 http://htvint.mada.ps:8889//orient/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="PS" tvg-language="Arabic" tvg-logo="" group-title="Education",Palestine Education
+#EXTINF:-1 tvg-id="PalestineEducation.ps" tvg-name="Palestine Education" tvg-country="PS" tvg-language="Arabic" tvg-logo="" group-title="Education",Palestine Education
 http://93.184.1.247:8080/Paestin_Edu/index.m3u8
 #EXTINF:-1 tvg-id="PalestineMubasher.ps" tvg-name="Palestine Mubasher" tvg-country="PS" tvg-language="Arabic" tvg-logo="https://i.imgur.com/bYz6HUG.png" group-title="General",Palestine Mubasher
 http://htvpalsat.mada.ps:8888/PBCLive/tracks-v1a1/mono.m3u8
diff --git a/channels/se.m3u b/channels/se.m3u
index bb5a4a158..ce21ff7e7 100644
--- a/channels/se.m3u
+++ b/channels/se.m3u
@@ -15,14 +15,14 @@ http://vod.tv7.fi:1935/tv7-se/_definst_/mp4:tv7-se.stream_360p/playlist.m3u8
 https://cdn-kanal10.crossnet.net/kanal10/mp4:mpegts.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="Kanal10.se" tvg-name="Kanal 10" tvg-country="SE" tvg-language="Swedish" tvg-logo="https://i.imgur.com/p5ktCEA.jpg" group-title="Religious",Kanal 10 (576p)
 https://cdn-kanal10.crossnet.net/kanal10/mpegts.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="TV4.se" tvg-name="TV4" tvg-country="SE" tvg-language="Swedish" tvg-logo="https://i.imgur.com/mvwiSqt.png" group-title="",TV4 (720p)
-https://csm-e-tv4se-eb.tls1.yospace.com/csm/live/142791716.m3u8
-#EXTINF:-1 tvg-id="TV4Nyheterna.se" tvg-name="TV4Nyheterna" tvg-country="SE" tvg-language="Swedish" tvg-logo="https://i.imgur.com/psAAPIE.jpg" group-title="",TV4Nyheterna (720p)
-https://csm-e-tv4se-eb.tls1.yospace.com/csm/live/142791350.m3u8
-#EXTINF:-1 tvg-id="TV4SvenskPolitik.se" tvg-name="TV4 Svensk Politik" tvg-country="SE" tvg-language="Swedish" tvg-logo="" group-title="",TV4 Svensk Politik (720p)
-https://csm-e-tv4se-eb.tls1.yospace.com/csm/live/142791553.m3u8
 #EXTINF:-1 tvg-id="TV1000WorldKino.se" tvg-name="TV1000 World Kino" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",TV1000 World Kino
 http://195.189.105.158:9050/121/index.m3u8
+#EXTINF:-1 tvg-id="TV4.se" tvg-name="TV4" tvg-country="SE" tvg-language="Swedish" tvg-logo="https://i.imgur.com/mvwiSqt.png" group-title="",TV4 (720p)
+https://csm-e-tv4se-eb.tls1.yospace.com/csm/live/142791716.m3u8
+#EXTINF:-1 tvg-id="TV4SvenskPolitik.se" tvg-name="TV4 Svensk Politik" tvg-country="SE" tvg-language="Swedish" tvg-logo="" group-title="",TV4 Svensk Politik (720p)
+https://csm-e-tv4se-eb.tls1.yospace.com/csm/live/142791553.m3u8
+#EXTINF:-1 tvg-id="TV4Nyheterna.se" tvg-name="TV4Nyheterna" tvg-country="SE" tvg-language="Swedish" tvg-logo="https://i.imgur.com/psAAPIE.jpg" group-title="",TV4Nyheterna (720p)
+https://csm-e-tv4se-eb.tls1.yospace.com/csm/live/142791350.m3u8
 #EXTINF:-1 tvg-id="ViasatHistoryRussia.se" tvg-name="Viasat History Russia" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="History",Viasat History Russia
 https://s1.idata.uz/stch_temp20/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="ViasatSportEast.se" tvg-name="Viasat Sport East" tvg-country="RU" tvg-language="Russian" tvg-logo="https://upload.wikimedia.org/wikipedia/en/4/45/Viasatsport.png" group-title="",Viasat Sport East
diff --git a/channels/unsorted.m3u b/channels/unsorted.m3u
index ae546e7eb..75351b4f8 100644
--- a/channels/unsorted.m3u
+++ b/channels/unsorted.m3u
@@ -512,17 +512,13 @@ http://210.210.155.35/session/83bc2526-da69-11e8-881b-c81f66f89318/dr9445/h/h144
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://static.epg.best/kr/Animax.kr.png" group-title="",Animax
 https://liveanevia.mncnow.id/live/eds/Animax/sa_dash_vmx/Animax.mpd
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/5UpjGcL.png" group-title="",Animestation (480p)
-https://stmv.video.expressolider.com.br/animestation1/animestation1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/5UpjGcL.png" group-title="",Animestation (480p)
 https://stmv.video.expressolider.com.br/animestation1/animestation1/chunklist_w2074350440.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/5UpjGcL.png" group-title="",Animestation (480p)
+https://stmv.video.expressolider.com.br/animestation1/animestation1/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",ANT1 HD
 https://antennalivesp-lh.akamaihd.net/i/live_1@715138/index_800_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Antena 1
-http://stream1.antenaplay.ro/live/smil:ComedyPlay.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Antena Comedy
 https://ch.iptvmate.net/8e00b8e53dfd2f3522d4c70bac04e3ee.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/GZABUfW.png" group-title="",Antena Cook and PLay
-http://stream1.antenaplay.ro/live/smil:CookPlay.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Antena Cook and PLay
 https://ch.iptvmate.net/163f3c3c469dde8877d72633c6c9a84f.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Antena Monden
@@ -981,14 +977,14 @@ https://buzzrota-web.amagi.tv/playlist.m3u8
 https://buzzr-roku-us.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Büyük Alanya TV
 https://canliyayin.buyukalanya.com/hls/byk/buyukalanya.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/Ot9wh52.png" group-title="",C3
-https://nrpus.bozztv.com/36bay2/gusa-c3/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/ZVO8GVI.png" group-title="",C-Ghost (480p)
-https://stmv.video.expressolider.com.br/ghostv/ghostv/playlist.m3u8
+https://stmv.video.expressolider.com.br/ghostv/ghostv/chunklist_w1238458345.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/ZVO8GVI.png" group-title="",C-Ghost (480p)
 https://stmv.video.expressolider.com.br/ghostv/ghostv/chunklist_w609611790.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/ZVO8GVI.png" group-title="",C-Ghost (480p)
-https://stmv.video.expressolider.com.br/ghostv/ghostv/chunklist_w1238458345.m3u8
+https://stmv.video.expressolider.com.br/ghostv/ghostv/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/Ot9wh52.png" group-title="",C3
+https://nrpus.bozztv.com/36bay2/gusa-c3/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",CA | Canadian Arab TV
 http://192.226.228.32:8080/hls/catv/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",CA | Global Calgary
@@ -3226,10 +3222,10 @@ http://5tv.lincoln.ne.gov/live/WIFI-2096k-1080p/WIFI-2096k-1080p.m3u8
 http://80tv.lincoln.ne.gov/live/WIFI-2096k-1080p/WIFI-2096k-1080p.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",LNKTV Health
 http://10tv.lincoln.ne.gov/live/WIFI-2096k-1080p/WIFI-2096k-1080p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/auEJJvP.png" group-title="",LocomotionTV (480p)
-http://51.222.85.85:81/hls/loco/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",Locomotion TV
 http://locomotiontv.com/envivo/loco_ch/stream.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/auEJJvP.png" group-title="",LocomotionTV (480p)
+http://51.222.85.85:81/hls/loco/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",LOGOS TV
 http://68.235.60.118:1935/logoschannel.com/logostv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",LOGOS TV
@@ -6834,20 +6830,6 @@ https://5ca3e84a76d30.streamlock.net/tvmarvallarta/smil:tvmarvallarta.smil/chunk
 https://25-rtvslo-tv-mb-int.cdn.eurovisioncdn.net/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/2Pg0baJ.png" group-title="",TV MAX
 https://59f1cbe63db89.streamlock.net:1443/tvmax/_definst_/tvmax/playlist.m3u8
-#EXTINF:-1 tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Comedy
-http://cdn.tvmatic.net/comedy.m3u8
-#EXTINF:-1 tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Crafts
-http://cdn.tvmatic.net/crafts.m3u8
-#EXTINF:-1 tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Facebook
-http://cdn.tvmatic.net/facebook.m3u8
-#EXTINF:-1 tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Fight
-http://cdn.tvmatic.net/fight.m3u8
-#EXTINF:-1 tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Funny
-http://cdn.tvmatic.net/funny.m3u8
-#EXTINF:-1 tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Sport
-http://cdn.tvmatic.net/sport.m3u8
-#EXTINF:-1 tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic TikTok
-http://cdn.tvmatic.net/tiktok.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",TV Metropolitana Rio
 https://59f1cbe63db89.streamlock.net:1443/caxiastv/_definst_/caxiastv/chunklist_w981877315.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/tvmittelrhein.png" group-title="",TV Mittelrhein
@@ -7034,6 +7016,20 @@ http://cdn-01.bonus-tv.ru:8080/tvm_edge/tracks-v1a1/index.m3u8
 http://196.28.226.121:1935/live/smil:Channel2.smil/chunklist_b714000_slpor.m3u8
 #EXTINF:-1 tvg-id="TVM3.ch" tvg-name="TVM3" tvg-country="" tvg-language="" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/tvm3.png" group-title="",TVM3
 https://edge5.vedge.infomaniak.com/livecast/tvm3/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Comedy
+http://cdn.tvmatic.net/comedy.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Crafts
+http://cdn.tvmatic.net/crafts.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Facebook
+http://cdn.tvmatic.net/facebook.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Fight
+http://cdn.tvmatic.net/fight.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Funny
+http://cdn.tvmatic.net/funny.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic Sport
+http://cdn.tvmatic.net/sport.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/l5PBcKN.png" group-title="",TVMatic TikTok
+http://cdn.tvmatic.net/tiktok.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",TVN Brasil
 http://painelvj.com.br:1935/tvnbrasil/tvnbrasil.sdp/live.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",TVN Brasil
@@ -8174,8 +8170,6 @@ http://cdn1.live-tv.od.ua:8081/wave/wave-abr/wave/wave-504/playlist.m3u8
 http://46.175.163.130/live_yatb/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",ІНФО
 http://109.68.40.67/life/magnolia_2/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="Sport",البحرين الرياضية
-http://185.105.4.106:1935/live/Bahrain%20Sports/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",الغد المشرق
 http://82.212.74.3:8000/live/hls/7512.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="" group-title="",نوبل TV
diff --git a/channels/us.m3u b/channels/us.m3u
index e207faf7b..62bf8823a 100644
--- a/channels/us.m3u
+++ b/channels/us.m3u
@@ -3242,6 +3242,8 @@ https://d2eit0bra9qkiw.cloudfront.net/v1/master/77872db67918a151b697b5fbc23151e5
 https://lnc-wjbk-fox-aws.tubi.video/index.m3u8
 #EXTINF:-1 tvg-id="WMFD.us" tvg-name="WMFD" tvg-country="US" tvg-language="English" tvg-logo="https://wmfd.com/images/logo.png" group-title="Local",WMFD (720p)
 https://player-api.new.livestream.com/accounts/1194911/events/3466400/live.m3u8
+#EXTINF:-1 tvg-id="WNWYFox5NewYork.us" tvg-name="WNYW Fox 5 New York" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/OfGcsUO.png" group-title="News",WNYW Fox 5 New York (720p)
+https://lnc-wnyw-fox-aws.tubi.video/index.m3u8
 #EXTINF:-1 tvg-id="WOFLFox35Orlando.us" tvg-name="WOFL Fox 35 Orlando" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/BOA8KKZ.jpg" group-title="",WOFL Fox 35 Orlando (720p)
 https://lnc-wofl-fox-aws.tubi.video/index.m3u8
 #EXTINF:-1 tvg-id="WorldPokerTour.us" tvg-name="World Poker Tour" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Nus9e8M.jpg" group-title="Sport",World Poker Tour (1080p)
@@ -3266,8 +3268,6 @@ https://lnc-wttg-fox-aws.tubi.video/index.m3u8
 https://lnc-wtvt-fox-aws.tubi.video/index.m3u8
 #EXTINF:-1 tvg-id="WTXFFox29Philadelphia.us" tvg-name="WTXF Fox 29 Philadelphia" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/fRjmk5r.png" group-title="News",WTXF Fox 29 Philadelphia (720p)
 https://lnc-wtxf-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="WNWYFox5NewYork.us" tvg-name="WNYW Fox 5 New York" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/OfGcsUO.png" group-title="News",WNYW Fox 5 New York (720p)
-https://lnc-wnyw-fox-aws.tubi.video/index.m3u8
 #EXTINF:-1 tvg-id="XcorpsTV.us" tvg-name="Xcorps TV" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SDKWWQu.png" group-title="Classic",Xcorps TV (720p)
 https://nrpus.bozztv.com/36bay2/gusa-shetv/index.m3u8
 #EXTINF:-1 tvg-id="Xplore.us" tvg-name="Xplore" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/QQuPjTD.png" group-title="",Xplore