diff --git a/channels/ru.m3u b/channels/ru.m3u
index 8ff75f33c..1cf9a08b4 100644
--- a/channels/ru.m3u
+++ b/channels/ru.m3u
@@ -32,8 +32,6 @@ https://sc.id-tv.kz/amedia_hit_hd_34_35.m3u8
 #EXTINF:-1 tvg-id="AmediaPremium.ru" tvg-name="Amedia Premium" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/UHo6cwX.png" group-title="",Amedia Premium (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/s64/index.m3u8
-#EXTINF:-1 tvg-id="Ani.ru" tvg-name="Ani" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Kids",Ani
-http://188.40.68.167/russia/ani/playlist.m3u8
 #EXTINF:-1 tvg-id="BollywoodHD.ru" tvg-name="Bollywood HD" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",Bollywood HD
 http://89.106.234.5:80/bollywood_hd_34_35.m3u8
 #EXTINF:-1 tvg-id="BollywoodHD.ru" tvg-name="Bollywood HD" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",Bollywood HD
@@ -46,15 +44,13 @@ http://ott-cdn.ucom.am/s34/index.m3u8
 http://ott-cdn.ucom.am/s78/index.m3u8
 #EXTINF:-1 tvg-id="Cinema.ru" tvg-name="Cinema" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",Cinema
 https://sc.id-tv.kz/Cinema_34_35.m3u8
-#EXTINF:-1 tvg-id="Eurodance90HD.ru" tvg-name="Eurodance 90 HD" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Music",Eurodance 90 HD
+#EXTINF:-1 tvg-id="Eurodance90HD.ru" tvg-name="Eurodance 90 HD" tvg-country="INT" tvg-language="English" tvg-logo="" group-title="Music",Eurodance 90 HD
 https://eurodance.catcast.tv/content/36987/index.m3u8
-#EXTINF:-1 tvg-id="FilmTV.ru" tvg-name="Film TV" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",Film TV
-http://filmtv.zapto.org:8050/hls/stream/index.m3u8
 #EXTINF:-1 tvg-id="FreshTV.ru" tvg-name="FreshTV" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/Ju3mLgq.png" group-title="Music",FreshTV (720p)
 https://strm.yandex.ru/kal/fresh/fresh0.m3u8
 #EXTINF:-1 tvg-id="GlobalStarTV.ru" tvg-name="Global Star TV" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/BJJN5Zp.jpg" group-title="",Global Star TV
 http://stream2.hardlife.tv:8134/hls-live/hlsGS/_definst_/liveevent/gs.m3u8
-#EXTINF:-1 tvg-id="GravityFouls.ru" tvg-name="Gravity Fouls" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Kids",Gravity Fouls
+#EXTINF:-1 tvg-id="GravityFouls.ru" tvg-name="Gravity Fouls" tvg-country="INT" tvg-language="Russian" tvg-logo="" group-title="Kids",Gravity Fouls
 https://autopilot.catcast.tv/content/38105/index.m3u8
 #EXTINF:-1 tvg-id="HDMedia.ru" tvg-name="HD Медиа" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/hd-media.png" group-title="Entertainment",HD Медиа (720p)
 https://strm.yandex.ru/kal/hdmedia/hdmedia0.m3u8
@@ -66,10 +62,6 @@ https://sc.id-tv.kz/hdl_34_35.m3u8
 https://sc.id-tv.kz/hdl_38_39.m3u8
 #EXTINF:-1 tvg-id="HITV.ru" tvg-name="HITV" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Music",HITV (1080p)
 https://strm.yandex.ru/kal/hittv/hittv0.m3u8
-#EXTINF:-1 tvg-id="KinderTV.ru" tvg-name="Kinder TV" tvg-country="RU" tvg-language="Ukrainian;Russian" tvg-logo="" group-title="Kids",Kinder TV
-http://autopilot.catcast.tv/content/38144/index.m3u8
-#EXTINF:-1 tvg-id="Kino24.ru" tvg-name="KINO24" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",KINO24
-http://85.192.44.14/hls/Kino24Ru/playlist.m3u8
 #EXTINF:-1 tvg-id="Leomax24.ru" tvg-name="Leomax 24" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Shop",Leomax 24
 http://tvshops.bonus-tv.ru:80/cdn/shop24/tracks-v1a1/index.m3u8
 #EXTINF:-1 tvg-id="LeomaxPlus.ru" tvg-name="Leomax Plus" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Shop",Leomax Plus
