diff --git a/channels/al.m3u b/channels/al.m3u
index aa0728bb25..47cbb8624c 100644
--- a/channels/al.m3u
+++ b/channels/al.m3u
@@ -13,24 +13,24 @@ http://tv.balkanweb.com:8081/news24/livestream/playlist.m3u8
 https://tv.oranews.tv/live/ora/index.m3u8
 #EXTINF:-1 tvg-id="OraNews.al" tvg-name="Ora News" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://i.imgur.com/GAx0LDU.png" group-title="",Ora News
 https://tv.oranews.tv/live/oranews/index.m3u8
+#EXTINF:-1 tvg-id="RTSH1.al" tvg-name="RTSH 1" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/3/30/RTSH_1_HD_(2020_Logo).svg/1920px-RTSH_1_HD_(2020_Logo).svg.png" group-title="General",RTSH 1
+http://edge01eu.ekranet.com:80/rtshhd_low/index.m3u8
+#EXTINF:-1 tvg-id="RTSH2.al" tvg-name="RTSH 2" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/ce/RTSH_2_HD_(2020_Logo).svg/1920px-RTSH_2_HD_(2020_Logo).svg.png" group-title="",RTSH 2
+http://edge01eu.ekranet.com:80/rtsh2hd1/index.m3u8
+#EXTINF:-1 tvg-id="RTSH24.al" tvg-name="RTSH 24" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/70/RTSH_24_%282020_Logo%29.svg/1920px-RTSH_24_%282020_Logo%29.svg.png" group-title="",RTSH 24
+http://edge01eu.ekranet.com:80/rtsh24/index.m3u8
+#EXTINF:-1 tvg-id="RTSH3.al" tvg-name="RTSH 3" tvg-country="AL" tvg-language="Albanian" tvg-logo="http://albepg.com/tvlogi/RTSH3 HD.png" group-title="",RTSH 3
+http://edge01eu.ekranet.com:80/rtsh3hd1/index.m3u8
+#EXTINF:-1 tvg-id="RTSHFilm.al" tvg-name="RTSH Film" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/94/RTSH_Film_%282020_Logo%29.svg/1920px-RTSH_Film_%282020_Logo%29.svg.png" group-title="",RTSH Film
+http://edge01eu.ekranet.com:80/rtshfilm1/index.m3u8
+#EXTINF:-1 tvg-id="RTSHMusike.al" tvg-name="RTSH Musike" tvg-country="AL" tvg-language="Albanian" tvg-logo="http://albepg.com/tvlogi/RTSH%20Muzike.png" group-title="",RTSH Musike
+http://edge01eu.ekranet.com/rtshmsicweb/index.m3u8
+#EXTINF:-1 tvg-id="RTSHShqip.al" tvg-name="RTSH Shqip" tvg-country="AL" tvg-language="Albanian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/46/RTSH_Shqip_%282020_Logo%29.svg/1920px-RTSH_Shqip_%282020_Logo%29.svg.png" group-title="",RTSH Shqip
+http://edge01eu.ekranet.com/rtshshqip1/index.m3u8
+#EXTINF:-1 tvg-id="RTSHSport.al" tvg-name="RTSH Plus" tvg-country="AL" tvg-language="Albanian" tvg-logo="http://albepg.com/tvlogi/RTSH Plus.png" group-title="",RTSH Sport
+http://edge01eu.ekranet.com:80/rtshsport_240p/index.m3u8
 #EXTINF:-1 tvg-id="RTVIlirida.al" tvg-name="RTV Ilirida" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",RTV Ilirida
 http://uk4.streamingpulse.com:1935/rtvilirida/rtvilirida/playlist.m3u8
-#EXTINF:-1 tvg-id="RTSH1.al" tvg-name="RTSH 1" tvg-country="AL,XK" tvg-language="Albanian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/3/30/RTSH_1_HD_(2020_Logo).svg/1920px-RTSH_1_HD_(2020_Logo).svg.png" group-title="General", RTSH 1
-http://edge01eu.ekranet.com:80/rtshhd_low/index.m3u8
-#EXTINF:-1 tvg-id="RTSH2.al" tvg-name="RTSH 2" tvg-country="AL,XK" tvg-language="Albanian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/c/ce/RTSH_2_HD_(2020_Logo).svg/1920px-RTSH_2_HD_(2020_Logo).svg.png" group-title="", RTSH 2
-http://edge01eu.ekranet.com:80/rtsh2hd1/index.m3u8
-#EXTINF:-1 tvg-id="RTSH3.al" tvg-name="RTSH 3" tvg-country="AL,XK" tvg-language="Albanian" tvg-logo="http://albepg.com/tvlogi/RTSH3 HD.png" group-title="", RTSH 3
-http://edge01eu.ekranet.com:80/rtsh3hd1/index.m3u8
-#EXTINF:-1 tvg-id="RTSHSport.al" tvg-name="RTSH Plus" tvg-country="AL,XK" tvg-language="Albanian" tvg-logo="http://albepg.com/tvlogi/RTSH Plus.png" group-title="", RTSH Sport
-http://edge01eu.ekranet.com:80/rtshsport_240p/index.m3u8
-#EXTINF:-1 tvg-id="RTSHMusike.al" tvg-name="RTSH Musike" tvg-country="AL,XK" tvg-language="Albanian" tvg-logo="http://albepg.com/tvlogi/RTSH%20Muzike.png" group-title="", RTSH Musike
-http://edge01eu.ekranet.com/rtshmsicweb/index.m3u8
-#EXTINF:-1 tvg-id="RTSH24.al" tvg-name="RTSH 24" tvg-country="AL,XK" tvg-language="Albanian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/7/70/RTSH_24_%282020_Logo%29.svg/1920px-RTSH_24_%282020_Logo%29.svg.png" group-title="", RTSH 24
-http://edge01eu.ekranet.com:80/rtsh24/index.m3u8
-#EXTINF:-1 tvg-id="RTSHFilm.al" tvg-name="RTSH Film" tvg-country="AL,XK" tvg-language="Albanian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/9/94/RTSH_Film_%282020_Logo%29.svg/1920px-RTSH_Film_%282020_Logo%29.svg.png" group-title="", RTSH Film
-http://edge01eu.ekranet.com:80/rtshfilm1/index.m3u8
-#EXTINF:-1 tvg-id="RTSHShqip.al" tvg-name="RTSH Shqip" tvg-country="AL,XK" tvg-language="Albanian" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/46/RTSH_Shqip_%282020_Logo%29.svg/1920px-RTSH_Shqip_%282020_Logo%29.svg.png" group-title="", RTSH Shqip
-http://edge01eu.ekranet.com/rtshshqip1/index.m3u8
 #EXTINF:-1 tvg-id="Syri Blue" tvg-name="Syri Blue" tvg-country="AL" tvg-language="Albanian" tvg-logo="http://www.albepg.com/tvlogi/Syri%20Blue.png" group-title="",Syri TV
 http://live.syri.tv:6969/live/syriblue/hd/23.ts
 #EXTINF:-1 tvg-id="TemaTV.al" tvg-name="Tema TV" tvg-country="AL" tvg-language="Albanian" tvg-logo="" group-title="",Tema TV
diff --git a/channels/ao.m3u b/channels/ao.m3u
index 9b3d610fa4..2bd73c50ba 100644
--- a/channels/ao.m3u
+++ b/channels/ao.m3u
@@ -1,3 +1,3 @@
 #EXTM3U
-#EXTINF:-1,TV Zimbo
+#EXTINF:-1 tvg-id="TVZimbo.ao" tvg-name="TV Zimbo" tvg-country="AO" tvg-language="" tvg-logo="" group-title="",TV Zimbo
 http://api.new.livestream.com/accounts/29819666/events/9254936/broadcasts/219581614.m3u8
