diff --git a/streams/ge.m3u b/streams/ge.m3u
index bb20713da2..4a62ab2238 100644
--- a/streams/ge.m3u
+++ b/streams/ge.m3u
@@ -3,7 +3,7 @@
 https://tv.cdn.xsg.ge/gpb-1tv/index.m3u8
 #EXTINF:-1 tvg-id="2TV.ge",2TV (720p)
 https://tv.cdn.xsg.ge/gpb-2tv/index.m3u8
-#EXTINF:-1 tvg-id="AbazaTV.ru",Abaza TV
+#EXTINF:-1 tvg-id="AbazaTV.ru",АБАЗА-ТВ
 https://public.apsny.camera/tv_abaza_tv_to_site/index.m3u8
 #EXTINF:-1 tvg-id="Adjarasport1.ge@SD",Adjarasport 1
 https://live20.bozztv.com/dvrfl05/gin-adjara/index.m3u8
diff --git a/streams/nl.m3u b/streams/nl.m3u
index 1a4aa391f0..7f22bd3968 100644
--- a/streams/nl.m3u
+++ b/streams/nl.m3u
@@ -336,3 +336,5 @@ http://190.2.148.141:8080/bar7657/index.m3u8
 https://zfmzoetermeer.nl/live/master.m3u8
 #EXTINF:-1 tvg-id="ZO34.nl",ZO!34 (720p)
 https://video.uitzending.tv:19360/zo34/zo34.m3u8
+#EXTINF:-1 tvg-id="TVRain.nl",Дождь (1080p) [Geo-blocked]
+https://wl.tvrain.tv/transcode/ngrp:ses_all/playlist.m3u8
diff --git a/streams/ru.m3u b/streams/ru.m3u
index 9b2e53bc50..2ea2631087 100644
--- a/streams/ru.m3u
+++ b/streams/ru.m3u
@@ -7,33 +7,33 @@ https://cdn-evacoder-tv.facecast.io/evacoder_hls_hi/CkxfR1xNUAJwTgtXTBZTAJli/ind
 https://video1.in-news.ru/360/index.m3u8
 #EXTINF:-1 tvg-id="scifi.ru@SD",.sci-fi
 http://178.124.179.122:8088/Sci-Fi/index.m3u8
-#EXTINF:-1 tvg-id="Ani.ru",Ani
+#EXTINF:-1 tvg-id="Ani.ru@SD",Ani
 http://stv.mediacdn.ru/live/cdn/ani/playlist.m3u8
 #EXTINF:-1 tvg-id="Bolt.ru",Bolt
 http://95.142.88.250/Bolt/index.m3u8
 #EXTINF:-1 tvg-id="Cinema.ru",Cinema
-http://catchup.videoline.ru/cinema/tracks-v1a1/mono.m3u8
+http://catchup.videoline.ru/cinema/playlist.m3u8
 #EXTINF:-1 tvg-id="DaVinci.ru@SD",Da Vinci
 http://178.217.72.66:8080/Da_Vinchi/index.m3u8
-#EXTINF:-1 tvg-id="",DanceHits80
+#EXTINF:-1 tvg-id="DanceHits80.ru@SD",DanceHits80
 http://dancehits80.denvs.ru:8080/index.m3u8
-#EXTINF:-1 tvg-id="FridayInternational.ru@SD",Friday! International
+#EXTINF:-1 tvg-id="FridayInternational.ru@SD",Пятница! International
 https://cdn4.skygo.mn/live/disk1/Friday/HLSv3-FTA/Friday.m3u8
 #EXTINF:-1 tvg-id="KHLPrime.ru",KHL Prime
 http://194.143.148.28:8080/KHL_HD/index.m3u8
 #EXTINF:-1 tvg-id="Kino24.ru",Kino 24
 http://sirius.greenhosting.ru/Kino24Ru/video.m3u8
-#EXTINF:-1 tvg-id="KinoTV.ru",Kino TV
+#EXTINF:-1 tvg-id="KinoTV.ru",КИНОТВ
 https://vod.tuva.ru/kinotv/index.m3u8
-#EXTINF:-1 tvg-id="",Kulinar TV Show
+#EXTINF:-1 tvg-id="KulinarTV.ru",Kulinar TV
 https://api.alpaca.t62a.com/hls/9110/index.m3u8
-#EXTINF:-1 tvg-id="Luch.ru@SD",Luch
+#EXTINF:-1 tvg-id="Luch.ru@SD",Луч
 https://mow-9-ll.facecast.io:8443/hls_re/c631505e4fd6d14665c0.m3u8
 #EXTINF:-1 tvg-id="MMATVcom.ru@SD",MMA-TV.com
 https://streams2.sofast.tv/vglive-sk-462904/playlist.m3u8
-#EXTINF:-1 tvg-id="MosObrTV.ru",MOSOBR.TV (720p)
+#EXTINF:-1 tvg-id="MosObrTV.ru",МосОбрТВ (720p)
 http://retj.educom.ru/mosobrtv/tv1/index.m3u8
-#EXTINF:-1 tvg-id="MosObrTV.ru",MOSOBR.TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="MosObrTV.ru",МосОбрТВ (720p)
 http://retc.educom.ru/mosobrtv/tv1/index.m3u8
 #EXTINF:-1 tvg-id="Pro100TV.ru",Pro100TV
 https://sirius.greenhosting.ru/Pro100tvRu/video.m3u8