@@ -131,16 +123,16 @@ https://rt-france.secure.footprint.net/1107.m3u8?streamType=live
 https://rt-uk-gd.secure2.footprint.net/1106.m3u8
 #EXTINF:-1 tvg-id="RTUK.ru" tvg-name="RT UK" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/zdTA0ha.png" group-title="News",RT UK (720p)
 https://rt-uk.secure.footprint.net/1106.m3u8?streamType=live
-#EXTINF:-1 tvg-id="RTGHD.ru" tvg-name="RTG HD" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",RTG HD
+#EXTINF:-1 tvg-id="RTGHD.ru" tvg-name="RTG HD" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Travel",RTG HD
 http://188.40.68.167/russia/rtg/playlist.m3u8
-#EXTINF:-1 tvg-id="RTDnaRusskom.ru" tvg-name="RTД на Русском" tvg-country="RU" tvg-language="Russian" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/a/ae/RTD-TV-logo.png/220px-RTD-TV-logo.png" group-title="Documentary",RTД на Русском (480p)
+#EXTINF:-1 tvg-id="RTD.ru" tvg-name="RTД" tvg-country="RU" tvg-language="Russian" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/a/ae/RTD-TV-logo.png/220px-RTD-TV-logo.png" group-title="Documentary",RTД (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/s93/index.m3u8
-#EXTINF:-1 tvg-id="RTDnaRusskom.ru" tvg-name="RTД на Русском" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/C6fylkt.png" group-title="Documentary",RTД на Русском
+#EXTINF:-1 tvg-id="RTD.ru" tvg-name="RTД" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/C6fylkt.png" group-title="Documentary",RTД
 https://rtmp.api.rt.com/hls/rtdru.m3u8
-#EXTINF:-1 tvg-id="RTDnaRusskom.ru" tvg-name="RTД на Русском" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/C6fylkt.png" group-title="Documentary",RTД на Русском (1080p)
+#EXTINF:-1 tvg-id="RTD.ru" tvg-name="RTД" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/C6fylkt.png" group-title="Documentary",RTД (1080p)
 https://strm.yandex.ru/kal/rtd_hd/rtd_hd0.m3u8
-#EXTINF:-1 tvg-id="RTDnaRusskom.ru" tvg-name="RTД на Русском" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/C6fylkt.png" group-title="Documentary",RTД на Русском
+#EXTINF:-1 tvg-id="RTD.ru" tvg-name="RTД" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/C6fylkt.png" group-title="Documentary",RTД
 https://uiptv.do.am/1ufc/300663722/playlist.m3u8
 #EXTINF:-1 tvg-id="RUTV.ru" tvg-name="RU.TV" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/0ujfLYr.png" group-title="Music",RU.TV (1080p)
 http://rutv.gcdn.co/streams/1410_95/playlist.m3u8
@@ -148,10 +140,10 @@ http://rutv.gcdn.co/streams/1410_95/playlist.m3u8
 https://rutv.gcdn.co/streams/1410_95/720n/index.m3u8
 #EXTINF:-1 tvg-id="RUTV.ru" tvg-name="RU.TV" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/0ujfLYr.png" group-title="Music",RU.TV (1080p)
 https://strm.yandex.ru/kal/rutv_cv/rutv_cv0.m3u8
-#EXTINF:-1 tvg-id="RussianTravelGuide.ru" tvg-name="Russian Travel Guide" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/x3IE7sE.png" group-title="Travel",Russian Travel Guide (480p)
+#EXTINF:-1 tvg-id="RTGTV.ru" tvg-name="RTG TV" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/x3IE7sE.png" group-title="Travel",RTG (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/s80/index.m3u8
-#EXTINF:-1 tvg-id="RussianTravelGuideHD.ru" tvg-name="Russian Travel Guide HD" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/NymtU1E.png" group-title="Travel",Russian Travel Guide HD (480p)
+#EXTINF:-1 tvg-id="RTGHD.ru" tvg-name="RTG HD" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/NymtU1E.png" group-title="Travel",RTG 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/s63/index.m3u8
 #EXTINF:-1 tvg-id="SGDF24RU.ru" tvg-name="SGDF24.RU" tvg-country="RU" tvg-language="Russian" tvg-logo="http://lime-tv.ru/uploads/posts/2018-06/thumbs/1529009151_sgdf24.png" group-title="Local",SGDF24.RU (Свердлов) (720p)