diff --git a/channels/co.m3u b/channels/co.m3u
index 436561be91..35866bcd63 100644
--- a/channels/co.m3u
+++ b/channels/co.m3u
@@ -55,7 +55,7 @@ https://stream.logicideas.media/telepacifico-live/smil:live.smil/playlist.m3u8
 https://streamyes.alsolnet.com/tvgracia/live/playlist.m3u8
 #EXTINF:-1 tvg-id="UAOPlay.co" tvg-name="UAO Play" tvg-country="CO" tvg-language="Spanish" tvg-logo="https://i.imgur.com/kady79t.jpg" group-title="",UAO Play
 https://live-edge-rbx-1.cdn.enetres.net/184784E1D210401F8041E3E1266822CC021/live-1500/index.m3u8
-#EXTINF:-1 group-title="Sport",Win Sports+
-http://saypopular.com:25461/oscar/20gar/52853
-#EXTINF:-1 group-title="Sport",Win Sports+
+#EXTINF:-1 tvg-id="WinSportsPlus.co" tvg-name="Win Sports+" tvg-country="CO" tvg-language="" tvg-logo="" group-title="Sport",Win Sports+
 http://latinoamericatv.vip:3334/Kaka/Kaka/1385
+#EXTINF:-1 tvg-id="WinSportsPlus.co" tvg-name="Win Sports+" tvg-country="CO" tvg-language="" tvg-logo="" group-title="Sport",Win Sports+
+http://saypopular.com:25461/oscar/20gar/52853
diff --git a/channels/cz.m3u b/channels/cz.m3u
index 514ccb149b..7ab4bc6c4d 100644
--- a/channels/cz.m3u
+++ b/channels/cz.m3u
@@ -37,9 +37,9 @@ https://ocko-live.ssl.cdn.cra.cz/channels/ocko_expres/playlist/cze/live_hq.m3u8
 https://ocko-live-dash.ssl.cdn.cra.cz/cra_live2/ocko_gold.stream.1.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="OckoStar.cz" tvg-name="Óčko Star" tvg-country="CZ" tvg-language="Czech" tvg-logo="" group-title="Music",Óčko Star
 https://ocko-live.ssl.cdn.cra.cz/channels/ocko_gold/playlist/cze/live_hq.m3u8
+#EXTINF:-1 tvg-id="ČT1HD.cz" tvg-name="ČT1 HD" tvg-country="CZ" tvg-language="Czech" tvg-logo="" group-title="",ČT1 HD
+http://213.151.233.20:8000/dna-5100-tv-pc/hls/4002v105.m3u8
 #EXTINF:-1 tvg-id="Slagr2.cz" tvg-name="Šlágr 2" tvg-country="CZ;SK" tvg-language="Czech" tvg-logo="https://www.starnet.cz/tv/slagr2.png" group-title="",Šlágr 2
 http://92.62.234.233/slagr2.m3u
 #EXTINF:-1 tvg-id="SlagrTV.cz" tvg-name="Šlágr TV" tvg-country="CZ;SK" tvg-language="Czech" tvg-logo="https://www.slagrtv.cz/files/logo-slagr.png" group-title="Music",Šlágr TV
 https://slagrtv-live-hls.ssl.cdn.cra.cz/channels/slagrtv/playlist/cze/live_hq.m3u8
-#EXTINF:-1 tvg-id="ČT1HD.cz" tvg-name="ČT1 HD" tvg-country="CZ" tvg-language="Czech" tvg-logo="" group-title="",ČT1 HD
-http://213.151.233.20:8000/dna-5100-tv-pc/hls/4002v105.m3u8
diff --git a/channels/fr.m3u b/channels/fr.m3u
index 0c2a1cc4c3..6d7739f79c 100644
--- a/channels/fr.m3u
+++ b/channels/fr.m3u
@@ -180,9 +180,9 @@ http://fash1043.cloudycdn.services/slive/_definst_/ftv_pg16_adaptive.smil/media.
 #EXTINF:-1 tvg-id="FashionTVPG16.fr" tvg-name="FashionTV PG16" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/E38ZhCz.jpg" group-title="Fashion",FashionTV PG16
 https://fash1043.cloudycdn.services/slive/ftv_pg16_adaptive.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="France2.fr" tvg-name="France 2" tvg-country="FR" tvg-language="French" tvg-logo="https://www.francetvpub.fr/wp-content/uploads/2018/01/france_2_logo_rvb_2_couleur_noir-crop-226x180.png" group-title="General",France 2
-https://mmsiptv.com/live/france2/playlist.m3u8
-#EXTINF:-1 tvg-id="France2.fr" tvg-name="France 2" tvg-country="FR" tvg-language="French" tvg-logo="https://www.francetvpub.fr/wp-content/uploads/2018/01/france_2_logo_rvb_2_couleur_noir-crop-226x180.png" group-title="General",France 2
 http://cdn.webtv4.cdnfr.orange.fr/hs/HALO3/hls/france2live-12471/hls/index.m3u8
+#EXTINF:-1 tvg-id="France2.fr" tvg-name="France 2" tvg-country="FR" tvg-language="French" tvg-logo="https://www.francetvpub.fr/wp-content/uploads/2018/01/france_2_logo_rvb_2_couleur_noir-crop-226x180.png" group-title="General",France 2
+https://mmsiptv.com/live/france2/playlist.m3u8
 #EXTINF:-1 tvg-id="France24Arabic.fr" tvg-name="France 24 Arabic" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/61MSiq9.png" group-title="News",France 24 Arabic (576p)
 https://static.france24.com/live/F24_AR_HI_HLS/live_tv.m3u8
 #EXTINF:-1 tvg-id="France24Arabic.fr" tvg-name="France 24 Arabic" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/61MSiq9.png" group-title="News",France 24 Arabic (576p)
@@ -253,8 +253,6 @@ http://ott-cdn.ucom.am/s35/index.m3u8
 https://midnightpulp-samsung.roku.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="Moods.fr" tvg-name="Moods" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/zSdsBGc.jpg" group-title="",Moods
 https://alchimie-moods-1-fr.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="Mondeduloisir.fr" tvg-name="Monde du Loisir" tvg-country="FR" tvg-language="French" tvg-logo="" group-title="",Monde du Loisir
-http://tv.mondeduloisir.fr:1935/tixtv/smil:web.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="MotorSportTV.fr" tvg-name="MotorSport.TV" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/cVCb02R.jpg" group-title="",MotorSport.TV
 https://alchimie-motor-sport-1-fr.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="MoviesCentral.fr" tvg-name="Movies Central" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/dwOoEmE.jpg" group-title="",Movies Central
@@ -313,8 +311,18 @@ https://tsf-hls-live-ssl.tf1.fr/tsf/1/hls/live_2328.m3u8
 https://mmsiptv.com/live/tfx/playlist.m3u8
 #EXTINF:-1 tvg-id="TFX.fr" tvg-name="TFX" tvg-country="FR;AD;BE;LU;MC;CH" tvg-language="French" tvg-logo="https://i.imgur.com/yJ5JRAK.png" group-title="",TFX (720p)
 https://tfx-hls-live-ssl.tf1.fr/tfx/1/hls/live_2328.m3u8
-#EXTINF:-1 tvg-id="TMACaraibes.fr" tvg-name="TMA Caraïbes" tvg-country="" tvg-language="French" tvg-logo="" group-title="",TMA Caraïbes
+#EXTINF:-1 tvg-id="TMACaraibes.fr" tvg-name="TMA Caraïbes" tvg-country="FR" tvg-language="French" tvg-logo="" group-title="",TMA Caraïbes
 http://hls.tmacaraibes.com/live/index.m3u8