@@ -45,9 +45,9 @@ https://hls-03-video.webcaramba.com/rutv/live.m3u8
 https://cdnfs.teonvi.com/sgdf/index.fmp4.m3u8
 #EXTINF:-1 tvg-id="ShoppingLive.ru",Shopping Live (576p) [Not 24/7]
 http://serv30.vintera.tv:8081/shoppinglive/shoppinglive_stream/playlist.m3u8
-#EXTINF:-1 tvg-id="Sochi24.ru",Sochi 24 HD
+#EXTINF:-1 tvg-id="Sochi24.ru",Сочи 24 HD
 http://serv30.vintera.tv:8081/sochi/sochi24_tv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Sochi Live HD (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="SochiLive.ru",Sochi Live HD (720p) [Not 24/7]
 http://serv30.vintera.tv:8081/sochi/sochi_stream/playlist.m3u8
 #EXTINF:-1 tvg-id="SONGTVRussia.ru",SONGTV Russia (720p)
 https://songtv.hls.iptvdc.com/web-russia/index.m3u8
@@ -55,7 +55,7 @@ https://songtv.hls.iptvdc.com/web-russia/index.m3u8
 http://194.143.148.28:8080/CTC_LOVE/index.m3u8
 #EXTINF:-1 tvg-id="TVPRO.ru@SD",TV PRO
 http://rtmp.tvpro-online.ru/hls/ch1.m3u8
-#EXTINF:-1 tvg-id="TvoeTV.ru",Tvoe TV HD
+#EXTINF:-1 tvg-id="TvoeTV.ru",Твое TV HD
 http://tvoetv.space:8080/tvoetv/index.m3u8
 #EXTINF:-1 tvg-id="UniverTV.ru",Univer TV (1080p)
 https://cdn.universmotri.ru/live/smil:univer.smil/playlist.m3u8
@@ -93,8 +93,6 @@ http://tele2dvrnat01-02.cdnvideo.ru/stream/NAT_Volga/hls/1920x1080@4504/playlist
 https://vgtrkregion-reg.cdnvideo.ru/vgtrk/volgograd/russia1-hd/index.m3u8
 #EXTINF:-1 tvg-id="GuberniaSamara.ru",Губерния (Самара) (576p)
 http://live.guberniatv.cdnvideo.ru/guberniatv/guberniatv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="TVRain.ru",Дождь (1080p) [Geo-blocked]
-https://wl.tvrain.tv/transcode/ngrp:ses_all/playlist.m3u8
 #EXTINF:-1 tvg-id="DomashnieZhivotnye.ru",Домашние животные
 http://178.217.72.66:8080/Domashnie_Zhivotnye/index.m3u8
 #EXTINF:-1 tvg-id="Domashniy.ru@SD",Домашний
@@ -253,7 +251,7 @@ http://45.67.57.9:8080/new/new/playlist.m3u8
 http://95.142.88.250/sarafan/index.m3u8
 #EXTINF:-1 tvg-id="SvoyoTV.ru",Своё HD
 http://live.stv24.tv:8080/svoetv/HQ_video.m3u8
-#EXTINF:-1 tvg-id="",Смайлик TV
+#EXTINF:-1 tvg-id="SmileTV.ru",Смайл ТВ
 https://5f05e059699ae.streamlock.net/WEB_Smilik/ngrp:Smilik.stream-adaptive/playlist.m3u8
 #EXTINF:-1 tvg-id="Solnce.ru",Солнце
 http://tv.mediacdn.ru/live/solntse/playlist.m3u8
@@ -279,7 +277,7 @@ https://air.tvk6.ru/tvk24/playlist.m3u8
 http://tvoetv.space:8080/tvoetv_humor/index.m3u8
 #EXTINF:-1 tvg-id="86.ru",Телеканал 86 (Сургут) (1080p) [Not 24/7]
 https://sitv.ru/hls/s86.m3u8
-#EXTINF:-1 tvg-id="",Телерадиокомпания 555 (Алушта) (720p)
+#EXTINF:-1 tvg-id="555.ru",Телерадиокомпания 555 (Алушта) (720p)
 http://trk555.tv:8888/live
 #EXTINF:-1 tvg-id="Telplus.ru",Телплюс ТВ (Астрахань) (360p) [Not 24/7]
 https://streaming.astrakhan.ru/telplushd/playlist.m3u8
@@ -291,7 +289,7 @@ http://live.tkr.cdnvideo.ru/tkr/tkr.sdp/playlist.m3u8
 https://cdn4.skygo.mn/live/disk1/TNT4/HLSv3-FTA/TNT4.m3u8
 #EXTINF:-1 tvg-id="TNTInternational.ru@SD",ТНТ International
 https://cdn4.skygo.mn/live/disk1/THT/HLSv3-FTA/THT.m3u8
-#EXTINF:-1 tvg-id="",Толк HD
+#EXTINF:-1 tvg-id="Tolk.ru",Толк HD
 http://live-tolknews.cdnvideo.ru/tolknews/stream/playlist.m3u8
 #EXTINF:-1 tvg-id="3ABNRussia.ru",Три Ангела (720p)
 https://hls.tv.3angels.ru/stream.m3u8