@@ -162,9 +154,9 @@ http://37.17.14.149:8905/play/a00m
 https://ch.iptvmate.net/5e933c221b143b0b9d00807a.m3u8
 #EXTINF:-1 tvg-id="SochiLiveHD.ru" tvg-name="Sochi Live HD" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Sochi Live HD (720p)
 http://serv30.vintera.tv:8081/sochi/sochi_stream/playlist.m3u8
-#EXTINF:-1 tvg-id="TVBRICSChinese.ru" tvg-name="TV BRICS Chinese" tvg-country="RU" tvg-language="Chinese" tvg-logo="https://i.imgur.com/vLpm8tN.png" group-title="",TV BRICS Chinese
+#EXTINF:-1 tvg-id="TVBRICSChinese.ru" tvg-name="TV BRICS Chinese" tvg-country="CN" tvg-language="Chinese" tvg-logo="https://i.imgur.com/vLpm8tN.png" group-title="",TV BRICS Chinese
 https://brics.bonus-tv.ru/cdn/brics/chinese/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="TVBRICSEnglish.ru" tvg-name="TV BRICS English" tvg-country="RU" tvg-language="English" tvg-logo="https://i.imgur.com/vLpm8tN.png" group-title="",TV BRICS English
+#EXTINF:-1 tvg-id="TVBRICSEnglish.ru" tvg-name="TV BRICS English" tvg-country="INT" tvg-language="English" tvg-logo="https://i.imgur.com/vLpm8tN.png" group-title="",TV BRICS English
 https://brics.bonus-tv.ru/cdn/brics/english/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="TVBRICSRussian.ru" tvg-name="TV BRICS Russian" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/vLpm8tN.png" group-title="",TV BRICS Russian
 https://brics.bonus-tv.ru/cdn/brics/russian/tracks-v1a1/index.m3u8
@@ -194,8 +186,6 @@ http://195.9.195.19:8001/hls2/vivarussia/index.m3u8
 https://live.prd.dlive.tv/hls/live/viva-russia.m3u8
 #EXTINF:-1 tvg-id="AvtoPlyus.ru" tvg-name="Авто Плюс" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Auto",Авто Плюс
 https://s4.idata.uz/avtoplyus/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="AVTO24.ru" tvg-name="АВТО24" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Auto",АВТО24
-http://188.40.68.167/russia/avto24/playlist.m3u8
 #EXTINF:-1 tvg-id="Aris24.ru" tvg-name="Арис 24" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Арис 24 (720p)
 http://serv25.vintera.tv:8081/test/aris/playlist.m3u8
 #EXTINF:-1 tvg-id="Arsenal.ru" tvg-name="Арсенал" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Арсенал (480p)
@@ -235,8 +225,6 @@ http://belnovosti.cdn.easyhoster.ru:8080/stream.m3u8
 http://live2.mediacdn.ru/sr1/tro/playlist.m3u8
 #EXTINF:-1 tvg-id="BolshayaAziya.ru" tvg-name="Большая Азия" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/bolshaya-azia.png" group-title="",Большая Азия (1080p)
 https://strm.yandex.ru/kal/bigasia/bigasia0.m3u8
-#EXTINF:-1 tvg-id="Bolshoyefir.ru" tvg-name="Большой эфир" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Большой эфир
-https://stream-msk-05.ott.tricolor.tv/dtv/id621_MSKSG-PVR-1--ChannelLIVE/03/plst.m3u8
 #EXTINF:-1 tvg-id="BST.ru" tvg-name="БСТ" tvg-country="RU" tvg-language="Bashkir" tvg-logo="https://i.imgur.com/rxwTjuT.jpg" group-title="",БСТ (Башкирское спутниковое телевидение) (576p)
 https://bsttv.bonus-tv.ru/cdn/bst/playlist.m3u8
 #EXTINF:-1 tvg-id="Vetta24.ru" tvg-name="Ветта 24" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",Ветта 24 (Пермь) (576p)