+#EXTINF:-1 tvg-id="TraceBrazuca.fr" tvg-name="Trace Brazuca" tvg-country="FR" tvg-language="" tvg-logo="" group-title="Music",Trace Brazuca
+https://mj1b2xsspj.singularcdn.net.br/trace/brazuca/6/prog_index.m3u8
+#EXTINF:-1 tvg-id="TraceLatina.fr" tvg-name="Trace Latina" tvg-country="FR" tvg-language="" tvg-logo="" group-title="Music",Trace Latina
+https://mj1b2xsspj.singularcdn.net.br/trace/latina/6/prog_index.m3u8
+#EXTINF:-1 tvg-id="TraceSportStars.fr" tvg-name="Trace Sport Stars" tvg-country="FR" tvg-language="" tvg-logo="" group-title="Sport",Trace Sport Stars
+https://mj1b2xsspj.singularcdn.net.br/trace/tss/6/prog_index.m3u8
+#EXTINF:-1 tvg-id="TraceToca.fr" tvg-name="Trace Toca" tvg-country="FR" tvg-language="" tvg-logo="" group-title="Music",Trace Toca
+https://mj1b2xsspj.singularcdn.net.br/trace/toca/6/prog_index.m3u8
+#EXTINF:-1 tvg-id="TraceUrban.fr" tvg-name="Trace Urban" tvg-country="FR" tvg-language="" tvg-logo="" group-title="Music",Trace Urban
+https://mj1b2xsspj.singularcdn.net.br/trace/urbanint/6/prog_index.m3u8
 #EXTINF:-1 tvg-id="TV3V.fr" tvg-name="TV3V" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/05RMwlR.png" group-title="",TV3V (720p)
 https://tv3v.hdr-tv.com/live/tv3v/livestream/master.m3u8
 #EXTINF:-1 tvg-id="TV5MondeInfo.fr" tvg-name="TV5Monde Info" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/AJx5Fy2.png" group-title="",TV5Monde Info
@@ -343,13 +351,3 @@ http://cdn.webtv4.cdnfr.orange.fr/hs/HALO4/hls/w9live-37153/hls/05.m3u8
 http://cdn.webtv4.cdnfr.orange.fr/hs/HALO4/hls/w9live-37153/hls/index.m3u8
 #EXTINF:-1 tvg-id="W9.fr" tvg-name="W9" tvg-country="FR" tvg-language="French" tvg-logo="" group-title="",W9
 https://mmsiptv.com/live/w9/playlist.m3u8
-#EXTINF:-1 tvg-logo="" group-title="Music",Trace Urban
-https://mj1b2xsspj.singularcdn.net.br/trace/urbanint/6/prog_index.m3u8
-#EXTINF:-1 tvg-logo="" group-title="Sport",Trace Sport Stars
-https://mj1b2xsspj.singularcdn.net.br/trace/tss/6/prog_index.m3u8
-#EXTINF:-1 tvg-logo="" group-title="Music",Trace Brazuca
-https://mj1b2xsspj.singularcdn.net.br/trace/brazuca/6/prog_index.m3u8
-#EXTINF:-1 tvg-logo="" group-title="Music",Trace Latina
-https://mj1b2xsspj.singularcdn.net.br/trace/latina/6/prog_index.m3u8
-#EXTINF:-1 tvg-logo="" group-title="Music",Trace Toca
-https://mj1b2xsspj.singularcdn.net.br/trace/toca/6/prog_index.m3u8
diff --git a/channels/gr.m3u b/channels/gr.m3u
index ebee782853..bdca4d773c 100644
--- a/channels/gr.m3u
+++ b/channels/gr.m3u
@@ -13,14 +13,26 @@ https://eco.streams.ovh:443/BarazaTV/BarazaTV/playlist.m3u8
 https://eco.streams.ovh:443/BarazaClassic/BarazaClassic/playlist.m3u8
 #EXTINF:-1 tvg-id="BarazaTVGreekMusicHits.gr" tvg-name="Baraza TV Greek Music Hits" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/mW6c2QR.png" group-title="Music",Baraza TV Greek Music Hits (1080p)
 https://eco.streams.ovh/BarazaTV/BarazarazaTV/BarazaTV/playlist.m3u8
+#EXTINF:-1 tvg-id="BestTV.gr" tvg-name="Best TV" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/k7vmAsg.png" group-title="",Best TV
+https://s.best-tv.gr/HLS/hls/best/1_2/index.m3u8
 #EXTINF:-1 tvg-id="Channel9.gr" tvg-name="Channel 9" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://i.imgur.com/24uaLwh.png" group-title="Local",Channel 9 (720p)
 http://176.9.123.140:1935/channel9/channel9/playlist.m3u8
 #EXTINF:-1 tvg-id="CorfuTV.gr" tvg-name="Corfu TV" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/G7LHkTE.jpg" group-title="",Corfu TV (576p)
 https://itv.streams.ovh/corfuchannel/corfuchannel/playlist.m3u8
+#EXTINF:-1 tvg-id="Diktyo1.gr" tvg-name="Diktyo1" tvg-country="GR" tvg-language="" tvg-logo="" group-title="",Diktyo1
+https://www.hellasnet.tv/rest.live.hn/diktyo1r/playlist.m3u8
 #EXTINF:-1 tvg-id="EnaChannel.gr" tvg-name="Ena Channel" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://greektv.pbworks.com/f/ENA_CHANNEL.png" group-title="Local",Ena Channel (720p)
 http://176.9.123.140:1935/1c/stream/master.m3u8
 #EXTINF:-1 tvg-id="EpirusTV1.gr" tvg-name="Epirus TV1" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://greektv.pbworks.com/f/EPIRUS_TV1.png" group-title="Local",Epirus TV1 (576p)
 http://176.9.123.140:1935/radioepirus/radioepirus/playlist.m3u8
+#EXTINF:-1 tvg-id="ert.gr" tvg-name="EPT1" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="" group-title="",ERT 1
+http://ert-live-bcbs15228.siliconweb.com/media/ert_1/ert_1.m3u8
+#EXTINF:-1 tvg-id="ert.gr" tvg-name="EPT2" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="" group-title="",ERT 2
+http://ert-live-bcbs15228.siliconweb.com/media/ert_2/ert_2.m3u8
+#EXTINF:-1 tvg-id="ert.gr" tvg-name="EPT3" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="" group-title="",ERT 3
+http://ert-live-bcbs15228.siliconweb.com/media/ert_3/ert_3.m3u8
+#EXTINF:-1 tvg-id="ERTWorld.gr" tvg-name="ERT World" tvg-country="GR" tvg-language="" tvg-logo="" group-title="",ERT World
+http://wpso.com:1936/hls/wzra.m3u8
 #EXTINF:-1 tvg-id="GroovyTV.gr" tvg-name="Groovy TV" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/0iklNh2.png" group-title="Movies",Groovy TV (532p)
 http://web.onair-radio.eu:1935/groovytv/groovytv/playlist.m3u8
 #EXTINF:-1 tvg-id="Ionian TV GR" tvg-name="Ionian TV GR" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://greektv.pbworks.com/w/file/fetch/51254412/IONIAN.PNG" group-title="Local",Ionian TV (720p)
@@ -45,6 +57,8 @@ http://live.streams.ovh:1935/NGradio/NGradio/playlist.m3u8
 https://live.streams.ovh/NGradio/NGradio/playlist.m3u8
 #EXTINF:-1 tvg-id="NRG91.gr" tvg-name="NRG 91" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/1Zl1OJ5.png" group-title="",NRG 91 (720p)
 http://tv.nrg91.gr:1935/onweb/live/master.m3u8
+#EXTINF:-1 tvg-id="tvopen.gr" tvg-name="Open TV HD" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/M6XG03v.png" group-title="",Open TV HD
+https://liveopencloud.siliconweb.com/1/ZlRza2R6L2tFRnFJ/eWVLSlQx/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="PlayTV.gr" tvg-name="Play TV" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://i.imgur.com/100uuWA.png" group-title="Music",Play TV (480p)
 http://web.onair-radio.eu:1935/Alpha-Host/Alpha-Host/playlist.m3u8
 #EXTINF:-1 tvg-id="PLP.gr" tvg-name="PLP" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/qa3Lurc.png" group-title="Local",PLP (226p)
