diff --git a/streams/ae.m3u b/streams/ae.m3u
index 0b59686e9..19d93267d 100644
--- a/streams/ae.m3u
+++ b/streams/ae.m3u
@@ -115,8 +115,6 @@ https://admdn2.cdn.mangomolo.com/nagtv/smil:nagtv.stream.smil/playlist.m3u8
 https://dmiffthvll.cdn.mangomolo.com/noordubaitv/smil:noordubaitv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="NourTV.ae" status="online",Nour TV (720p)
 https://cdn.bestream.io:19360/elfaro4/elfaro4.m3u8
-#EXTINF:-1 tvg-id="PeaceTVAlbanian.ae" status="online",Peace TV Albanian (360p)
-http://82.114.67.178:8081/hls/PeaceTV.m3u8
 #EXTINF:-1 tvg-id="PMC.ae" status="online",PMC (1080p)
 https://hls.pmchd.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="SamaDubai.ae" status="online",Sama Dubai (1080p)
diff --git a/streams/af.m3u b/streams/af.m3u
index 87aa0ef68..8d76328d7 100644
--- a/streams/af.m3u
+++ b/streams/af.m3u
@@ -27,7 +27,5 @@ https://raw.githubusercontent.com/taodicakhia/IPTV_Exception/master/channels/af/
 https://raw.githubusercontent.com/taodicakhia/IPTV_Exception/master/channels/af/tolotv.m3u8
 #EXTINF:-1 tvg-id="" status="online",ATN Europe
 https://d10rltuy0iweup.cloudfront.net/ATNINT/myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Pamir TV (1080p) [Not 24/7]
-http://live.stream.cdn.pamirtv.com/ptv/d0dbe915091d400bd8ee7f27f0791303.sdp/index.m3u8
 #EXTINF:-1 tvg-id="RTASport.af",RTA Sports
 https://hls.rtasport.live/hls/stream.m3u8
diff --git a/streams/ar.m3u b/streams/ar.m3u
index 0d1dd0511..aeccc6256 100644
--- a/streams/ar.m3u
+++ b/streams/ar.m3u
@@ -468,7 +468,7 @@ https://g5.mc-slo.transport.edge-access.net/a15/ngrp:canal10mdq-100044_all/Playl
 https://stream.arcast.com.ar/c5sf/c5sf/playlist.m3u8
 #EXTINF:-1 tvg-id="EcoTV.ar",Eco TV (720p)
 https://stream.arcast.com.ar/ecotv/ngrp:ecotv_all/playlist.m3u8
-#EXTINF:-1 tvg-id="",Magic Kids (486p)
+#EXTINF:-1 tvg-id="MagicKids.ar",Magic Kids (486p)
 https://magicstream.ddns.net:443/magicstream/stream.m3u8
 #EXTINF:-1 tvg-id="QuatroTV.ar",Quatro TV (540p)
 https://stream.arcast.live/quatro/quatro/playlist.m3u8
diff --git a/streams/at.m3u b/streams/at.m3u
index 145d03f29..a71824fe1 100644
--- a/streams/at.m3u
+++ b/streams/at.m3u
@@ -57,3 +57,5 @@ https://ms01.w24.at/W24/smil:liveevent.smil/playlist.m3u8
 https://streaming13.huberwebmedia.at/LiveApp/streams/985585225397790082777809.m3u8
 #EXTINF:-1 tvg-id="" status="online",SchauTV (720p)
 https://schautv.mdn.ors.at/out/u/schautv-nodrm.m3u8
+#EXTINF:-1 tvg-id="AntenneVorarlberg.at" status="online",Antenne Vorarlberg (720p) [Not 24/7]
+https://5857db5306b83.streamlock.net/antennevorarlberg-live/_definst_/mp4:livestream/playlist.m3u8
diff --git a/streams/au_samsung.m3u b/streams/au_samsung.m3u
index 1f5d93ca1..238845306 100644
--- a/streams/au_samsung.m3u
+++ b/streams/au_samsung.m3u
@@ -15,9 +15,9 @@ https://rialto-rialto-samsungaustralia.amagi.tv/playlist.m3u8
 https://ryanandfriends-samsungau.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="SmithsonianChannelAsia.us" status="online",Smithsonian Channel Asia (1080p)
 https://smithsonianaus-samsungau.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="TastemadeAustralia.us" status="online",Tastemade Australia (1080p)
+#EXTINF:-1 tvg-id="TastemadeAustralia.au" status="online",Tastemade Australia (1080p)
 https://tmint-aus-samsungau.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="TimeLineAustralia.au" status="online",Time Line Australia (720p)
+#EXTINF:-1 tvg-id="Timeline.us" status="online",Time Line Australia (720p)
 https://lds-timeline-samsungau.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="TraceSportStars.fr" status="online",Trace Sport Stars (Australia) (1080p)
 https://lightning-tracesport-samsungau.amagi.tv/playlist.m3u8
@@ -25,15 +25,15 @@ https://lightning-tracesport-samsungau.amagi.tv/playlist.m3u8
 https://lightning-traceurban-samsungau.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Wonder.uk" status="online",Wonder (720p)
 https://lds-wonder-samsungau.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Euronews English (720p)
+#EXTINF:-1 tvg-id="EuronewsEnglish.fr" status="online",Euronews English (720p)
 https://euronews-euronews-world-1-au.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fuel TV (720p)
+#EXTINF:-1 tvg-id="FUELTV.at" status="online",Fuel TV (720p)
 https://fueltv-fueltv-1-au.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Horse and Country (720p)
+#EXTINF:-1 tvg-id="HorseCountryTV.uk" status="online",Horse and Country (720p)
 https://hncfree-samsungau.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Real Stories (720p)
+#EXTINF:-1 tvg-id="RealStories.uk" status="online",Real Stories (720p)
 https://lds-realstories-samsungau.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",VENN (1080p)
+#EXTINF:-1 tvg-id="VENN.us" status="online",VENN (1080p)
 https://venntv-samsungau.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Zoo Moo (Australia) (1080p)
+#EXTINF:-1 tvg-id="ZooMoo.sg" status="online",Zoo Moo (Australia) (1080p)
 https://zoomoo-samsungau.amagi.tv/playlist.m3u8
diff --git a/streams/az.m3u b/streams/az.m3u
index 9b1a36aac..0636c3850 100644
--- a/streams/az.m3u
+++ b/streams/az.m3u
@@ -35,7 +35,7 @@ https://str1.yodacdn.net/qafkaz/playlist.m3u8
 https://str.yodacdn.net/real/playlist.m3u8
 #EXTINF:-1 tvg-id="IctimaiTV.az",Ictimai TV
 http://109.205.166.68/server124/ictimai_tv/index.m3u8
-#EXTINF:-1 tvg-id="",Kanal Turan (576p)
+#EXTINF:-1 tvg-id="KanalTuran.fr",Kanal Turan (576p)
 https://donvolga.com/Turan-TV/index.m3u8
 #EXTINF:-1 tvg-id="BakuTV.az",Baku TV (720p)
 https://rtmp.baku.tv/live/bakutv_720p.m3u8
diff --git a/streams/ba.m3u b/streams/ba.m3u
index df2688efc..8f2d12797 100644
--- a/streams/ba.m3u
+++ b/streams/ba.m3u
@@ -27,7 +27,7 @@ http://wowza.bihnet.net:88/hls/b1-live.m3u8
 https://restreamer1.tnt.ba/hls/kanal6.m3u8
 #EXTINF:-1 tvg-id="SevdahTV.ba",Sevdah TV (288p)
 https://restreamer2.tnt.ba/hls/stream.m3u8
-#EXTINF:-1 tvg-id="TNTKids.ba",TNT Kids (288p)
+#EXTINF:-1 tvg-id="TNTKidsTV.ba",TNT Kids (288p)
 https://restreamer1.tnt.ba/hls/tntkids.m3u8
 #EXTINF:-1 tvg-id="MariaPlusVisionMedjugorje.ba",María+Visión Medjugorje (720p)
 https://1601580044.rsc.cdn77.org/live/_jcn_/amlst:Italiasette/playlist.m3u8
diff --git a/streams/be.m3u b/streams/be.m3u
index 38ea38434..95589c444 100644
--- a/streams/be.m3u
+++ b/streams/be.m3u
@@ -83,3 +83,5 @@ https://live-radio-cf-vrt.akamaized.net/groupa/live/bac277a1-306d-44a0-8e2e-e5b9
 https://live-radio-cf-vrt.akamaized.net/groupb/live/0f394a26-c87d-475e-8590-e9c6e79b28d9/live.isml/.mpd
 #EXTINF:-1 tvg-id="" status="online",VRT Radio StuBru
 https://live-radio-cf-vrt.akamaized.net/groupb/live/0f394a26-c87d-475e-8590-e9c6e79b28d9/live.isml/.m3u8
+#EXTINF:-1 tvg-id="SterkTV.be" status="online",SterkTV (1080p) [Not 24/7]
+https://602ccc850c9bb.streamlock.net/sterktv/smil:sterk.smil/playlist.m3u8
diff --git a/streams/be_samsung.m3u b/streams/be_samsung.m3u
index 7882c6ed5..c63ba7412 100644
--- a/streams/be_samsung.m3u
+++ b/streams/be_samsung.m3u
@@ -3,13 +3,13 @@
 https://rakuten-africanews-2-be.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",AVF Family
 https://futuretoday-afv-family-2-be.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Bloomberg Quicktake
+#EXTINF:-1 tvg-id="BloombergQuicktake.us" status="online",Bloomberg Quicktake
 https://bloomberg-quicktake-1-be.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Bloomberg TV
+#EXTINF:-1 tvg-id="BloombergTV.us" status="online",Bloomberg TV
 https://bloomberg-bloomberg-1-be.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Duck TV
+#EXTINF:-1 tvg-id="DuckTV.sk" status="online",Duck TV
 https://mmm-ducktv-4-be.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Euronews
+#EXTINF:-1 tvg-id="EuronewsEnglish.fr" status="online",Euronews
 https://rakuten-euronews-10-be.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",MavTV Global
 https://mavtv-mavtvglobal-1-be.samsung.wurl.tv/playlist.m3u8
diff --git a/streams/br.m3u b/streams/br.m3u
index 35393898d..624cdef27 100644
--- a/streams/br.m3u
+++ b/streams/br.m3u
@@ -583,9 +583,9 @@ http://painelvj.com.br/tvaguaboa2/tvaguaboa2.sdp/playlist.m3u8
 https://stmv1.srvstm.com/wtvbrasil/wtvbrasil/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Fora Tedio TV (720p)
 http://stream.foratedio.com/foratedio/foratedio/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Kuriakos Cine (1080p)
+#EXTINF:-1 tvg-id="KuriakosCine.pt" status="online",Kuriakos Cine (1080p)
 https://w2.manasat.com/kcine/smil:kcine.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Kuriakos Kids (1080p)
+#EXTINF:-1 tvg-id="KuriakosKids.pt" status="online",Kuriakos Kids (1080p)
 https://w2.manasat.com/kkids/smil:kkids.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TVComunitaria.br" status="online",TVCOM DF (360p)
 https://5b7f3c45ab7c2.streamlock.net/8008/smil:8008.smil/playlist.m3u8?DVR=
diff --git a/streams/br_samsung.m3u b/streams/br_samsung.m3u
index a87d6600f..c99de06dd 100644
--- a/streams/br_samsung.m3u
+++ b/streams/br_samsung.m3u
@@ -5,7 +5,7 @@ https://darkmatter-por-samsungbrazil.amagi.tv/playlist.m3u8
 https://tastemade-pt16intl-samsungbrazil.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Bloomberg TV US (1080p)
 https://bloomberg-bloomberg-3-br.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fuel TV (720p)
+#EXTINF:-1 tvg-id="FUELTV.at" status="online",Fuel TV (720p)
 https://fueltv-fueltv-9-br.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="MyTimeMovieNetworkBrazil.br" status="online",MyTime Movie Network Brazil (720p)
 https://appletree-mytime-samsungbrazil.amagi.tv/playlist.m3u8
diff --git a/streams/ca.m3u b/streams/ca.m3u
index 5ffc7a4d6..251b9f5a5 100644
--- a/streams/ca.m3u
+++ b/streams/ca.m3u
@@ -169,3 +169,7 @@ https://cbcrclinear-tor.akamaized.net/hls/live/2042765/CBCRCLINEAR_TOR_11/master
 https://cbcrclinear-tor.akamaized.net/hls/live/2042756/CBCRCLINEAR_TOR_2/master5.m3u8
 #EXTINF:-1 tvg-id="CBRTDT.ca",CBC Calgary (CBRT-DT) [Geo-blocked]
 https://cbcrclinear-tor.akamaized.net/hls/live/2042763/CBCRCLINEAR_TOR_9/master5.m3u8
+#EXTINF:-1 tvg-id="SardariTV.ca" status="online",Sardari TV (1080p) [Not 24/7]
+http://158.69.124.9:1935/sardaritv/sardaritv/playlist.m3u8
+#EXTINF:-1 tvg-id="PamirTV.ca" status="online",Pamir TV (1080p) [Not 24/7]
+http://live.stream.cdn.pamirtv.com/ptv/d0dbe915091d400bd8ee7f27f0791303.sdp/index.m3u8
diff --git a/streams/ca_samsung.m3u b/streams/ca_samsung.m3u
index 0071ad98f..ecc918eb2 100644
--- a/streams/ca_samsung.m3u
+++ b/streams/ca_samsung.m3u
@@ -11,33 +11,33 @@ https://inwonder-samsung-canada.amagi.tv/playlist.m3u8
 https://kidoodletv-kdtv-1-ca.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="MHZ.ca" status="online",MHZ
 https://mhz-samsung-linear-ca.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Baywatch
+#EXTINF:-1 tvg-id="Baywatch.us" status="online",Baywatch
 https://d22ljxpuae2sin.cloudfront.net/playlist.m3u8
 #EXTINF:-1 tvg-id="beINSportsCanada.ca" status="online",Bein Sport Xtra
 https://bein-xtra-samsung-canada.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",DryBar Comedy
 https://drybar-drybarcomedy-1-ca.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",FailArmy
+#EXTINF:-1 tvg-id="FailArmy.us" status="online",FailArmy
 https://failarmy-international-ca.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fuel TV (720p)
+#EXTINF:-1 tvg-id="FUELTV.at" status="online",Fuel TV (720p)
 https://fueltv-fueltv-1-ca.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Haunt TV
+#EXTINF:-1 tvg-id="HauntTV.us" status="online",Haunt TV
 https://blueantmediacanada-haunttv-samsungca.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Mav TV
+#EXTINF:-1 tvg-id="MAVTV.us" status="online",Mav TV
 https://mavtv-1-ca.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Outside TV (720p)
+#EXTINF:-1 tvg-id="OutsideTV.us" status="online",Outside TV (720p)
 https://outside-tv-samsung-ca.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",People are Awesome
+#EXTINF:-1 tvg-id="PeopleAreAwesome.us" status="online",People are Awesome
 https://jukin-peopleareawesome-2-ca.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",PowerNation
+#EXTINF:-1 tvg-id="PowerNationTV.us" status="online",PowerNation
 https://rtmtv-samsung-ca.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",The Design Network
+#EXTINF:-1 tvg-id="TheDesignNetwork.us" status="online",The Design Network
 https://thedesignnetwork-tdn-6-ca.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",The Jack Hannah Channel
 https://littonjackhannah-samsungca.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",The Pet Collective
+#EXTINF:-1 tvg-id="ThePetCollective.us" status="online",The Pet Collective
 https://the-pet-collective-international-ca.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="WeatherSpyCanada.ca" status="online",Weatherspy (720p)
 https://jukin-weatherspy-2-ca.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",World Poker Tour
+#EXTINF:-1 tvg-id="WorldPokerTour.us" status="online",World Poker Tour
 https://world-poker-tour-samsung-ca.samsung.wurl.tv/playlist.m3u8
diff --git a/streams/cn.m3u b/streams/cn.m3u
index 74497f74f..e0332084f 100644
--- a/streams/cn.m3u
+++ b/streams/cn.m3u
@@ -1593,3 +1593,5 @@ http://stream.lytv.net.cn/2/sd/live.m3u8
 https://hw-m-l.cztv.com/channels/lantian/channel10/1080p.m3u8
 #EXTINF:-1 tvg-id="CCTV15.cn",CCTV-15音乐
 http://hwrr.jx.chinamobile.com:8080/PLTV/88888888/224/3221225641/index.m3u8