@@ -384,9 +372,9 @@ http://212.77.128.179:8089/www_mezhdunet/mezhdunet/playlist.m3u8
 http://live.trkmillet.ru/millet/index.m3u8
 #EXTINF:-1 tvg-id="Ministerstvoidey.ru" tvg-name="Министерство идей" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Министерство идей (720p)
 http://live-minidey.cdnvideo.ru/minidey/minidey.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="MIR.ru" tvg-name="МИР" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/mir_ru.jpg" group-title="General",МИР (1080p)
+#EXTINF:-1 tvg-id="Mir.ru" tvg-name="Мир" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/mir_ru.jpg" group-title="General",Мир (1080p)
 http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv_2500/playlist.m3u8
-#EXTINF:-1 tvg-id="MIRPlus4.ru" tvg-name="МИР +4" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/CrFWXTD.png" group-title="",МИР +4 (540p)
+#EXTINF:-1 tvg-id="MirPlus4.ru" tvg-name="Мир +4" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/CrFWXTD.png" group-title="",Мир +4 (540p)
 http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mirtv3_2500/playlist.m3u8
 #EXTINF:-1 tvg-id="Mir24.ru" tvg-name="Мир 24" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/mir_24_ru.jpg" group-title="News",Мир 24
 http://188.40.68.167/russia/mir24/playlist.m3u8
@@ -396,7 +384,7 @@ http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/mir24_2500/playlist.m3u8
 https://sc.id-tv.kz/Mir24.m3u8
 #EXTINF:-1 tvg-id="Mir24.ru" tvg-name="Мир 24" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/mir_24_ru.jpg" group-title="News",Мир 24
 https://sc.id-tv.kz/Mir24_38_39.m3u8
-#EXTINF:-1 tvg-id="MIRPremium.ru" tvg-name="МИР Premium" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Entertainment",МИР Premium (1080p)
+#EXTINF:-1 tvg-id="Mir24.ru" tvg-name="Мир 24" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/mir_24_ru.jpg" group-title="",Мир 24 (1080p)
 http://hls.mirtv.cdnvideo.ru/mirtv-parampublish/hd/playlist.m3u8
 #EXTINF:-1 tvg-id="MirBelogorya.ru" tvg-name="Мир Белогорья" tvg-country="RU" tvg-language="Russian" tvg-logo="http://mirbelogorya.ru/images/stories/news/2014/08/мир/0белогорья_логотип.jpg" group-title="",Мир Белагорья (720p)
 http://mirbelogorya.ru:8080/mirbelogorya/index.m3u8
@@ -422,15 +410,13 @@ https://a3569456481-s26881.cdn.ngenix.net/live/smil:mplan.smil/index.m3u8
 http://hls.volgograd1vtv.cdnvideo.ru/volgograd1vtv/volgograd1vtv.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="Muzhskoekino.ru" tvg-name="Мужское кино" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Мужское кино
 https://sc.id-tv.kz/Mujskoe_kino_hd_38_39.m3u8
-#EXTINF:-1 tvg-id="MUZTV.ru" tvg-name="МУЗ-ТВ" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/n7bGFXj.png" group-title="",МУЗ-ТВ (480p)
+#EXTINF:-1 tvg-id="MuzTV.ru" tvg-name="Муз-ТВ" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/n7bGFXj.png" group-title="Music",Муз-ТВ (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/s28/index.m3u8
-#EXTINF:-1 tvg-id="MUZTV.ru" tvg-name="МУЗ-ТВ" tvg-country="RU" tvg-language="Russian" tvg-logo="http://www.tv-logo.com/pt-data/uploads/images/logo/muz_tv.jpg" group-title="Music",МУЗ-ТВ (720p)
+#EXTINF:-1 tvg-id="MuzTV.ru" tvg-name="Муз-ТВ" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/n7bGFXj.png" group-title="Music",Муз-ТВ (720p)
 https://strm.yandex.ru/kal/muztv_supres/muztv_supres0.m3u8
 #EXTINF:-1 tvg-id="MuzSoyuz.ru" tvg-name="МузСоюз" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Music",МузСоюз
 http://hls.tvsoyuz.cdnvideo.ru/tvsoyuz2/muzsoyuz.6fw0-58xp-acts-esy0/chunklist.m3u8