@@ -55,8 +69,12 @@ http://web.onair-radio.eu:1935/video/video/playlist.m3u8
 http://live.cast-control.eu:1935/samiaki/samiaki/playlist.m3u8
 #EXTINF:-1 tvg-id="skai.gr" tvg-name="Skai TV" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/44RsYnf.jpg" group-title="",Skai TV
 https://skai-live-back.siliconweb.com/media/cambria4/index.m3u8
+#EXTINF:-1 tvg-id="star.gr" tvg-name="Star" tvg-country="GR" tvg-language="Modern Greek (1453 -)" tvg-logo="https://i.imgur.com/4HSJigE.png" group-title="",Star
+https://livestar.siliconweb.com/media/s tar1/star1mediumhd.m3u8
 #EXTINF:-1 tvg-id="StartTV.gr" tvg-name="Start TV" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://greektv.pbworks.com/f/START_TV.png" group-title="Local",Start TV (480p)
 https://live.cast-control.eu/StartMedia/StartMedia/playlist.m3u8
+#EXTINF:-1 tvg-id="Tilemousiki.gr" tvg-name="Tilemousiki" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/wb4pLkW.jpg" group-title="",Tilemousiki
+http://iptv1.gripfs.tk:8080/channel/709bb160/index.m3u8?q=eyJ1c2VySWQiOiJhZG1pbiJ9.KzXTu4AXEXc0KBtLr1OMj2VVhkIK3OJeN8fyEW9yEfqM6FYVxqw-URTKK028zIuM-fArvKHG_hW2LevFtPa7ug
 #EXTINF:-1 tvg-id="TopChannel.gr" tvg-name="Top Channel" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://greektv.pbworks.com/f/TOP_KOZANIS.png" group-title="Local",Top Channel (240p)
 https://itv.streams.ovh/topchannel/topchannel/playlist.m3u8
 #EXTINF:-1 tvg-id="TRTTV.gr" tvg-name="TRT TV" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://i.imgur.com/nAzfWx5.png" group-title="Local",TRT TV
@@ -65,6 +83,10 @@ https://www.hellasnet.tv/rest.live.hn/trt2/chunklist.m3u8
 https://live.streams.ovh/tvcreta/tvcreta/chunklist.m3u8
 #EXTINF:-1 tvg-id="TVFilopoli.gr" tvg-name="TV Filopoli" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="http://i.imgur.com/GdgekUL.png" group-title="",TV Filopoli (360p)
 http://live.streams.ovh:1935/tvfilopoli/tvfilopoli/playlist.m3u8
+#EXTINF:-1 tvg-id="TVRodopi.gr" tvg-name="TV Rodopi" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/UZeSUN2.png" group-title="",TV Rodopi
+https://video.connect4.gr/live/tvrodopi/chunklist_w962288216.m3u8
+#EXTINF:-1 tvg-id="TV100.gr" tvg-name="TV100" tvg-country="GR" tvg-language="" tvg-logo="https://i.imgur.com/ebFr9dD.png" group-title="",TV100
+https://live.fm100.gr/hls/tv100/index.m3u8
 #EXTINF:-1 tvg-id="Vouli GR" tvg-name="Vouli GR" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=41706922&t=1524412256156" group-title="",Vouli Tileorasi (540p)
 https://streamer-cache.grnet.gr/parliament/hls/webtv.m3u8
 #EXTINF:-1 tvg-id="Vouli GR" tvg-name="Vouli GR" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Vouli Tileorasi (360p)
@@ -81,25 +103,3 @@ http://web.onair-radio.eu:1935/explorecy/explorecy/playlist.m3u8
 http://live.cretetv.gr:1935/cretetv/myStream/f1tv.m3u8
 #EXTINF:-1 tvg-id="MesogeiosTV.gr" tvg-name="Μεσογειος TV" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/OnB6n3C.jpg" group-title="Local",Μεσογειος TV (450p)
 http://176.9.123.140:1935/mesogeiostv/stream/master.m3u8
-#EXTINF:-1,Diktyo1
-https://www.hellasnet.tv/rest.live.hn/diktyo1r/playlist.m3u8
-#EXTINF:-1,ERT World
-http://wpso.com:1936/hls/wzra.m3u8
-#EXTINF:-1 tvg-id="ert.gr" tvg-name="EPT1" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="" group-title="",ERT 1
-http://ert-live-bcbs15228.siliconweb.com/media/ert_1/ert_1.m3u8
-#EXTINF:-1 tvg-id="ert.gr" tvg-name="EPT2" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="" group-title="",ERT 2
-http://ert-live-bcbs15228.siliconweb.com/media/ert_2/ert_2.m3u8
-#EXTINF:-1 tvg-id="ert.gr" tvg-name="EPT3" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="" group-title="",ERT 3
-http://ert-live-bcbs15228.siliconweb.com/media/ert_3/ert_3.m3u8
-#EXTINF:-1 tvg-id="tvopen.gr" tvg-name="Open TV HD" tvg-country="GR" tvg-language="Modern Greek (1453-)" tvg-logo="https://i.imgur.com/M6XG03v.png" group-title="",Open TV HD
-https://liveopencloud.siliconweb.com/1/ZlRza2R6L2tFRnFJ/eWVLSlQx/hls/live/playlist.m3u8
-#EXTINF:-1 tvg-id="star.gr" tvg-name="Star" tvg-country="GR" tvg-language="Modern Greek (1453 -)" tvg-logo="https://i.imgur.com/4HSJigE.png" group-title="",Star
-https://livestar.siliconweb.com/media/s tar1/star1mediumhd.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="TV Rodopi" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/UZeSUN2.png" group-title="",TV Rodopi
-https://video.connect4.gr/live/tvrodopi/chunklist_w962288216.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="Best TV" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/k7vmAsg.png" group-title="",Best TV
-https://s.best-tv.gr/HLS/hls/best/1_2/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="TV100" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/ebFr9dD.png" group-title="",TV100
-https://live.fm100.gr/hls/tv100/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="Tilemousiki" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/wb4pLkW.jpg" group-title="",Tilemousiki
-http://iptv1.gripfs.tk:8080/channel/709bb160/index.m3u8?q=eyJ1c2VySWQiOiJhZG1pbiJ9.KzXTu4AXEXc0KBtLr1OMj2VVhkIK3OJeN8fyEW9yEfqM6FYVxqw-URTKK028zIuM-fArvKHG_hW2LevFtPa7ug
diff --git a/channels/kr.m3u b/channels/kr.m3u
index ce554912c1..8fd12e0951 100644
--- a/channels/kr.m3u
+++ b/channels/kr.m3u
@@ -23,6 +23,10 @@ http://cbs-live.gscdn.com/cbs-live/cbs-live.stream/playlist.m3u8
 http://cbs-live.gscdn.com:1935/cbs-live/cbs-live.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="CGNTV.kr" tvg-name="CGNTV" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/SQI9PAz.png" group-title="Religious",CGNTV
 http://cgntv-glive.ofsdelivery.net/live/_definst_/cgntv_kr02/chunklist.m3u8
+#EXTINF:-1 tvg-id="ChannelAPlus.kr" tvg-name="ChannelAPlus" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C17141.png" group-title="",ChannelAPlus
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C17141&q=SD&apikey=cit1254678
+#EXTINF:-1 tvg-id="ChunghwaTV.kr" tvg-name="Chunghwa TV" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00544.png" group-title="",Chunghwa TV
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00544&q=SD&apikey=cit1254678
 #EXTINF:-1 tvg-id="EBS1.kr" tvg-name="EBS 1" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/s1y2zoe.png" group-title="",EBS 1
 http://ebsonair.ebs.co.kr/groundwavefamilypc/familypc1m/chunklist_w1960240276.m3u8
 #EXTINF:-1 tvg-id="EBS2.kr" tvg-name="EBS 2" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/7K7zmoE.png" group-title="",EBS 2