diff --git a/streams/ru_bonustv.m3u b/streams/ru_bonustv.m3u
index 86185ada26..b2dda604b9 100644
--- a/streams/ru_bonustv.m3u
+++ b/streams/ru_bonustv.m3u
@@ -5,7 +5,7 @@ https://12channel.bonus-tv.ru/cdn/12channel/playlist.m3u8
 https://12channel.bonus-tv.ru/cdn/12channel_blackout/playlist.m3u8
 #EXTINF:-1 tvg-id="ArirangTV.kr",Arirang
 https://cdn-01.bonus-tv.ru/arirang_edge/playlist.m3u8
-#EXTINF:-1 tvg-id="",E!
+#EXTINF:-1 tvg-id="ETV.ru",E
 https://cdn-01.bonus-tv.ru/gsl/playlist.m3u8
 #EXTINF:-1 tvg-id="Leomax24.ru",Leomax 24 (1080p)
 https://tvshops.bonus-tv.ru/cdn/shop24/playlist.m3u8
@@ -37,7 +37,7 @@ https://bsttv.bonus-tv.ru/cdn/kurai/playlist.m3u8
 https://s1.tv-nano.com/Magnat_HD_5119705/video.m3u8
 #EXTINF:-1 tvg-id="OsetiyaIryston.ru",Осетия Ирыстон
 https://osir.mediacdn.ru/cdn/osetia/playlist.m3u8
-#EXTINF:-1 tvg-id="",Первый Ярославский
+#EXTINF:-1 tvg-id="YaPervyy.ru",Первый Ярославский
 https://yaroslavl.mediacdn.ru/cdn/pervyaroslavsk/playlist.m3u8
 #EXTINF:-1 tvg-id="Prodvizhenie.ru",Продвижение
 https://prodvizhenie.bonus-tv.ru/cdn/prodvizhenie/playlist.m3u8
@@ -59,7 +59,7 @@ https://bl.webcaster.pro/media/playlist/free_fe8dc1b768a84b8b0333db826471f17e_hd
 https://live-stranafm.cdnvideo.ru/stranafm/smil:stranafm.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Tamyr.ru",Тамыр (Уфа) (576p)
 https://bsttv.bonus-tv.ru/cdn/tamyr/playlist.m3u8
-#EXTINF:-1 tvg-id="",ТК Краснодар
+#EXTINF:-1 tvg-id="TelekanalKrasnodar.ru",Телеканал Краснодар
 https://krasnodar.mediacdn.ru/live/cdn/krasnodar/playlist.m3u8
 #EXTINF:-1 tvg-id="TNVPlanet.ru",ТНВ-Планета (Казань)
 https://planeta.mediacdn.ru/cdn/tnvplanet/playlist.m3u8
diff --git a/streams/ru_catcast.m3u b/streams/ru_catcast.m3u
index 8543bd60c4..f31b24de08 100644
--- a/streams/ru_catcast.m3u
+++ b/streams/ru_catcast.m3u
@@ -1,15 +1,47 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",A21 VITAL AUTOSPORT [Not 24/7]
+#EXTINF:-1 tvg-id="VitalSport.ru",VITAL Sport [Not 24/7]
+https://vslive.pw/stream/48527/index.m3u8
+#EXTINF:-1 tvg-id="VitalDrive.ru",VITAL Drive [Not 24/7]
 https://autopilot.catcast.tv/content/37909/index.m3u8
-#EXTINF:-1 tvg-id="",Детское кино International
+#EXTINF:-1 tvg-id="VitalDrive.ru",VITAL Drive [Not 24/7]
+https://tv.a21network.ru/stream/37909/index.m3u8
+#EXTINF:-1 tvg-id="VitalFootball.ru",VITAL Football [Not 24/7]
+https://vslive.pw/stream/48682/index.m3u8
+#EXTINF:-1 tvg-id="VitalPlus.ru",VITAL Plus [Not 24/7]
+https://vslive.pw/stream/48683/index.m3u8
+#EXTINF:-1 tvg-id="VitalBasketball.ru",VITAL Basketball [Not 24/7]
+https://vslive.pw/stream/48684/index.m3u8
+#EXTINF:-1 tvg-id="VitalTennis.ru",VITAL Tennis [Not 24/7]
+https://vslive.pw/stream/48685/index.m3u8
+#EXTINF:-1 tvg-id="Detskoekino.ru@International",Детское кино International [Not 24/7]
 https://autopilot.catcast.tv/content/38720/index.m3u8
-#EXTINF:-1 tvg-id="",Кино 1 International
+#EXTINF:-1 tvg-id="Kino1.ru@International",Кино 1 International [Not 24/7]
 http://kino-1.catcast.tv/content/38617/index.m3u8
-#EXTINF:-1 tvg-id="",Кино 1 International
+#EXTINF:-1 tvg-id="Kino1.ru@International",Кино 1 International [Not 24/7]
 https://autopilot.catcast.tv/content/38617/index.m3u8
-#EXTINF:-1 tvg-id="",Музыка 1 International
+#EXTINF:-1 tvg-id="Muzyka1.ru@International",Музыка 1 International [Not 24/7]
 https://kino-1.catcast.tv/content/37745/index.m3u8
-#EXTINF:-1 tvg-id="",Музыка 2 International
+#EXTINF:-1 tvg-id="Muzyka1.ru@International",Музыка 2 International [Not 24/7]
 https://kino-1.catcast.tv/content/37742/index.m3u8