-#EXTINF:-1 tvg-id="Mult.ru" tvg-name="Мульт" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Мульт
-https://autopilot.catcast.tv/content/38850/index.m3u8
 #EXTINF:-1 tvg-id="Multilandiya.ru" tvg-name="Мультиландия" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Мультиландия (576p)
 http://serv30.vintera.tv:8081/detskiy/multimania20/playlist.m3u8
 #EXTINF:-1 tvg-id="Nadezhda.ru" tvg-name="Надежда" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Religious",Надежда (720p)
@@ -439,11 +425,6 @@ https://live-tvhope.cdnvideo.ru/tvhope-pull/tvhope_1/playlist.m3u8
 https://tvhope.cdnvideo.ru/tvhope-pull/tvhope_1/playlist.m3u8
 #EXTINF:-1 tvg-id="Nano.ru" tvg-name="Нано" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Нано
 http://nano.teleservice.su:8080/hls/nano.m3u8
-#EXTINF:-1 tvg-id="NastoyashcheeVremya.ru" tvg-name="Настоящее Время" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Настоящее Время (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/s61/index.m3u8
-#EXTINF:-1 tvg-id="NastoyashcheeVremya.ru" tvg-name="Настоящее Время" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Настоящее Время (1080p)
-http://rfe-lh.akamaihd.net/i/rfe_tvmc5@383630/master.m3u8
 #EXTINF:-1 tvg-id="Nauka.ru" tvg-name="Наука" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Наука (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/s98/index.m3u8
@@ -487,20 +468,8 @@ https://sc.id-tv.kz/o_34_35.m3u8
 https://strm.yandex.ru/kal/o2/o20.m3u8
 #EXTINF:-1 tvg-id="O2TV.ru" tvg-name="О2ТВ" tvg-country="RU" tvg-language="Russian" tvg-logo="https://ustanovca-tricorol-tv.ru/wp-content/uploads/2017/12/o-tv.png" group-title="",О2ТВ
 https://strm.yandex.ru/kal/o2/o20_169_480p.json/index-v1-a1.m3u8
-#EXTINF:-1 tvg-id="ObshchestvennoeNezavisimoeTelevidenie.ru" tvg-name="Общественное Независимое Телевидение" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Общественное Независимое Телевидение
-http://85.238.112.40:8810/hls_sec/239.33.75.33-.m3u8
-#EXTINF:-1 tvg-id="ObshchestvennoeNezavisimoeTelevidenie.ru" tvg-name="Общественное Независимое Телевидение" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Общественное Независимое Телевидение
-https://ch.iptvmate.net/a46f7aba4c40d62799b6ca0296fb7f6c.m3u8
-#EXTINF:-1 tvg-id="OdincovoTV.ru" tvg-name="Одинцово ТВ" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",Одинцово ТВ
+#EXTINF:-1 tvg-id="OTV.ru" tvg-name="ОТВ" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",ОТВ (Одинцово)
 http://185.18.4.16/live/3m/playlist.m3u8
-#EXTINF:-1 tvg-id="OplotTV.ru" tvg-name="Оплот ТВ" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Оплот ТВ
-http://185.114.136.25/oplot-tv
-#EXTINF:-1 tvg-id="OplotTV.ru" tvg-name="Оплот ТВ" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Оплот ТВ
-http://185.114.136.25/oplot-tv?streamType=live
-#EXTINF:-1 tvg-id="OstrosyuzhetnoeHD.ru" tvg-name="Остросюжетное HD" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Остросюжетное HD (720p)
-http://51.195.44.53:8081/tv/ostros/playlist.m3u8
-#EXTINF:-1 tvg-id="OTV24.ru" tvg-name="ОТВ 24" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="News",ОТВ 24 (1080p)
-https://strm.yandex.ru/kal/otv24/otv240.m3u8
 #EXTINF:-1 tvg-id="OTR.ru" tvg-name="ОТР" tvg-country="RU" tvg-language="Russian" tvg-logo="https://iptvx.one/icn/otr_ru.png" group-title="General",ОТР
 https://uiptv.do.am/1ufc/000000008/playlist.m3u8
 #EXTINF:-1 tvg-id="OTS.ru" tvg-name="ОТС" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",ОТС (1080p)