+#EXTINF:-1 tvg-id="GreatWallElite.cn" status="blocked",Great Wall Elite (720p)
+http://50.7.220.74:8278/chcfamily/playlist.m3u8?ct=18393&tid=ME7E3282776332827763&tsum=c098f25f9c140478d2a814b22a7ccbd3
diff --git a/streams/co.m3u b/streams/co.m3u
index b55ec9199..3f55b5bf8 100644
--- a/streams/co.m3u
+++ b/streams/co.m3u
@@ -41,7 +41,7 @@ https://movil.ejeserver.com/live/visiondorada.m3u8
 https://video.ejeserver.com/live/visiondorada.m3u8
 #EXTINF:-1 tvg-id="CaracolTV.co" status="blocked",Caracol TV (720p) [Geo-blocked]
 https://mdstrm.com/live-stream-playlist/574463697b9817cf0886fc17.m3u8
-#EXTINF:-1 tvg-id="CinemaMas.co" status="",Cinema + (720p)
+#EXTINF:-1 tvg-id="CinemaPlus.co" status="",Cinema + (720p)
 http://hvtrafico.ddns.net:1935/cinema720/cinema720.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="CNCMedellin.co" status="online",CNC Medellín (720p)
 http://cncmedellin.ddns.net:1935/canalcnc/canalcnc_360p/playlist.m3u8
diff --git a/streams/cz.m3u b/streams/cz.m3u
index 6b8687593..6fee30e7a 100644
--- a/streams/cz.m3u
+++ b/streams/cz.m3u
@@ -40,7 +40,7 @@ https://stream.polar.cz/vctv/vctvlive-1/playlist.m3u8
 https://stream.polar.cz/polar2/polarlive2-1/playlist.m3u8
 #EXTINF:-1 tvg-id="TVNoe.cz" status="online",TV NOE
 https://n105.quickmedia.tv/noe-abr/noe-abr/playlist_dvr.m3u8
-#EXTINF:-1 tvg-id="" status="online",TV NOE+
+#EXTINF:-1 tvg-id="TVNoePlus.cz" status="online",TV NOE+
 https://n105.quickmedia.tv/noe-2-abr/noe-2-abr/playlist_dvr.m3u8
 #EXTINF:-1 tvg-id="UTV.cz" status="online",ÚTV (1080p)
 https://vysilani.zaktv.cz/broadcast/hls/utv/index.m3u8
diff --git a/streams/de.m3u b/streams/de.m3u
index 78e9f632d..03e3f3c47 100644
--- a/streams/de.m3u
+++ b/streams/de.m3u
@@ -453,8 +453,6 @@ https://zdf-hls-17.akamaized.net/hls/live/2016500/de/high/master.m3u8
 https://zdf-hls-16.akamaized.net/hls/live/2016499/de/high/master.m3u8
 #EXTINF:-1 tvg-id="ZweiMusicTelevision.de" status="timeout",ZWEI2 Music (1080p)
 https://serve-first.folxplay.tv/folx/ch-2/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",Antenne Vorarlberg (720p) [Not 24/7]
-https://5857db5306b83.streamlock.net/antennevorarlberg-live/_definst_/mp4:livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="DWDeutsch.de" status="online" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",DW (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s26/index.m3u8
@@ -486,3 +484,7 @@ https://edge14.vedge.infomaniak.com/livecast/ik:wir24tv_hms/manifest.m3u8
 https://euvia.cdn.ses-ps.com/secure/DASH-Live/manifest.mpd
 #EXTINF:-1 tvg-id="DWEnglish.de",DW English
 https://ythls.onrender.com/channel/UCknLrEdhRCp1aegoMqRaCZg.m3u8
+#EXTINF:-1 tvg-id="AdriaMusicTelevision.de" status="timeout",Adria Music RS
+http://91.212.150.248/AdriaMusicTV/index.m3u8
+#EXTINF:-1 tvg-id="Kanal10.de",Kanal10 (1080p)
+https://ub1doy938d.gjirafa.net/live/oEZi1otQqIHglY0tzZidyCPWhxrS5WgO/yky0y1.m3u8
diff --git a/streams/de_adultswim.m3u b/streams/de_adultswim.m3u
index 12c679f39..997352e28 100644
--- a/streams/de_adultswim.m3u
+++ b/streams/de_adultswim.m3u
@@ -35,7 +35,7 @@ https://adultswim-vodlive.cdn.turner.com/live/test-2/stream_de.m3u8
 https://adultswim-vodlive.cdn.turner.com/live/mr-pickles/stream_de.m3u8
 #EXTINF:-1 tvg-id="" status="online",Adult Swim Primal (1080p) [Geo-blocked]
 https://adultswim-vodlive.cdn.turner.com/live/primal/stream_de.m3u8
-#EXTINF:-1 tvg-id="" status="online",Adult Swim Rick and Morty (1080p) [Geo-blocked]
+#EXTINF:-1 tvg-id="AdultSwimRickandMorty.us" status="online",Adult Swim Rick and Morty (1080p) [Geo-blocked]
 https://adultswim-vodlive.cdn.turner.com/live/rick-and-morty/stream_de.m3u8
 #EXTINF:-1 tvg-id="" status="online",Adult Swim Squidbillies (1080p) [Geo-blocked]
 https://adultswim-vodlive.cdn.turner.com/live/squidbillies/stream_de.m3u8
diff --git a/streams/de_samsung.m3u b/streams/de_samsung.m3u
index a0b17962a..a3ac4ba16 100644
--- a/streams/de_samsung.m3u
+++ b/streams/de_samsung.m3u
@@ -11,7 +11,7 @@ https://inwonder-samsung-de.amagi.tv/playlist.m3u8
 https://sofy-ger-samsung.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="TastemadeGermany.de" status="online",Tastemade Deutschland (720p)
 https://tastemade-de-samsung.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fuel TV (1080p)
+#EXTINF:-1 tvg-id="FUELTV.at" status="online",Fuel TV (1080p)
 https://fueltv-fueltv-5-de.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Xite (720p)
+#EXTINF:-1 tvg-id="XITE.nl" status="online",Xite (720p)
 https://xite-samsung-de.amagi.tv/playlist.m3u8
diff --git a/streams/dk_samsung.m3u b/streams/dk_samsung.m3u
index 8e167eae7..fa4804440 100644
--- a/streams/dk_samsung.m3u
+++ b/streams/dk_samsung.m3u
@@ -5,9 +5,9 @@ https://rakuten-africanews-1-dk.samsung.wurl.com/manifest/playlist.m3u8
 https://rakuten-euronews-1-dk.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="EuronewsEnglish.fr" status="online",Euronews English
 https://rakuten-euronews-1-dk.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Bloomberg TV US (1080p)
+#EXTINF:-1 tvg-id="BloombergTV.us" status="online",Bloomberg TV US (1080p)
 https://bloomberg-bloomberg-1-dk.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Duck Tv (720p)
+#EXTINF:-1 tvg-id="DuckTV.sk" status="online",Duck Tv (720p)
 https://mmm-ducktv-4-dk.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Rakuten Action (720p)
 https://rakuten-action-10-dk.samsung.wurl.tv/playlist.m3u8
diff --git a/streams/do.m3u b/streams/do.m3u
index 9fa462e52..ad0051c9c 100644
--- a/streams/do.m3u
+++ b/streams/do.m3u
@@ -235,7 +235,7 @@ https://ss3.domint.net:3108/zol_str/vzol/playlist.m3u8
 https://lb00zdigital.streamprolive.com/mnt/hls/live.m3u8
 #EXTINF:-1 tvg-id="CTVCanal76.do",CTV Canal 76 (720p)
 https://vdo2.streamgato.us:3978/live/ctvlive.m3u8
-#EXTINF:-1 tvg-id="AlegreTV.do",Alegre TV (720p)
+#EXTINF:-1 tvg-id="AlegreTVRD.do",Alegre TV (720p)
 https://vsrv2.az-streamingserver.com:3149/live/alegretvlive.m3u8
 #EXTINF:-1 tvg-id="002RadioTV.do",002 Radio TV (720p)
 https://cdn.002radio.com:3909/live/radio002live.m3u8
diff --git a/streams/es.m3u b/streams/es.m3u
index 26605f397..ae57d63f7 100644
--- a/streams/es.m3u
+++ b/streams/es.m3u
@@ -515,3 +515,7 @@ https://cdnlive.shooowit.net/rtvcelive/channel1.smil/playlist.m3u8
 https://cloudvideo.servers10.com:8081/8020/index.m3u8
 #EXTINF:-1 tvg-id="CancioneroTV.es",Cancionero TV
 http://89.140.229.4/hls1/cancionero.m3u8
+#EXTINF:-1 tvg-id="BoingSpain.es" status="timeout",Boing Spain
+http://149.62.177.157:8000/play/a010
+#EXTINF:-1 tvg-id="AlcarriaTV.es" status="online",Alcarria TV (576p) [Not 24/7]
+http://217.182.77.27/live/alcarriatv-livestream.m3u8
diff --git a/streams/es_pluto.m3u b/streams/es_pluto.m3u
index 74682498c..9fd41a7d1 100644
--- a/streams/es_pluto.m3u
+++ b/streams/es_pluto.m3u
@@ -83,11 +83,11 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e82bb378
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e82bb378601b80007b4bd78/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5e82bb378601b80007b4bd78&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=925&terminate=false&userId=
 #EXTINF:-1 tvg-id="PlutoTVToonsClasicoSpain.es" status="online",Pluto TV Toons Clásico (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/609e7e423e9173000706a681/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="" status="online",Comedia Made in Spain (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="ComediaMadeinSpain.us" status="online",Comedia Made in Spain (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f1abce155a03d0007718834/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f1abce155a03d0007718834&deviceLat=41.1167&deviceLon=1.2500&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=ES&serverSideAds=false&sid=505&terminate=false&userId=
 #EXTINF:-1 tvg-id="" status="online",Pluto TV Comedia (Made in Spain) (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1abce155a03d0007718834/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&is_lat=1&platform=web&rdid=channel&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="" status="online",Pluto TV MTV Catfish (Spain) (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f1ab3c7778230000735cf41/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5f1ab3c7778230000735cf41&deviceLat=41.1167&deviceLon=1.2500&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=ES&serverSideAds=false&sid=305&terminate=false&userId=
-#EXTINF:-1 tvg-id="" status="online",Top Gear (720p)
+#EXTINF:-1 tvg-id="TopGear.uk" status="online",Top Gear (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/60d356a534f63f000850cdd7/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&serverSideAds=false&studio_id=viacom&tags=ROKU_CONTENT_TAGS
diff --git a/streams/es_rakuten.m3u b/streams/es_rakuten.m3u
index 8d1874fa7..7647c2bd8 100644
--- a/streams/es_rakuten.m3u
+++ b/streams/es_rakuten.m3u
@@ -33,15 +33,15 @@ https://jukin-weatherspy-2-eu.rakuten.wurl.tv/playlist.m3u8
 https://lds-wonder-rakuten.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="YoungHollywood.us" status="online",Young Hollywood (720p)
 https://younghollywood-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",EDGEsport (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="EDGEsport.uk" status="online",EDGEsport (1080p) [Not 24/7]
 https://edgesports-row-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",ESTV (1080p)
+#EXTINF:-1 tvg-id="ESTV.us" status="online",ESTV (1080p)
 https://estv-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fuel TV (1080p)
+#EXTINF:-1 tvg-id="FUELTV.at" status="online",Fuel TV (1080p)
 https://fueltv-fueltv-10-eu.rakuten.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",MyTime movie network Spain (1080p)
+#EXTINF:-1 tvg-id="MyTimeMovieNetworkSpain.es" status="online",MyTime movie network Spain (1080p)
 https://appletree-mytimespain-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",People are Awesome (720p)
+#EXTINF:-1 tvg-id="PeopleAreAwesome.us" status="online",People are Awesome (720p)
 https://jukin-peopleareawesome-2-eu.rakuten.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Rakuten Top Free Spain (720p)
 https://rakuten-topfree-2-eu.rakuten.wurl.tv/playlist.m3u8
diff --git a/streams/es_samsung.m3u b/streams/es_samsung.m3u
index de7aa99fa..6007afb2d 100644
--- a/streams/es_samsung.m3u
+++ b/streams/es_samsung.m3u
@@ -19,13 +19,13 @@ https://sofytv-samsunges.amagi.tv/playlist.m3u8
 https://the-pet-collective-international-es.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="TraceSportStars.fr" status="online",Trace Sport Stars (1080p) [Geo-blocked]
 http://tracesportstars-samsunges.amagi.tv/hls/amagi_hls_data_samsunguk-tracesport-samsungspain/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Caillou
+#EXTINF:-1 tvg-id="Caillou.fr" status="online",Caillou
 https://dhx-caillou-1-es.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fuel TV (1080p)
+#EXTINF:-1 tvg-id="FUELTV.at" status="online",Fuel TV (1080p)
 https://fueltv-fueltv-7-es.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",iHola Play
 https://rakuten-hola-2-es.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",People are Awesome
+#EXTINF:-1 tvg-id="PeopleAreAwesome.us" status="online",People are Awesome
 https://jukin-peopleareawesome-2-es.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="RakutenTVDramaMoviesSpain.es" status="online",Rakuten Drama
 https://rakuten-tvshows-2-es.samsung.wurl.tv/playlist.m3u8
@@ -33,5 +33,5 @@ https://rakuten-tvshows-2-es.samsung.wurl.tv/playlist.m3u8
 https://rakuten-family-2-es.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Supertoons TV
 https://kedoo-supertoonstv-2-es.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Tastemade
+#EXTINF:-1 tvg-id="Tastemade.us" status="online",Tastemade
 https://tastemade-es16tm-samsung.amagi.tv/playlist.m3u8
diff --git a/streams/fi_samsung.m3u b/streams/fi_samsung.m3u
index 99d40d13b..d0ed8cfd7 100644
--- a/streams/fi_samsung.m3u
+++ b/streams/fi_samsung.m3u
@@ -7,7 +7,7 @@ https://bloomberg-quicktake-1-fi.samsung.wurl.com/manifest/playlist.m3u8
 https://mmm-ducktv-4-fi.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Bloomberg TV US (1080p)
 https://bloomberg-bloomberg-1-fi.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Euronews English (720p)
+#EXTINF:-1 tvg-id="EuronewsEnglish.fr" status="online",Euronews English (720p)
 https://rakuten-euronews-1-fi.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="RakutenTVFamilyMoviesFinland.fi" status="online",Rakuten Family (Finland) (720p)
 https://rakuten-family-12-fi.samsung.wurl.tv/playlist.m3u8
diff --git a/streams/fr.m3u b/streams/fr.m3u
index f51ba4cc0..d8147e70b 100644
--- a/streams/fr.m3u
+++ b/streams/fr.m3u
@@ -193,7 +193,7 @@ https://ythls.onrender.com/channel/UCuju5K7RVyqTZ0xVPbb3Zvg.m3u8
 https://ythls.onrender.com/channel/UCgRU1S0M_TbYe0G0O1s4mqg.m3u8
 #EXTINF:-1 tvg-id="" status="online",La Petite Sorcière Tanny
 https://ythls.onrender.com/channel/UC1VGGT9RfunvCdvZf_gqVBg.m3u8
-#EXTINF:-1 tvg-id="Nickelodeon.fr" status="online",Nickelodeon France
+#EXTINF:-1 tvg-id="NickelodeonFrance.fr" status="online",Nickelodeon France
 https://ythls.onrender.com/channel/UCeGvSi1Tb8OV78ue3_tux1A.m3u8
 #EXTINF:-1 tvg-id="" status="online",Peppa Pig Français
 https://ythls.onrender.com/channel/UCXptamDYEVcU4JCio30hYTw.m3u8
diff --git a/streams/fr_pluto.m3u b/streams/fr_pluto.m3u
index e6a7c9eaf..e57395b83 100644
--- a/streams/fr_pluto.m3u
+++ b/streams/fr_pluto.m3u
@@ -79,51 +79,51 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8eb7e3d
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8eb7e3d2ed18000746d09a/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
 #EXTINF:-1 tvg-id="PlutoTVYogaFrance.fr" status="online",Pluto TV Yoga (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/60803e541a829e0008e91641/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=35fbb570-e986-11eb-a0af-c3b401f46211&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=ca55bef6-f2a6-488a-be5d-c7ba24d93cdd