@@ -47,6 +51,18 @@ http://liveko24-manminglobal3.ktcdn.co.kr/liveko24/gcnko_high/chunklist.m3u8
 http://mediaworks.dema.mil.kr:1935/live_edge/cudo.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="Hallypop.kr" tvg-name="Hallypop" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/FCFAAJb.png" group-title="",Hallypop (1080p)
 https://dai.google.com/linear/hls/event/ctGD-E18Q0-3WScFd_tK5w/master.m3u8
+#EXTINF:-1 tvg-id="JIBSSBS.kr" tvg-name="JIBS SBS" tvg-country="KR" tvg-language="" tvg-logo="http://jibs.co.kr/resources/common/img/bottom_logo.png" group-title="",JIBS SBS
+http://123.140.197.22/stream/1/play.m3u8
+#EXTINF:-1 tvg-id="JTBC.kr" tvg-name="JTBC" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C01582.png" group-title="",JTBC
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C01582&q=SD&apikey=cit1254678
+#EXTINF:-1 tvg-id="JTBCGolf.kr" tvg-name="JTBC Golf" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00588.png" group-title="",JTBC Golf
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00588&q=SD&apikey=cit1254678
+#EXTINF:-1 tvg-id="JTBCGolfSports.kr" tvg-name="JTBC Golf&Sports" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00805.png" group-title="",JTBC Golf&Sports
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00805&q=SD&apikey=cit1254678
+#EXTINF:-1 tvg-id="JTBC2.kr" tvg-name="JTBC2" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C15741.png" group-title="",JTBC2
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C15741&q=SD&apikey=cit1254678
+#EXTINF:-1 tvg-id="JTBC4.kr" tvg-name="JTBC4" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C22041.png" group-title="",JTBC4
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C22041&q=SD&apikey=cit1254678
 #EXTINF:-1 tvg-id="KPlus.kr" tvg-name="K+" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/4DEUpdm.jpg" group-title="",K+ (576p)
 http://210.210.155.35/uq2663/h/h08/index.m3u8
 #EXTINF:-1 tvg-id="KBS1.kr" tvg-name="KBS 1" tvg-country="KR" tvg-language="Korean" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/d/d5/KBS_1_logo.svg/langfr-220px-KBS_1_logo.svg.png" group-title="",KBS 1
@@ -55,12 +71,32 @@ http://121.130.210.101:9981/stream/channelid/637185705
 rtmp://218.38.152.31:1935/klive/klive.stream
 #EXTINF:-1 tvg-id="MaeilBusinessNewspaper.kr" tvg-name="Maeil Business Newspaper" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/AmalRpB.png" group-title="",Maeil Business Newspaper
 rtmp://origin.flive.skcdn.com/mbn-auth1/1000k
+#EXTINF:-1 tvg-id="MBN.kr" tvg-name="MBN" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00708.png" group-title="",MBN
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00708&q=SD&apikey=cit1254678
+#EXTINF:-1 tvg-id="MBNPlus.kr" tvg-name="MBN Plus" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C17142.png" group-title="",MBN Plus
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C17142&q=SD&apikey=cit1254678
+#EXTINF:-1 tvg-id="Mnet.kr" tvg-name="Mnet" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00579.png" group-title="",Mnet
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00579&q=SD&apikey=cit1254678
+#EXTINF:-1 tvg-id="Mnet.kr" tvg-name="Mnet" tvg-country="KR" tvg-language="Korean" tvg-logo="" group-title="",Mnet
+http://95.217.44.77:80/mnet/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="MTN.kr" tvg-name="MTN" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/QMDDHd1.gif" group-title="",MTN
 http://183.110.27.87/mtnlive/_definst_/720/chunklist.m3u8
 #EXTINF:-1 tvg-id="MTN.kr" tvg-name="MTN" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/QMDDHd1.gif" group-title="",MTN
 rtmp://mmoney.flive.skcdn.com/mmoneymobile/money3.stream
 #EXTINF:-1 tvg-id="NBSKoreaAgriculturalBroadcasting.kr" tvg-name="NBS Korea Agricultural Broadcasting" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/loWf3B5.jpg" group-title="",NBS Korea Agricultural Broadcasting (720p)
 https://media.joycorp.co.kr:4443/live/live_720p/playlist.m3u8
+#EXTINF:-1 tvg-id="OtvN.kr" tvg-name="O tvN" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C01143.png" group-title="",O tvN
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C01143&q=SD&apikey=cit1254678
+#EXTINF:-1 tvg-id="OGN.kr" tvg-name="OGN" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00590.png" group-title="",OGN
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00590&q=SD&apikey=cit1254678
+#EXTINF:-1 tvg-id="Olive.kr" tvg-name="Olive" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00575.png" group-title="",Olive
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00575&q=SD&apikey=cit1254678
+#EXTINF:-1 tvg-id="Onstyle.kr" tvg-name="Onstyle" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C01142.png" group-title="",Onstyle
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C01142&q=SD&apikey=cit1254678
+#EXTINF:-1 tvg-id="SBS.kr" tvg-name="SBS" tvg-country="KR" tvg-language="Korean" tvg-logo="" group-title="",SBS
+http://95.217.44.77:80/sbs/tracks-v1a1/mono.m3u8
+#EXTINF:-1 tvg-id="SBSBiz.kr" tvg-name="SBS Biz" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C15846.png" group-title="",SBS Biz
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C15846&q=SD&apikey=cit1254678
 #EXTINF:-1 tvg-id="SBSInternational.kr" tvg-name="SBS International" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/JNmRU3V.png" group-title="",SBS International (480p)
 https://streaming-a-802.cdn.nextologies.com/SBS_Live_HD/live/SBS_Live_HD_1500k/playlist.m3u8
 #EXTINF:-1 tvg-id="SBSKNN.kr" tvg-name="SBS KNN" tvg-country="KR" tvg-language="Korean" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/KNN_logo.svg/120px-KNN_logo.svg.png" group-title="",SBS KNN (450p)
@@ -71,65 +107,27 @@ https://streaming-a-802.cdn.nextologies.com/SBS_Plus/live/SBS_Plus_1500k/playlis
 https://streaming-a-802.cdn.nextologies.com/SBS_18/playlist.m3u8
 #EXTINF:-1 tvg-id="TBS.kr" tvg-name="TBS" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/wqlTcbI.png" group-title="",TBS (720p)
 https://tbs.hscdn.com/tbstvweb/tbstv/playlist.m3u8
+#EXTINF:-1 tvg-id="TheKPOP.kr" tvg-name="The K-POP" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C43342.png" group-title="",The K-POP
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C43342&q=SD&apikey=cit1254678
+#EXTINF:-1 tvg-id="TVChosun.kr" tvg-name="TV Chosun" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C01581.png" group-title="",TV Chosun
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C01581&q=SD&apikey=cit1254678
+#EXTINF:-1 tvg-id="TVChosun2.kr" tvg-name="TV Chosun 2" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00585.png" group-title="",TV Chosun 2
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00585&q=SD&apikey=cit1254678
 #EXTINF:-1 tvg-id="TVWorkNet.kr" tvg-name="TVWorkNet" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/xLL7Sxm.png" group-title="",TVWorkNet (480p)
 http://live.worktv.or.kr:1935/live/wowtvlive1.sdp/playlist.m3u8
+#EXTINF:-1 tvg-id="XtvN.kr" tvg-name="XtvN" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C01141.png" group-title="",XtvN
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C01141&q=SD&apikey=cit1254678
+#EXTINF:-1 tvg-id="YonhapNewsTV.kr" tvg-name="YonhapNewsTV" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C01723.png" group-title="",YonhapNewsTV
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C01723&q=SD&apikey=cit1254678
+#EXTINF:-1 tvg-id="YTN.kr" tvg-name="YTN" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00593.png" group-title="",YTN
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00593&q=SD&apikey=cit1254678
 #EXTINF:-1 tvg-id="YTN.kr" tvg-name="YTN" tvg-country="KR" tvg-language="Korean" tvg-logo="https://static.epg.best/kr/YTN.kr.png" group-title="",YTN
 http://slive.ytn.co.kr/ytn/_definst_/ytn_stream_20190306/playlist.m3u8
 #EXTINF:-1 tvg-id="YTNDMB.kr" tvg-name="YTN DMB" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/fdFQonN.jpg" group-title="",YTN DMB (270p)
 http://slive.ytn.co.kr:1935/dmb/ydlive_20140419_1/playlist.m3u8
 #EXTINF:-1 tvg-id="YTNSCIENCE.kr" tvg-name="YTN SCIENCE" tvg-country="KR" tvg-language="Korean" tvg-logo="https://i.imgur.com/FIzME5L.jpg" group-title="",YTN SCIENCE (270p)
 http://slive.sciencetv.kr:1935/science/yslive_20140419_1/playlist.m3u8