@@ -509,10 +478,10 @@ https://strm.yandex.ru/kal/otstv/otstv0.m3u8
 http://51.68.141.106:8081/tv/ohota-i-ryibalka/playlist.m3u8
 #EXTINF:-1 tvg-id="Ohotairybalka.ru" tvg-name="Охота и рыбалка" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Hobby",Охота и рыбалка
 https://s3.idata.uz/dars5/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="OhotnikiRybolov.ru" tvg-name="Охотник и Рыболов" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/k1Gt1Rc.png" group-title="",Охотник и Рыболов (480p)
+#EXTINF:-1 tvg-id="OhotnikiRybolov.ru" tvg-name="Охотник и Рыболов" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/k1Gt1Rc.png" group-title="Hobby",Охотник и Рыболов (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/s62/index.m3u8
-#EXTINF:-1 tvg-id="OhotnikiRybolovInternational.ru" tvg-name="Охотник и Рыболов International" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Hobby",Охотник и Рыболов International (1080p)
+#EXTINF:-1 tvg-id="OhotnikirybolovInternational.ru" tvg-name="Охотник и рыболов International" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Hobby",Охотник и рыболов International (1080p)
 https://strm.yandex.ru/kal/ohotnik/ohotnik0.m3u8
 #EXTINF:-1 tvg-id="Pervyykanal.ru" tvg-name="Первый канал" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/iW5vhkb.png" group-title="General",Первый канал (576p)
 http://51.68.141.106:8081/tv/pervyiy-kanal/playlist.m3u8
@@ -536,13 +505,11 @@ https://sc.id-tv.kz/Pobeda_34_35.m3u8
 https://sc.id-tv.kz/Pobeda_36_37.m3u8
 #EXTINF:-1 tvg-id="Podvodoy.ru" tvg-name="Под водой" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Под водой (1080p)
 http://live-1.otcnet.ru/podvodoi/index.m3u8
-#EXTINF:-1 tvg-id="Poedinok.ru" tvg-name="Поединок" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Поединок
-https://stream-msk-06.ott.tricolor.tv/dtv/id629_MSKSG-PVR-1--Channel_LIVE2/03/plst.m3u8
 #EXTINF:-1 tvg-id="Poehali.ru" tvg-name="Поехали!" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Поехали!
 http://89.106.234.3:80/poehali_34_35.m3u8
 #EXTINF:-1 tvg-id="Poehali.ru" tvg-name="Поехали!" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Поехали!
 http://sc.id-tv.kz:80/poehali_38_39.m3u8
-#EXTINF:-1 tvg-id="PREMERA.ru" tvg-name="ПРЕМЬЕРА" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",ПРЕМЬЕРА
+#EXTINF:-1 tvg-id="Premera.ru" tvg-name="Премьера" tvg-country="INT" tvg-language="Russian" tvg-logo="" group-title="Movies",Премьера
 https://autopilot.catcast.tv/content/39161/index.m3u8
 #EXTINF:-1 tvg-id="Prima.ru" tvg-name="Прима" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Прима
 https://rt-sib-krsk-htlive.cdn.ngenix.net/hls/CH_R11_OTT_SIB_KRSK_STS/variant.m3u8
@@ -551,13 +518,13 @@ https://strm.yandex.ru/kal/prodvizheniye/prodvizheniye0.m3u8
 #EXTINF:-1 tvg-id="PyatnicaInternational.ru" tvg-name="Пятница! International" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/CNOYAUN.png" group-title="",Пятница! International (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/s50/index.m3u8
-#EXTINF:-1 tvg-id="RORTALFOXMIXTV.ru" tvg-name="РORTAL FOXMIX TV" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",РORTAL FOXMIX TV
+#EXTINF:-1 tvg-id="PortalFoxMixTV.ru" tvg-name="Portal FoxMix TV" tvg-country="INT" tvg-language="Russian" tvg-logo="" group-title="",Portal FoxMix TV
 http://tv.portalfoxmix.club:1935/portalfoxmix/portalfoxmix/chunklist_w707723531.m3u8
 #EXTINF:-1 tvg-id="RadioShanson.ru" tvg-name="Радио Шансон" tvg-country="RU" tvg-language="Russian" tvg-logo="http://lion-tv.com/uploads/posts/2016-09/1472964269_178.png" group-title="Music",Радио Шансон (720p)
 http://chanson-video.hostingradio.ru:8080/hls/chansonabr/live.m3u8
 #EXTINF:-1 tvg-id="RadioShanson.ru" tvg-name="Радио Шансон" tvg-country="RU" tvg-language="Russian" tvg-logo="http://lion-tv.com/uploads/posts/2016-09/1472964269_178.png" group-title="Music",Радио Шансон
 http://chanson-video.hostingradio.ru:8080/hls/chansonabr/live_hiq/index.m3u8