-#EXTINF:-1 tvg-id="",Музыка Кино International
+#EXTINF:-1 tvg-id="MuzykaKino.ru@International",Музыка Кино International [Not 24/7]
 https://kino-1.catcast.tv/content/37739/index.m3u8
+#EXTINF:-1 tvg-id="MalderMegahit.ru",Малдер Мегахит [Not 24/7]
+https://v2.catcast.tv/content/47689/index.m3u8
+#EXTINF:-1 tvg-id="LyubimoeIndijskoeKino.ru",Любимое Индийское Кино [Not 24/7]
+https://v2.catcast.tv/content/41596/index.m3u8
+#EXTINF:-1 tvg-id="CityEdenTV.ru",Сити Эдем ТВ [Not 24/7]
+https://v2.catcast.tv/content/34246/index.m3u8
+#EXTINF:-1 tvg-id="CityEdenKinoAction.ru",Сити Эдем КиноЭкшен [Not 24/7]
+https://v2.catcast.tv/content/41333/index.m3u8
+#EXTINF:-1 tvg-id="CityEdenTeleNovella.ru",Сити Эдем ТелеНовелла [Not 24/7]
+https://v2.catcast.tv/content/46209/index.m3u8
+#EXTINF:-1 tvg-id="CityEdenKinoMistika.ru",Сити Эдем КиноМистика [Not 24/7]
+https://v2.catcast.tv/content/40783/index.m3u8
+#EXTINF:-1 tvg-id="CityEdenKinoDok.ru",Сити Эдем КиноДок [Not 24/7]
+https://v2.catcast.tv/content/40783/index.m3u8
+#EXTINF:-1 tvg-id="CityEdenMeditationMusic.ru",Сити Эдем ТВ Meditation Music [Not 24/7]
+https://v2.catcast.tv/content/47410/index.m3u8
+#EXTINF:-1 tvg-id="CityEdenKinoKlassika.ru",Сити Эдем КиноКлассика [Not 24/7]
+https://v2.catcast.tv/content/34185/index.m3u8
+#EXTINF:-1 tvg-id="MGMHD.us@CatcastRU",MGM HD [Not 24/7]
+https://v2.catcast.tv/content/44051/index.m3u8
diff --git a/streams/ru_mylifeisgood.m3u b/streams/ru_mylifeisgood.m3u
index 0408d495a8..239e68d885 100644
--- a/streams/ru_mylifeisgood.m3u
+++ b/streams/ru_mylifeisgood.m3u
@@ -13,5 +13,5 @@ https://livetv.mylifeisgood.net.ru/channels/fridayhd.m3u8
 https://livetv.mylifeisgood.net.ru/channels/tv3hd.m3u8
 #EXTINF:-1 tvg-id="TNT.ru",ТНТ
 https://livetv.mylifeisgood.net.ru/channels/tnthd.m3u8
-#EXTINF:-1 tvg-id="YuTV.ru",Ю
+#EXTINF:-1 tvg-id="U.ru",Ю
 https://livetv.mylifeisgood.net.ru/channels/u_ott_tv_hq.m3u8
diff --git a/streams/ru_smotrim.m3u b/streams/ru_smotrim.m3u
index 9931f27d03..7c35c1d874 100644
--- a/streams/ru_smotrim.m3u
+++ b/streams/ru_smotrim.m3u
@@ -3,23 +3,23 @@
 https://live-vgtrksmotrim.cdnvideo.ru/vgtrksmotrim/smotrim-live-04-srt.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="360News.ru",360° Новости
 https://live-vgtrksmotrim.cdnvideo.ru/vgtrksmotrim/smotrim-live-03-srt.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",Арктика 24
+#EXTINF:-1 tvg-id="Arktika24.ru",Арктика 24 (Архангельск)
 https://vgtrkregion-reg.cdnvideo.ru/vgtrk/arhangelsk/arktika24-hd/index.m3u8
-#EXTINF:-1 tvg-id="",Башкортостан 24
+#EXTINF:-1 tvg-id="Bashkortostan24.ru",Башкортостан 24
 https://vgtrkregion-reg.cdnvideo.ru/vgtrk/ufa/bashkortostan24-hd/index.m3u8
 #EXTINF:-1 tvg-id="BigAsia.ru",Большая Азия
 https://live-bigasia.cdnvideo.ru/bigasia/bigasia.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",Вести ФМ
+#EXTINF:-1 tvg-id="VestiFM.ru",Вести ФМ
 https://player.smotrim.ru/iframe/stream/live_id/0487fd79-60e6-4333-a545-909d6e015173
 #EXTINF:-1 tvg-id="VmesteRF.ru",Вместе РФ
 https://qcpdqumitwf.a.trbcdn.net/livemastersrt/pr4mw_lvie-vmesterf-srt.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Volgograd24.ru",Волгоград 24
 https://vgtrkregion-reg.cdnvideo.ru/vgtrk/volgograd/volgograd24-hd/index.m3u8
-#EXTINF:-1 tvg-id="",Восток 24
+#EXTINF:-1 tvg-id="Vostok24.ru",Восток 24 (Владивосток)
 https://vgtrkregion-reg.cdnvideo.ru/vgtrk/vladivostok/vostok24-hd/index.m3u8
 #EXTINF:-1 tvg-id="DumaTV.ru",Дума ТВ
 https://dumatv.iptv2022.com/index.m3u8