-#EXTINF:-1 tvg-id="" status="online",Cribs Maisons De Star (720p)
+#EXTINF:-1 tvg-id="CribsMaisonsDeStarsFrance.us" status="online",Cribs Maisons De Star (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/602cf8963b4bc90007454541/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c8b08c0-e98a-11eb-a932-2f3c780ff9ff&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=5043513f-eb20-46fd-8286-9e9ba240e6f9
-#EXTINF:-1 tvg-id="" status="error",Pluto TV Catfish (480p)
+#EXTINF:-1 tvg-id="PlutoTVCatfish.us" status="error",Pluto TV Catfish (480p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8eb66537867f0007146953/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
-#EXTINF:-1 tvg-id="" status="error",Pluto TV Catfish (720p)
+#EXTINF:-1 tvg-id="PlutoTVCatfish.us" status="error",Pluto TV Catfish (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8eb66537867f0007146953/master.m3u8?appName=androidmobile&appVersion=5.4.0&architecture=mobile&buildVersion=5.4.0-917c0e6072&deviceDNT=0&deviceId=071492b1-cafd-427b-81d4-f532808c8397_d6a39913ac3adbd2&deviceMake=samsung&deviceModel=SM-N976N&deviceType=android,samsung,mobile&deviceVersion=7.1.2_25&marketingRegion=FR&sid=b90a2c1a-a2ce-4601-a02d-abe734775341
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Catfish (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PlutoTVCatfish.us" status="online",Pluto TV Catfish (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8eb66537867f0007146953/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="" status="online",Pluto TV Ciné+ (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ff5eb810e2996000768c0e2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c89a930-e98a-11eb-a932-2f3c780ff9ff&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d7d7d33d-5784-4dee-a799-d09bd30b065a
 #EXTINF:-1 tvg-id="" status="online",Pluto TV Classic TV FR
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5e46ae801f347500099d461a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=7c53ccf0-2c61-11ed-97e8-9197ab2286d6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c1f0b225-6ea9-4a37-b41c-8a14c7f5094f
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Crime Investigation 360 (720p)
+#EXTINF:-1 tvg-id="PlutoTVCrimeInvestigation360.us" status="online",Pluto TV Crime Investigation 360 (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/6000a5a9e767980007b497ca/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Dossiers FBI (360p)
+#EXTINF:-1 tvg-id="PlutoTVDossiersFBI.us" status="online",Pluto TV Dossiers FBI (360p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8edad922b10b000753bc37/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Dossiers FBI (720p)
+#EXTINF:-1 tvg-id="PlutoTVDossiersFBI.us" status="online",Pluto TV Dossiers FBI (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8edad922b10b000753bc37/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Dossiers FBI (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PlutoTVDossiersFBI.us" status="online",Pluto TV Dossiers FBI (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8edad922b10b000753bc37/master.m3u8?appName=androidmobile&appVersion=5.4.0&architecture=mobile&deviceDNT=0&deviceId=071492b1-cafd-427b-81d4-f532808c8397_d6a39913ac3adbd2&deviceMake=samsung&deviceModel=SM-N976N&deviceType=android,samsung,mobile&deviceVersion=7.1.2_25&sid=b90a2c1a-a2ce-4601-a02d-abe734775341
 #EXTINF:-1 tvg-id="" status="online",Pluto TV Hélène et les garçons (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/604f8de01b479400078fb1e7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c8b2fd0-e98a-11eb-a932-2f3c780ff9ff&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=65d7f2cc-e6f8-4e43-9cb5-1de8d1f71f71
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Le miel et les abeilles (720p)
+#EXTINF:-1 tvg-id="PlutoTVLemieletlesabeilles.us" status="online",Pluto TV Le miel et les abeilles (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/60549a8d8f1b53000768bc52/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c8b56e0-e98a-11eb-a932-2f3c780ff9ff&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=9dcb446c-ad5a-4171-a84f-d144607d7b33
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Le miracle de l'amour (720p)
+#EXTINF:-1 tvg-id="PlutoTVLemiracledelamour.us" status="online",Pluto TV Le miracle de l'amour (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/60549c238c3f21000753d3e0/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c8b56e1-e98a-11eb-a932-2f3c780ff9ff&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=af1cb1d2-a877-4020-81af-3f89e475eb94
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Les Cordier (240p)
+#EXTINF:-1 tvg-id="PlutoTVLesCordier.us" status="online",Pluto TV Les Cordier (240p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8ed80fa09f120007c8daa5/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Les Cordier (720p)
+#EXTINF:-1 tvg-id="PlutoTVLesCordier.us" status="online",Pluto TV Les Cordier (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8ed80fa09f120007c8daa5/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="" status="online",Pluto TV Les filles d'à côté (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/60549d97cd7b090007c73314/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c8ba500-e98a-11eb-a932-2f3c780ff9ff&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=0e7a9749-ec3d-4fea-9861-01e153b22e40
-#EXTINF:-1 tvg-id="" status="error",Pluto TV Les Nouveaux Detectives (480p)
+#EXTINF:-1 tvg-id="PlutoTVLesNouveauxDetectives.us" status="error",Pluto TV Les Nouveaux Detectives (480p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8edb6df1ebb800072edf10/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Les Nouveaux Detectives (720p)
+#EXTINF:-1 tvg-id="PlutoTVLesNouveauxDetectives.us" status="online",Pluto TV Les Nouveaux Detectives (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8edb6df1ebb800072edf10/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Louis La Brocante (480p)
+#EXTINF:-1 tvg-id="PlutoTVLouisLaBrocante.us" status="online",Pluto TV Louis La Brocante (480p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8ed6d569d2d4000864a976/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Louis La Brocante (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PlutoTVLouisLaBrocante.us" status="online",Pluto TV Louis La Brocante (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8ed6d569d2d4000864a976/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Tortues Ninja TV (720p)
+#EXTINF:-1 tvg-id="PlutoTVTortuesNinjaTV.us" status="online",Pluto TV Tortues Ninja TV (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8ecc1b37867f00071469e9/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="" status="online",Pluto TV Tortues Ninja TV (720p)
+#EXTINF:-1 tvg-id="PlutoTVTortuesNinjaTV.us" status="online",Pluto TV Tortues Ninja TV (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8ecc1b37867f00071469e9/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
-#EXTINF:-1 tvg-id="" status="error",Pluto TV TROLL TV (720p)
+#EXTINF:-1 tvg-id="PlutoTVTROL.us" status="error",Pluto TV TROLL TV (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f8eb8a8b2619a000710605c/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=48.8582&deviceLon=2.3387&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=FR&serverSideAds=false&sessionID=cc7dc550-6be3-11eb-9c02-0242ac110002&sid=cc7dc550-6be3-11eb-9c02-0242ac110002&userId=
-#EXTINF:-1 tvg-id="" status="online",Pluto TV TROLL TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PlutoTVTROL.us" status="online",Pluto TV TROLL TV (720p) [Not 24/7]
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f8eb8a8b2619a000710605c/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
diff --git a/streams/fr_samsung.m3u b/streams/fr_samsung.m3u
index dd5fba3a7..412b504d9 100644
--- a/streams/fr_samsung.m3u
+++ b/streams/fr_samsung.m3u
@@ -27,7 +27,7 @@ https://tntv-samsung-fr.amagi.tv/playlist.m3u8
 https://versatile-wildsidetv-1-fr.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",BBC Doctor Who
 https://bbceu-doctorwho-3-fr.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fuel TV (1080p)
+#EXTINF:-1 tvg-id="FUELTV.at" status="online",Fuel TV (1080p)
 https://fueltv-fueltv-8-fr.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Mytime Movies (1080p)
 https://mytimefrance-rakuten-samsung.amagi.tv/playlist.m3u8
diff --git a/streams/gr.m3u b/streams/gr.m3u
index 6aa4147ac..c5c294030 100644
--- a/streams/gr.m3u
+++ b/streams/gr.m3u
@@ -133,8 +133,6 @@ http://web.onair-radio.eu:1935/explorecy/explorecy/playlist.m3u8
 http://5db313b643fd8.streamlock.net:1935/ZerounoTV/ZerounoTV/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Alpha BUP
 http://78.83.87.222:9999/play/a011/index.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",Camera Smile (480p)
-https://nrpus.bozztv.com/36bay2/gusa-camerasmile/index.m3u8
 #EXTINF:-1 tvg-id="IonianTV.gr" status="online",Ionian Channel (720p) [Not 24/7]
 https://stream.ioniantv.gr/ionian/live_abr/playlist.m3u8
 #EXTINF:-1 tvg-id="IonianTV.gr" status="online",Ionian Channel (1080p) [Not 24/7]
@@ -191,3 +189,5 @@ https://channel.streams.ovh:1936/epsilontv/epsilontv/playlist.m3u8
 https://cbd537474fbad4634b64787657ff6456.msvdn.net/news/ert_news_main/mainabr/playlist_dvr.m3u8
 #EXTINF:-1 tvg-id="MADGreekz.gr",MAD Greekz
 http://live.streams.ovh:1935/foxtv/foxtv/playlist.m3u8
+#EXTINF:-1 tvg-id="MadTV.gr",Mad TV
+https://ythls.onrender.com/channel/UCs3cho4vcDuCze0tk3W9iVQ.m3u8
diff --git a/streams/gt.m3u b/streams/gt.m3u
index 2dc2a9549..eab41ce0c 100644
--- a/streams/gt.m3u
+++ b/streams/gt.m3u
@@ -135,7 +135,7 @@ https://cdn.streamhispanatv.net:3390/live/sastvgtlive.m3u8
 http://204.12.202.90:8080/playgt/playgt2023/102
 #EXTINF:-1 tvg-id="TVFlorencia.gt" status="online",TV Florencia (720p)
 http://204.12.202.90:8080/playgt/playgt2023/96
-#EXTINF:-1 tvg-id=TVFlorencia.gt"" status="online",TV Florencia (720p)
+#EXTINF:-1 tvg-id="TVFlorencia.gt" status="online",TV Florencia (720p)
 https://cdn.streamhispanatv.net:3819/live/tvflorencialive.m3u8
 #EXTINF:-1 tvg-id="TVTun.gt" status="online",TV Tun (240p) [Not 24/7]
 https://cdn.streamhispanatv.net:3832/live/tvtunlive.m3u8
diff --git a/streams/hk.m3u b/streams/hk.m3u
index e7ca6e675..3547b3407 100644
--- a/streams/hk.m3u
+++ b/streams/hk.m3u
@@ -78,43 +78,41 @@ https://cdn.hklive.tv/xxxx/78/index.m3u8
 http://210.210.155.37/dr9445/h/h07/index.m3u8
 #EXTINF:-1 tvg-id="RTHKTV33.hk" status="online",RTHK TV 33 (港台電視33) (720p)
 https://live.astradamy.com/hk33/index.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",SPOTV2 (1080p)
-https://bcovlive-a.akamaihd.net/48eee16919834d3b97df1082a649bcfa/ap-northeast-1/6271486521001/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",SPOTV (1080p)
-https://bcovlive-a.akamaihd.net/99545824f51f4c1592b35314c6ece3b0/ap-northeast-1/6271486521001/playlist.m3u8
 #EXTINF:-1 tvg-id="TVBFinanceSportsInformationChannel.hk" status="online" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246",TVB Finance and Sport Channel (720p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246
 https://cdn.hklive.tv/xxxx/85/index.m3u8
 #EXTINF:-1 tvg-id="TVBFinanceSportsInformationChannel.hk" status="online",TVB Finance Sports & Information Channel (720p)
 https://tvp22.sky4k.top/index2.php
-#EXTINF:-1 tvg-id="" status="online",TVB J2
+#EXTINF:-1 tvg-id="J2.hk" status="online",TVB J2
 https://j3.lhlh.app/mv.m3u8
-#EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246",TVB J2 (720p)
+#EXTINF:-1 tvg-id="J2.hk" status="online" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246",TVB J2 (720p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246
 https://cdn.hklive.tv/xxxx/82/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",TVB J2 (720p)
+#EXTINF:-1 tvg-id="J2.hk" status="online",TVB J2 (720p)
 https://live.astradamy.com/tvbj2/index.m3u8
-#EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246",TVB Jade (翡翠台) (720p)
+#EXTINF:-1 tvg-id="Jade.hk" status="online" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246",TVB Jade (翡翠台) (720p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246
 https://cdn.hklive.tv/xxxx/81/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",TVB Jade (翡翠台) (720p)
+#EXTINF:-1 tvg-id="Jade.hk" status="online",TVB Jade (翡翠台) (720p)
 https://live.astradamy.com/tvbfc/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",TVB Jade (翡翠台) (Cantonese Subtitles) (720p)
+#EXTINF:-1 tvg-id="Jade.hk" status="online",TVB Jade (翡翠台) (Cantonese Subtitles) (720p)
 http://23.237.10.66:16106
-#EXTINF:-1 tvg-id="" status="online",TVB Pearl (珍珠台) (720p)
+#EXTINF:-1 tvg-id="Pearl.hk" status="online",TVB Pearl (珍珠台) (720p)
 https://live.astradamy.com/tvbpearl/index.m3u8
-#EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246",TVB Pearl (珍珠台) (1080p) [Geo-blocked]
+#EXTINF:-1 tvg-id="Pearl.hk" status="online" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246",TVB Pearl (珍珠台) (1080p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246
 https://cdn.hklive.tv/xxxx/84/index.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",TVB明珠台 (PEARL)
+#EXTINF:-1 tvg-id="Pearl.hk" status="timeout",TVB明珠台 (PEARL)
 http://116.199.5.51:8114/00000000/hls/index.m3u8?Fsv_chan_hls_se_idx=12&Fsv_ctype=LIVES&Fsv_otype=1&FvSeid=1&Pcontent_id=.m3u8&Provider_id=
-#EXTINF:-1 tvg-id="" status="timeout",TVB明珠台 (PEARL)
+#EXTINF:-1 tvg-id="Pearl.hk" status="timeout",TVB明珠台 (PEARL)
 http://116.199.5.51:8114/hls/Fsv_chan_hls_se_idx=12?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=12&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_rate_id=2&FvSeid=1&Pcontent_id=8114.m3u8&Provider_id=0
-#EXTINF:-1 tvg-id="" status="timeout",TVB明珠台 (PEARL)
+#EXTINF:-1 tvg-id="Pearl.hk" status="timeout",TVB明珠台 (PEARL)
 http://116.199.5.52:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=12&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
-#EXTINF:-1 tvg-id="" status="timeout",TVB翡翠台 (JADE) (576p)
+#EXTINF:-1 tvg-id="Jade.hk" status="timeout",TVB翡翠台 (JADE) (576p)
 http://116.199.5.51:8114/00000000/hls/index.m3u8?Fsv_chan_hls_se_idx=188&Fsv_ctype=LIVES&Fsv_otype=1&FvSeid=1&Pcontent_id=.m3u8&Provider_id=
-#EXTINF:-1 tvg-id="" status="timeout",TVB翡翠台 (JADE) (576p)
+#EXTINF:-1 tvg-id="Jade.hk" status="timeout",TVB翡翠台 (JADE) (576p)
 http://116.199.5.52:8114/00000000/index.m3u8?Fsv_CMSID=&Fsv_SV_PARAM1=0&Fsv_ShiftEnable=0&Fsv_ShiftTsp=0&Fsv_chan_hls_se_idx=188&Fsv_cid=0&Fsv_ctype=LIVES&Fsv_ctype=LIVES&Fsv_filetype=1&Fsv_otype=1&Fsv_otype=1&Fsv_rate_id=0&FvSeid=5abd1660af1babb4&Pcontent_id=&Provider_id=
-#EXTINF:-1 tvg-id="" status="online",有線新聞台 i-Cable 24-hour News Channel (720p)
+#EXTINF:-1 tvg-id="iCABLENewsChannel.hk" status="online",有線新聞台 i-Cable 24-hour News Channel (720p)
 https://uc6.i-cable.com/live_freedirect/freehd209_h.live/playlist.m3u8
+#EXTINF:-1 tvg-id="MeiAhMovieChannel.hk" status="blocked",Mei Ah Movie Channel (720p)
+http://50.7.220.74:8278/meiyamovie_twn/playlist.m3u8?ct=19226&tid=MFEF1001328410013284&tsum=9839709ca0f37641c5d1ba962c3bc739
diff --git a/streams/hn.m3u b/streams/hn.m3u
index 85af7385b..8924c8ea6 100644
--- a/streams/hn.m3u
+++ b/streams/hn.m3u
@@ -79,7 +79,7 @@ https://videoserver.ideskhn.com:3863/live/waldivisionlive.m3u8
 https://5caf24a595d94.streamlock.net:1937/8142/8142/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Radio Imagen 105.1 FM (La Esperanza) (720p) [Not 24/7]
 http://lencatelevision.com:8080/hls/ltv2.m3u8
-#EXTINF:-1 tvg-id="" status="online",Sula TV (720p)
+#EXTINF:-1 tvg-id="SulaTV.hn" status="online",Sula TV (720p)
 https://sulatv1.ddns.net/hls/live/index.m3u8
 #EXTINF:-1 tvg-id="TVCentroHD.hn" status="online",TV Centro 27.2 (720p)
 https://cloud2.streaminglivehd.com:1936/8004/8004/playlist.m3u8
diff --git a/streams/ie_samsung.m3u b/streams/ie_samsung.m3u
index b9e12d616..02aa17853 100644
--- a/streams/ie_samsung.m3u
+++ b/streams/ie_samsung.m3u
@@ -3,15 +3,15 @@
 https://rakuten-africanews-1-ie.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="BloombergQuicktake.us" status="online",Bloomberg Quicktake (1080p)
 https://bloomberg-quicktake-1-ie.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",AFV Family
+#EXTINF:-1 tvg-id="AFVFamily.us" status="online",AFV Family
 https://futuretoday-afv-family-2-ie.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Bloomberg TV US (1080p)
+#EXTINF:-1 tvg-id="BloombergTV.us" status="online",Bloomberg TV US (1080p)
 https://bloomberg-bloomberg-1-ie.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Duck TV
+#EXTINF:-1 tvg-id="DuckTV.sk" status="online",Duck TV
 https://mmm-ducktv-4-ie.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Euronews English (720p)
+#EXTINF:-1 tvg-id="EuronewsEnglish.fr" status="online",Euronews English (720p)
 https://rakuten-euronews-1-ie.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Mav TV Motorsports Network
+#EXTINF:-1 tvg-id="MAVTV.us" status="online",Mav TV Motorsports Network
 https://mavtv-mavtvglobal-1-ie.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",The Guardian
+#EXTINF:-1 tvg-id="TheGuardian.uk" status="online",The Guardian
 https://rakuten-guardian-1-ie.samsung.wurl.tv/playlist.m3u8
diff --git a/streams/il.m3u b/streams/il.m3u
index 44e8d5ec0..55bfeb5e1 100644
--- a/streams/il.m3u
+++ b/streams/il.m3u
@@ -29,3 +29,5 @@ http://wowza.media-line.co.il/Musayof-Live/livestream.sdp/playlist.m3u8
 https://d18b0e6mopany4.cloudfront.net/out/v1/08bc71cf0a0f4712b6b03c732b0e6d25/index.m3u8
 #EXTINF:-1 tvg-id="Hidabroot.il",Hidabroot
 https://cdn.cybercdn.live/HidabrootIL/Live97/playlist.m3u8
+#EXTINF:-1 tvg-id="ShelanuTV.il" status="online",Shelanu TV (720p)
+https://1247634592.rsc.cdn77.org/1247634592/playlist.m3u8
diff --git a/streams/in.m3u b/streams/in.m3u
index cf50c97da..5501b94b1 100644
--- a/streams/in.m3u
+++ b/streams/in.m3u
@@ -296,8 +296,6 @@ http://103.81.104.118/hls/stream8.m3u8
 http://newsmaffia.casacam.net:1935/newsmaffia/newsmaffia/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Desi Channel (720p)
 https://live.wmncdn.net/desichannel/7e2dd0aed46b70a5c77f4affdb702e4b.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",FASTWAY NEWS (720p) [Not 24/7]
-http://163.47.214.155:1935/fwnews/live/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Filmeraa (720p)
 https://a.jsrdn.com/broadcast/7ef91d3d7a/+0000/c.m3u8
 #EXTINF:-1 tvg-id="" status="online",Indywood TV
@@ -310,8 +308,6 @@ http://59c3ec70cfde0.streamlock.net/channel_6/channel6/playlist.m3u8
 http://192.99.2.28/mandra_hls/mandra.m3u8
 #EXTINF:-1 tvg-id="" status="online",Sada TV (1080p) [Not 24/7]
 http://cdn12.henico.net:8080/live/sadatv/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",Sardari TV (1080p) [Not 24/7]
-http://158.69.124.9:1935/sardaritv/sardaritv/playlist.m3u8
 #EXTINF:-1 tvg-id="SonyBBCEarth.in" status="timeout",Sony BBC Earth HD (1080p)
 http://103.81.104.118/hls/stream5.m3u8
 #EXTINF:-1 tvg-id="" status="online",Star Cinema (576p)
diff --git a/streams/in_samsung.m3u b/streams/in_samsung.m3u
index 6d4be5df2..83c20835d 100644
--- a/streams/in_samsung.m3u
+++ b/streams/in_samsung.m3u
@@ -11,15 +11,15 @@ https://inwonder-samsungindia.amagi.tv/playlist.m3u8
 https://the-pet-collective-international-in.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="WeatherSpyIndia.in" status="online",Weatherspy
 https://jukin-weatherspy-2-in.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Failarmy International
+#EXTINF:-1 tvg-id="FailArmy.us" status="online",Failarmy International
 https://failarmy-international-in.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Filmstream
+#EXTINF:-1 tvg-id="Filmstream.nl" status="online",Filmstream
 https://spi-filmstream-1-in.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fuel TV (1080p)
+#EXTINF:-1 tvg-id="FUELTV.at" status="online",Fuel TV (1080p)
 https://fueltv-fueltv-12-in.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Go USA
+#EXTINF:-1 tvg-id="GoUSATV.us" status="online",Go USA
 https://brandusa-gousa-1-in.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Mav TV
+#EXTINF:-1 tvg-id="MAVTV.us" status="online",Mav TV
 https://mavtv-mavtvglobal-1-in.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",People are Awesome
+#EXTINF:-1 tvg-id="PeopleAreAwesome.us" status="online",People are Awesome
 https://jukin-peopleareawesome-2-in.samsung.wurl.tv/playlist.m3u8
diff --git a/streams/iq.m3u b/streams/iq.m3u
index 299ef745e..83af75bf5 100644
--- a/streams/iq.m3u
+++ b/streams/iq.m3u
@@ -55,5 +55,3 @@ https://5ab29cc78f681.streamlock.net/PayamTV/livestream/playlist.m3u8
 https://svs.itworkscdn.net/rudawlive/rudawlive.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="ZagrosTV.iq" status="online",Zagros (720p) [Not 24/7]
 https://5a3ed7a72ed4b.streamlock.net/zagrostv/SMIL:myStream.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",SterkTV (1080p) [Not 24/7]
-https://602ccc850c9bb.streamlock.net/sterktv/smil:sterk.smil/playlist.m3u8
diff --git a/streams/ir.m3u b/streams/ir.m3u
index b613a8f09..49d298880 100644
--- a/streams/ir.m3u
+++ b/streams/ir.m3u
@@ -59,7 +59,7 @@ http://cdn1.live.irib.ir:1935/live-channels/smil:varzesh/playlist.m3u8
 http://51.210.199.8/hls/stream.m3u8
 #EXTINF:-1 tvg-id="YourTimeTV.ir" status="online",YourTime TV (720p) [Not 24/7]
 https://hls.yourtime.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="" status="online",Diyar TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="DiyarTV.tr" status="online",Diyar TV (720p) [Not 24/7]
 http://51.210.199.28/hls/stream.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Ecran TV (720p) [Not 24/7]
 http://51.210.199.40/hls/stream.m3u8
@@ -71,7 +71,7 @@ http://51.210.199.12/hls/stream.m3u8
 http://51.210.199.31/hls/stream.m3u8
 #EXTINF:-1 tvg-id="" status="online",Marjaeyat (1080p) [Not 24/7]
 https://livefa.marjaeyattv.com/mtv_fa/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",NAVAHANG (720p)
+#EXTINF:-1 tvg-id="NavahangTV.fi" status="online",NAVAHANG (720p)
 http://51.210.227.130/hls/stream.m3u8
 #EXTINF:-1 tvg-id="" status="online",Sahar (480p)
 http://cdnlive.irib.ir/live-channels/smil:sahar3/playlist.m3u8
diff --git a/streams/it.m3u b/streams/it.m3u
index 838357e5b..71dd3fa31 100644
--- a/streams/it.m3u
+++ b/streams/it.m3u
@@ -236,7 +236,7 @@ http://uk4.streamingpulse.com:1935/TeleabruzzoTV/TeleabruzzoTV/playlist.m3u8
 https://5ce9406b73c33.streamlock.net/TeleArena/TeleArena.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="Telebelluno.it" status="online",Telebelluno (720p)
 https://live.mariatvcdn.com/telebelluno/a3b80388da9801906adf885282e73bc3.sdp/mono.m3u8
-#EXTINF:-1 tvg-id="Telechiara.it" status="online",Telechiara (720p)
+#EXTINF:-1 tvg-id="TeleChiara.it" status="online",Telechiara (720p)
 http://fms.tvavicenza.it:1935/telechiara/diretta/playlist.m3u8
 #EXTINF:-1 tvg-id="TelecolorLombardia.it" status="online",Telecolor Lombardia (1080p) [Not 24/7]
 https://1aadf145546f475282c5b4e658c0ac4b.msvdn.net/live/324149/hlbAWtl/playlist.m3u8
@@ -316,8 +316,6 @@ https://5db313b643fd8.streamlock.net/Vuemme/Vuemme/playlist.m3u8
 https://live3-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(lb)/index.m3u8
 #EXTINF:-1 tvg-id="AntennaTre.it" status="timeout",Antenna Tre Veneto (480p) [Geo-blocked]
 https://59d8c0cee6f3d.streamlock.net/antennatreveneto/antennatreveneto.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",Boing Spain
-http://149.62.177.157:8000/play/a010
 #EXTINF:-1 tvg-id="" status="online",Gold 78 (1080p)
 https://stream2.xdevel.com/video1s86-22/stream/playlist_dvr.m3u8
 #EXTINF:-1 tvg-id="" status="online",Radio Radicale TV (240p) [Not 24/7]
@@ -592,7 +590,7 @@ https://stream1.aswifi.it/poptelevision/live/index.m3u8
 https://5f22d76e220e1.streamlock.net/reklamatv/reklamatv/playlist.m3u8
 #EXTINF:-1 tvg-id="",TeleCampione [Geo-blocked] 
 https://5f22d76e220e1.streamlock.net/telecampione/telecampione/playlist.m3u8
-#EXTINF:-1 tvg-id="",TV 2000 (720p)
+#EXTINF:-1 tvg-id="TV2000.va",TV 2000 (720p)
 https://hls-live-tv2000.akamaized.net/hls/live/2028510/tv2000/master.m3u8
 #EXTINF:-1 tvg-id="",Vivaldi TV (1080p)
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01523-mezzo-vivalditv-tcl/playlist.m3u8
@@ -604,7 +602,7 @@ https://live2.msf.cdn.mediaset.net/content/hls_h0_clr_vos/live/channel(i2)/index
 https://0ff9dd7fe9b64bc08a5fc4ed525454c3.msvdn.net/live/S42170132/sT6C3LFaD1iA/playlist.m3u8
 #EXTINF:-1 tvg-id="TLTMolise.it",TLT Molise (1080p)
 https://5f22d76e220e1.streamlock.net/tltmolise/tltmolise/playlist.m3u8
-#EXTINF:-1 tvg-id="RAI4K.it",RAI 4K [Geo-blocked] 
+#EXTINF:-1 tvg-id="Rai4K.it",RAI 4K [Geo-blocked] 
 https://raievent10-elem-live.akamaized.net/hls/live/619189/raievent10/raievent10/playlist.m3u8
 #EXTINF:-1 tvg-id="OttoChannel.it",Otto Channel (480p)
 https://ottop-live-meride.akamaized.net/hls/live/2039996/ch1/playlist.m3u8
diff --git a/streams/it_pluto.m3u b/streams/it_pluto.m3u
index f6e29804c..c68bd9fec 100644
--- a/streams/it_pluto.m3u
+++ b/streams/it_pluto.m3u
@@ -57,7 +57,7 @@ https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6385eb5588399a000759e
 https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6093f48c95132a00075fd859/master.m3u8?deviceType=samsung-tvplus&deviceMake=samsung&deviceModel=samsung&deviceVersion=unknown&appVersion=unknown&deviceLat=0&deviceLon=0&deviceDNT=%7BTARGETOPT%7D&deviceId=%7BPSID%7D&advertisingId=%7BPSID%7D&us_privacy=1YNY&samsung_app_domain=%7BAPP_DOMAIN%7D&samsung_app_name=%7BAPP_NAME%7D&profileLimit=&profileFloor=&embedPartner=samsung-tvplus
 #EXTINF:-1 tvg-id="",Pluto TV Kids Italy (720p)
 https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/62444e195d2ab7000861694b/master.m3u8?deviceType=samsung-tvplus&deviceMake=samsung&deviceModel=samsung&deviceVersion=unknown&appVersion=unknown&deviceLat=0&deviceLon=0&deviceDNT=%7BTARGETOPT%7D&deviceId=%7BPSID%7D&advertisingId=%7BPSID%7D&us_privacy=1YNY&samsung_app_domain=%7BAPP_DOMAIN%7D&samsung_app_name=%7BAPP_NAME%7D&profileLimit=&profileFloor=&embedPartner=samsung-tvplus
-#EXTINF:-1 tvg-id="LesorelleMcLeod.it",Le sorelle McLeod Italy (720p)
+#EXTINF:-1 tvg-id="LesorelleMcLeodItaly.it",Le sorelle McLeod Italy (720p)
 https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/60a2837f8154ab0007c4dcdf/master.m3u8?deviceType=samsung-tvplus&deviceMake=samsung&deviceModel=samsung&deviceVersion=unknown&appVersion=unknown&deviceLat=0&deviceLon=0&deviceDNT=%7BTARGETOPT%7D&deviceId=%7BPSID%7D&advertisingId=%7BPSID%7D&us_privacy=1YNY&samsung_app_domain=%7BAPP_DOMAIN%7D&samsung_app_name=%7BAPP_NAME%7D&profileFloor=&profileLimit=&embedPartner=samsung-tvplus
 #EXTINF:-1 tvg-id="",MacGyver Italy (720p)
 https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/6245d4511358320007029cdf/master.m3u8?deviceType=samsung-tvplus&deviceMake=samsung&deviceModel=samsung&deviceVersion=unknown&appVersion=unknown&deviceLat=0&deviceLon=0&deviceDNT=%7BTARGETOPT%7D&deviceId=%7BPSID%7D&advertisingId=%7BPSID%7D&us_privacy=1YNY&samsung_app_domain=%7BAPP_DOMAIN%7D&samsung_app_name=%7BAPP_NAME%7D&profileLimit=&profileFloor=&embedPartner=samsung-tvplus
diff --git a/streams/it_samsung.m3u b/streams/it_samsung.m3u
index 9d84683de..4bd610e39 100644
--- a/streams/it_samsung.m3u
+++ b/streams/it_samsung.m3u
@@ -37,7 +37,7 @@ https://the-pet-collective-international-it.samsung.wurl.tv/playlist.m3u8
 https://bbceu-bbcdrama-2-it.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="CGEntertainment.it" status="online",CG Entertainment
 https://cgentertainment-cgtv-1-it.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fuel TV (1080p)
+#EXTINF:-1 tvg-id="FUELTV.at" status="online",Fuel TV (1080p)
 https://fueltv-fueltv-6-it.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Full Moon
 https://minerva-fullmoon-1-it.samsung.wurl.tv/playlist.m3u8
@@ -45,11 +45,11 @@ https://minerva-fullmoon-1-it.samsung.wurl.tv/playlist.m3u8
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg00712-alchimie-humanitydocit-samsungit/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Motor1 TV
 https://motorsportnetwork-motor1tv-1-it.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Museum TV [Geo-blocked]
+#EXTINF:-1 tvg-id="MuseumTV.fr" status="online",Museum TV [Geo-blocked]
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01492-secomsasmediart-museumtv-eng-samsungit/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Myzen TV [Geo-blocked]
+#EXTINF:-1 tvg-id="MyZenTV.fr" status="online",Myzen TV [Geo-blocked]
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01255-secomcofites-my-myzen-samsungen-samsungit/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",People are Awesome
+#EXTINF:-1 tvg-id="PeopleAreAwesome.us" status="online",People are Awesome
 https://jukin-peopleareawesome-2-it.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Planeta Junior
 https://deaplaneta-planetakidz-2-it.samsung.wurl.tv/playlist.m3u8
@@ -59,13 +59,13 @@ https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg00784-shortsinternati-shortstv-fast
 https://gto2000-sportoutdoortv-1-it.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Sportitalia.it" status="online",Sports Italia
 https://sportsitalia-samsungitaly.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Teletubbies
+#EXTINF:-1 tvg-id="Teletubbies.uk" status="online",Teletubbies
 https://dhx-teletubbies-2-it.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Televisa Telenovelas
 https://televisa-televisa-1-it.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Trace Latina [Geo-blocked]
+#EXTINF:-1 tvg-id="TraceLatina.fr" status="online",Trace Latina [Geo-blocked]
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01131-tracetv-tracelatinait-samsungit/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Trace Urban [Geo-blocked]
+#EXTINF:-1 tvg-id="TraceUrban.fr" status="online",Trace Urban [Geo-blocked]
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01131-tracetv-traceurbanit-samsungit/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",WP Minerva Pictures
 https://minerva-wp-1-it.samsung.wurl.tv/playlist.m3u8
diff --git a/streams/kh.m3u b/streams/kh.m3u
index 14592fff9..ea953e10a 100644
--- a/streams/kh.m3u
+++ b/streams/kh.m3u
@@ -27,7 +27,7 @@ http://167.99.72.244:1935/hm_hdtv/_definst_/smil:HMHDTV.smil/playlist.m3u8
 http://203.176.130.123:8989/live/ctv9hd.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="ApsaraTV11.kh",Apsara TV11 (720p) [Not 24/7]
 http://203.176.130.123:8989/live/apsaratv_480k.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="",WIKI TV (720p)
+#EXTINF:-1 tvg-id="WikiTV.kh",WIKI TV (720p)
 http://206.189.93.160:1935/live/myStream_720p/playlist.m3u8
 #EXTINF:-1 tvg-id="TV5Cambodia.kh",TV5 Cambodia (720p) [Not 24/7]
 http://203.176.130.123:8989/live/tv5_480k.stream/playlist.m3u8
diff --git a/streams/kr.m3u b/streams/kr.m3u
index dababe63d..8ac16627e 100644
--- a/streams/kr.m3u
+++ b/streams/kr.m3u
@@ -211,3 +211,7 @@ http://mytv.dothome.co.kr/ch/catv/2.php
 http://mytv.dothome.co.kr/ch/catv/5.php
 #EXTINF:-1 tvg-id="KBSStory.kr",KBS Story
 http://mytv.dothome.co.kr/ch/catv/4.php
+#EXTINF:-1 tvg-id="SPOTV2.kr" status="blocked",SPOTV2 (1080p)
+https://bcovlive-a.akamaihd.net/48eee16919834d3b97df1082a649bcfa/ap-northeast-1/6271486521001/playlist.m3u8
+#EXTINF:-1 tvg-id="SPOTV.kr" status="blocked",SPOTV (1080p)
+https://bcovlive-a.akamaihd.net/99545824f51f4c1592b35314c6ece3b0/ap-northeast-1/6271486521001/playlist.m3u8
diff --git a/streams/la.m3u b/streams/la.m3u
index 9d177097e..8f05c1a88 100644
--- a/streams/la.m3u
+++ b/streams/la.m3u
@@ -25,3 +25,5 @@ https://livefta.malimarcdn.com/ftaedge00/nat.sdp/playlist.m3u8
 https://livefta.malimarcdn.com/ftaedge00/ohmuanglao.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="VatiLao.la" status="online",Vati Lao TV (720p)
 https://livefta.malimarcdn.com/ftaedge00/vatilaotv.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="LookThoongTV.la" status="online",Look Thoong TV (720p) [Not 24/7]
+https://livefta.malimarcdn.com/ftaedge00/lookthoongtv.sdp/playlist.m3u8
diff --git a/streams/lt.m3u b/streams/lt.m3u
index 35dc4aabc..0a2f39e95 100644
--- a/streams/lt.m3u
+++ b/streams/lt.m3u
@@ -1,6 +1,8 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="LRTLituanica.lt" status="online",LRT Lituanica (720p)
 https://lituanica-dvr.lrt.lt/lrt-ndvr/hls/lituanica_720p/index.m3u8
+#EXTINF:-1 tvg-id="LRTLituanica.lt" status="online",LRT Lituanica (720p)
+https://lituanica.lrt.lt/lituanica/master.m3u8
 #EXTINF:-1 tvg-id="M1.lt" status="online",M-1 (480p)
 https://m-1.data.lt/m-1/smil:m-1.smil/chunklist_b1000000.m3u8
 #EXTINF:-1 tvg-id="PowerHitRadio.lt" status="online",Power Hit Radio (720p) [Not 24/7]
diff --git a/streams/lu_samsung.m3u b/streams/lu_samsung.m3u
index cdb3ee7a7..318e93741 100644
--- a/streams/lu_samsung.m3u
+++ b/streams/lu_samsung.m3u
@@ -3,9 +3,9 @@
 https://rakuten-africanews-2-lu.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="BloombergQuicktake.us" status="online",Bloomberg Quicktake (1080p)
 https://bloomberg-quicktake-1-lu.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Bloomberg TV US (1080p)
+#EXTINF:-1 tvg-id="BloombergTV.us" status="online",Bloomberg TV US (1080p)
 https://bloomberg-bloomberg-1-lu.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Euronews
+#EXTINF:-1 tvg-id="EuronewsEnglish.fr" status="online",Euronews
 https://rakuten-euronews-10-lu.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Mav TV Global
+#EXTINF:-1 tvg-id="MAVTV.us" status="online",Mav TV Global
 https://mavtv-mavtvglobal-1-lu.samsung.wurl.tv/playlist.m3u8
diff --git a/streams/mx.m3u b/streams/mx.m3u
index ab0008883..ee0c005c8 100644
--- a/streams/mx.m3u
+++ b/streams/mx.m3u
@@ -143,8 +143,6 @@ http://189.240.210.28:1935/live/setpuebla/playlist.m3u8
 https://hls.gvstream.live/telesistemas/15tv.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="XHSPRTDT1.mx" status="online",XHSPR-TDT1 (Canal Catorce)
 https://60ed5b6d0df78.streamlock.net:1936/segundo/segundo/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Alcarria TV (576p) [Not 24/7]
-http://217.182.77.27/live/alcarriatv-livestream.m3u8
 #EXTINF:-1 tvg-id="CanaldelCongreso452.mx" status="timeout",Canal del Congreso 45.2 [Not 24/7]
 https://edge.canaldelcongreso.gob.mx/live_sd2/smil:canal-sd2.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CanaldelCongreso453.mx" status="timeout",Canal del Congreso 45.3 [Not 24/7]
@@ -219,9 +217,9 @@ https://stream.oursnetworktv.com/latin/encoder73/playlist.m3u8
 https://60ed5b6d0df78.streamlock.net:1936/cuarto/cuarto/playlist.m3u8
 #EXTINF:-1 tvg-id="",Antena Tele (1080p)
 https://5ca9af4645e15.streamlock.net/grd/videogrd/playlist.m3u8
-#EXTINF:-1 tvg-id="",TV Independencia (1080p)
+#EXTINF:-1 tvg-id="TVIndependencia.mx",TV Independencia (1080p)
 https://stream.oursnetworktv.com/latin/tvindependencia/playlist.m3u8
-#EXTINF:-1 tvg-id="",TV Migrante (720p)
+#EXTINF:-1 tvg-id="TVMigrante.mx",TV Migrante (720p)
 https://60ed5b6d0df78.streamlock.net:1936/prueba/prueba/playlist.m3u8
 #EXTINF:-1 tvg-id="NPlus.mx",NMás [Geo-blocked]
 https://channel07-notusa.akamaized.net/hls/live/2036971/event01/index.m3u8
diff --git a/streams/mx_samsung.m3u b/streams/mx_samsung.m3u
index c12db26ee..38573e0f7 100644
--- a/streams/mx_samsung.m3u
+++ b/streams/mx_samsung.m3u
@@ -5,11 +5,11 @@ https://inwonder-samsungmexico.amagi.tv/playlist.m3u8
 https://tastemadees16intl-samsungmexico.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Bloomberg TV US (1080p)
 https://bloomberg-bloomberg-5-mx.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Euronews en Español (720p)
+#EXTINF:-1 tvg-id="EuronewsEnglish.fr" status="online",Euronews en Español (720p)
 https://euronews-euronews-spanish-2-mx.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fuel TV (1080p)
+#EXTINF:-1 tvg-id="FUELTV.at" status="online",Fuel TV (1080p)
 https://fueltv-fueltv-11-mx.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",MyTime movie network Mexico (720p)
+#EXTINF:-1 tvg-id="MyTimeMovieNetworkMexico.mx" status="online",MyTime movie network Mexico (720p)
 https://appletree-mytime-samsungmexico.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Runtime (Mexico) (1080p)
 https://runtimemx-samsungmx.amagi.tv/playlist.m3u8
diff --git a/streams/nl.m3u b/streams/nl.m3u
index 16bad2009..b68a64325 100644
--- a/streams/nl.m3u
+++ b/streams/nl.m3u
@@ -231,7 +231,7 @@ https://d3j015sg8r68y.cloudfront.net/nlpo/clr-nlpo/omroepvenray/index.m3u8
 https://61ae39677a1ab.streamlock.net/radionl/radionl_1080p/playlist.m3u8?ref=Hoofdwebsite&token_endtime=1661322499&token_hash=yPCofcNBmbfuVCU4UqsLrQ6GgnKJGC5gQ0tn5_F9FSE=&token_starttime=0
 #EXTINF:-1 tvg-id="" status="online",ROS TV Krant (1080p)
 https://server-67.stream-server.nl:1936/RosTVkrant/RosTVkrant/playlist.m3u8
-#EXTINF:-1 tvg-id="RTVArhhemTV.nl" status="error",RTV Arnhem (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="RTVArnhemTV.nl" status="error",RTV Arnhem (480p) [Not 24/7]
 https://ms2.mx-cd.net/tv/163-669433/RTV_Arnhem.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",RTV LOVE (720p)
 https://d2o8iss0ldenh4.cloudfront.net/nlpo/clr-nlpo/rtvlove/index.m3u8
diff --git a/streams/nl_samsung.m3u b/streams/nl_samsung.m3u
index 7d5b95bfe..341648475 100644
--- a/streams/nl_samsung.m3u
+++ b/streams/nl_samsung.m3u
@@ -1,33 +1,33 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="Filmstream.nl" status="online",Filmstream
 https://spi-filmstream-1-nl.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Are we there Yet? [Geo-blocked]
+#EXTINF:-1 tvg-id="AreWeThereYet.us" status="online",Are we there Yet? [Geo-blocked]
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg00353-lionsgatestudio-arewethereyetnl-samsungnl/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Bloomberg Quicktake
+#EXTINF:-1 tvg-id="BloombergQuicktake.us" status="online",Bloomberg Quicktake
 https://bloomberg-quicktake-1-nl.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Bloomberg TV+
+#EXTINF:-1 tvg-id="BloombergTVPlus.us" status="online",Bloomberg TV+
 https://bloomberg-bloombergtv-3-nl.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",DiscoverFilm
+#EXTINF:-1 tvg-id="DiscoverFilm.uk" status="online",DiscoverFilm
 https://discoverfilm-discoverfilm-1-nl.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Euronews English (720p)
+#EXTINF:-1 tvg-id="EuronewsEnglish.fr" status="online",Euronews English (720p)
 https://rakuten-euronews-1-nl.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Failarmy International
+#EXTINF:-1 tvg-id="FailArmy.us" status="online",Failarmy International
 https://failarmy-international-nl.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fashion TV
+#EXTINF:-1 tvg-id="FashionTVEurope.fr" status="online",Fashion TV
 https://fashiontv-fashiontv-5-nl.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fuel TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="FUELTV.at" status="online",Fuel TV (1080p) [Not 24/7]
 http://fueltv-fueltv-14-nl.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Go USA TV
+#EXTINF:-1 tvg-id="GoUSATV.us" status="online",Go USA TV
 https://brandusa-gousa-1-nl.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Hell's Kitchen
+#EXTINF:-1 tvg-id="GordonRamsaysHellsKitchen.us" status="online",Hell's Kitchen
 https://cdn-uw2-prod.tsv2.amagi.tv/linear/amg00654-itvstudios-hellskitchennl-samsungnl/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",LOL! Network
+#EXTINF:-1 tvg-id="KevinHartsLOLNetwork.us" status="online",LOL! Network
 https://lol-lolnetwork-2-nl.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Mav Tv Motorsports Network
+#EXTINF:-1 tvg-id="MAVTV.us" status="online",Mav Tv Motorsports Network
 https://mavtv-mavtvglobal-1-nl.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Mojitv
 https://odmedia-mojitv-1-nl.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Museum TV [Geo-blocked]
+#EXTINF:-1 tvg-id="MuseumTV.fr" status="online",Museum TV [Geo-blocked]
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01492-secomsasmediart-museumtv-eng-samsungnl/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",MYZen Fit [Geo-blocked]
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01255-secomcofites-my-myzen-samsungen-samsungnl/playlist.m3u8
@@ -45,25 +45,25 @@ https://rakuten-family-8-nl.samsung.wurl.tv/playlist.m3u8
 https://rakuten-spotlight-8-nl.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Reuters Now
 https://reuters-reutersnow-1-nl.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Sofy TV
+#EXTINF:-1 tvg-id="SofyTV.ch" status="online",Sofy TV
 https://cdn-uw2-prod.tsv2.amagi.tv/linear/amg00535-largofilmsltdli-sofytvnl-samsungnl/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Strongman Champions League
 https://rightsboosterltd-scl-1-nl.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Tennis Channel
+#EXTINF:-1 tvg-id="TennisChannel.us" status="online",Tennis Channel
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01444-tennischannelth-tennischannelnl-samsungnl/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",The Guardian
+#EXTINF:-1 tvg-id="TheGuardian.uk" status="online",The Guardian
 https://rakuten-guardian-1-nl.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",The Pet Collective
+#EXTINF:-1 tvg-id="ThePetCollective.us" status="online",The Pet Collective
 https://the-pet-collective-international-nl.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Travelxp
+#EXTINF:-1 tvg-id="Travelxp.in" status="online",Travelxp
 https://travelxp-travelxp-3-nl.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Waterbear
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01415-waterbearnetwor-waterbear-samsungnl/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Wicked Tuna
 https://cdn-uw2-prod.tsv2.amagi.tv/linear/amg00353-lionsgatestudio-wickedtunanl-samsungnl/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",WildEarth [Geo-blocked]
+#EXTINF:-1 tvg-id="WildEarth.us" status="online",WildEarth [Geo-blocked]
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01290-wildearthmediap-wildearth-samsungnl/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",World Poker Tour
+#EXTINF:-1 tvg-id="WorldPokerTour.us" status="online",World Poker Tour
 https://wpt-theworldpokertour-1-nl.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Xplore
+#EXTINF:-1 tvg-id="XploreTV.us" status="online",Xplore
 https://cdn-uw2-prod.tsv2.amagi.tv/linear/amg00111-hearstmediaprod-xploreintlnl-samsungnl/playlist.m3u8
diff --git a/streams/no_samsung.m3u b/streams/no_samsung.m3u
index 5f0449163..890cac25e 100644
--- a/streams/no_samsung.m3u
+++ b/streams/no_samsung.m3u
@@ -7,5 +7,5 @@ https://bloomberg-quicktake-1-no.samsung.wurl.com/manifest/playlist.m3u8
 https://mmm-ducktv-4-no.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Bloomberg TV US (1080p)
 https://bloomberg-bloomberg-1-no.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Euronews English (720p)
+#EXTINF:-1 tvg-id="EuronewsEnglish.fr" status="online",Euronews English (720p)
 https://rakuten-euronews-1-no.samsung.wurl.com/manifest/playlist.m3u8
diff --git a/streams/nz.m3u b/streams/nz.m3u
index 3f50dc3df..3b4fe01fe 100644
--- a/streams/nz.m3u
+++ b/streams/nz.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="CH200.nz" status="online",Channel 200 (540p)
+#EXTINF:-1 tvg-id="Channel200.nz" status="online",Channel 200 (540p)
 https://d1jlnqid3sfc6m.cloudfront.net/out/v1/3fc2254c865a457c8d7fbbce227a2aae/index.m3u8
 #EXTINF:-1 tvg-id="Firstlight.nz" status="online",Firstlight (576p)
 https://uni01rtmp.tulix.tv/firstlight/firstlight.smil/playlist.m3u8
diff --git a/streams/nz_samsung.m3u b/streams/nz_samsung.m3u
index 091b82573..30b9df003 100644
--- a/streams/nz_samsung.m3u
+++ b/streams/nz_samsung.m3u
@@ -1,59 +1,59 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="" status="online",Action Hollywood Movies
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg01076-lightningintern-actionhollywood-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Ausbiz TV
+#EXTINF:-1 tvg-id="AusbizTV.au" status="online",Ausbiz TV
 https://ausbiztv-ausbiz-1-nz.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Bloomberg Quicktake
+#EXTINF:-1 tvg-id="BloombergQuicktake.us" status="online",Bloomberg Quicktake
 https://bloomberg-quicktake-4-nz.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Bloomberg TV
+#EXTINF:-1 tvg-id="BloombergTV.us" status="online",Bloomberg TV
 https://bloomberg-bloomberg-2-nz.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Bounty
 https://bountyfilms-bounty-1-nz.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",CineView
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg01076-lightningintern-rialto-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Clubbing TV
+#EXTINF:-1 tvg-id="ClubbingTV.fr" status="online",Clubbing TV
 https://clubbingtv-samsungnz.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Drybar Comedy
 https://drybar-drybarcomedy-1-nz.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Dust
+#EXTINF:-1 tvg-id="DUST.us" status="online",Dust
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00219-gunpowdersky-dustintlnz-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",EuroNews
+#EXTINF:-1 tvg-id="EuronewsEnglish.fr" status="online",EuroNews
 https://euronews-euronews-world-1-nz.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",GB News
+#EXTINF:-1 tvg-id="GBNews.uk" status="online",GB News
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg01076-lightningintern-gbnewsnz-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Gusto TV
+#EXTINF:-1 tvg-id="GustoTV.us" status="online",Gusto TV
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg01077-gustoworldwidem-gustotvnz-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Horse and Country Free
+#EXTINF:-1 tvg-id="HorseCountryTV.uk" status="online",Horse and Country Free
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00810-horsecountrytvl-hncfreenz-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Introuble
+#EXTINF:-1 tvg-id="InTrouble.nl" status="online",Introuble
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00861-terninternation-introublenz-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",InWonder
+#EXTINF:-1 tvg-id="InWonder.nl" status="online",InWonder
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00861-terninternation-inwondernz-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Kartoon Channel
+#EXTINF:-1 tvg-id="KartoonChannel.us" status="online",Kartoon Channel
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg01076-lightningintern-kartoonchannel-samsungnz/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Love Stories TV
 https://lovestoriestv-lovestoriestv-1-nz.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Made in Hollywood
+#EXTINF:-1 tvg-id="MadeInHollywood.us" status="online",Made in Hollywood
 https://connection3-ent-nz.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Magellen TV
 https://magellantv-3-nz.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Mav TV Motorsports Network
+#EXTINF:-1 tvg-id="MAVTV.us" status="online",Mav TV Motorsports Network
 https://mavtv-mavtvglobal-1-nz.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Motorvision.TV
+#EXTINF:-1 tvg-id="MotorvisionTV.de" status="online",Motorvision.TV
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg01329-otterainc-motorvisionnz-samsungnz/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Mtrspt 1
 https://kravemedia-mtrspt1-1-nz.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Nosey
+#EXTINF:-1 tvg-id="Nosey.us" status="online",Nosey
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00514-noseybaxterllc-noseyintlnz-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Now 70's
+#EXTINF:-1 tvg-id="Now70s.uk" status="online",Now 70's
 https://lightning-now70s-samsungnz.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Now 80's
+#EXTINF:-1 tvg-id="Now80s.uk" status="online",Now 80's
 https://lightning-now80s-samsungnz.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Now 90's
+#EXTINF:-1 tvg-id="Now90s.uk" status="online",Now 90's
 https://lightning-now90s-samsungnz.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Outdoor Channel
+#EXTINF:-1 tvg-id="OutdoorChannel.us" status="online",Outdoor Channel
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00718-outdoorchannela-outdoortvnz-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Pet Club TV
+#EXTINF:-1 tvg-id="PetClubTV.hk" status="online",Pet Club TV
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg01076-lightningintern-petclub-samsungnz/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Pulse TV
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg01076-lightningintern-pulse-samsungnz/playlist.m3u8
@@ -61,33 +61,33 @@ https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg01076-lightningintern-pulse-samsu
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00426-littledotstudio-realcrimebetanz-samsungnz/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Real Life
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00426-littledotstudio-reallifenz-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Real Stories
+#EXTINF:-1 tvg-id="RealStories.uk" status="online",Real Stories
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00426-littledotstudio-realstoriesnz-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Real Wild
+#EXTINF:-1 tvg-id="RealWild.us" status="online",Real Wild
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00426-littledotstudio-realwildnz-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Revry
+#EXTINF:-1 tvg-id="Revry.us" status="online",Revry
 https://revry-revry-3-nz.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Ryan and Friends
+#EXTINF:-1 tvg-id="RyanandFriends.us" status="online",Ryan and Friends
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00286-pocketwatch-ryanandfriends-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Smithsonian Channel
+#EXTINF:-1 tvg-id="SmithsonianChannelAsia.us" status="online",Smithsonian Channel
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg01553-blueantmediaasi-smithsoniannz-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Tastemade International
+#EXTINF:-1 tvg-id="Tastemade.us" status="online",Tastemade International
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00047-tastemade-tmintlaus-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",The Design Network
+#EXTINF:-1 tvg-id="TheDesignNetwork.us" status="online",The Design Network
 https://thedesignnetwork-tdn-1-nz.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Timeline
+#EXTINF:-1 tvg-id="Timeline.us" status="online",Timeline
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00426-littledotstudio-timelinenz-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Trace Sports Stars
+#EXTINF:-1 tvg-id="TraceSportStars.fr" status="online",Trace Sports Stars
 https://trace-sportstars-samsungnz.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Trace Urban
+#EXTINF:-1 tvg-id="TraceUrban.fr" status="online",Trace Urban
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg01076-lightningintern-traceurban-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Travel XP
+#EXTINF:-1 tvg-id="Travelxp.in" status="online",Travel XP
 https://travelxp-travelxp-1-nz.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",True Crime Now
+#EXTINF:-1 tvg-id="TrueCrimeNow.us" status="online",TrueCrimeNow.us
 https://alliantcontent-truecrimenow-3-nz.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Wonder
+#EXTINF:-1 tvg-id="Wonder.uk" status="online",Wonder
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00426-littledotstudio-wondernz-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Zoo Moo (1080p)
+#EXTINF:-1 tvg-id="ZooMoo.sg" status="online",Zoo Moo (1080p)
 https://amg01553-blueantmediaasi-zoomoonz-samsungnz-rdufn.amagi.tv/playlist/amg01553-blueantmediaasi-zoomoonz-samsungnz/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Zoo Moo (1080p)
+#EXTINF:-1 tvg-id="ZooMoo.sg" status="online",Zoo Moo (1080p)
 https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg01553-blueantmediaasi-zoomoonz-samsungnz/playlist.m3u8
diff --git a/streams/pt.m3u b/streams/pt.m3u
index a5fc77e7f..5149b1b9d 100644
--- a/streams/pt.m3u
+++ b/streams/pt.m3u
@@ -70,3 +70,5 @@ https://streaming-live.rtp.pt/liverepeater/smil:rtpmem.smil/playlist.m3u8
 https://5c65286fc6ace.streamlock.net/cancaonova/CancaoNova/playlist.m3u8
 #EXTINF:-1 tvg-id="TVIFiccao.pt",TVI Ficção [Geo-blocked]
 https://video-auth2.iol.pt/live_tvi_ficcao/live_tvi_ficcao/edge_servers/tvificcao-720p/playlist.m3u8
+#EXTINF:-1 tvg-id="CNNPortugal.pt",CNN Portugal
+https://sktv-forwarders.7m.pl/get.php?x=CNN_Portugal
diff --git a/streams/pt_samsung.m3u b/streams/pt_samsung.m3u
index d4cbbd19f..d9b0253dd 100644
--- a/streams/pt_samsung.m3u
+++ b/streams/pt_samsung.m3u
@@ -1,15 +1,15 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="BloombergQuicktake.us" status="online",Bloomberg Quicktake (1080p)
 https://bloomberg-quicktake-1-pt.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Africanews
+#EXTINF:-1 tvg-id="Africanews.cg" status="online",Africanews
 https://rakuten-africanews-1-pt.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Bloomberg TV US (1080p)
 https://bloomberg-bloomberg-1-pt.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Euronews Português (576p)
+#EXTINF:-1 tvg-id="EuronewsPortuguese.fr" status="online",Euronews Português (576p)
 https://rakuten-euronews-8-pt.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Rakuten Documentaries
 https://rakuten-documentaries-14-pt.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Rakuten Family
 https://rakuten-family-14-pt.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Reuters
+#EXTINF:-1 tvg-id="ReutersTV.us" status="online",Reuters
 https://reuters-reutersnow-1-pt.samsung.wurl.com/manifest/playlist.m3u8
diff --git a/streams/rs.m3u b/streams/rs.m3u
index 16b6fa1c0..10e8cb559 100644
--- a/streams/rs.m3u
+++ b/streams/rs.m3u
@@ -1,6 +1,4 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="KlanKosova.rs" status="timeout",Klan Kosova
-http://93.157.62.180/KlanKosova/index.m3u8
 #EXTINF:-1 tvg-id="KurirTV.rs" status="online",Kurir TV (360p)
 https://kurir-tv.haste-cdn.net/providus/live2805.m3u8
 #EXTINF:-1 tvg-id="KurirTV.rs" status="timeout",Kurir TV (720p)
@@ -153,13 +151,13 @@ https://vod1.laki.eu/kopernikus/video.m3u8
 https://vod1.laki.eu/toptv/video.m3u8
 #EXTINF:-1 tvg-id="TVKanalM.rs",TV Kanal M (576p)
 http://176.67.210.1/hls/kanalm.m3u8
-#EXTINF:-1 tvg-id="",Bloomberg Adria (1080p)
+#EXTINF:-1 tvg-id="BloombergAdriaTV.rs",Bloomberg Adria (1080p)
 https://d3ojytvj4doga3.cloudfront.net/app-23764-1566/ngrp:Jq3SvH9h_all/playlist.m3u8
 #EXTINF:-1 tvg-id="",RTV Tesla (576p)
 https://vod1.laki.eu/teslatv/video.m3u8
-#EXTINF:-1 tvg-id="",Una TV (576p)
+#EXTINF:-1 tvg-id="UNATV.rs",Una TV (576p)
 https://vod1.laki.eu/tvuna/playlist.m3u8
-#EXTINF:-1 tvg-id="",Balkan Radio Salzburg (480p)
+#EXTINF:-1 tvg-id="BalkanRadioSalzburg.at",Balkan Radio Salzburg (480p)
 https://channel.streams.ovh:1936/balkanradiosalzburgtv/balkanradiosalzburgtv/playlist.m3u8
 #EXTINF:-1 tvg-id="",Dox TV (576p)
 https://vod1.laki.eu/dox/index.m3u8
diff --git a/streams/se_samsung.m3u b/streams/se_samsung.m3u
index 98b5f39bb..f8fba639b 100644
--- a/streams/se_samsung.m3u
+++ b/streams/se_samsung.m3u
@@ -1,35 +1,35 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="ThePetCollectiveSweden.se" status="online",The Pet Collective International
 https://the-pet-collective-international-se.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Are we there Yet? [Geo-blocked]
+#EXTINF:-1 tvg-id="AreWeThereYet.us" status="online",Are we there Yet? [Geo-blocked]
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg00353-lionsgatestudio-arewethereyetse-samsungse/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Bloomberg Quicktake
+#EXTINF:-1 tvg-id="BloombergQuicktake.us" status="online",Bloomberg Quicktake
 https://bloomberg-quicktake-1-se.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Bloomberg TV+
+#EXTINF:-1 tvg-id="BloombergTVPlus.us" status="online",Bloomberg TV+
 https://bloomberg-bloombergtv-3-se.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Euronews English (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="EuronewsEnglish.fr" status="online",Euronews English (720p) [Not 24/7]
 https://rakuten-euronews-1-se.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Failarmy International
+#EXTINF:-1 tvg-id="FailArmy.us" status="online",Failarmy International
 https://failarmy-international-se.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fashion TV
+#EXTINF:-1 tvg-id="FashionTVEurope.fr" status="online",Fashion TV
 https://fashiontv-fashiontv-5-se.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Filmstream
+#EXTINF:-1 tvg-id="Filmstream.nl" status="online",Filmstream
 https://spi-filmstream-1-se.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fuel TV (1080p)
+#EXTINF:-1 tvg-id="FUELTV.at" status="online",Fuel TV (1080p)
 https://fueltv-fueltv-13-se.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Go Usa TV
+#EXTINF:-1 tvg-id="GoUSATV.us" status="online",Go Usa TV
 https://brandusa-gousa-1-se.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Guardian
+#EXTINF:-1 tvg-id="TheGuardian.uk" status="online",Guardian
 https://rakuten-guardian-1-se.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Gusto TV
+#EXTINF:-1 tvg-id="GustoTV.us" status="online",Gusto TV
 https://gustotv-gustotv-2-se.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Mav TV Motorsports Network
+#EXTINF:-1 tvg-id="MAVTV.us" status="online",Mav TV Motorsports Network
 https://mavtv-mavtvglobal-1-se.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Museum TV Fast
+#EXTINF:-1 tvg-id="MuseumTVFast.us" status="online",Museum TV Fast
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01492-secomsasmediart-museumtv-eng-samsungse/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Myzen Fit
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01255-secomcofites-my-myzen-samsungen-samsungse/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",People are Awesome
+#EXTINF:-1 tvg-id="PeopleAreAwesome.us" status="online",People are Awesome
 https://jukin-peopleareawesome-2-se.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Radical Docs
 https://quintus-radicaldocs-1-se.samsung.wurl.tv/playlist.m3u8
@@ -45,13 +45,13 @@ https://rakuten-family-9-se.samsung.wurl.tv/playlist.m3u8
 https://rakuten-spotlight-9-se.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Strongman Champions League
 https://rightsboosterltd-scl-1-se.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Tastemade
+#EXTINF:-1 tvg-id="Tastemade.us" status="online",Tastemade
 https://tmint-aus-samsungswedan.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Travelxp
+#EXTINF:-1 tvg-id="Travelxp.in" status="online",Travelxp
 https://travelxp-travelxp-1-se.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Waterbear
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01415-waterbearnetwor-waterbear-samsungse/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",WildEarth [Geo-blocked]
+#EXTINF:-1 tvg-id="WildEarth.us" status="online",WildEarth [Geo-blocked]
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg01290-wildearthmediap-wildearth-samsungse/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",World Poker Tour
+#EXTINF:-1 tvg-id="WorldPokerTour.us" status="online",World Poker Tour
 https://wpt-theworldpokertour-1-se.samsung.wurl.tv/playlist.m3u8
diff --git a/streams/si.m3u b/streams/si.m3u
index 9e2c21dd0..d3d99f7c6 100644
--- a/streams/si.m3u
+++ b/streams/si.m3u
@@ -5,8 +5,6 @@ http://91.220.221.60/gtv_hls/gtv_03.m3u8
 https://5ca49f2417d90.streamlock.net/live/dolnykubin1/playlist.m3u8
 #EXTINF:-1 tvg-id="VeseljakTV.si" status="online",Veseljak TV (1080p)
 https://stream.veseljak.tv/hls/stream.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",Adria Music RS
-http://91.212.150.248/AdriaMusicTV/index.m3u8
 #EXTINF:-1 tvg-id="ExodusTV.si",Exodus TV (480p)
 https://584943999.r.worldssl.net/584943999/vzivo/playlist.m3u8
 #EXTINF:-1 tvg-id="TrzicTV.si",Trzic TV (1080p)
diff --git a/streams/sk.m3u b/streams/sk.m3u
index 9b4f99e92..f741ed579 100644
--- a/streams/sk.m3u
+++ b/streams/sk.m3u
@@ -49,7 +49,7 @@ https://e11.stv.livebox.sk/stv-tv/stv4.stream/playlist.m3u8
 http://95.105.193.219:88/hls/tvsen.m3u8
 #EXTINF:-1 tvg-id="TVSkalica.sk",TV Skalica (540p)
 http://95.105.193.219:88/hls/tvs.m3u8
-#EXTINF:-1 tvg-id="",TV Brezová (540p)
+#EXTINF:-1 tvg-id="TVBrezova.sk",TV Brezová (540p)
 http://95.105.193.219:88/hls/tvb.m3u8
 #EXTINF:-1 tvg-id="",TV Stará Turá (540p)
 http://95.105.193.219:88/hls/tvst.m3u8
diff --git a/streams/so.m3u b/streams/so.m3u
index abe3c78d5..4e02919c2 100644
--- a/streams/so.m3u
+++ b/streams/so.m3u
@@ -3,5 +3,3 @@
 https://ap02.iqplay.tv:8082/iqb8002/s03btv/playlist.m3u8
 #EXTINF:-1 tvg-id="SomaliNationalTV.so" status="online",Somali National TV (576p)
 https://ap02.iqplay.tv:8082/iqb8002/s4ne/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Somali cable (576p)
-https://ap02.iqplay.tv:8082/iqb8002/somc131/playlist.m3u8
diff --git a/streams/so_premiumfree.m3u b/streams/so_premiumfree.m3u
index 8a2391e2f..d284f5138 100644
--- a/streams/so_premiumfree.m3u
+++ b/streams/so_premiumfree.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" status="online",Afriwood Blockbuster (720p)
+#EXTINF:-1 tvg-id="AfriwoodBlockbuster.za" status="online",Afriwood Blockbuster (720p)
 https://origin3.afxp.telemedia.co.za/PremiumFree/afriwoodbb/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Afriwood Series (720p)
+#EXTINF:-1 tvg-id="AfriwoodSeries.za" status="online",Afriwood Series (720p)
 https://origin3.afxp.telemedia.co.za/PremiumFree/afriwoodseries/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Bongo TV (720p)
 https://origin3.afxp.telemedia.co.za/PremiumFree/bongotv/playlist.m3u8
@@ -17,11 +17,11 @@ https://origin3.afxp.telemedia.co.za/PremiumFree/fightnight/playlist.m3u8
 https://origin3.afxp.telemedia.co.za/PremiumFree/freshtv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Gospel (720p)
 https://origin3.afxp.telemedia.co.za/PremiumFree/gospellife/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Kiddiwinks (720p)
+#EXTINF:-1 tvg-id="Kiddiwinks.za" status="online",Kiddiwinks (720p)
 https://origin3.afxp.telemedia.co.za/PremiumFree/kiddiwinks/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Life TV (720p)
 https://origin3.afxp.telemedia.co.za/PremiumFree/lifetv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Limelight (720p)
+#EXTINF:-1 tvg-id="Limelight.za" status="online",Limelight (720p)
 https://origin3.afxp.telemedia.co.za/PremiumFree/limelight/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",LOL (720p)
 https://origin3.afxp.telemedia.co.za/PremiumFree/lol/playlist.m3u8
@@ -31,9 +31,9 @@ https://origin3.afxp.telemedia.co.za/PremiumFree/pulse/playlist.m3u8
 https://origin3.afxp.telemedia.co.za/PremiumFree/romanza/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",RPM (720p)
 https://origin3.afxp.telemedia.co.za/PremiumFree/rpm/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Sports Connect (720p)
+#EXTINF:-1 tvg-id="SportsConnect.za" status="online",Sports Connect (720p)
 https://origin3.afxp.telemedia.co.za/PremiumFree/sportsconnect/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",True African (720p)
+#EXTINF:-1 tvg-id="TrueAfrican.za" status="online",True African (720p)
 https://origin3.afxp.telemedia.co.za/PremiumFree/trueafrican/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Crime and Evidence (720p)
 https://afxporigin.telemedia.co.za/afxp/abr_crimeandevidence/playlist.m3u8
\ No newline at end of file
diff --git a/streams/tw.m3u b/streams/tw.m3u
index 0d1fbf3fe..c40a92187 100644
--- a/streams/tw.m3u
+++ b/streams/tw.m3u
@@ -181,12 +181,8 @@ https://live.streamingfast.net/osmflivech47.m3u8
 https://live.streamingfast.net/osmflivech49.m3u8
 #EXTINF:-1 tvg-id="" status="online",GOOD TV CH50 國際講員 中文發音 (720p) [Not 24/7]
 https://live.streamingfast.net/osmflivech50.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",Great Wall Elite (720p)
-http://50.7.220.74:8278/chcfamily/playlist.m3u8?ct=18393&tid=ME7E3282776332827763&tsum=c098f25f9c140478d2a814b22a7ccbd3
 #EXTINF:-1 tvg-id="" status="blocked",KLT Golden TV International (KLT靖天国际台) (720p)
 http://198.16.64.10:8278/jingtianintl_twn/playlist.m3u8?ct=19226&tid=ME4E7632479576324795&tsum=9922eeed6392b21e1710ba791cc599d6
-#EXTINF:-1 tvg-id="" status="blocked",Mei Ah Movie Channel (720p)
-http://50.7.220.74:8278/meiyamovie_twn/playlist.m3u8?ct=19226&tid=MFEF1001328410013284&tsum=9839709ca0f37641c5d1ba962c3bc739
 #EXTINF:-1 tvg-id="" status="online",MNews (鏡電視新聞台)
 https://ythls.onrender.com/channel/UC4LjkybVKXCDlneVXlKAbmw.m3u8
 #EXTINF:-1 tvg-id="NationalGeographicTaiwan.tw" status="blocked",National Geographic HD (720p)
diff --git a/streams/ua.m3u b/streams/ua.m3u
index 289fd7754..67588798c 100644
--- a/streams/ua.m3u
+++ b/streams/ua.m3u
@@ -92,7 +92,7 @@ https://stream.ntktv.ua/s/ntk/ntk.m3u8
 http://ftp.orbita.dn.ua/hls/orbita.m3u8
 #EXTINF:-1 tvg-id="Channel7Ukraine.ua",Channel 7 Ukraine (720p)
 http://cdn10.live-tv.od.ua:8081/7tvod/7tvod-abr/7tvod/7tvod/playlist.m3u8
-#EXTINF:-1 tvg-id="PershiyDilovy.ua",Pershiy Dilovy
+#EXTINF:-1 tvg-id="PershiyDiloviy.ua",Pershiy Dilovy
 http://212.28.87.173:8000/play/a105/index.m3u8
 #EXTINF:-1 tvg-id="TISTV.ua",TIS TV (480p)
 http://cdn10.live-tv.od.ua:8081/riood/tisod-abr-lq/riood/tisod504/playlist.m3u8
diff --git a/streams/uk.m3u b/streams/uk.m3u
index ecccfd6a2..6d4c7e9bc 100644
--- a/streams/uk.m3u
+++ b/streams/uk.m3u
@@ -227,10 +227,10 @@ http://188.40.68.167/russia/jimjam/playlist.m3u8
 https://5a0e89631aa14.streamlock.net/LatestTV/LatestTV/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",n TV (US Eastern) (720p) [Not 24/7]
 https://a.jsrdn.com/broadcast/22680_3BR3zocwi9/-0500/c.m3u8
-#EXTINF:-1 tvg-id="" status="online",Shelanu TV (720p)
-https://1247634592.rsc.cdn77.org/1247634592/playlist.m3u8
 #EXTINF:-1 tvg-id="AlbUKTV.uk" status="online",AlbUK TV (1080p) [Not 24/7]
 http://albuk.dyndns.tv:1935/albuk/albuk.stream/playlist.m3u8
+#EXTINF:-1 tvg-id="SomaliCableTV.uk" status="online",Somali cable (576p)
+https://ap02.iqplay.tv:8082/iqb8002/somc131/playlist.m3u8
 #EXTINF:-1 tvg-id="MTVGlobal.uk",MTV Global (576p)
 http://195.24.89.82/MTV_SD/index.m3u8
 #EXTINF:-1 tvg-id="MTV00s.uk",MTV 00s (576p)
diff --git a/streams/uk_channelbox.m3u b/streams/uk_channelbox.m3u
index 46f92fa87..505eaf7d8 100644
--- a/streams/uk_channelbox.m3u
+++ b/streams/uk_channelbox.m3u
@@ -5,13 +5,13 @@ http://81.94.196.204/tsstreamer/France24_HD.ts
 http://81.94.196.204/tsstreamer/France24_SD.ts
 #EXTINF:-1 tvg-id="VoxAfrica.uk" status="online",VoxAfrica
 http://188.227.164.31/tsstreamer/VoxAfrica_SD.ts
-#EXTINF:-1 tvg-id="" status="online",CurrentTime
+#EXTINF:-1 tvg-id="CurrentTimeTV.cz" status="online",CurrentTime
 http://81.94.196.204/tsstreamer/CurrentTime_SD.ts
-#EXTINF:-1 tvg-id="" status="online",Hellenic
+#EXTINF:-1 tvg-id="HellenicTV.gr" status="online",Hellenic
 http://188.227.164.31/tsstreamer/Hellenic_SD.ts
-#EXTINF:-1 tvg-id="" status="online",NTD
+#EXTINF:-1 tvg-id="NTDTVEurope.us" status="online",NTD
 http://5.152.223.78/tsstreamer/NTD_SD.ts
-#EXTINF:-1 tvg-id="" status="online",NTD
+#EXTINF:-1 tvg-id="NTDTVEurope.us" status="online",NTD
 http://78.129.193.20/tsstreamer/NTD_SD.ts
-#EXTINF:-1 tvg-id="" status="online",TVP
+#EXTINF:-1 tvg-id="TVPWorld.pl" status="online",TVP
 http://78.129.193.20/tsstreamer/TVP_SD.ts
diff --git a/streams/uk_pluto.m3u b/streams/uk_pluto.m3u
index cf8539abe..f833cd56d 100644
--- a/streams/uk_pluto.m3u
+++ b/streams/uk_pluto.m3u
@@ -51,9 +51,9 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ce44810b
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5fb5844bf5514d0007945bda/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
 #EXTINF:-1 tvg-id="" status="online",Pluto TV BBC Home (720p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5fb5836fe745b600070fc743/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="" status="online",Pluto TV British TV (684p)
+#EXTINF:-1 tvg-id="PlutoTVBritishTV.us" status="online",Pluto TV British TV (684p)
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5b68a18823ecb93393cba2f1/master.m3u8?advertisingId=channel&appName=rokuchannel&appVersion=1.0&bmodel=bm1&channel_id=channel&content=channel&content_rating=ROKU_ADS_CONTENT_RATING&content_type=livefeed&coppa=false&deviceDNT=1&deviceId=channel&deviceMake=rokuChannel&deviceModel=web&deviceType=rokuChannel&deviceVersion=1.0&embedPartner=rokuChannel&genre=ROKU_ADS_CONTENT_GENRE&is_lat=1&platform=web&rdid=channel&studio_id=viacom&tags=ROKU_CONTENT_TAGS
-#EXTINF:-1 tvg-id="" status="online",Pluto TV British TV (720p)
+#EXTINF:-1 tvg-id="PlutoTVBritishTV.us" status="online",Pluto TV British TV (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5b68a18823ecb93393cba2f1/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5b68a18823ecb93393cba2f1&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=154&terminate=false&userId=
 #EXTINF:-1 tvg-id="" status="online",Pluto TV Classic Movies (England) (720p)
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5d134a74ca91eedee1630faa/master.m3u8?advertisingId=&appName=web&appStoreUrl=&appVersion=DNT&app_name=&architecture=&buildVersion=&deviceDNT=0&deviceId=5d134a74ca91eedee1630faa&deviceLat=&deviceLon=&deviceMake=web&deviceModel=web&deviceType=web&deviceVersion=DNT&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false&sid=903&terminate=false&userId=
diff --git a/streams/uk_rakuten.m3u b/streams/uk_rakuten.m3u
index c2da9a9ac..dee1df6d2 100644
--- a/streams/uk_rakuten.m3u
+++ b/streams/uk_rakuten.m3u
@@ -17,11 +17,11 @@ https://rakuten-family-1-eu.rakuten.wurl.tv/playlist.m3u8
 https://rakuten-spotlight-1-eu.rakuten.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="RevryNews.us" status="online",Revry News (720p)
 https://revry-revrynews-1-eu.rakuten.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Bloomberg TV (1080p)
+#EXTINF:-1 tvg-id="BloombergTV.us" status="online",Bloomberg TV (1080p)
 https://bloomberg-bloomberg-1-eu.rakuten.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Rakuten Shows UK (720p)
 https://rakuten-tvshows-1-eu.rakuten.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Rakuten Top Free UK (720p)
 https://rakuten-topfree-1-eu.rakuten.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Travel XP (720p)
+#EXTINF:-1 tvg-id="Travelxp.in" status="online",Travel XP (720p)
 https://travelxp-travelxp-1-eu.rakuten.wurl.tv/playlist.m3u8
diff --git a/streams/uk_samsung.m3u b/streams/uk_samsung.m3u
index 553514c2d..818f159a1 100644
--- a/streams/uk_samsung.m3u
+++ b/streams/uk_samsung.m3u
@@ -39,7 +39,7 @@ https://dhx-teletubbies-1-gb.samsung.wurl.tv/playlist.m3u8
 https://tennischannel-int-samsunguk.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="TennisChannel.us" status="online",Tennis Channel (720p)
 https://tennischannel-intl-samsung-uk.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="TimeLine.uk" status="online",Time Line (720p)
+#EXTINF:-1 tvg-id="Timeline.us" status="online",Time Line (720p)
 https://timeline-samsung-uk.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Wonder.uk" status="online",Wonder (720p)
 https://wonder-samsung-uk.amagi.tv/playlist.m3u8
@@ -47,15 +47,15 @@ https://wonder-samsung-uk.amagi.tv/playlist.m3u8
 https://uksono1-samsunguk.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="FashionTelevision.uk" status="online",Fashion TV (England) (1080p) [Not 24/7]
 https://fashiontv-fashiontv-1-gb.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",FTF For the fans (720p)
+#EXTINF:-1 tvg-id="FTF.us" status="online",FTF For the fans (720p)
 https://elevensports-uk.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fuel TV (1080p)
+#EXTINF:-1 tvg-id="FUELTV.at" status="online",Fuel TV (1080p)
 https://fueltv-fueltv-2-gb.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Gusto TV (720p)
+#EXTINF:-1 tvg-id="GustoTV.us" status="online",Gusto TV (720p)
 https://gustotv-samsung-gb.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Horse and Country (720p)
+#EXTINF:-1 tvg-id="HorseCountryTV.uk" status="online",Horse and Country (720p)
 https://hncfree-samsung-uk.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Qello Concerts by Stingray (1080p)
+#EXTINF:-1 tvg-id="QelloConcertsbyStingray.ca" status="online",Qello Concerts by Stingray (1080p)
 https://d2gjhy8g9ziabr.cloudfront.net/v1/master/3fec3e5cac39a52b2132f9c66c83dae043dc17d4/prod-samsungtvplus-stitched/samsungtvplus_uk_stingrayqello_001.m3u8
 #EXTINF:-1 tvg-id="TheGuardian.uk" status="online",The Guardian (720p)
 https://0d0239e437124ddcb8090d815caf4013.mediatailor.us-east-1.amazonaws.com/v1/master/04fd913bb278d8775298c26fdca9d9841f37601f/Samsung-gb_TheGuardianChannel/playlist.m3u8
diff --git a/streams/uk_sportstribal.m3u b/streams/uk_sportstribal.m3u
index e0740bd23..8937f20fe 100644
--- a/streams/uk_sportstribal.m3u
+++ b/streams/uk_sportstribal.m3u
@@ -11,5 +11,5 @@ https://d2xeo83q8fcni6.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d2
 https://d3w4n3hhseniak.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/WPT-SportsTribal/120.m3u8
 #EXTINF:-1 tvg-id="" status="online",Pac12 Insider (720p)
 https://pac12-sportstribal.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",SportsGrid (1080p)
+#EXTINF:-1 tvg-id="SportsGrid.us" status="online",SportsGrid (1080p)
 https://sportsgrid-tribal.amagi.tv/playlist.m3u8
diff --git a/streams/us.m3u b/streams/us.m3u
index 7c0e3a0e2..4e8f8eb66 100644
--- a/streams/us.m3u
+++ b/streams/us.m3u
@@ -679,7 +679,7 @@ https://cdn30.liveonlineservices.com/hls/tagtv.m3u8
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5af61f59d5eeee7af3d1db8f/playlist.m3u8
 #EXTINF:-1 tvg-id="Tastemade.us" status="online",Tastemade (1080p)
 https://tastemadessai.akamaized.net/amagi_hls_data_tastemade-tastemade/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="TastemadeAustralia.us" status="online",Tastemade Australia (1080p)
+#EXTINF:-1 tvg-id="TastemadeAustralia.au" status="online",Tastemade Australia (1080p)
 https://tastemadeintaus-smindia.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="TastemadeenEspanol.us" status="online",Tastemade en Español (1080p)
 https://tastemadees16intl-brightcove.amagi.tv/hls/amagi_hls_data_tastemade-tastemade-es16intl-brightcove/CDN/playlist.m3u8
@@ -895,7 +895,7 @@ https://otteravision-tg.ottera.tv/live/master.m3u8?channel=tg_tg_us
 #EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Fast&Fun Box (Russian) (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s79/index.m3u8
-#EXTINF:-1 tvg-id="" status="timeout" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",FightBox HD (480p)
+#EXTINF:-1 tvg-id="FightBox.nl" status="timeout" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",FightBox HD (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s86/index.m3u8
 #EXTINF:-1 tvg-id="" status="online",Fox HD Russia
@@ -1033,3 +1033,9 @@ https://livevideo01.rocketcitynow.com/hls/live/2011659/elvs/live.m3u8
 https://livevideo.tegnadigital.com/wtic/v1/master/f9c1bf9ffd6ac86b6173a7c169ff6e3f4efbd693/WTIC/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="CameraSmileTV.us" status="timeout",Camera Smile (480p)
+https://nrpus.bozztv.com/36bay2/gusa-camerasmile/index.m3u8
+#EXTINF:-1 tvg-id="FastwayNews.us" status="online",FASTWAY NEWS (720p) [Not 24/7]
+http://163.47.214.155:1935/fwnews/live/playlist.m3u8
+#EXTINF:-1 tvg-id="KXXVDT1.us",ABC 25 News Central Texas (KXXV-DT1)
+https://content.uplynk.com/channel/9d4e02c9c3544c269d32e6b316792c8f.m3u8
diff --git a/streams/us_klowdtv.m3u b/streams/us_klowdtv.m3u
index 069f9750c..a593f60b9 100644
--- a/streams/us_klowdtv.m3u
+++ b/streams/us_klowdtv.m3u
@@ -27,7 +27,7 @@ https://cdn.klowdtv.net/803B48A/n1.klowdtv.net/live2/qvclive_720p/playlist.m3u8
 https://redseat-thefirst-klowdtv.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",France 24 (720p)
 https://cdn.klowdtv.net/803B48A/n1.klowdtv.net/live2/france24_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Horse TV
+#EXTINF:-1 tvg-id="HorseTV.it" status="online",Horse TV
 https://cdn.klowdtv.net/803B48A/n1.klowdtv.net/live3/horsetv_720p/playlist.m3u8
 #EXTINF:-1 tvg-id="SonyMovies.us" status="online",Sony Movie Channel (720p)
 https://cdn.klowdtv.net/803B48A/n1.klowdtv.net/live1/smc_720p/playlist.m3u8
diff --git a/streams/us_plex.m3u b/streams/us_plex.m3u
index 14025875d..6001b1406 100644
--- a/streams/us_plex.m3u
+++ b/streams/us_plex.m3u
@@ -73,13 +73,13 @@ https://yahoo-plex.amagi.tv/playlist.m3u8
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg00684-accuweather-accuweather-plex/playlist.m3u8
 #EXTINF:-1 tvg-id="AFVEspanol.us" status="online",AFV en Español (720p) [Not 24/7]
 https://linear-46.frequency.stream/dist/plex/46/hls/master/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",EDGEsport (1080p)
+#EXTINF:-1 tvg-id="EDGEsport.uk" status="online",EDGEsport (1080p)
 https://edgesports-plex.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="EstrellaTV.us" status="online",Estrella TV East (1080p)
 https://estrellatv-plex.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="FreebieTV.us" status="online",Freebie TV (720p) [Not 24/7]
 https://d1h1d6qoy9vnra.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/Freebie-Plex/187.m3u8
-#EXTINF:-1 tvg-id="" status="online",Real Stories (1080p)
+#EXTINF:-1 tvg-id="RealStories.uk" status="online",Real Stories (1080p)
 https://lds-realstories-plex.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="RetroCrush.us" status="online",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
diff --git a/streams/us_roku.m3u b/streams/us_roku.m3u
index f16849f3a..8dab5a4a7 100644
--- a/streams/us_roku.m3u
+++ b/streams/us_roku.m3u
@@ -83,5 +83,5 @@ https://mytime-roku-ingest.cinedigm.com/playlist.m3u8
 https://pac12-roku-us.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="BabySharkTV.us" status="online",Baby Shark TV (1080p)
 https://fc2f8d2d3cec45bb9187e8de15532838.mediatailor.us-east-1.amazonaws.com/v1/master/44f73ba4d03e9607dcd9bebdcb8494d86964f1d8/Roku_BabySharkTV/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",RCN Mas
+#EXTINF:-1 tvg-id="RCNMas.co" status="online",RCN Mas
 https://rcntv-rcnmas-1-us.roku.wurl.tv/playlist.m3u8
diff --git a/streams/us_samsung.m3u b/streams/us_samsung.m3u
index 206d1c355..ae900febe 100644
--- a/streams/us_samsung.m3u
+++ b/streams/us_samsung.m3u
@@ -95,15 +95,15 @@ https://yahoo-samsung.amagi.tv/playlist.m3u8
 https://younghollywood-rakuten-samsung.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="CheddarNews.us" status="online",Cheddar News (720p)
 https://cheddar.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",EDGEsport (1080p)
+#EXTINF:-1 tvg-id="EDGEsport.uk" status="online",EDGEsport (1080p)
 https://edgesport-rakuten-samsung.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",EDGEsport (1080p)
+#EXTINF:-1 tvg-id="EDGEsport.uk" status="online",EDGEsport (1080p)
 https://edgesport-samsungus.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",EDGEsport (US) (720p)
+#EXTINF:-1 tvg-id="EDGEsport.uk" status="timeout",EDGEsport (US) (720p)
 https://img-edgesport.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="ESTV.us" status="online",ESTV (1080p)
 https://estv-rakuten-samsung.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Fuel TV (720p)
+#EXTINF:-1 tvg-id="FUELTV.at" status="online",Fuel TV (720p)
 https://fueltv-fueltv-1.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="GustoTV.us" status="online",Gusto TV (720p)
 https://gustotv.samsung.wurl.com/manifest/playlist.m3u8
diff --git a/streams/us_stirr.m3u b/streams/us_stirr.m3u
index 117100660..24c3c3bb8 100644
--- a/streams/us_stirr.m3u
+++ b/streams/us_stirr.m3u
@@ -359,17 +359,17 @@ https://dai.google.com/linear/hls/event/3e-9BOvHQrCI9hboMYjb6w/master.m3u8
 https://dai.google.com/linear/hls/event/frfwucAPTVunrpitYiymwg/master.m3u8
 #EXTINF:-1 tvg-id="ChickenSoupfortheSoul.us" status="online",Chicken Soup For The Soul (1080p)
 https://dai.google.com/linear/hls/event/2C5P0JGUSj65s8KpeyIDcQ/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",Qello Concerts (1080p)
+#EXTINF:-1 tvg-id="QelloConcertsbyStingray.ca" status="online",Qello Concerts (1080p)
 https://dai.google.com/linear/hls/event/BakMHO8xRSmGKYeiyhsq3A/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",Stingray Djazz (1080p)
+#EXTINF:-1 tvg-id="StingrayDJAZZ.ca" status="online",Stingray Djazz (1080p)
 https://dai.google.com/linear/hls/event/C-lfmhUVTGeDNWwU13_EgA/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",Stingray Everything 80s (1080p)
+#EXTINF:-1 tvg-id="StingrayEverything80s.ca" status="online",Stingray Everything 80s (1080p)
 https://stirr.ott-channels.stingray.com/128/master.m3u8
 #EXTINF:-1 tvg-id="" status="online",STIRR City (480p)
 https://dai.google.com/linear/hls/event/4aD5IJf0QgKUJwPbq2fngg/master.m3u8
 #EXTINF:-1 tvg-id="" status="online",STIRR Gusto TV (1080p)
 https://dai.google.com/linear/hls/event/tdSCy5u2R5WtCLXX4NwDtg/master.m3u8
-#EXTINF:-1 tvg-id="" status="online",STIRR Horror Movies (720p)
+#EXTINF:-1 tvg-id="STIRRHorror.us" status="online",STIRR Horror Movies (720p)
 https://dai.google.com/linear/hls/event/3NTKKQBuQtaIrcUBj20lyg/master.m3u8
 #EXTINF:-1 tvg-id="" status="online",STIRR National (720p)
 https://dai.google.com/linear/hls/event/-V3XSvA2Sa6e8h7cnHXB8w/master.m3u8
diff --git a/streams/vn.m3u b/streams/vn.m3u
index 657ff9f88..b16b1d613 100644
--- a/streams/vn.m3u
+++ b/streams/vn.m3u
@@ -77,5 +77,3 @@ https://vips-livecdn.fptplay.net/hda3/vtv7hd_vhls.smil/playlist.m3u8
 https://vips-livecdn.fptplay.net/hda2/vtv8hd_vhls.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="VTV9.vn" status="blocked",VTV9 (1080p) [Geo-blocked]
 https://vips-livecdn.fptplay.net/hda2/vtv9_vhls.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Look Thoong TV (720p) [Not 24/7]
-https://livefta.malimarcdn.com/ftaedge00/lookthoongtv.sdp/playlist.m3u8
diff --git a/streams/vn_fptplay.m3u b/streams/vn_fptplay.m3u
index 413913430..b6d8cfdc2 100644
--- a/streams/vn_fptplay.m3u
+++ b/streams/vn_fptplay.m3u
@@ -56,16 +56,16 @@ https://livecdn.fptplay.net/sdb/vtc8_hls.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="VTC9.vn" status="blocked" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",VTC9 (576p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36
 https://livecdn.fptplay.net/sdb/vtc9_hls.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",Cinemax Asia (720p)
+#EXTINF:-1 tvg-id="CinemaxAsia.sg" status="blocked" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",Cinemax Asia (720p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36
 https://livecdn.fptplay.net/hda1/cinemax_hls.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",HBO Asia
+#EXTINF:-1 tvg-id="HBOAsia.sg" status="blocked" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",HBO Asia
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36
 https://vips-livecdn.fptplay.net/hda1/hbo_vhls.smil/chunklist.m3u8
 #EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",HTV4 (576p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36
 https://livecdn.fptplay.net/sdb/htv4_hls.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",Kix (1080p)
+#EXTINF:-1 tvg-id="KIX.hk" status="blocked" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",Kix (1080p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36
 https://livecdn.fptplay.net/hda1/kixhd_vhls.smil/chunklist.m3u8
 #EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",National Geographic Asia (1080p)
@@ -74,10 +74,10 @@ https://livecdn.fptplay.net/hda2/natgeohd_vhls.smil/chunklist.m3u8
 #EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",National Geographic Wild Asia (1080p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36
 https://livecdn.fptplay.net/hda3/natgeowild_vhls.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",Rock Entertainment (1080p)
+#EXTINF:-1 tvg-id="ROCKEntertainment.sg" status="blocked" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",Rock Entertainment (1080p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36
 https://livecdn.fptplay.net/hda1/blueantent_vhls.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",Rock Extreme (1080p)
+#EXTINF:-1 tvg-id="ROCKExtreme.sg" status="blocked" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",Rock Extreme (1080p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36
 https://livecdn.fptplay.net/hda1/blueantext_vhls.smil/chunklist.m3u8
 #EXTINF:-1 tvg-id="" status="blocked" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",THVL1 HD (720p)
diff --git a/streams/xk.m3u b/streams/xk.m3u
index c7260a28b..f554670a9 100644
--- a/streams/xk.m3u
+++ b/streams/xk.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" status="online",TV Dielli (720p)
+#EXTINF:-1 tvg-id="TVDielli.xk" status="online",TV Dielli (720p)
 http://stream.tvdielli.com:8081/dielli/index.m3u8
 #EXTINF:-1 tvg-id="RTK1.xk",RTK 1 (1080p)
 https://ub1doy938d.gjirafa.net/live/Gfsqdsr7FewrYClU3ACEGZvCHktt2wse/zykxzq.m3u8
@@ -21,15 +21,17 @@ https://cdn.vpplayer.tech/agmipnzy/livestream/0E9A6FA7-4ED3-41B8-AAE2-46E7FFE724
 https://ub1doy938d.gjirafa.net/live/6rgklscjRSjkIb3cFcFiyCmOrcQ7AWeB/zy1zzz.m3u8
 #EXTINF:-1 tvg-id="ZeriTV.xk",Zeri TV (1080p)
 https://ub1doy938d.gjirafa.net/live/dCynrjRK8sEsrYu0zDtDg8l4KaXbFpXl/zyqy1y.m3u8
-#EXTINF:-1 tvg-id="",TV Prizreni (1080p)
+#EXTINF:-1 tvg-id="TVPrizreni.xk",TV Prizreni (1080p)
 https://ub1doy938d.gjirafa.net/live/dCynrjRK8sEsrYu0zDtDg8l4KaXbFpXl/zy1ztx.m3u8
 #EXTINF:-1 tvg-id="ATV.xk",ATV Live (1080p)
 https://ub1doy938d.gjirafa.net/live/V5VHPPcRRtIuWFdnDuwjefzSqTKyBrW3/zyq001.m3u8
-#EXTINF:-1 tvg-id="",Kanal10 (1080p)
-https://ub1doy938d.gjirafa.net/live/oEZi1otQqIHglY0tzZidyCPWhxrS5WgO/yky0y1.m3u8
-#EXTINF:-1 tvg-id="",Syri Vision (1080p)
+#EXTINF:-1 tvg-id="TVSyri.xk",Syri Vision (1080p)
 https://ub1doy938d.gjirafa.net/live/DpTlD159VIIRWtzFOvUI70nftnyosgUE/y10z1k.m3u8
 #EXTINF:-1 tvg-id="TVOpoja.xk" status="error",TV Opoja (720p) [Not 24/7]
 http://ip.opoja.tv:1935/tvopoja/tvopoja/playlist.m3u8
 #EXTINF:-1 tvg-id="TVArberia4Muzike.xk" status="online",RTV Arberia Musik
 http://rtvarberia4.flashmediacast.com:1935/RtvArberia4/livestream/playlist.m3u8
+#EXTINF:-1 tvg-id="PeaceTVAlbanian.xk" status="online",Peace TV Albanian (360p)
+http://82.114.67.178:8081/hls/PeaceTV.m3u8
+#EXTINF:-1 tvg-id="KlanKosova.xk" status="timeout",Klan Kosova
+http://93.157.62.180/KlanKosova/index.m3u8