-#EXTINF:-1 tvg-id="Radostmoya.ru" tvg-name="Радость моя" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Kids",Радость моя
+#EXTINF:-1 tvg-id="RadostMoya.ru" tvg-name="Радость Моя" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Kids",Радость Моя
 http://188.40.68.167/russia/radost_moya/playlist.m3u8
 #EXTINF:-1 tvg-id="Ratnik.ru" tvg-name="Ратник" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Entertainment",Ратник (1080p)
 http://live-ratnik.cdnvideo.ru/ratnik/ratnik.sdp/playlist.m3u8
@@ -681,7 +648,7 @@ http://hls-tvsoyuz.cdnvideo.ru/tvsoyuz/soyuz/playlist.m3u8
 http://tvsoyuz.cdnvideo.ru/tvsoyuz/soyuz/playlist.m3u8
 #EXTINF:-1 tvg-id="Soyuz.ru" tvg-name="Союз" tvg-country="RU" tvg-language="Russian" tvg-logo="https://tv-soyuz.ru/static/img/logo.png" group-title="Religious",Союз (720p)
 https://strm.yandex.ru/kal/soyuz_supres/soyuz_supres0.m3u8
-#EXTINF:-1 tvg-id="SSSRTV.ru" tvg-name="СССР ТВ" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",СССР ТВ
+#EXTINF:-1 tvg-id="SSSRTV.ru" tvg-name="СССР ТВ" tvg-country="INT" tvg-language="Russian" tvg-logo="" group-title="",СССР ТВ
 https://autopilot.catcast.tv/content/38821/index.m3u8
 #EXTINF:-1 tvg-id="Start.ru" tvg-name="Старт" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Sport",Старт (1080p)
 https://strm.yandex.ru/kal/start/start0.m3u8
@@ -693,7 +660,7 @@ https://strm.yandex.ru/kal/start/start0_169_480p.json/index-v1-a1.m3u8
 https://strm.yandex.ru/kal/start/start0_169_720p.json/index-v1-a1.m3u8
 #EXTINF:-1 tvg-id="StranaFM.ru" tvg-name="Страна FM" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Music",Страна FM (720p)
 http://live.stranafm.cdnvideo.ru/stranafm/stranafm_hd.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="STRKHD.ru" tvg-name="СТРК HD" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",СТРК HD
+#EXTINF:-1 tvg-id="STRK.ru" tvg-name="СТРК" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",СТРК
 http://sochinskayatrk.ru/hdtv/hls/strc_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="STS.ru" tvg-name="СТС" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/pJNWVAz.png" group-title="",СТС
 #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
@@ -752,9 +719,9 @@ https://hls.tv.3angels.ru/stream/HQ.m3u8
 http://streamer.rtcommufa.ru:1935/tugantel/tugantel1/playlist.m3u8
 #EXTINF:-1 tvg-id="Udmurtiya.ru" tvg-name="Удмуртия" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Local",Удмуртия (404p)
 https://hls-myudm.cdnvideo.ru/myudm-live/myudm.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="Uzhastik.ru" tvg-name="Ужастик" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Ужастик
+#EXTINF:-1 tvg-id="Uzhastik.ru" tvg-name="Ужастик" tvg-country="INT" tvg-language="Russian" tvg-logo="" group-title="",Ужастик
 https://autopilot.catcast.tv/content/38896/index.m3u8
-#EXTINF:-1 tvg-id="FantastikaSciFi.ru" tvg-name="Фантастика Sci-Fi" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="",Фантастика Sci-Fi
+#EXTINF:-1 tvg-id="FantastikaSciFi.ru" tvg-name="Фантастика Sci-Fi" tvg-country="INT" tvg-language="Russian" tvg-logo="" group-title="",Фантастика Sci-Fi
 https://autopilot.catcast.tv/content/38801/index.m3u8
 #EXTINF:-1 tvg-id="Futbol.ru" tvg-name="Футбол" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/g24DSFV.png" group-title="",Футбол (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