-#EXTINF:-1 tvg-id="",Запад 24 (Калининград)
+#EXTINF:-1 tvg-id="Zapad24.ru",Запад 24 (Калининград)
 https://vgtrkregion-reg.cdnvideo.ru/vgtrk/kaliningrad/zapad24-hd/index.m3u8
 #EXTINF:-1 tvg-id="Kavkaz24.ru",Кавказ 24 (Ставрополь)
 https://vgtrkregion-reg.cdnvideo.ru/vgtrk/stavropol/kavkaz24-hd/index.m3u8
@@ -45,7 +45,7 @@ https://vgtrkregion-reg.cdnvideo.ru/vgtrk/7/russia1-hd/index.m3u8
 https://vgtrkregion-reg.cdnvideo.ru/vgtrk/8/russia1-hd/index.m3u8
 #EXTINF:-1 tvg-id="Russia1.ru",Россия 1 (+9)
 https://vgtrkregion-reg.cdnvideo.ru/vgtrk/9/russia1-hd/index.m3u8
-#EXTINF:-1 tvg-id="Russia1.ru",Россия 1 (VGTRK Official)
+#EXTINF:-1 tvg-id="Russia1.ru",Россия 1
 https://vgtrkregion-reg.cdnvideo.ru/vgtrk/0/russia1-hd/index.m3u8
 #EXTINF:-1 tvg-id="Russia1.ru",Россия 1 / ГТРК Адыгея
 http://vgtrkregion-reg.cdnvideo.ru/vgtrk/maykop/russia1-hd/index.m3u8
@@ -159,25 +159,25 @@ https://player.smotrim.ru/iframe/stream/live_id/1525504b-449d-432d-ab5d-1f11081f
 https://player.smotrim.ru/iframe/stream/live_id/3b73bf76-7245-4981-a865-38478e21df1f
 #EXTINF:-1 tvg-id="RTRPlanetaUSA.us",РТР Планета США
 https://player.smotrim.ru/iframe/stream/live_id/cf22fa5c-e21a-433e-8317-7e8dd3150d6a
-#EXTINF:-1 tvg-id="",Самара 24
+#EXTINF:-1 tvg-id="Samara24.ru",Самара 24
 https://vgtrkregion-reg.cdnvideo.ru/vgtrk/samara/samara24-hd/index.m3u8
-#EXTINF:-1 tvg-id="",Сибирь 24 (Красноярск)
+#EXTINF:-1 tvg-id="Sibir24.ru@KYA",Сибирь 24 (Красноярск)
 https://vgtrkregion-reg.cdnvideo.ru/vgtrk/krasnoyarsk/sibir24-hd/index.m3u8
-#EXTINF:-1 tvg-id="",Сибирь 24 (Новосибирск)
-https://vgtrkregion-reg.cdnvideo.ru/vgtrk/novosibirsk/russia1-hd/index.m3u8
-#EXTINF:-1 tvg-id="",Смотрим
+#EXTINF:-1 tvg-id="Sibir24.ru@NVS",Сибирь 24 (Новосибирск)
+https://vgtrkregion-reg.cdnvideo.ru/vgtrk/novosibirsk/sibir24-hd/index.m3u8
+#EXTINF:-1 tvg-id="SmotrimChestnyyDetektiv.ru",Смотрим Честный Детектив
 https://live-vgtrksmotrim.cdnvideo.ru/vgtrksmotrim/smotrim-live-01.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="SolovyovLive.ru",Соловьев LIVE
 https://player.smotrim.ru/iframe/stream/live_id/985d5c7b-9727-4942-a4ba-a6e852caf0c1
 #EXTINF:-1 tvg-id="Surgut24.ru",СургутИнформТВ
 https://sitv.ru/vgtrk/stv.m3u8
-#EXTINF:-1 tvg-id="",Телеканал Краснодар
+#EXTINF:-1 tvg-id="TelekanalKrasnodar.ru",Телеканал Краснодар
 https://live-tvkrasnodar.cdnvideo.ru/tvkrasnodar/tvkrasnodar.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="TNTMusic.ru",ТНТ Music
 https://tntmsmotr.mediacdn.ru/cdn/smotr/playlist.m3u8
-#EXTINF:-1 tvg-id="",Толк
+#EXTINF:-1 tvg-id="Tolk.ru",Толк
 https://live-tolknews.cdnvideo.ru/tolknews/stream/playlist.m3u8
-#EXTINF:-1 tvg-id="",Урал 24 (Челябинск)
+#EXTINF:-1 tvg-id="Ural24.ru",Урал 24 (Челябинск)
 https://vgtrkregion-reg.cdnvideo.ru/vgtrk/chelyabinsk/ural24-hd/index.m3u8
 #EXTINF:-1 tvg-id="UgraTV.ru",Югра
 https://live-ugratv.cdnvideo.ru/ugratv/ugratv/playlist.m3u8
diff --git a/streams/ru_televizor24.m3u b/streams/ru_televizor24.m3u
index 05f66abdeb..13557d3727 100644
--- a/streams/ru_televizor24.m3u
+++ b/streams/ru_televizor24.m3u
@@ -7,7 +7,7 @@ https://streaming.thestream.cyou/live/554.m3u8
 https://streaming.thestream.cyou/live/44.m3u8
 #EXTINF:-1 tvg-id="Domashniy.ru",Домашний
 https://streaming.televizor-24-tochka.ru/live/17.m3u8