-#EXTINF:-1 tvg-id="Mnet.kr" tvg-name="Mnet" tvg-country="KR" tvg-language="Korean" tvg-logo="" group-title="",Mnet
-http://95.217.44.77:80/mnet/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="SBS.kr" tvg-name="SBS" tvg-country="KR" tvg-language="Korean" tvg-logo="" group-title="",SBS
-http://95.217.44.77:80/sbs/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00551.png",tvN
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00551&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00593.png",YTN
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00593&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C01143.png",O tvN
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C01143&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C15741.png",JTBC2
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C15741&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C01141.png",XtvN
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C01141&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C01582.png",JTBC
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C01582&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00575.png",Olive
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00575&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C01723.png",YonhapNewsTV
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C01723&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C22041.png",JTBC4
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C22041&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00805.png",JTBC Golf&Sports
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00805&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00579.png",Mnet
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00579&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00588.png",JTBC Golf
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00588&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C01142.png",Onstyle
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C01142&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00585.png",TV Chosun 2
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00585&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C01581.png",TV Chosun
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C01581&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C17141.png",ChannelAPlus
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C17141&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00544.png",Chunghwa TV
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00544&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C01101.png",YTN2
+#EXTINF:-1 tvg-id="YTN2.kr" tvg-name="YTN2" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C01101.png" group-title="",YTN2
 http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C01101&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C17142.png",MBN Plus
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C17142&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C43342.png",The K-POP
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C43342&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00590.png",OGN
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00590&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C00708.png",MBN
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C00708&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C15347.png",YTNScience
+#EXTINF:-1 tvg-id="YTNScience.kr" tvg-name="YTNScience" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C15347.png" group-title="",YTNScience
 http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C15347&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C15846.png",SBS Biz
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C15846&q=SD&apikey=cit1254678
-#EXTINF:-1 tvg-logo="http://jibs.co.kr/resources/common/img/bottom_logo.png",JIBS SBS
-http://123.140.197.22/stream/1/play.m3u8
diff --git a/channels/tz.m3u b/channels/tz.m3u
index 6c748b5f1f..635aea7435 100644
--- a/channels/tz.m3u
+++ b/channels/tz.m3u
@@ -1,9 +1,9 @@
 #EXTM3U
+#EXTINF:-1 tvg-id="AzamSports1HD.tz" tvg-name="Azam Sports 1 HD" tvg-country="TZ" tvg-language="" tvg-logo="https://azamtv.co.tz/tan/thumb/c/124/70/channels/channel_image1444752374.jpg" group-title="Sport",Azam Sports 1 HD
+https://1446000130.rsc.cdn77.org/1446000130/index.m3u8
+#EXTINF:-1 tvg-id="AzamSports2.tz" tvg-name="Azam Sports 2" tvg-country="TZ" tvg-language="" tvg-logo="https://azamtv.co.tz/tan/thumb/c/124/70/channels/channel_image1508329528.png" group-title="Sport",Azam Sports 2
+https://1326605225.rsc.cdn77.org/1326605225/tracks-v1a1/index.m3u8
+#EXTINF:-1 tvg-id="ChannelTen.tz" tvg-name="Channel Ten" tvg-country="TZ" tvg-language="" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcSlgi36jeSD2_aTBenoZYVRo53N_WjRVK9EcA&usqp=CAU" group-title="",Channel Ten
+http://hls-pull-switchinternational.speedws.com/live/test1/playlist.m3u8
 #EXTINF:-1 tvg-id="IBNTV.tz" tvg-name="IBN TV" tvg-country="TZ" tvg-language="English" tvg-logo="https://i.imgur.com/Wf2BlTG.png" group-title="Religious",IBN TV
 http://138.68.138.119:8080/low/5a8993709ea19/index.m3u8
-#EXTINF:-1 tvg-logo="https://azamtv.co.tz/tan/thumb/c/124/70/channels/channel_image1444752374.jpg" group-title="Sport",Azam Sports 1 HD
-https://1446000130.rsc.cdn77.org/1446000130/index.m3u8
-#EXTINF:-1 tvg-logo="https://azamtv.co.tz/tan/thumb/c/124/70/channels/channel_image1508329528.png" group-title="Sport",Azam Sports 2
-https://1326605225.rsc.cdn77.org/1326605225/tracks-v1a1/index.m3u8
-#EXTINF:-1 tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcSlgi36jeSD2_aTBenoZYVRo53N_WjRVK9EcA&usqp=CAU" group-title="",Channel Ten 
-http://hls-pull-switchinternational.speedws.com/live/test1/playlist.m3u8
diff --git a/channels/us.m3u b/channels/us.m3u
index 4466e6ad64..138a2763aa 100644
--- a/channels/us.m3u
+++ b/channels/us.m3u
@@ -748,6 +748,10 @@ http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ca671f215a62078d2e
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d4947590ba40f75dc29c26b/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&genre=ROKU_ADS_CONTENT_GENRE&content_rating=ROKU_ADS_CONTENT_RATING&studio_id=viacom&channel_id=channel
 #EXTINF:-1 tvg-id="ComedyCentralAnimation.us" tvg-name="Comedy Central Animation" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f99e24636d67d0007a94e6d/colorLogoPNG.png" group-title="",Comedy Central Animation
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f99e24636d67d0007a94e6d/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&genre=ROKU_ADS_CONTENT_GENRE&content_rating=ROKU_ADS_CONTENT_RATING&studio_id=viacom&channel_id=channel
+#EXTINF:-1 tvg-id="ComedyCentralBrasil.us" tvg-name="Comedy Central Brasil" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://i.imgur.com/ZekUX7A.png" group-title="Comedy",Comedy Central Brasil
+http://ug1upc1hgb.singularcdn.net.br/CCLB_HD/tracks-v2a1/mono.m3u8
+#EXTINF:-1 tvg-id="ComedyCentralHDBrasil.us" tvg-name="Comedy Central HD Brasil" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://i.imgur.com/ZekUX7A.png" group-title="Comedy",Comedy Central HD Brasil
+http://ug1upc1hgb.singularcdn.net.br/CCLB_HD/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="ComedyCentralLatino.us" tvg-name="Comedy Central Latino" tvg-country="US" tvg-language="Spanish" tvg-logo="http://images.pluto.tv/channels/5cf96dad1652631e36d43320/colorLogoPNG.png" group-title="",Comedy Central Latino
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5cf96dad1652631e36d43320/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&genre=ROKU_ADS_CONTENT_GENRE&content_rating=ROKU_ADS_CONTENT_RATING&studio_id=viacom&channel_id=channel
 #EXTINF:-1 tvg-id="ComedyCentralMadeinGermany.us" tvg-name="Comedy Central Made in Germany" tvg-country="DE" tvg-language="German" tvg-logo="https://images.pluto.tv/channels/5d4948418101147596fd6c5a/colorLogoPNG.png" group-title="",Comedy Central Made in Germany