-#EXTINF:-1 tvg-id="",За!ТВ
+#EXTINF:-1 tvg-id="ZaTV.ru",За!ТВ
 https://streaming.televizor-24-tochka.ru/live/25.m3u8
 #EXTINF:-1 tvg-id="Zvezda.ru",Звезда
 https://streaming.televizor-24-tochka.ru/live/21.m3u8
@@ -23,13 +23,13 @@ https://streaming.televizor-24-tochka.ru/live/22.m3u8
 https://streaming.televizor-24-tochka.ru/live/20.m3u8
 #EXTINF:-1 tvg-id="NTV.ru",НТВ
 https://streaming.televizor-24-tochka.ru/live/7.m3u8
-#EXTINF:-1 tvg-id="",НТВ Мир
+#EXTINF:-1 tvg-id="NTVMir.ru",НТВ Мир
 https://streaming.thestream.cyou/live/213.m3u8
 #EXTINF:-1 tvg-id="OTR.ru",ОТР
 https://streaming.televizor-24-tochka.ru/live/12.m3u8
 #EXTINF:-1 tvg-id="ChannelOne.ru",Первый канал
 https://streaming.televizor-24-tochka.ru/live/4.m3u8
-#EXTINF:-1 tvg-id="",Первый канал Европа
+#EXTINF:-1 tvg-id="ChannelOne.ru@Europe",Первый канал Европа
 https://streaming.thestream.cyou/live/210.m3u8
 #EXTINF:-1 tvg-id="Pobeda.ru",Победа
 https://streaming.thestream.cyou/live/43.m3u8
@@ -47,15 +47,13 @@ https://streaming.televizor-24-tochka.ru/live/9.m3u8
 https://streaming.televizor-24-tochka.ru/live/15.m3u8
 #EXTINF:-1 tvg-id="STS.ru",СТС
 https://streaming.televizor-24-tochka.ru/live/16.m3u8
-#EXTINF:-1 tvg-id="",Таврия
+#EXTINF:-1 tvg-id="Tavriya.ru",Таврия
 https://streaming.televizor-24-tochka.ru/live/24.m3u8
 #EXTINF:-1 tvg-id="TV3.ru",ТВ3
 https://streaming.televizor-24-tochka.ru/live/18.m3u8
 #EXTINF:-1 tvg-id="TVCentr.ru",ТВ Центр
 https://streaming.televizor-24-tochka.ru/live/13.m3u8
-#EXTINF:-1 tvg-id="",ТНР
-https://streaming.televizor-24-tochka.ru/live/26.m3u8
 #EXTINF:-1 tvg-id="TNT.ru",ТНТ
 https://streaming.televizor-24-tochka.ru/live/23.m3u8
-#EXTINF:-1 tvg-id="",ТРК Юнион
+#EXTINF:-1 tvg-id="PervyyRespublikanskiy.ru",Первый Республиканский
 https://streaming.televizor-24-tochka.ru/live/27.m3u8
diff --git a/streams/ru_tvbricks.m3u b/streams/ru_tvbricks.m3u
index f256d08478..4613e2d1bf 100644
--- a/streams/ru_tvbricks.m3u
+++ b/streams/ru_tvbricks.m3u
@@ -7,5 +7,5 @@ https://engbrics.mediacdn.ru/cdn/brics/english/playlist.m3u8
 https://porbrics.mediacdn.ru/cdn/brics/portuguese/playlist.m3u8
 #EXTINF:-1 tvg-id="TVBRICSRussian.ru",TV BRICS Russian (1080p)
 https://rusbrics.mediacdn.ru/cdn/brics/russian/playlist.m3u8
-#EXTINF:-1 tvg-id="",TV BRICS Spanish (1080p)
+#EXTINF:-1 tvg-id="TVBRICSSpanish.es",TV BRICS Spanish (1080p)
 https://espbrics.mediacdn.ru/cdn/brics/spanish/playlist.m3u8
diff --git a/streams/ru_tvteleport.m3u b/streams/ru_tvteleport.m3u
index d9eeb92b71..1f37db70db 100644
--- a/streams/ru_tvteleport.m3u
+++ b/streams/ru_tvteleport.m3u
@@ -5,7 +5,7 @@ http://31.148.48.15/A1/index.m3u8
 http://31.148.48.15/A2/index.m3u8
 #EXTINF:-1 tvg-id="Ani.ru",Ani
 http://31.148.48.15/Ani/index.m3u8
-#EXTINF:-1 tvg-id="BRIDGE.ru",Bridge
+#EXTINF:-1 tvg-id="BRIDGE.ru",BRIDGE
 http://31.148.48.15/Bridge_TV/index.m3u8
 #EXTINF:-1 tvg-id="BRIDGEClassic.ru",BRIDGE Classic
 http://31.148.48.15/Bridge_TV_Classic/index.m3u8
@@ -21,7 +21,7 @@ http://31.148.48.15/Eda_Premium_HD/index.m3u8
 http://31.148.48.15/HD_Life/index.m3u8
 #EXTINF:-1 tvg-id="Nickelodeon.ru@SD",Nickelodeon
 http://31.148.48.15/Nickelodeon/index.m3u8
-#EXTINF:-1 tvg-id="o2tv.ru@SD",o2tv
+#EXTINF:-1 tvg-id="o2tv.ru@SD",о2тв
 http://31.148.48.15/O2_HD/index.m3u8
 #EXTINF:-1 tvg-id="STSkids.ru",STS kids
 http://31.148.48.15/STS_Kids_HD/index.m3u8
diff --git a/streams/ru_zabava.m3u b/streams/ru_zabava.m3u
index db1b8f18b9..10e5f17720 100644
--- a/streams/ru_zabava.m3u
+++ b/streams/ru_zabava.m3u
@@ -1,35 +1,20 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",2х2
+#EXTINF:-1 tvg-id="2x2.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",2х2 [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_2X2/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Russian Extreme UHD
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-https://zabava-htlive.cdn.ngenix.net/hls/CH_RUSSIANEXTREMEULTRA/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Ultra HD Cinema
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-https://zabava-htlive.cdn.ngenix.net/hls/CH_ULTRAHDCINEMA/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Восток 24
+#EXTINF:-1 tvg-id="Vostok24.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Восток 24 (Владивосток) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 http://s91030.cdn.ngenix.net/hls/CH_R01_OTT_DV_VLD_VOSTOK24_OTT/variant.m3u8
 #EXTINF:-1 tvg-id="Domashniy.ru" http-user-agent="WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer",Домашний (540p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_DOMASHNIY/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Домашний +7
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-http://zabava-htlive.cdn.ngenix.net/hls/CH_DOMASHNY_7/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Звезда
+#EXTINF:-1 tvg-id="Zvezda.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Звезда [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_ZVEZDA/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Звезда +7
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-http://zabava-htlive.cdn.ngenix.net/hls/CH_ZVEZDA_7/variant.m3u8
 #EXTINF:-1 tvg-id="Carousel.ru" http-user-agent="WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer",Карусель (540p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_KARUSEL/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Карусель +7
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-http://zabava-htlive.cdn.ngenix.net/hls/CH_KARUSEL_7/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Кубань 24
+#EXTINF:-1 tvg-id="Kuban24.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Кубань 24 [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 https://rt-sth-krdar-htlive.cdn.ngenix.net/hls/CH_R04_KUBAN24/variant.m3u8
 #EXTINF:-1 tvg-id="RussiaK.ru" http-user-agent="WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer",Культура (540p) [Geo-blocked]
@@ -38,135 +23,84 @@ https://zabava-htlive.cdn.ngenix.net/hls/CH_RUSSIAK/variant.m3u8
 #EXTINF:-1 tvg-id="LenTV24.ru" http-user-agent="WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer",Лен ТВ 24 (540p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer
 https://rt-nw-spb-htlive.cdn.ngenix.net/hls/CH_R02_LENTVSD/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Мир
+#EXTINF:-1 tvg-id="Mir.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Мир [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_MIR/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Мир +7
+#EXTINF:-1 tvg-id="Mir.ru@Plus7" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Мир +7 [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_MIR_7/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Муз ТВ
+#EXTINF:-1 tvg-id="MuzTV.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Муз ТВ [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_MUZTV/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Муз ТВ +7
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-https://zabava-htlive.cdn.ngenix.net/hls/CH_MUZTV_7/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Наша Сибирь 4k
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-http://zabava-htlive.cdn.ngenix.net/hls/CH_NASHASIBIR4K/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Новгородское областное телевидение
+#EXTINF:-1 tvg-id="NovgorOblTV.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Новгородское областное телевидение [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 https://rt-nw-novg-htlive.cdn.ngenix.net/hls/CH_R02_NOVGORODTV/variant.m3u8
 #EXTINF:-1 tvg-id="NTV.ru" http-user-agent="WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer",НТВ (540p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_NTV/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",НТВ +7
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-http://zabava-htlive.cdn.ngenix.net/hls/CH_NTV_7/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",НТК
+#EXTINF:-1 tvg-id="NTK21.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",НТК 21 (Биробиджан) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 https://s97982.cdn.ngenix.net/hls/CH_R79_OTT_DV_HVSK_NTK/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",ОТР
+#EXTINF:-1 tvg-id="OTR.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",ОТР [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_OTR/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Первый канал
+#EXTINF:-1 tvg-id="ChannelOne.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Первый канал [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_1TVSD/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Первый канал +9
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-https://s14131.cdn.ngenix.net/hls/CH_R41_OTT_DV_KAM_1TV/variant.m3u8
 #EXTINF:-1 tvg-id="Prima.ru" http-user-agent="WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer",Прима (1080p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer
 https://rt-sib-krsk-htlive.cdn.ngenix.net/hls/CH_R11_OTT_SIB_KRSK_STS/variant.m3u8
 #EXTINF:-1 tvg-id="Friday.ru" http-user-agent="WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer",Пятница! (540p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_PYATNIZZA/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Пятница!
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-http://zabava-htlive.cdn.ngenix.net/hls/CH_PYATNIZZA/variant.m3u8
 #EXTINF:-1 tvg-id="Channel5.ru" http-user-agent="WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer",Пятый Канал (540p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_5TV/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Пятый канал +7
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-http://zabava-htlive.cdn.ngenix.net/hls/CH_5TV_7/variant.m3u8
 #EXTINF:-1 tvg-id="RENTV.ru" http-user-agent="WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer",РЕН ТВ (540p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_RENTV/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",РенТВ +7
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-http://zabava-htlive.cdn.ngenix.net/hls/CH_RENTV_7/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Россия 1
+#EXTINF:-1 tvg-id="Russia1.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Россия 1 [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_RUSSIA1/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Россия 1 +9
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-https://s14131.cdn.ngenix.net/hls/CH_R41_OTT_DV_KAM_ROSSIA1/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Россия 24
+#EXTINF:-1 tvg-id="Russia24.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Россия 24 [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 http://zabava-htlive.cdn.ngenix.net/hls/CH_RUSSIA24/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Россия К +7
+#EXTINF:-1 tvg-id="RussiaK.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Россия К [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-http://zabava-htlive.cdn.ngenix.net/hls/CH_RUSSIAK_7/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Солнце
+http://zabava-htlive.cdn.ngenix.net/hls/CH_RUSSIAK/variant.m3u8
+#EXTINF:-1 tvg-id="SanktPeterburg.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Санкт-Петербург HD
+#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
+https://rt-nw-spb-htlive.cdn.ngenix.net/hls/CH_R02_SPBREGIONALHD/variant.m3u8
+#EXTINF:-1 tvg-id="Solnce.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Солнце [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 http://zabava-htlive.cdn.ngenix.net/hls/CH_DISNEY/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Солнце +7
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-http://zabava-htlive.cdn.ngenix.net/hls/CH_DISNEY_7/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Спас
+#EXTINF:-1 tvg-id="Spas.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Спас [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_SPAS/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Спас +7
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-https://zabava-htlive.cdn.ngenix.net/hls/CH_SPAS_7/variant.m3u8
 #EXTINF:-1 tvg-id="STS.ru" http-user-agent="WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer",СТС (540p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_STS/variant.m3u8
 #EXTINF:-1 tvg-id="STSLove.ru" http-user-agent="WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer",СТС Love (540p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_STSLOVE/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",СТС Love +7
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-https://zabava-htlive.cdn.ngenix.net/hls/CH_STSLOVE_7/variant.m3u8
 #EXTINF:-1 tvg-id="Subbota.ru" http-user-agent="WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer",Суббота! (450p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_SUPER/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",ТВ3 +7
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-http://zabava-htlive.cdn.ngenix.net/hls/CH_TV3_7/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",ТВ Центр
+#EXTINF:-1 tvg-id="TVCentr.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",ТВ Центр [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_TVC/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",ТВ Центр +7
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-https://zabava-htlive.cdn.ngenix.net/hls/CH_TVC_7/variant.m3u8
 #EXTINF:-1 tvg-id="TV3.ru" http-user-agent="WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer",ТВ-3 (540p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_TV3/variant.m3u8
 #EXTINF:-1 tvg-id="TNT.ru" http-user-agent="WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer",ТНТ (540p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_TNT/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",ТНТ4