@@ -1110,6 +1114,8 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5bb1af6a2
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5e94cd036cc69d0007e8a1ba/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&genre=ROKU_ADS_CONTENT_GENRE&content_rating=ROKU_ADS_CONTENT_RATING&studio_id=viacom&channel_id=channel
 #EXTINF:-1 tvg-id="ForensicsFilesSTIRR.us" tvg-name="Forensics Files (STIRR)" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/3e64aff5-e709-4ced-8452-d67728e54718-small3x1_stirr_1219_epg_forensicfiles_1920x1080.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="",Forensics Files (STIRR)
 https://dai.google.com/linear/hls/event/fJj7BuL_Tv2KjCnNAmLK8g/master.m3u8
+#EXTINF:-1 tvg-id="FoxGreece.us" tvg-name="Fox Greece" tvg-country="GR" tvg-language="" tvg-logo="" group-title="",Fox Greece
+http://live.streams.ovh:1935/foxtv/foxtv/playlist.m3u8
 #EXTINF:-1 tvg-id="FoxLifeRussia.us" tvg-name="Fox Life Russia" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",Fox Life Russia (576p)
 http://51.68.140.190:8081/tv/fox-life/playlist.m3u8
 #EXTINF:-1 tvg-id="FoxNews.us" tvg-name="Fox News" tvg-country="US" tvg-language="English" tvg-logo="" group-title="News",Fox News (720p)
@@ -1730,6 +1736,8 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d14fd1a2
 http://pluto-live.plutotv.net/egress/chandler/pluto01/live/VIACBS03/master.m3u8
 #EXTINF:-1 tvg-id="MTVBlockParty.us" tvg-name="MTV Block Party" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5d3609cd6a6c78d7672f2a81/colorLogoPNG.png" group-title="",MTV Block Party
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d3609cd6a6c78d7672f2a81/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&genre=ROKU_ADS_CONTENT_GENRE&content_rating=ROKU_ADS_CONTENT_RATING&studio_id=viacom&channel_id=channel
+#EXTINF:-1 tvg-id="MTVBrasil.us" tvg-name="MTV Brasil" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://i.imgur.com/U6Rgjqs.png" group-title="Music",MTV Brasil
+http://ug1upc1hgb.singularcdn.net.br/MTV_BR_HD/tracks-v2a1/mono.m3u8
 #EXTINF:-1 tvg-id="MTVCatfishTVShow.us" tvg-name="MTV Catfish TV Show" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5f1ab3c7778230000735cf41/colorLogoPNG.png" group-title="",MTV Catfish TV Show
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f1ab3c7778230000735cf41/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&content_rating=ROKU_ADS_CONTENT_RATING
 #EXTINF:-1 tvg-id="MTVClassic.us" tvg-name="MTV Classic" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5de91b7ea86ee60009d89e75/colorLogoPNG.png" group-title="",MTV Classic
@@ -1750,6 +1758,8 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5caf330ea
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/600169ec77e6f70008fa9cf0/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&content_rating=ROKU_ADS_CONTENT_RATING
 #EXTINF:-1 tvg-id="MTVEmbarazadaalos16.us" tvg-name="MTV Embarazada a los 16" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f98537a5a4341000733aefe/colorLogoPNG.png" group-title="",MTV Embarazada a los 16
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f98537a5a4341000733aefe/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&content_rating=ROKU_ADS_CONTENT_RATING
+#EXTINF:-1 tvg-id="MTVHDBrasil.us" tvg-name="MTV HD Brasil" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://i.imgur.com/U6Rgjqs.png" group-title="Music",MTV HD Brasil
+http://ug1upc1hgb.singularcdn.net.br/MTV_BR_HD/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="MTVLatino.us" tvg-name="MTV Latino" tvg-country="US" tvg-language="Spanish" tvg-logo="http://images.pluto.tv/channels/5cf96d351652631e36d4331f/colorLogoPNG.png" group-title="",MTV Latino
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5cf96d351652631e36d4331f/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&genre=ROKU_ADS_CONTENT_GENRE&content_rating=ROKU_ADS_CONTENT_RATING&studio_id=viacom&channel_id=channel
 #EXTINF:-1 tvg-id="MTVLiveHD.us" tvg-name="MTV Live HD" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images2.imgbox.com/92/f9/p2ALSiHp_o.jpg" group-title="",MTV Live HD
@@ -1934,6 +1944,10 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f4796368
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d8d08395f39465da6fb3ec4/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&genre=ROKU_ADS_CONTENT_GENRE&content_rating=ROKU_ADS_CONTENT_RATING&studio_id=viacom&channel_id=channel
 #EXTINF:-1 tvg-id="NickJr.us" tvg-name="Nick Jr" tvg-country="US" tvg-language="English" tvg-logo="http://static.epg.best/sa/NickJr.sa.png" group-title="",Nick Jr
 http://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ca6748a37b88b269472dad9/master.m3u8?terminate=false&deviceType=web&deviceMake=web&deviceModel=web&sid=978&deviceId=5ca6748a37b88b269472dad9&deviceVersion=DNT&appVersion=DNT&deviceDNT=0&userId=&advertisingId=&deviceLat=&deviceLon=&app_name=&appName=web&buildVersion=&appStoreUrl=&architecture=&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false
+#EXTINF:-1 tvg-id="NickJrBrasil.us" tvg-name="Nick Jr Brasil" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://i.imgur.com/6vVmJJf.png" group-title="Kids",Nick Jr Brasil
+http://ug1upc1hgb.singularcdn.net.br/NICK_JR_BR_HD/tracks-v2a1/mono.m3u8
+#EXTINF:-1 tvg-id="NickJrHDBrasil.us" tvg-name="Nick Jr HD Brasil" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://i.imgur.com/6vVmJJf.png" group-title="Kids",Nick Jr HD Brasil
+http://ug1upc1hgb.singularcdn.net.br/NICK_JR_BR_HD/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="NickJrClub.us" tvg-name="Nick Jr. Club" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5ddd7cb2cbb9010009b4fe32/colorLogoPNG.png" group-title="",Nick Jr. Club
 https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ddd7cb2cbb9010009b4fe32/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=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
 #EXTINF:-1 tvg-id="NickJrClub.us" tvg-name="Nick Jr. Club" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f121460b73ac6000719fbaf/colorLogoPNG.png" group-title="",Nick Jr. Club
@@ -1948,6 +1962,12 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ede45451
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ca673e0d0bd6c2689c94ce3/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&genre=ROKU_ADS_CONTENT_GENRE&content_rating=ROKU_ADS_CONTENT_RATING&studio_id=viacom&channel_id=channel
 #EXTINF:-1 tvg-id="nickPlutoTV.us" tvg-name="nick Pluto TV" tvg-country="DE" tvg-language="German" tvg-logo="https://images.pluto.tv/channels/5ede448d3d50590007a4419e/colorLogoPNG.png" group-title="",nick Pluto TV
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ede448d3d50590007a4419e/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&genre=ROKU_ADS_CONTENT_GENRE&content_rating=ROKU_ADS_CONTENT_RATING&studio_id=viacom&channel_id=channel
+#EXTINF:-1 tvg-id="NickelodeonBrasil.us" tvg-name="Nickelodeon Brasil" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://i.imgur.com/ZjLSLiY.png" group-title="Kids",Nickelodeon Brasil
+http://ug1upc1hgb.singularcdn.net.br/NICK_BR_HD/tracks-v2a1/mono.m3u8
+#EXTINF:-1 tvg-id="NickelodeonHDBrasil.us" tvg-name="Nickelodeon HD Brasil" tvg-country="BR" tvg-language="Portuguese" tvg-logo="http://i.imgur.com/ZjLSLiY.png" group-title="Kids",Nickelodeon HD Brasil
+http://ug1upc1hgb.singularcdn.net.br/NICK_BR_HD/tracks-v1a1/mono.m3u8
+#EXTINF:-1 tvg-id="NickelodeonKorea.us" tvg-name="Nickelodeon Korea" tvg-country="KR" tvg-language="" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C43241.png" group-title="",Nickelodeon Korea
+http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C43241&q=SD&apikey=cit1254678
 #EXTINF:-1 tvg-id="nickrewind.us" tvg-name="nickrewind" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5ed106ce4bf2e80007700bb3/colorLogoPNG.png" group-title="",nickrewind
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ed106ce4bf2e80007700bb3/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&genre=ROKU_ADS_CONTENT_GENRE&content_rating=ROKU_ADS_CONTENT_RATING&studio_id=viacom&channel_id=channel
 #EXTINF:-1 tvg-id="NorthCarolinaGreenvilleAshevilleSTIRR.us" tvg-name="North Carolina: Greenville - Asheville (STIRR)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/7JgPJxx.png" group-title="Local",North Carolina: Greenville - Asheville (STIRR)
@@ -2998,6 +3018,14 @@ https://dai2.xumo.com/xumocdn/p=roku/amagi_hls_data_xumo1234A-tmz/CDN/1280x720_5
 https://dai2.xumo.com/xumocdn/p=redbox&deviceid=&is_lat=&subp=RedboxdesktopWebLinux/amagi_hls_data_xumo1234A-tmz/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="TMZXUMO.us" tvg-name="TMZ (XUMO)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/j09QMqL.png" group-title="",TMZ (XUMO)
 https://dai2.xumo.com/amagi_hls_data_xumo1234A-tmz/CDN/master.m3u8
+#EXTINF:-1 tvg-id="TNTSports2Brasil.us" tvg-name="TNT Sports 2 Brasil" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/d/dc/Logotipo_TNT_Sports.png" group-title="Sport",TNT Sports 2 Brasil
+https://glxlmn026c.singularcdn.net.br/playout_02/playlist-720p.m3u8
+#EXTINF:-1 tvg-id="TNTSports3Brasil.us" tvg-name="TNT Sports 3 Brasil" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/d/dc/Logotipo_TNT_Sports.png" group-title="Sport",TNT Sports 3 Brasil
+https://glxlmn026c.singularcdn.net.br/playout_03/playlist-720p.m3u8
+#EXTINF:-1 tvg-id="TNTSports4Brasil.us" tvg-name="TNT Sports 4 Brasil" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/d/dc/Logotipo_TNT_Sports.png" group-title="Sport",TNT Sports 4 Brasil
+https://glxlmn026c.singularcdn.net.br/playout_04/playlist-720p.m3u8
+#EXTINF:-1 tvg-id="TNTSports5Brasil.us" tvg-name="TNT Sports 5 Brasil" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/d/dc/Logotipo_TNT_Sports.png" group-title="Sport",TNT Sports 5 Brasil
+https://glxlmn026c.singularcdn.net.br/playout_05/playlist-720p.m3u8
 #EXTINF:-1 tvg-id="TODAY.us" tvg-name="TODAY" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5d695f7db53adf96b78e7ce3/colorLogoPNG.png" group-title="",TODAY
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d695f7db53adf96b78e7ce3/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&genre=ROKU_ADS_CONTENT_GENRE&content_rating=ROKU_ADS_CONTENT_RATING&studio_id=viacom&channel_id=channel
 #EXTINF:-1 tvg-id="TokuSHOUTsu.us" tvg-name="TokuSHOUTsu" tvg-country="US" tvg-language="English" tvg-logo="https://i0.wp.com/tokusatsunetwork.com/wp-content/uploads/2020/03/tsu-e1584362198575.png" group-title="",TokuSHOUTsu
@@ -3362,31 +3390,3 @@ https://y5w8j4a9.ssl.hwcdn.net/zlivingusa_r/index.m3u8
 https://y5w8j4a9.ssl.hwcdn.net/zlivingusa_r_prod/tracks-v1a1/index.m3u8
 #EXTINF:-1 tvg-id="ZooMoo.us" tvg-name="Zoo Moo" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/1wYnA2i.jpg" group-title="",Zoo Moo
 https://rockentertainment-zoomoo-1.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 group-title="Music" tvg-logo="http://i.imgur.com/U6Rgjqs.png" tvg-country="BR" tvg-language="Portuguese",MTV Brasil
-http://ug1upc1hgb.singularcdn.net.br/MTV_BR_HD/tracks-v2a1/mono.m3u8
-#EXTINF:-1 group-title="Music" tvg-logo="http://i.imgur.com/U6Rgjqs.png" tvg-country="BR" tvg-language="Portuguese",MTV HD Brasil
-http://ug1upc1hgb.singularcdn.net.br/MTV_BR_HD/tracks-v1a1/mono.m3u8
-#EXTINF:-1 group-title="Kids" tvg-logo="http://i.imgur.com/ZjLSLiY.png" tvg-country="BR" tvg-language="Portuguese",Nickelodeon Brasil
-http://ug1upc1hgb.singularcdn.net.br/NICK_BR_HD/tracks-v2a1/mono.m3u8
-#EXTINF:-1 group-title="Kids" tvg-logo="http://i.imgur.com/ZjLSLiY.png" tvg-country="BR" tvg-language="Portuguese",Nickelodeon HD Brasil
-http://ug1upc1hgb.singularcdn.net.br/NICK_BR_HD/tracks-v1a1/mono.m3u8
-#EXTINF:-1 group-title="Kids" tvg-logo="http://i.imgur.com/6vVmJJf.png" tvg-country="BR" tvg-language="Portuguese",Nick Jr Brasil
-http://ug1upc1hgb.singularcdn.net.br/NICK_JR_BR_HD/tracks-v2a1/mono.m3u8
-#EXTINF:-1 group-title="Kids" tvg-logo="http://i.imgur.com/6vVmJJf.png" tvg-country="BR" tvg-language="Portuguese",Nick Jr HD Brasil
-http://ug1upc1hgb.singularcdn.net.br/NICK_JR_BR_HD/tracks-v1a1/mono.m3u8
-#EXTINF:-1 group-title="Comedy" tvg-logo="http://i.imgur.com/ZekUX7A.png" tvg-country="BR" tvg-language="Portuguese",Comedy Central Brasil
-http://ug1upc1hgb.singularcdn.net.br/CCLB_HD/tracks-v2a1/mono.m3u8
-#EXTINF:-1 group-title="Comedy" tvg-logo="http://i.imgur.com/ZekUX7A.png" tvg-country="BR" tvg-language="Portuguese",Comedy Central HD Brasil
-http://ug1upc1hgb.singularcdn.net.br/CCLB_HD/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-logo="https://upload.wikimedia.org/wikipedia/pt/d/dc/Logotipo_TNT_Sports.png" group-title="Sport" tvg-country="BR" tvg-language="Portuguese",TNT Sports 2 Brasil
-https://glxlmn026c.singularcdn.net.br/playout_02/playlist-720p.m3u8
-#EXTINF:-1 tvg-logo="https://upload.wikimedia.org/wikipedia/pt/d/dc/Logotipo_TNT_Sports.png" group-title="Sport" tvg-country="BR" tvg-language="Portuguese",TNT Sports 3 Brasil
-https://glxlmn026c.singularcdn.net.br/playout_03/playlist-720p.m3u8
-#EXTINF:-1 tvg-logo="https://upload.wikimedia.org/wikipedia/pt/d/dc/Logotipo_TNT_Sports.png" group-title="Sport" tvg-country="BR" tvg-language="Portuguese",TNT Sports 4 Brasil
-https://glxlmn026c.singularcdn.net.br/playout_04/playlist-720p.m3u8
-#EXTINF:-1 tvg-logo="https://upload.wikimedia.org/wikipedia/pt/d/dc/Logotipo_TNT_Sports.png" group-title="Sport" tvg-country="BR" tvg-language="Portuguese",TNT Sports 5 Brasil
-https://glxlmn026c.singularcdn.net.br/playout_05/playlist-720p.m3u8
-#EXTINF:-1 tvg-country="GR",Fox Greece
-http://live.streams.ovh:1935/foxtv/foxtv/playlist.m3u8
-#EXTINF:-1 tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C43241.png" tvg-country="KR",Nickelodeon Korea
-http://121.130.84.30:9999/klive/api/url.m3u8?m=url&s=tving&i=C43241&q=SD&apikey=cit1254678