+#EXTINF:-1 tvg-id="TNT4.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",ТНТ4 [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_TNT4/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",ТНТ4 +7
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-http://zabava-htlive.cdn.ngenix.net/hls/CH_TNT4_7/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",ТНТ +7
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-http://zabava-htlive.cdn.ngenix.net/hls/CH_TNT_7/variant.m3u8
 #EXTINF:-1 tvg-id="Che.ru" http-user-agent="WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer",Че! (540p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.44.1 (AndroidTV/9) HlsWinkPlayer
 https://zabava-htlive.cdn.ngenix.net/hls/CH_PERETZ/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Че!
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-http://zabava-htlive.cdn.ngenix.net/hls/CH_PERETZ/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Че! +7
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-http://zabava-htlive.cdn.ngenix.net/hls/CH_PERETZ_7/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Ю
+#EXTINF:-1 tvg-id="U.ru" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Ю [Geo-blocked]
 #EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
 http://zabava-htlive.cdn.ngenix.net/hls/CH_U/variant.m3u8
-#EXTINF:-1 tvg-id="" http-user-agent="WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer",Ю +7
-#EXTVLCOPT:http-user-agent=WINK/1.40.1 (AndroidTV/9) HlsWinkPlayer
-http://zabava-htlive.cdn.ngenix.net/hls/CH_U_7/variant.m3u8
diff --git a/streams/ua.m3u b/streams/ua.m3u
index 383cb6c204..3390a3acc7 100644
--- a/streams/ua.m3u
+++ b/streams/ua.m3u
@@ -55,8 +55,6 @@ http://212.28.87.173:8000/play/a10y/index.m3u8
 #EXTINF:-1 tvg-id="TVDom.ua" http-user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:97.0) Gecko/20100101 Firefox/97.0",Kanal Dom (720p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:97.0) Gecko/20100101 Firefox/97.0
 https://kanaldom.cdn-05.cosmonova.net.ua/hls/kanaldom_ua_hi/index.m3u8
-#EXTINF:-1 tvg-id="Lugansk24.ua",Lugansk 24 (1084p)
-https://tv.gtrklnr.ru/hls/Lugansk24.m3u8
 #EXTINF:-1 tvg-id="M2.ua",M2 (540p)
 https://live.m2.tv/hls3/stream.m3u8
 #EXTINF:-1 tvg-id="MistoPlus.ua",Micto (360p)
diff --git a/streams/uz_cinerama.m3u b/streams/uz_cinerama.m3u
deleted file mode 100644
index fcd718794a..0000000000
--- a/streams/uz_cinerama.m3u
+++ /dev/null
@@ -1 +0,0 @@
-#EXTM3U