diff --git a/channels/ae.m3u b/channels/ae.m3u
index bf16afd12..4579922fa 100644
--- a/channels/ae.m3u
+++ b/channels/ae.m3u
@@ -115,17 +115,17 @@ https://svs.itworkscdn.net/smc1live/smc1.smil/playlist.m3u8
 http://51.210.199.1/hls/stream.m3u8
 #EXTINF:-1 tvg-id="Wanasah" tvg-name="Wanasah" tvg-country="ARAB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/GmgibYW.jpg" group-title="Music",Wanasah (1080p)
 https://shls-wanasah-prod-dub.shahid.net/out/v1/c84ef3128e564b74a6a796e8b6287de6/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://content.weyyak.com/207c8580-318d-ea11-831d-02d662556796/poster-image" group-title="",Weyyak Action (720p)
+#EXTINF:-1 tvg-id="WeyyakAction.ae" tvg-name="Weyyak Action" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://content.weyyak.com/207c8580-318d-ea11-831d-02d662556796/poster-image" group-title="",Weyyak Action (720p)
 https://weyyak-live.akamaized.net/weyyak_action/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://content.weyyak.com/d995517f-bc87-ea11-831d-02d662556796/poster-image" group-title="",Weyyak Drama (720p)
+#EXTINF:-1 tvg-id="WeyyakDrama.ae" tvg-name="Weyyak Drama" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://content.weyyak.com/d995517f-bc87-ea11-831d-02d662556796/poster-image" group-title="",Weyyak Drama (720p)
 https://weyyak-live.akamaized.net/weyyak_drama/index.m3u88
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://content.weyyak.com/bc777336-328d-ea11-831d-02d662556796/poster-image" group-title="",Weyyak Mix (720p)
+#EXTINF:-1 tvg-id="WeyyakMix.ae" tvg-name="Weyyak Mix" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://content.weyyak.com/bc777336-328d-ea11-831d-02d662556796/poster-image" group-title="",Weyyak Mix (720p)
 https://weyyak-live.akamaized.net/weyyak_mix/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://content.weyyak.com/d867c2e9-328d-ea11-831d-02d662556796/poster-image" group-title="",Weyyak Nawaem (720p)
+#EXTINF:-1 tvg-id="WeyyakNawaem.ae" tvg-name="Weyyak Nawaem" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://content.weyyak.com/d867c2e9-328d-ea11-831d-02d662556796/poster-image" group-title="",Weyyak Nawaem (720p)
 https://weyyak-live.akamaized.net/weyyak_nawaem/index.m3u8
 #EXTINF:-1 tvg-id="YasTV.ae" tvg-name="Yas TV" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://i.imgur.com/ky1sNul.png" group-title="Sport",Yas TV (1080p)
 https://admdn1.cdn.mangomolo.com/yastv/smil:yastv.stream.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://content.weyyak.com/5a7c9610-5562-407b-b711-f31ce6267786/poster-image" group-title="",Zee Aflam (720p)
+#EXTINF:-1 tvg-id="ZeeAflam.ae" tvg-name="Zee Aflam" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://content.weyyak.com/5a7c9610-5562-407b-b711-f31ce6267786/poster-image" group-title="",Zee Aflam (720p)
 https://weyyak-live.akamaized.net/weyyak_zee_aflam/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://content.weyyak.com/25a860af-4bbc-4289-8e1f-b3bed0dcc64a/poster-image" group-title="",Zee Alwan (720p)
+#EXTINF:-1 tvg-id="ZeeAlwan.ae" tvg-name="Zee Alwan" tvg-country="AE" tvg-language="Arabic" tvg-logo="https://content.weyyak.com/25a860af-4bbc-4289-8e1f-b3bed0dcc64a/poster-image" group-title="",Zee Alwan (720p)
 https://weyyak-live.akamaized.net/weyyak_zee_alwan/index.m3u8
diff --git a/channels/at.m3u b/channels/at.m3u
index d0c910e34..de23080d6 100644
--- a/channels/at.m3u
+++ b/channels/at.m3u
@@ -1,6 +1,8 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="DorfTV.at" tvg-name="Dorf TV" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/SK9IQ1Z.png" group-title="",Dorf TV
 https://stream.openplayout.org/hls/dorf.m3u8
+#EXTINF:-1 tvg-id="dorftv.at" tvg-name="dorf tv" tvg-country="AT;DE" tvg-language="German" tvg-logo="" group-title="",dorf tv
+https://stream.openplayout.org/hls/dorf_high/index.m3u8
 #EXTINF:-1 tvg-id="FS1Salzburg.at" tvg-name="FS1 (Salzburg)" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/HSRpYUl.jpg" group-title="",FS1 (Salzburg)
 https://stream.fs1.tv/hls/webstream.m3u8
 #EXTINF:-1 tvg-id="GoTV.at" tvg-name="GoTV" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/UxISEZf.png" group-title="",GoTV (576p)
@@ -65,11 +67,3 @@ https://streaming14.huberwebmedia.at/LiveApp/streams/livestream.m3u8
 https://ms01.w24.at/W24/smil:liveevent.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="W24TV.at" tvg-name="W24 TV" tvg-country="AT" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/w24.png" group-title="",W24 TV
 https://ms01.w24.at/W24/smil:liveevent.smil/chunklist_w89103916_b2176000_slger.m3u8
-#EXTINF:-1 tvg-id="dorftv.at" tvg-name="dorf tv" tvg-country="AT;DE" tvg-language="German" tvg-logo="" group-title="",dorf tv
-https://stream.openplayout.org/hls/dorf_high/index.m3u8
-#EXTINF:-1 tvg-id="M4TV.at" tvg-name="M4TV" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",M4TV (1080p)
-https://5a32c05065c79.streamlock.net/live/stream/playlist.m3u8
-#EXTINF:-1 tvg-id="oe24TV.at" tvg-name="oe24.TV" tvg-country="AT;DE" tvg-language="German" tvg-logo="" group-title="",oe24.TV (360p)
-https://apasfoe24l.sf.apa.at/ipad/oe24-live1/oe24.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="Okto.at" tvg-name="Okto" tvg-country="AT;DE" tvg-language="German" tvg-logo="" group-title="",Okto (720p)
-https://d38d1dtxhym0zi.cloudfront.net/LiveHTTPOrigin/okto/playlist.m3u8
diff --git a/channels/bg.m3u b/channels/bg.m3u
index 4614e079c..d6ab14ee7 100644
--- a/channels/bg.m3u
+++ b/channels/bg.m3u
@@ -11,11 +11,11 @@ http://edge1.cdn.bg:2006/fls/bonair.stream/playlist.m3u8
 http://ios.cdn.bg:2006/fls/bonair.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="LightChannel.bg" tvg-name="Light Channel" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://i.imgur.com/qskVMhF.png" group-title="",Light Channel (480p)
 https://streamer1.streamhost.org/salive/GMIlcbgM/playlist.m3u8
+#EXTINF:-1 tvg-id="SuperToonsTV.de" tvg-name="Super Toons TV" tvg-country="BG" tvg-language="" tvg-logo="https://i.imgur.com/35BpWJh.jpg" group-title="Kids",Super Toons TV
+https://kedoo-supertoonstv-5-de.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="Travel TV" tvg-name="Travel TV" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://i.imgur.com/7E4Kia6.jpg" group-title="Travel",Travel TV
 http://31.13.223.104:1935/travel/travel.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="TV+" tvg-name="TV+" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://i.imgur.com/W074hkS.jpg" group-title="",TV+
 http://141.136.14.18/kanal1/kanal1.m3u8
 #EXTINF:-1 tvg-id="TV+" tvg-name="TV+" tvg-country="BG" tvg-language="Bulgarian" tvg-logo="https://i.imgur.com/W074hkS.jpg" group-title="",TV+
 http://141.136.14.18/kanal1/kanal1_1500/index.m3u8
-#EXTINF:-1 tvg-id="SuperToonsTV.de" tvg-name="Super Toons TV" tvg-country="BG" tvg-language="" tvg-logo="https://i.imgur.com/35BpWJh.jpg" group-title="Kids",Super Toons TV
-https://kedoo-supertoonstv-5-de.samsung.wurl.com/manifest/playlist.m3u8
diff --git a/channels/ca.m3u b/channels/ca.m3u
index 9e22efc22..477d85b4c 100644
--- a/channels/ca.m3u
+++ b/channels/ca.m3u
@@ -89,8 +89,12 @@ http://cdn27.live247stream.com/primecanada/247/primecanada/stream1/playlist.m3u8
 https://qvmstream.tulix.tv/720p/720p/playlist.m3u8
 #EXTINF:-1 tvg-id="SardariTV.ca" tvg-name="Sardari TV" tvg-country="CA" tvg-language="English" tvg-logo="https://i.imgur.com/AhbJjPL.jpg" group-title="",Sardari TV (1080p)
 http://158.69.124.9:1935/sardaritv/sardaritv/playlist.m3u8
+#EXTINF:-1 tvg-id="StingrayKaraoke.ca" tvg-name="Stingray Karaoke" tvg-country="CA" tvg-language="" tvg-logo="https://i.imgur.com/XkBOu3Q.jpg" group-title="",Stingray Karaoke
+https://stingray-karaoke-2-de.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="StingrayNaturescape.ca" tvg-name="Stingray Naturescape" tvg-country="CA" tvg-language="CA" tvg-logo="https://i.imgur.com/OweXTPf.png" group-title="",Stingray Naturescape
 https://stingray-naturescape-1-ca.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="StingrayQelloConcerts.ca" tvg-name="Stingray Qello Concerts" tvg-country="CA" tvg-language="English" tvg-logo="https://i.imgur.com/IVUgJPY.png" group-title="",Stingray Qello Concerts
+https://stingray-qelloconcerts-2-de.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="TAGTV.ca" tvg-name="TAG TV" tvg-country="CA" tvg-language="Hindi" tvg-logo="https://i.imgur.com/4PA2adF.png" group-title="",TAG TV (1080p)
 http://cdn11.live247stream.com/tag/tv/playlist.m3u8
 #EXTINF:-1 tvg-id="TamilVisionTV.ca" tvg-name="Tamil Vision TV" tvg-country="INT" tvg-language="English" tvg-logo="https://i.imgur.com/jSWRXdg.png" group-title="",Tamil Vision TV (1080p)
@@ -101,6 +105,8 @@ http://live.tamilvision.tv:8081/TVI/SD/playlist.m3u8
 https://ti-samsung-ca.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="TeleV.ca" tvg-name="Tele-V" tvg-country="CA" tvg-language="French" tvg-logo="https://raw.githubusercontent.com/geonsey/Free2ViewTV/master/images/logos/TeleV_1200x1200.png" group-title="",Tele-V (720p)
 https://bcsecurelivehls-i.akamaihd.net/hls/live/551061/618566855001/master.m3u8
+#EXTINF:-1 tvg-id="Teletubbies.ca" tvg-name="Teletubbies" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/FlCXGip.jpg" group-title="",Teletubbies
+https://dhx-teletubbies-3-de.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="TheDesignNetwork.ca" tvg-name="The Design Network" tvg-country="CA" tvg-language="CA" tvg-logo="https://i.imgur.com/wCq3E0M.png" group-title="",The Design Network
 https://thedesignnetwork-tdn-6-ca.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="Toronto360TV.ca" tvg-name="Toronto 360 TV" tvg-country="CA" tvg-language="English" tvg-logo="https://i.imgur.com/PkWndsv.png" group-title="Local",Toronto 360 TV (720p)
@@ -127,9 +133,3 @@ https://waypointtv-samsung-ca.samsung.wurl.com/manifest/playlist.m3u8
 https://jukin-weatherspy-2-ca.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="WorldPokerTour.ca" tvg-name="World Poker Tour" tvg-country="CA" tvg-language="CA" tvg-logo="https://i.imgur.com/ZqB9etQ.png" group-title="",World Poker Tour
 https://world-poker-tour-samsung-ca.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="StingrayQelloConcerts.ca" tvg-name="Stingray Qello Concerts" tvg-country="CA" tvg-language="English" tvg-logo="https://i.imgur.com/IVUgJPY.png" group-title="",Stingray Qello Concerts
-https://stingray-qelloconcerts-2-de.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="StingrayKaraoke.ca" tvg-name="Stingray Karaoke" tvg-country="CA" tvg-language="" tvg-logo="https://i.imgur.com/XkBOu3Q.jpg" group-title="",Stingray Karaoke
-https://stingray-karaoke-2-de.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="Teletubbies.ca" tvg-name="Teletubbies" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/FlCXGip.jpg" group-title="",Teletubbies
-https://dhx-teletubbies-3-de.samsung.wurl.com/manifest/playlist.m3u8
diff --git a/channels/de.m3u b/channels/de.m3u
index 196b8bf60..f1aeb2fcc 100644
--- a/channels/de.m3u
+++ b/channels/de.m3u
@@ -41,12 +41,12 @@ https://derste247livede.akamaized.net/hls/live/658317/daserste_de/master.m3u8
 https://mcdn.daserste.de/daserste/de/master.m3u8
 #EXTINF:-1 tvg-id="DasErste.de" tvg-name="Das Erste" tvg-country="DE" tvg-language="German" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/4/4a/Das_Erste_HD_Logo.svg/1280px-Das_Erste_HD_Logo.svg.png" group-title="",Das Erste (720p)
 https://mcdn.daserste.de:443/daserste/de/master_3744.m3u8
+#EXTINF:-1 tvg-id="DeutschesMusikFernsehen.de" tvg-name="Deutsches Musik Fernsehen" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/fw5O4PK.png" group-title="Music",Deutsches Musik Fernsehen
+http://tv.artcom-venture.de:1322/dmf/tv_720.m3u8
 #EXTINF:-1 tvg-id="DeutschesMusikFernsehen.de" tvg-name="deutsches-musik-fernsehen" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/wUjgEUs.jpg" group-title="",Deutsches Musik Fernsehen (720p)
 https://tv.artcom-venture.de/dmf/tv.m3u8
 #EXTINF:-1 tvg-id="DeutschesMusikFernsehen.de" tvg-name="Deutsches Musik Fernsehen" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/deutschesmusikfernsehen.png" group-title="",Deutsches Musik Fernsehen
 https://tv.artcom-venture.de/dmf/tv_720.m3u8
-#EXTINF:-1 tvg-id="DeutschesMusikFernsehen.de" tvg-name="Deutsches Musik Fernsehen" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/fw5O4PK.png" group-title="Music",Deutsches Musik Fernsehen
-http://tv.artcom-venture.de:1322/dmf/tv_720.m3u8
 #EXTINF:-1 tvg-id="DresdenFernsehen.de" tvg-name="Dresden Fernsehen" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",Dresden Fernsehen (1080p)
 https://dresden.iptv-playoutcenter.de/dresden/dresdenfernsehen.stream_1/playlist.m3u8
 #EXTINF:-1 tvg-id="DUST.de" tvg-name="DUST" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/pXXUmuW.jpg" group-title="",DUST
@@ -104,8 +104,6 @@ https://fcblive-a.akamaized.net/dc-1/live/hls/p/2090621/e/1_ts6d5c4t/sd/10000/t/
 http://62.113.210.2/filstalwelle-live/_definst_/mp4:livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="FrankenFernsehen.de" tvg-name="Franken Fernsehen" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/frankenfernsehen.png" group-title="",Franken Fernsehen (Nürnberg)
 https://frankentv.iptv-playoutcenter.de/frankentv/frankentv.stream_1/playlist.m3u8
-#EXTINF:-1 tvg-id="TVHalle.de" tvg-name="TV Halle" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/Ecrl44R.png" group-title="",TV Halle (720p)
-http://62.113.210.250/medienasa-live/tvhalle_high/HasBahCa.m3u8
 #EXTINF:-1 tvg-id="Hamburg1.de" tvg-name="Hamburg 1" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/9TRhahY.png" group-title="",Hamburg 1
 https://live2.telvi.de/hls/hamburg1.m3u8
 #EXTINF:-1 tvg-id="HauptstadtTV.de" tvg-name="Hauptstadt.TV" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/ZXskBkv.png" group-title="",Hauptstadt.TV (Potsdam)
@@ -178,40 +176,40 @@ https://www.oeins.de/live/studio.m3u8
 http://iptvcodes.blogspot.com@62.113.210.250/medienasa-live/ok-dessau_high/hasbahca.m3u8
 #EXTINF:-1 tvg-id="OffenerKanalDessau.de" tvg-name="Offener Kanal Dessau" tvg-country="DE" tvg-language="German" tvg-logo="http://www.youngspeech.de/wp-content/gallery/pop10-konzert/d-logode.jpg" group-title="",Offener Kanal Dessau (1080p)
 http://iptvcodes.blogspot.com@62.113.210.250/medienasa-live/ok-dessau_high/hasbahca.m3u8?bitrate=800
+#EXTINF:-1 tvg-id="OffenerKanalDessau.de" tvg-name="Offener Kanal Dessau" tvg-country="DE" tvg-language="German" tvg-logo="https://www.ok-dessau.de/fileadmin/layout/logo_okdessau.jpg" group-title="",Offener Kanal Dessau
+https://58bd5b7a98e04.streamlock.net/medienasa-live/_definst_/mp4:ok-dessau_high/playlist.m3u8?&ref=www.ok-dessau.de&seid=408238
+#EXTINF:-1 tvg-id="OffenerKanalFlensburg.de" tvg-name="Offener Kanal Flensburg" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/YNYsGYY.png" group-title="",Offener Kanal Flensburg
+https://d1lv1lpzlrjn3y.cloudfront.net/play/hls/flensburgtv/index.m3u8
 #EXTINF:-1 tvg-id="OffenerKanalFulda.de" tvg-name="Offener Kanal Fulda" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/XsmPI4N.jpg" group-title="",Offener Kanal Fulda
 https://s.ok54.de/mok-fu/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="OffenerKanalGiessen.de" tvg-name="Offener Kanal Gießen" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/XsmPI4N.jpg" group-title="",Offener Kanal Gießen
 https://s.ok54.de/mok-gi/mok-gi/playlist.m3u8
+#EXTINF:-1 tvg-id="OffenerKanalKaiserslautern.de" tvg-name="Offener Kanal Kaiserslautern" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/SzGXrjb.png" group-title="",Offener Kanal Kaiserslautern
+https://s.ok54.de/abr_okkl/webstream/playlist.m3u8
 #EXTINF:-1 tvg-id="OffenerKanalKassel.de" tvg-name="Offener Kanal Kassel" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/XsmPI4N.jpg" group-title="",Offener Kanal Kassel
 https://s.ok54.de/mok-ks/kassel/playlist.m3u8
+#EXTINF:-1 tvg-id="OffenerKanalKiel.de" tvg-name="Offener Kanal Kiel" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/A8rLufC.png" group-title="",Offener Kanal Kiel
+https://d1lv1lpzlrjn3y.cloudfront.net/play/hls/kieltv/index.m3u8
+#EXTINF:-1 tvg-id="OffenerKanalKoblenz.de" tvg-name="Offener Kanal Koblenz" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/okkoblenz.png" group-title="",Offener Kanal Koblenz
+https://s.ok54.de/ok4/live/playlist.m3u8
 #EXTINF:-1 tvg-id="OffenerKanalMagdeburg.de" tvg-name="Offener Kanal Magdeburg" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/BHTsPMP.png" group-title="",Offener Kanal Magdeburg (1080p)
 http://62.113.210.250/medienasa-live/ok-magdeburg_high/FluxusTV.m3u8
+#EXTINF:-1 tvg-id="OffenerKanalMagdeburg.de" tvg-name="Offener Kanal Magdeburg" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/kBR5XUI.png" group-title="",Offener Kanal Magdeburg
+http://62.113.210.250:1935/medienasa-live/_definst_/mp4:ok-magdeburg_high/playlist.m3u8?&ref=www.ok-magdeburg.de&seid=771136
 #EXTINF:-1 tvg-id="OffenerKanalMagdeburg.de" tvg-name="Offener Kanal Magdeburg" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",Offener Kanal Magdeburg (1080p)
 http://iptvcodes.blogspot.com@62.113.210.250/medienasa-live/ok-magdeburg_high/hasbahca.m3u8
 #EXTINF:-1 tvg-id="OffenerKanalMagdeburg.de" tvg-name="Offener Kanal Magdeburg" tvg-country="DE" tvg-language="German" tvg-logo="http://www.ok-magdeburg.de/wp-content/themes/okm/images/logo-offener-kanal-magdeburg.png" group-title="",Offener Kanal Magdeburg (1080p)
 http://iptvcodes.blogspot.com@62.113.210.250/medienasa-live/ok-magdeburg_high/hasbahca.m3u8?bitrate=800
+#EXTINF:-1 tvg-id="OffenerKanalMainz.de" tvg-name="Offener Kanal Mainz" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/rM9dOa4.png" group-title="",Offener Kanal Mainz
+https://s.ok54.de/oktvmainz/webstream/playlist.m3u8
+#EXTINF:-1 tvg-id="OffenerKanalMerseburg.de" tvg-name="Offener Kanal Merseburg" tvg-country="DE" tvg-language="German" tvg-logo="https://www.okmq.de/images/logo/logo_neu.png" group-title="",Offener Kanal Merseburg
+http://62.113.210.250:1935/medienasa-live/_definst_/mp4:ok-merseburg_high/playlist.m3u8?&ref=www.okmq.de&seid=800040
 #EXTINF:-1 tvg-id="OffenerKanalRheinMain.de" tvg-name="Offener Kanal Rhein-Main" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/XsmPI4N.jpg" group-title="",Offener Kanal Rhein-Main
 https://s.ok54.de/mok-rm/mok-rm/playlist.m3u8
 #EXTINF:-1 tvg-id="OffenerKanalSalzwedel.de" tvg-name="Offener Kanal Salzwedel" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/B5obZtE.png" group-title="",Offener Kanal Salzwedel (1080p)
 http://62.113.210.250/medienasa-live/ok-salzwedel_high/FluxusTV.m3u8
 #EXTINF:-1 tvg-id="OffenerKanalSalzwedel.de" tvg-name="Offener Kanal Salzwedel" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",Offener Kanal Salzwedel (1080p)
 http://62.113.210.250/medienasa-live/ok-salzwedel_high/HasBahCa.m3u8?bitrate=800
-#EXTINF:-1 tvg-id="OffenerKanalDessau.de" tvg-name="Offener Kanal Dessau" tvg-country="DE" tvg-language="German" tvg-logo="https://www.ok-dessau.de/fileadmin/layout/logo_okdessau.jpg" group-title="",Offener Kanal Dessau
-https://58bd5b7a98e04.streamlock.net/medienasa-live/_definst_/mp4:ok-dessau_high/playlist.m3u8?&ref=www.ok-dessau.de&seid=408238
-#EXTINF:-1 tvg-id="OffenerKanalFlensburg.de" tvg-name="Offener Kanal Flensburg" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/YNYsGYY.png" group-title="",Offener Kanal Flensburg
-https://d1lv1lpzlrjn3y.cloudfront.net/play/hls/flensburgtv/index.m3u8
-#EXTINF:-1 tvg-id="OffenerKanalKaiserslautern.de" tvg-name="Offener Kanal Kaiserslautern" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/SzGXrjb.png" group-title="",Offener Kanal Kaiserslautern
-https://s.ok54.de/abr_okkl/webstream/playlist.m3u8
-#EXTINF:-1 tvg-id="OffenerKanalKiel.de" tvg-name="Offener Kanal Kiel" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/A8rLufC.png" group-title="",Offener Kanal Kiel
-https://d1lv1lpzlrjn3y.cloudfront.net/play/hls/kieltv/index.m3u8
-#EXTINF:-1 tvg-id="OffenerKanalKoblenz.de" tvg-name="Offener Kanal Koblenz" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/okkoblenz.png" group-title="",Offener Kanal Koblenz
-https://s.ok54.de/ok4/live/playlist.m3u8
-#EXTINF:-1 tvg-id="OffenerKanalMagdeburg.de" tvg-name="Offener Kanal Magdeburg" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/kBR5XUI.png" group-title="",Offener Kanal Magdeburg
-http://62.113.210.250:1935/medienasa-live/_definst_/mp4:ok-magdeburg_high/playlist.m3u8?&ref=www.ok-magdeburg.de&seid=771136
-#EXTINF:-1 tvg-id="OffenerKanalMainz.de" tvg-name="Offener Kanal Mainz" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/rM9dOa4.png" group-title="",Offener Kanal Mainz
-https://s.ok54.de/oktvmainz/webstream/playlist.m3u8
-#EXTINF:-1 tvg-id="OffenerKanalMerseburg.de" tvg-name="Offener Kanal Merseburg" tvg-country="DE" tvg-language="German" tvg-logo="https://www.okmq.de/images/logo/logo_neu.png" group-title="",Offener Kanal Merseburg
-http://62.113.210.250:1935/medienasa-live/_definst_/mp4:ok-merseburg_high/playlist.m3u8?&ref=www.okmq.de&seid=800040
 #EXTINF:-1 tvg-id="OffenerKanalSalzwedel.de" tvg-name="Offener Kanal Salzwedel" tvg-country="DE" tvg-language="German" tvg-logo="https://ok-salzwedel.de/wp-content/themes/oksaw/images/logo-home.png" group-title="",Offener Kanal Salzwedel
 https://58bd5b7a98e04.streamlock.net/medienasa-live/_definst_/mp4:ok-salzwedel_high/playlist.m3u8?&ref=ok-salzwedel.de&seid=783487
 #EXTINF:-1 tvg-id="OffenerKanalTrier.de" tvg-name="Offener Kanal Trier" tvg-country="DE" tvg-language="German" tvg-logo="https://raw.githubusercontent.com/jnk22/kodinerds-iptv/master/logos/tv/oktrier.png" group-title="",Offener Kanal Trier
@@ -266,14 +264,14 @@ https://rnf.iptv-playoutcenter.de/rnf/rnf.stream_1/playlist.m3u8
 https://stream.rockantenne.de/rockantenne/stream/mp3
 #EXTINF:-1 tvg-id="RTLGold.de" tvg-name="RTL Gold" tvg-country="DE" tvg-language="" tvg-logo="" group-title="",RTL Gold
 https://stream.y5.hu/stream/stream_rtlgold/stream.m3u8
-#EXTINF:-1 tvg-id="RTLZweiDeutschland.de" tvg-name="RTL Zwei Deutschland" tvg-country="DE" tvg-language="" tvg-logo="" group-title="",RTL Zwei Deutschland
-https://stream.y5.hu/stream/stream_rtl2/hls0/stream.m3u8
-#EXTINF:-1 tvg-id="RTLZweiDeutschland.de" tvg-name="RTL Zwei Deutschland" tvg-country="DE" tvg-language="" tvg-logo="" group-title="",RTL Zwei Deutschland
-https://stream.y5.hu/stream/stream_rtl2/hls1/stream.m3u8
 #EXTINF:-1 tvg-id="RTLKlub.de" tvg-name="RTL Klub" tvg-country="DE" tvg-language="" tvg-logo="" group-title="",RTL Klub
 https://stream.y5.hu/stream/stream_rtlklub/hls0/stream.m3u8
 #EXTINF:-1 tvg-id="RTLKlub.de" tvg-name="RTL Klub" tvg-country="DE" tvg-language="" tvg-logo="" group-title="",RTL Klub
 https://stream.y5.hu/stream/stream_rtlklub/hls1/stream.m3u8
+#EXTINF:-1 tvg-id="RTLZweiDeutschland.de" tvg-name="RTL Zwei Deutschland" tvg-country="DE" tvg-language="" tvg-logo="" group-title="",RTL Zwei Deutschland
+https://stream.y5.hu/stream/stream_rtl2/hls0/stream.m3u8
+#EXTINF:-1 tvg-id="RTLZweiDeutschland.de" tvg-name="RTL Zwei Deutschland" tvg-country="DE" tvg-language="" tvg-logo="" group-title="",RTL Zwei Deutschland
+https://stream.y5.hu/stream/stream_rtl2/hls1/stream.m3u8
 #EXTINF:-1 tvg-id="RTLPlus.de" tvg-name="RTL+" tvg-country="DE" tvg-language="" tvg-logo="" group-title="",RTL+
 https://stream.y5.hu/stream/stream_rtlp/stream.m3u8
 #EXTINF:-1 tvg-id="SaarlandFernsehen1.de" tvg-name="Saarland Fernsehen 1" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/Nvw7SaN.png" group-title="",Saarland Fernsehen 1 (1080p)
@@ -304,6 +302,8 @@ https://5856e1a25f71a.streamlock.net/easycast8-live/_definst_/mp4:livestreamhd8/
 https://5856e1a25f71a.streamlock.net/easycast8-live/_definst_/mp4:livestreamhd8/playlist.m3u8?&ref=www.teltowkanal.de
 #EXTINF:-1 tvg-id="tiviTURK.de" tvg-name="tiviTÜRK" tvg-country="TR" tvg-language="Turkish" tvg-logo="https://i.ibb.co/9TDs8q8/IFE6LHH.jpg" group-title="",tiviTÜRK
 https://stream.tiviturk.de/live/tiviturk.m3u8
+#EXTINF:-1 tvg-id="TVHalle.de" tvg-name="TV Halle" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/Ecrl44R.png" group-title="",TV Halle (720p)
+http://62.113.210.250/medienasa-live/tvhalle_high/HasBahCa.m3u8
 #EXTINF:-1 tvg-id="TVHalle.de" tvg-name="TV Halle" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/GUBVccx.png" group-title="",TV Halle (720p)
 http://62.113.210.250/medienasa-live/tvhalle_high/hasbahca.m3u8
 #EXTINF:-1 tvg-id="TVMainfranken.de" tvg-name="TV Mainfranken" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",TV Mainfranken (1080p)
diff --git a/channels/es.m3u b/channels/es.m3u
index 29fb824fe..34c68d650 100644
--- a/channels/es.m3u
+++ b/channels/es.m3u
@@ -373,6 +373,66 @@ https://cloudtv.provideo.es/live/marbellatv-livestream.m3u8
 https://tvmelilla-hls-rm-lw.flumotion.com/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioTelevisionMogan.es" tvg-name="Radio Televisión Mogán" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/radiotelevisionmogan/picture?width=320&height=320" group-title="",Radio Televisión Mogán (1080p)
 https://5b38ce71f1f00.streamlock.net/8162/8162/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVActionMoviesAustria.es" tvg-name="Rakuten TV Action Movies Austria" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/81NIxYJ.jpg" group-title="",Rakuten TV Action Movies Austria
+https://rakuten-actionmovies-5-at.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVActionMoviesFrance.es" tvg-name="Rakuten TV Action Movies France" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/uMcwx2p.jpg" group-title="",Rakuten TV Action Movies France
+https://rakuten-actionmovies-7-fr.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVActionMoviesGermany.es" tvg-name="Rakuten TV Action Movies Germany" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/81NIxYJ.jpg" group-title="",Rakuten TV Action Movies Germany
+https://rakuten-actionmovies-3-de.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVActionMoviesItaly.es" tvg-name="Rakuten TV Action Movies Italy" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/uMcwx2p.jpg" group-title="",Rakuten TV Action Movies Italy
+https://rakuten-actionmovies-6-it.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVActionMoviesSwitzerland.es" tvg-name="Rakuten TV Action Movies Switzerland" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/uMcwx2p.jpg" group-title="",Rakuten TV Action Movies Switzerland
+https://rakuten-actionmovies-4-ch.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVActionMoviesUK.es" tvg-name="Rakuten TV Action Movies UK" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/uMcwx2p.jpg" group-title="",Rakuten TV Action Movies UK
+https://rakuten-actionmovies-1-gb.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVComedyMoviesAustria.es" tvg-name="Rakuten TV Comedy Movies Austria" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/slOK2IH.jpg" group-title="",Rakuten TV Comedy Movies Austria
+https://rakuten-comedymovies-5-at.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVComedyMoviesFrance.es" tvg-name="Rakuten TV Comedy Movies France" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/o1qKoje.jpg" group-title="",Rakuten TV Comedy Movies France
+https://rakuten-comedymovies-7-fr.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVComedyMoviesGermany.es" tvg-name="Rakuten TV Comedy Movies Germany" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/slOK2IH.jpg" group-title="",Rakuten TV Comedy Movies Germany
+https://rakuten-comedymovies-3-de.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVComedyMoviesItaly.es" tvg-name="Rakuten TV Comedy Movies Italy" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/o1qKoje.jpg" group-title="",Rakuten TV Comedy Movies Italy
+https://rakuten-comedymovies-6-it.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVComedyMoviesSwitzerland.es" tvg-name="Rakuten TV Comedy Movies Switzerland" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/o1qKoje.jpg" group-title="",Rakuten TV Comedy Movies Switzerland
+https://rakuten-comedymovies-4-ch.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVComedyMoviesUK.es" tvg-name="Rakuten TV Comedy Movies UK" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/eQKFgpa.png" group-title="",Rakuten TV Comedy Movies UK
+https://rakuten-comedymovies-1-gb.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVDramaAustria.es" tvg-name="Rakuten TV Drama Austria" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/5bC53Xk.jpg" group-title="",Rakuten TV Drama Austria
+https://rakuten-tvshows-5-at.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVDramaFrance.es" tvg-name="Rakuten TV Drama France" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/dWNxCqp.png" group-title="",Rakuten TV Drama France
+https://rakuten-tvshows-7-fr.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVDramaGermany.es" tvg-name="Rakuten TV Drama Germany" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/5bC53Xk.jpg" group-title="",Rakuten TV Drama Germany
+https://rakuten-tvshows-3-de.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVDramaItaly.es" tvg-name="Rakuten TV Drama Italy" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/oMXfdkV.png" group-title="",Rakuten TV Drama Italy
+https://rakuten-tvshows-6-it.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVDramaSwitzerland.es" tvg-name="Rakuten TV Drama Switzerland" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/dWNxCqp.png" group-title="",Rakuten TV Drama Switzerland
+https://rakuten-tvshows-4-ch.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVDramaUK.es" tvg-name="Rakuten TV Drama UK" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/dWNxCqp.png" group-title="",Rakuten TV Drama UK
+https://rakuten-tvshows-1-gb.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVFamilyAustria.es" tvg-name="Rakuten TV Family Austria" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/hboiinD.jpg" group-title="",Rakuten TV Family Austria
+https://rakuten-family-5-at.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVFamilyGermany.es" tvg-name="Rakuten TV Family Germany" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/hboiinD.jpg" group-title="",Rakuten TV Family Germany
+https://rakuten-family-3-de.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVFamilyMoviesFrance.es" tvg-name="Rakuten TV Family Movies France" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/hboiinD.jpg" group-title="",Rakuten TV Family Movies France
+https://rakuten-family-7-fr.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVFamilyMoviesItaly.es" tvg-name="Rakuten TV Family Movies Italy" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/hboiinD.jpg" group-title="",Rakuten TV Family Movies Italy
+https://rakuten-family-6-it.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVFamilyMoviesUK.es" tvg-name="Rakuten TV Family Movies UK" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/hboiinD.jpg" group-title="",Rakuten TV Family Movies UK
+https://rakuten-family-1-gb.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVFamilySwitzerland.es" tvg-name="Rakuten TV Family Switzerland" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/hboiinD.jpg" group-title="",Rakuten TV Family Switzerland
+https://rakuten-family-4-ch.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVSpotlightAustria.es" tvg-name="Rakuten TV Spotlight Austria" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/qgYRzl1.jpg" group-title="",Rakuten TV Spotlight Austria
+https://rakuten-spotlight-5-at.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVSpotlightFrance.es" tvg-name="Rakuten TV Spotlight France" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/TUDZvHw.jpg" group-title="",Rakuten TV Spotlight France
+https://rakuten-spotlight-7-fr.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVSpotlightGermany.es" tvg-name="Rakuten TV Spotlight Germany" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/qgYRzl1.jpg" group-title="",Rakuten TV Spotlight Germany
+https://rakuten-spotlight-3-de.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVSpotlightItaly.es" tvg-name="Rakuten TV Spotlight Italy" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/TUDZvHw.jpg" group-title="",Rakuten TV Spotlight Italy
+https://rakuten-spotlight-6-it.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVSpotlightSwitzerland.es" tvg-name="Rakuten TV Spotlight Switzerland" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/vbb3bjW.png" group-title="",Rakuten TV Spotlight Switzerland
+https://rakuten-spotlight-4-ch.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="RakutenTVSpotlightUK.es" tvg-name="Rakuten TV Spotlight UK" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/vbb3bjW.png" group-title="",Rakuten TV Spotlight UK
+https://rakuten-spotlight-1-gb.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="RealMadridTV.es" tvg-name="Real Madrid TV" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="Sport",Real Madrid TV
 http://rmtvlive-lh.akamaihd.net/i/rmtv_1@154306/index_1000_av-b.m3u8
 #EXTINF:-1 tvg-id="RealMadridTV.es" tvg-name="Real Madrid TV" tvg-country="ES" tvg-language="Spanish" tvg-logo="" group-title="Sport",Real Madrid TV (404p)
@@ -525,63 +585,3 @@ https://cloud.streamingconnect.tv:455/radiotvzafra/radiotvzafra.m3u8
 https://bcovlive-a.akamaihd.net/1e7e91116b104391a4f22e13a694d94f/eu-central-1/6057955885001/playlist_dvr.m3u8
 #EXTINF:-1 tvg-id="APunt.es" tvg-name="À Punt" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",À Punt
 https://bcovlive-a.akamaihd.net/469e448f034b4d46afa4bcac53297d60/eu-central-1/6057955885001/playlist_dvr.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/81NIxYJ.jpg" group-title="",Rakuten TV Action Movies Germany
-https://rakuten-actionmovies-3-de.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/81NIxYJ.jpg" group-title="",Rakuten TV Action Movies Austria
-https://rakuten-actionmovies-5-at.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/slOK2IH.jpg" group-title="",Rakuten TV Comedy Movies Austria
-https://rakuten-comedymovies-5-at.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/5bC53Xk.jpg" group-title="",Rakuten TV Drama Austria
-https://rakuten-tvshows-5-at.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/hboiinD.jpg" group-title="",Rakuten TV Family Austria
-https://rakuten-family-5-at.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="AT" tvg-language="German" tvg-logo="https://i.imgur.com/qgYRzl1.jpg" group-title="",Rakuten TV Spotlight Austria
-https://rakuten-spotlight-5-at.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/uMcwx2p.jpg" group-title="",Rakuten TV Action Movies Switzerland
-https://rakuten-actionmovies-4-ch.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/o1qKoje.jpg" group-title="",Rakuten TV Comedy Movies Switzerland
-https://rakuten-comedymovies-4-ch.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/dWNxCqp.png" group-title="",Rakuten TV Drama Switzerland
-https://rakuten-tvshows-4-ch.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/hboiinD.jpg" group-title="",Rakuten TV Family Switzerland
-https://rakuten-family-4-ch.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="CH" tvg-language="German" tvg-logo="https://i.imgur.com/vbb3bjW.png" group-title="",Rakuten TV Spotlight Switzerland
-https://rakuten-spotlight-4-ch.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/slOK2IH.jpg" group-title="",Rakuten TV Comedy Movies Germany
-https://rakuten-comedymovies-3-de.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/5bC53Xk.jpg" group-title="",Rakuten TV Drama Germany
-https://rakuten-tvshows-3-de.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/hboiinD.jpg" group-title="",Rakuten TV Family Germany
-https://rakuten-family-3-de.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="DE" tvg-language="German" tvg-logo="https://i.imgur.com/qgYRzl1.jpg" group-title="",Rakuten TV Spotlight Germany
-https://rakuten-spotlight-3-de.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/uMcwx2p.jpg" group-title="",Rakuten TV Action Movies France
-https://rakuten-actionmovies-7-fr.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/o1qKoje.jpg" group-title="",Rakuten TV Comedy Movies France
-https://rakuten-comedymovies-7-fr.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/dWNxCqp.png" group-title="",Rakuten TV Drama France
-https://rakuten-tvshows-7-fr.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/hboiinD.jpg" group-title="",Rakuten TV Family Movies France
-https://rakuten-family-7-fr.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/TUDZvHw.jpg" group-title="",Rakuten TV Spotlight France
-https://rakuten-spotlight-7-fr.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/uMcwx2p.jpg" group-title="",Rakuten TV Action Movies Italy
-https://rakuten-actionmovies-6-it.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/o1qKoje.jpg" group-title="",Rakuten TV Comedy Movies Italy
-https://rakuten-comedymovies-6-it.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/hboiinD.jpg" group-title="",Rakuten TV Family Movies Italy
-https://rakuten-family-6-it.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/TUDZvHw.jpg" group-title="",Rakuten TV Spotlight Italy
-https://rakuten-spotlight-6-it.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="IT" tvg-language="Italian" tvg-logo="https://i.imgur.com/oMXfdkV.png" group-title="",Rakuten TV Drama Italy
-https://rakuten-tvshows-6-it.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/uMcwx2p.jpg" group-title="",Rakuten TV Action Movies UK
-https://rakuten-actionmovies-1-gb.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/eQKFgpa.png" group-title="",Rakuten TV Comedy Movies UK
-https://rakuten-comedymovies-1-gb.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/dWNxCqp.png" group-title="",Rakuten TV Drama UK
-https://rakuten-tvshows-1-gb.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/hboiinD.jpg" group-title="",Rakuten TV Family Movies UK
-https://rakuten-family-1-gb.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/vbb3bjW.png" group-title="",Rakuten TV Spotlight UK
-https://rakuten-spotlight-1-gb.samsung.wurl.com/manifest/playlist.m3u8
diff --git a/channels/fr.m3u b/channels/fr.m3u
index 5b90f2db8..c15a145b7 100644
--- a/channels/fr.m3u
+++ b/channels/fr.m3u
@@ -161,6 +161,8 @@ https://rakuten-euronews-3-it.samsung.wurl.com/manifest/playlist.m3u8
 #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/s89/index.m3u8
 #EXTINF:-1 tvg-id="FashionTV.fr" tvg-name="Fashion TV" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/E38ZhCz.jpg" group-title="",Fashion TV
+https://fashiontv-fashiontv-4-de.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="FashionTV.fr" tvg-name="Fashion TV" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/E38ZhCz.jpg" group-title="",Fashion TV
 https://fashiontv-fashiontv-loriginal-fr.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="FashionTVRussia.fr" tvg-name="Fashion TV Russia" tvg-country="RU" tvg-language="Russian" tvg-logo="https://i.imgur.com/fcnRf1f.png" group-title="",Fashion TV Russia (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
@@ -169,7 +171,7 @@ http://ott-cdn.ucom.am/s30/index.m3u8
 http://80.94.54.42/fashiontv/stream/playlist.m3u8
 #EXTINF:-1 tvg-id="FashionTVCzechSlovak.fr" tvg-name="FashionTV Czech&Slovak" tvg-country="CZ" tvg-language="English" tvg-logo="http://www.tvfashion.eu/wp-content/themes/Divi-child/images/logo-tvfashion-piatok.png" group-title="Fashion",FashionTV Czech&Slovak (450p)
 http://lb.streaming.sk/fashiontv/stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/auHH1Ig.png" group-title="Fashion",FashionTV Midnite Secrets (1080p)
+#EXTINF:-1 tvg-id="FashionTVMidniteSecrets.fr" tvg-name="FashionTV Midnite Secrets" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/auHH1Ig.png" group-title="Fashion",FashionTV Midnite Secrets (1080p)
 https://fash1043.cloudycdn.services/slive/_definst_/ftv_midnite_secrets_adaptive.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="FashionTVParis.fr" tvg-name="FashionTV Paris" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/yvNu4Rm.png" group-title="Fashion",FashionTV Paris (1080p)
 https://fash1043.cloudycdn.services/slive/_definst_/ftv_ftv_paris_pg_4dg_27027_paris_pg18_188_hls.smil/playlist.m3u8
@@ -367,5 +369,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-id="FashionTV.fr" tvg-name="Fashion TV" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/E38ZhCz.jpg" group-title="",Fashion TV
-https://fashiontv-fashiontv-4-de.samsung.wurl.com/manifest/playlist.m3u8
diff --git a/channels/hk.m3u b/channels/hk.m3u
index 4eb9f9972..2bd902e97 100644
--- a/channels/hk.m3u
+++ b/channels/hk.m3u
@@ -1,16 +1,28 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="A1Tai.hk" tvg-name="A1台" tvg-country="HK" tvg-language="Chinese;Yue Chinese" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/thumb/8/80/ATV_A1_logo.jpg/300px-ATV_A1_logo.jpg" group-title="General",A1台 (720p)
 https://15813114727637862976168173814320.live.prod.hkatv.com/a1_cbr_lo.m3u8
+#EXTINF:-1 tvg-id="CelestialClassicMovies.hk" tvg-name="Celestial Classic Movies" tvg-country="MY" tvg-language="" tvg-logo="https://1.bp.blogspot.com/-JitJUuWTMxg/VH--1LtXqGI/AAAAAAAAAo0/FL_bgsBFjeU/s1600/CELESTIAL%2BCLASSIC%2BMOVIES%2Blogo.png" group-title="",Celestial Classic 天映经典
+http://50.7.161.82:8278/streams/d/Celestial2/playlist.m3u8
 #EXTINF:-1 tvg-id="CelestialMovies.hk" tvg-name="Celestial Movies" tvg-country="HK;SG;MY;ID;TW;BN;BD" tvg-language="Chinese" tvg-logo="https://astrocontent.s3.amazonaws.com/Images/ChannelLogo/Pos/322_300.png" group-title="Movies",Celestial Movies (480p)
 http://210.210.155.35/qwr9ew/s/s33/index.m3u8
+#EXTINF:-1 tvg-id="CelestialMoviesMalaysia.hk" tvg-name="Celestial Movies Malaysia" tvg-country="MY" tvg-language="" tvg-logo="https://upload.wikimedia.org/wikipedia/id/thumb/a/af/CMC_English_full_color_black_text_2.jpg/200px-CMC_English_full_color_black_text_2.jpg" group-title="",Celestial Movies 天映频道
+http://50.7.161.82:8278/streams/d/Celestial/playlist.m3u8
 #EXTINF:-1 tvg-id="J2.hk" tvg-name="J2" tvg-country="HK;MO" tvg-language="Chinese;Yue Chinese" tvg-logo="http://img.tvb.com/corporate/_fck_/image/J2_logo_L(2)" group-title="",J2
 https://cdn.hkdtmb.com/hls/82/index.m3u8
+#EXTINF:-1 tvg-id="Kix.hk" tvg-name="Kix" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://i.imgur.com/mX1nnGy.png" group-title="Entertainment",Kix
+http://210.210.155.35/uq2663/h/h07/01.m3u8
+#EXTINF:-1 tvg-id="Kix.hk" tvg-name="Kix" tvg-country="MY" tvg-language="" tvg-logo="https://astrocontent.s3.amazonaws.com/Images/ChannelLogo/Pos/705_300.png" group-title="",Kix
+https://livecdn.fptplay.net/hda/kixhd_hls.smil/chunklist_b2500000.m3u8
 #EXTINF:-1 tvg-id="StarSports.hk" tvg-name="Star Sports" tvg-country="SAS" tvg-language="English" tvg-logo="https://photo.sofun.tw/2013/11/STAR-SPORTS-LOGO.jpg" group-title="Sport",Star Sports
 rtmp://ivi.bupt.edu.cn:1935/livetv/starsports
+#EXTINF:-1 tvg-id="StarSports2HD.hk" tvg-name="Star Sports 2 HD" tvg-country="HK;IN" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/4/49/Star_Sports_India_logo1.png" group-title="Sport",Star Sports 2 HD
+http://221.120.204.4/STAR-SPORTS-2/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="Thrill.hk" tvg-name="Thrill" tvg-country="SAS" tvg-language="English" tvg-logo="http://console.celestialtiger.com/images/upload/1f6e441382a388940977fd9e165178c42fe0c193.png" group-title="Movies",Thrill (480p)
 http://45.126.83.51/qwr9ew/s/s34/index.m3u8
 #EXTINF:-1 tvg-id="TVBJade.hk" tvg-name="TVB Jade" tvg-country="HK" tvg-language="Chinese" tvg-logo="" group-title="",TVB Jade
 http://ubaio.chaoniu1995.top:6796/ub/cr/crtv.php?id=30
+#EXTINF:-1 tvg-id="TVBXingHe.hk" tvg-name="TVB Xing He" tvg-country="MY" tvg-language="" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/thumb/1/17/TVB_Xing_He_logo_2017.png/220px-TVB_Xing_He_logo_2017.png" group-title="",TVB Xing He 星河
+http://50.7.161.82:8278/streams/d/Xinhe/playlist.m3u8
 #EXTINF:-1 tvg-id="ViuTV.hk" tvg-name="ViuTV" tvg-country="HK" tvg-language="Chinese;Yue Chinese" tvg-logo="http://aaaa.com.hk/main/wp-content/uploads/2020/02/ViuTV-logo.png" group-title="",ViuTV
 https://cdn.hkdtmb.com/hls/99/index.m3u8
 #EXTINF:-1 tvg-id="YaLuWeiShi.hk" tvg-name="亞旅衛視" tvg-country="HK" tvg-language="Chinese;Mandarin Chinese" tvg-logo="https://i.imgur.com/1wbOhJV.jpg" group-title="Travel",亞旅衛視
@@ -37,15 +49,3 @@ http://221.179.217.70/PLTV/88888888/224/3221225942/1.m3u8
 http://117.169.120.138:8080/live/fhzixun/.m3u8
 #EXTINF:-1 tvg-id="FengHuangWeiShiDianYingTai.hk" tvg-name="鳳凰衛視電影台" tvg-country="HK" tvg-language="Chinese" tvg-logo="https://p1.ifengimg.com/a/2018_43/45a9d426b4ae58c.jpg" group-title="",鳳凰衛視電影台
 rtmp://ivi.bupt.edu.cn:1935/livetv/fhdy
-#EXTINF:-1 tvg-id="StarSports2HD.hk" tvg-name="Star Sports 2 HD" tvg-country="HK;IN" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/4/49/Star_Sports_India_logo1.png" group-title="Sport",Star Sports 2 HD
-http://221.120.204.4/STAR-SPORTS-2/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="CelestialClassicMovies.hk" tvg-name="Celestial Classic Movies" tvg-country="MY" tvg-language="" tvg-logo="https://1.bp.blogspot.com/-JitJUuWTMxg/VH--1LtXqGI/AAAAAAAAAo0/FL_bgsBFjeU/s1600/CELESTIAL%2BCLASSIC%2BMOVIES%2Blogo.png" group-title="",Celestial Classic 天映经典
-http://50.7.161.82:8278/streams/d/Celestial2/playlist.m3u8
-#EXTINF:-1 tvg-id="CelestialMoviesMalaysia.hk" tvg-name="Celestial Movies Malaysia" tvg-country="MY" tvg-language="" tvg-logo="https://upload.wikimedia.org/wikipedia/id/thumb/a/af/CMC_English_full_color_black_text_2.jpg/200px-CMC_English_full_color_black_text_2.jpg" group-title="",Celestial Movies 天映频道
-http://50.7.161.82:8278/streams/d/Celestial/playlist.m3u8
-#EXTINF:-1 tvg-id="TVBXingHe.hk" tvg-name="TVB Xing He" tvg-country="MY" tvg-language="" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/thumb/1/17/TVB_Xing_He_logo_2017.png/220px-TVB_Xing_He_logo_2017.png" group-title="",TVB Xing He 星河
-http://50.7.161.82:8278/streams/d/Xinhe/playlist.m3u8
-#EXTINF:-1 tvg-id="Kix.hk" tvg-name="Kix" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://i.imgur.com/mX1nnGy.png" group-title="Entertainment",Kix
-http://210.210.155.35/uq2663/h/h07/01.m3u8
-#EXTINF:-1 tvg-id="Kix.hk" tvg-name="Kix" tvg-country="MY" tvg-language="" tvg-logo="https://astrocontent.s3.amazonaws.com/Images/ChannelLogo/Pos/705_300.png" group-title="",Kix
-https://livecdn.fptplay.net/hda/kixhd_hls.smil/chunklist_b2500000.m3u8
diff --git a/channels/in.m3u b/channels/in.m3u
index d8ad827e5..51ee164a9 100644
--- a/channels/in.m3u
+++ b/channels/in.m3u
@@ -377,6 +377,8 @@ https://vidcdn.vidgyor.com/thanthi-origin/liveabr/thanthi-origin/live1/playlist.
 https://timesnow-lh.akamaihd.net/i/TNHD_1@129288/master.m3u8
 #EXTINF:-1 tvg-id="Travelxp.in" tvg-name="Travelxp" tvg-country="IN;AU" tvg-language="English" tvg-logo="https://i.imgur.com/6V48LwT.jpg" group-title="",Travelxp
 https://travelxp-travelxp-1-au.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="TravelxpHD.in" tvg-name="Travelxp HD" tvg-country="IN" tvg-language="" tvg-logo="https://i.imgur.com/6V48LwT.jpg" group-title="",Travelxp HD
+https://travelxp-travelxp-2-de.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="TwentyFourNews.in" tvg-name="Twenty Four News" tvg-country="IN" tvg-language="Malayalam" tvg-logo="http://mhdtvworld.com/wp-content/uploads/2018/11/24_news_in.png" group-title="News",Twenty Four News (576p)
 http://103.199.160.85/Content/24news/Live/Channel(24news)/index.m3u8
 #EXTINF:-1 tvg-id="VasanthTV.in" tvg-name="Vasanth TV" tvg-country="IN" tvg-language="Hindi" tvg-logo="" group-title="",Vasanth TV
@@ -405,5 +407,3 @@ https://news18kannada-lh.akamaihd.net/i/n18kannada_1@372918/index_4_av-p.m3u8?sd
 http://103.199.161.254/Content/publicmusic/Live/Channel(PublicMusic)/index.m3u8
 #EXTINF:-1 tvg-id="SuvarnaNews24x7.in" tvg-name="Suvarna News 24×7" tvg-country="IN" tvg-language="Kannada" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/4/4b/Suvarna_News_New_Logo.jpg" group-title="News",ಸುವರ್ಣ ಸುದ್ದಿ 24×7 Suvarna (360p)
 https://vidcdn.vidgyor.com/suvarna-origin/liveabr/suvarna-origin/live1/playlist.m3u8
-#EXTINF:-1 tvg-id="TravelxpHD.in" tvg-name="Travelxp HD" tvg-country="IN" tvg-language="" tvg-logo="https://i.imgur.com/6V48LwT.jpg" group-title="",Travelxp HD
-https://travelxp-travelxp-2-de.samsung.wurl.com/manifest/playlist.m3u8
diff --git a/channels/jp.m3u b/channels/jp.m3u
index bd3f87903..72ca4daf0 100644
--- a/channels/jp.m3u
+++ b/channels/jp.m3u
@@ -1,4 +1,6 @@
 #EXTM3U
+#EXTINF:-1 tvg-id="Animax.jp" tvg-name="Animax" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",Animax
+http://193.160.32.112:9090/hstv.php?id=139
 #EXTINF:-1 tvg-id="AnimaxAsia.jp" tvg-name="Animax Asia" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",Animax Asia (360p)
 https://tvonlineindonesia.xyz:443/m3u8/usee-animax-People+62.m3u8
 #EXTINF:-1 tvg-id="AnimaxJapan.jp" tvg-name="Animax Japan" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="Movies",Animax Japan (720p)
@@ -17,14 +19,34 @@ https://livecdn.fptplay.net/hda3/animaxport_2000.stream/.m3u8
 http://182.216.142.247:9999/klive/api/url.m3u8?m=url&s=wavve&i=A01&q=SD&apikey=196JE7PCDI
 #EXTINF:-1 tvg-id="AnimaxKorea.jp" tvg-name="Animax Korea" tvg-country="KR" tvg-language="" tvg-logo="https://img.pooq.co.kr/BMS/ChannelImg/31_anymax.png" group-title="",Animax Korea
 http://sksmsanf.iptime.org:9999/klive/api/url.m3u8?m=url&s=wavve&i=A01&q=SD&apikey=OJW57DXHXF
+#EXTINF:-1 tvg-id="BSAnimax.jp" tvg-name="BS Animax" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",BS Animax
+http://redlabmcdn.s.llnwi.net/jp01/bs14/index.m3u8
 #EXTINF:-1 tvg-id="BSAsahi.jp" tvg-name="BS Asahi" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://company.tv-asahi.co.jp/saiyo/group/img/company/logo-bsasahi.png" group-title="Local",BS Asahi
 http://203.162.235.41:16914
+#EXTINF:-1 tvg-id="BSAsahi.jp" tvg-name="BS Asahi" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",BS Asahi
+http://redlabmcdn.s.llnwi.net/jp01/bs04/index.m3u8
+#EXTINF:-1 tvg-id="BSFuji.jp" tvg-name="BS Fuji" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",BS Fuji
+http://redlabmcdn.s.llnwi.net/jp01/bs07/index.m3u8
 #EXTINF:-1 tvg-id="BSFujiBS181.jp" tvg-name="BS Fuji (BS181)" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://www.zne-iptv.com/wp-content/uploads/2017/10/22-BS-FUJI-770x480.jpg" group-title="Local",BS Fuji (BS181)
 http://203.162.235.41:16911
+#EXTINF:-1 tvg-id="BSNIPPON.jp" tvg-name="BS NIPPON" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",BS NIPPON
+http://redlabmcdn.s.llnwi.net/jp01/bs03/index.m3u8
+#EXTINF:-1 tvg-id="BSTBS.jp" tvg-name="BS TBS" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",BS TBS
+http://redlabmcdn.s.llnwi.net/jp01/bs05/index.m3u8
+#EXTINF:-1 tvg-id="BSTVTokyo.jp" tvg-name="BS TV Tokyo" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",BS TV Tokyo
+http://redlabmcdn.s.llnwi.net/jp01/bs06/index.m3u8
 #EXTINF:-1 tvg-id="BSTVTokyoBS171.jp" tvg-name="BS TV Tokyo (BS171)" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/b/b7/TV_Tokyo_logo_20110629.svg/1280px-TV_Tokyo_logo_20110629.svg.png" group-title="Local",BS TV Tokyo (BS171)
 http://203.162.235.41:16915
+#EXTINF:-1 tvg-id="BSTBS.jp" tvg-name="BS-TBS" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",BS-TBS
+http://193.160.32.112:9090/hstv.php?id=242
 #EXTINF:-1 tvg-id="BSTBS.jp" tvg-name="BS-TBS" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://pbs.twimg.com/profile_images/1260862250295812096/a6-UyLc__400x400.jpg" group-title="",BS-TBS
 http://203.162.235.41:16913
+#EXTINF:-1 tvg-id="Bs12.jp" tvg-name="Bs12" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",Bs12
+http://redlabmcdn.s.llnwi.net/jp01/bs08/index.m3u8
+#EXTINF:-1 tvg-id="BStereDong.jp" tvg-name="BSテレ東" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",BSテレ東
+http://193.160.32.112:9090/hstv.php?id=243
+#EXTINF:-1 tvg-id="BShuzi.jp" tvg-name="BSフジ" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",BSフジ
+http://193.160.32.112:9090/hstv.php?id=244
 #EXTINF:-1 tvg-id="CGNTVJapan.jp" tvg-name="CGNTV Japan" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://i.imgur.com/rXrSsiI.jpg" group-title="Religious",CGNTV Japan (720p)
 http://cgntv-glive.ofsdelivery.net/live/_definst_/cgntv_jp/playlist.m3u8
 #EXTINF:-1 tvg-id="FujiTV.jp" tvg-name="Fuji TV" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",Fuji TV
@@ -33,30 +55,66 @@ http://redlabmcdn.s.llnwi.net/jp01/ryowa7/index.m3u8
 https://fujitv.mov3.co/hls/fujitv.m3u8
 #EXTINF:-1 tvg-id="FujiTVJOCXDTV.jp" tvg-name="Fuji TV (JOCX-DTV)" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://upload.wikimedia.org/wikipedia/fr/thumb/6/65/Fuji_TV_Logo.svg/1049px-Fuji_TV_Logo.svg.png" group-title="Local",Fuji TV (JOCX-DTV)
 http://203.162.235.41:16904
+#EXTINF:-1 tvg-id="GAORA.jp" tvg-name="GAORA" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",GAORA
+http://193.160.32.112:9090/hstv.php?id=296
+#EXTINF:-1 tvg-id="GolfNetwork.jp" tvg-name="Golf Network" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",Golf Network
+http://193.160.32.112:9090/hstv.php?id=249
+#EXTINF:-1 tvg-id="GreenChannel.jp" tvg-name="Green Channel" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",Green Channel
+http://193.160.32.112:9090/hstv.php?id=140
 #EXTINF:-1 tvg-id="GSTV.jp" tvg-name="GSTV" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://i.imgur.com/8AM9fC8.jpg" group-title="Shop",GSTV (720p)
 https://gemstv.wide-stream.net/gemstv01/smil:gemstv01.smil/chunklist.m3u8
 #EXTINF:-1 tvg-id="GTNTyphome.jp" tvg-name="GTN Typhome" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://i.imgur.com/gFKvgAd.jpg" group-title="",GTN Typhome (English Subs) (720p)
 https://gorilla.gaki-no-tsukai.eu/hls/test.m3u8
 #EXTINF:-1 tvg-id="GunmaTV.jp" tvg-name="Gunma TV" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/8/87/Gtv_logo_ja_01.svg/800px-Gtv_logo_ja_01.svg.png" group-title="Local",Gunma TV
 https://movie.mcas.jp/switcher/smil:mcas8.smil/master.m3u8
+#EXTINF:-1 tvg-id="JSports1.jp" tvg-name="J Sports 1" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",J Sports 1
+http://193.160.32.112:9090/hstv.php?id=129
+#EXTINF:-1 tvg-id="JSports1.jp" tvg-name="J Sports 1" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",J Sports 1
+http://redlabmcdn.s.llnwi.net/jp01/bs15/index.m3u8
+#EXTINF:-1 tvg-id="JSports2.jp" tvg-name="J Sports 2" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",J Sports 2
+http://193.160.32.112:9090/hstv.php?id=130
+#EXTINF:-1 tvg-id="JSports2.jp" tvg-name="J Sports 2" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",J Sports 2
+http://redlabmcdn.s.llnwi.net/jp01/bs11/index.m3u8
+#EXTINF:-1 tvg-id="JSports3.jp" tvg-name="J Sports 3" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",J Sports 3
+http://193.160.32.112:9090/hstv.php?id=131
+#EXTINF:-1 tvg-id="JSports3.jp" tvg-name="J Sports 3" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",J Sports 3
+http://redlabmcdn.s.llnwi.net/jp01/bs12/index.m3u8
+#EXTINF:-1 tvg-id="JSports4.jp" tvg-name="J Sports 4" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",J Sports 4
+http://193.160.32.112:9090/hstv.php?id=132
 #EXTINF:-1 tvg-id="JapanetChannelDX.jp" tvg-name="Japanet Channel DX" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://img.japanet.co.jp/shopping/img/senqua/header/logo.gif" group-title="Shop",Japanet Channel DX (1080p)
 https://bcsecurelivehls-i.akamaihd.net/hls/live/265320/5043843989001/140130JTDX/index.m3u8
 #EXTINF:-1 tvg-id="JSTV2.jp" tvg-name="JSTV 2" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://www.monpetitforfait.com/comparateur-box-internet/wp-content/uploads/2020/05/jstv2-regarder.png" group-title="Local",JSTV 2
 http://203.162.235.41:16901
+#EXTINF:-1 tvg-id="KidsStation.jp" tvg-name="Kids Station" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",Kids Station
+http://193.160.32.112:9090/hstv.php?id=289
+#EXTINF:-1 tvg-id="MBS.jp" tvg-name="MBS" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",MBS
+http://193.160.32.112:9090/hstv.php?id=199
+#EXTINF:-1 tvg-id="MusicJapan.jp" tvg-name="Music Japan" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",Music Japan
+http://193.160.32.112:9090/hstv.php?id=288
 #EXTINF:-1 tvg-id="NewJapanProWrestlingWorld.jp" tvg-name="New Japan Pro Wrestling World" tvg-country="JP" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/thumb/1/1c/New_Japan_Pro_Wrestling_Logo_2.svg/480px-New_Japan_Pro_Wrestling_Logo_2.svg.png" group-title="Sport",New Japan Pro Wrestling World
 https://aka-amd-njpwworld-hls-enlive.akamaized.net/hls/video/njpw_en/njpw_en_channel01_3/chunklist_DVR.m3u8
 #EXTINF:-1 tvg-id="NHKBSPremiumBS103.jp" tvg-name="NHK BS Premium (BS103)" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/2/21/NHK_BS%E3%83%97%E3%83%AC%E3%83%9F%E3%82%A2%E3%83%A0_%E6%96%B0%E3%83%AD%E3%82%B4.png" group-title="Local",NHK BS Premium (BS103)
 http://203.162.235.41:16910
+#EXTINF:-1 tvg-id="NHKBS1.jp" tvg-name="NHK BS1" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",NHK BS1
+http://redlabmcdn.s.llnwi.net/jp01/bs01/index.m3u8
 #EXTINF:-1 tvg-id="NHKBS1BS101.jp" tvg-name="NHK BS1 (BS101)" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/6d/NHKBS1%E3%83%AD%E3%82%B42020-.png" group-title="Local",NHK BS1 (BS101)
 http://203.162.235.41:16909
+#EXTINF:-1 tvg-id="NHKBSI.jp" tvg-name="NHK BSI" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",NHK BSI
+http://193.160.32.112:9090/hstv.php?id=128
+#EXTINF:-1 tvg-id="NHKBSP.jp" tvg-name="NHK BSP" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",NHK BSP
+http://redlabmcdn.s.llnwi.net/jp01/bs02/index.m3u8
 #EXTINF:-1 tvg-id="NHKChineseVision.jp" tvg-name="NHK Chinese Vision" tvg-country="JP" tvg-language="Chinese" tvg-logo="https://i.imgur.com/4yRulEZ.png" group-title="News",NHK Chinese Vision
 https://nhkw-zh-hlscomp.akamaized.net/8thz5iufork8wjip/playlist.m3u8
 #EXTINF:-1 tvg-id="NHKE.jp" tvg-name="NHK E" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",NHK E [Not 24/7]
 http://redlabmcdn.s.llnwi.net/jp01/ryowa1/index.m3u8
+#EXTINF:-1 tvg-id="NHKEducationalTV.jp" tvg-name="NHK Educational TV" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",NHK Educational TV
+http://193.160.32.112:9090/hstv.php?id=120
 #EXTINF:-1 tvg-id="NHKG.jp" tvg-name="NHK G" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",NHK G
 http://redlabmcdn.s.llnwi.net/jp01/ryowa2/index.m3u8
 #EXTINF:-1 tvg-id="NHKGeneralJOAKDTV.jp" tvg-name="NHK General (JOAK-DTV)" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/6/6f/NHK%E7%B7%8F%E5%90%88%E3%83%AD%E3%82%B42020-.png" group-title="Local",NHK General (JOAK-DTV)
 http://203.162.235.41:16903
+#EXTINF:-1 tvg-id="NHKGeneralTV.jp" tvg-name="NHK General TV" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",NHK General TV
+http://193.160.32.112:9090/hstv.php?id=121
 #EXTINF:-1 tvg-id="NHKGeneralTV.jp" tvg-name="NHK General TV" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",NHK General TV
 https://nhk.mov3.co/hls/nhk.m3u8
 #EXTINF:-1 tvg-id="NHKWorldJapan.jp" tvg-name="NHK World Japan" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://i.imgur.com/SQISXoD.jpg" group-title="News",NHK World Japan
@@ -79,6 +137,24 @@ https://www.news24.jp/livestream/index.m3u8
 https://cdn-live1.qvc.jp/iPhone/1501/1501.m3u8
 #EXTINF:-1 tvg-id="ShopChannel.jp" tvg-name="Shop Channel" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://i.imgur.com/3K36JEA.jpg" group-title="Shop",Shop Channel
 https://stream3.shopch.jp/HLS/master.m3u8
+#EXTINF:-1 tvg-id="Star1.jp" tvg-name="Star 1" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",Star 1
+http://193.160.32.112:9090/hstv.php?id=136
+#EXTINF:-1 tvg-id="Star1.jp" tvg-name="Star 1" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",Star 1
+http://redlabmcdn.s.llnwi.net/jp01/bs09/index.m3u8
+#EXTINF:-1 tvg-id="Star2.jp" tvg-name="Star 2" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",Star 2
+http://193.160.32.112:9090/hstv.php?id=137
+#EXTINF:-1 tvg-id="Star2.jp" tvg-name="Star 2" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",Star 2
+http://redlabmcdn.s.llnwi.net/jp01/bs10/index.m3u8
+#EXTINF:-1 tvg-id="Star3.jp" tvg-name="Star 3" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",Star 3
+http://193.160.32.112:9090/hstv.php?id=138
+#EXTINF:-1 tvg-id="SUNSTATION2.jp" tvg-name="SUN STATION 2" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",SUN STATION 2
+http://193.160.32.112:9090/hstv.php?id=125
+#EXTINF:-1 tvg-id="SUNSTATION4.jp" tvg-name="SUN STATION 4" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",SUN STATION 4
+http://193.160.32.112:9090/hstv.php?id=127
+#EXTINF:-1 tvg-id="SunTV.jp" tvg-name="Sun TV" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",Sun TV
+http://193.160.32.112:9090/hstv.php?id=238
+#EXTINF:-1 tvg-id="TBS.jp" tvg-name="TBS" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",TBS
+http://193.160.32.112:9090/hstv.php?id=124
 #EXTINF:-1 tvg-id="TBS.jp" tvg-name="TBS" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",TBS
 http://redlabmcdn.s.llnwi.net/jp01/ryowa5/index.m3u8
 #EXTINF:-1 tvg-id="TBS.jp" tvg-name="TBS" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",TBS
@@ -99,107 +175,31 @@ http://redlabmcdn.s.llnwi.net/jp01/ryowa4/index.m3u8
 http://203.162.235.41:16908
 #EXTINF:-1 tvg-id="TVTokyo.jp" tvg-name="TV Tokyo" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://i.imgur.com/vgEnHX6.png" group-title="",TV Tokyo
 http://redlabmcdn.s.llnwi.net/jp01/ryowa6/tracks-v1a1/mono.m3u8
+#EXTINF:-1 tvg-id="TVO.jp" tvg-name="TVO" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",TVO
+http://193.160.32.112:9090/hstv.php?id=126
 #EXTINF:-1 tvg-id="WeatherNews.jp" tvg-name="Weather News" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://dbbovgtu2bg0x.cloudfront.net/uploads/program/main_image/749853303/app_app_wether_news.png" group-title="Weather",Weather News
 https://movie.mcas.jp/mcas/smil:wn1.smil/master.m3u8
+#EXTINF:-1 tvg-id="WOWOWCinema.jp" tvg-name="WOWOW Cinema" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",WOWOW Cinema
+http://193.160.32.112:9090/hstv.php?id=135
+#EXTINF:-1 tvg-id="WOWOWLive.jp" tvg-name="WOWOW Live" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",WOWOW Live
+http://193.160.32.112:9090/hstv.php?id=134
+#EXTINF:-1 tvg-id="WOWOWPrime.jp" tvg-name="WOWOW Prime" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",WOWOW Prime
+http://193.160.32.112:9090/hstv.php?id=133
 #EXTINF:-1 tvg-id="WOWOWsinema.jp" tvg-name="WOWOWシネマ" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",WOWOWシネマ (Wowow Cinema)
 http://203.162.235.41:16916
-#EXTINF:-1,日本娛樂
-http://193.160.32.112:9090/hstv.php?id=122
-#EXTINF:-1,日本西片
-http://193.160.32.112:9090/hstv.php?id=240
-#EXTINF:-1,日本電視歡樂
-http://193.160.32.112:9090/hstv.php?id=237
-#EXTINF:-1,日劇場
-http://193.160.32.112:9090/hstv.php?id=287
-#EXTINF:-1,日本下位
-http://193.160.32.112:9090/hstv.php?id=119
-#EXTINF:-1,日テレnews24 (Nippon News 24)
-http://193.160.32.112:9090/hstv.php?id=42
-#EXTINF:-1,Animax
-http://193.160.32.112:9090/hstv.php?id=139
-#EXTINF:-1,BS-TBS
-http://193.160.32.112:9090/hstv.php?id=242
-#EXTINF:-1,BSテレ東
-http://193.160.32.112:9090/hstv.php?id=243
-#EXTINF:-1,BSフジ
-http://193.160.32.112:9090/hstv.php?id=244
-#EXTINF:-1,GAORA
-http://193.160.32.112:9090/hstv.php?id=296
-#EXTINF:-1,Golf Network
-http://193.160.32.112:9090/hstv.php?id=249
-#EXTINF:-1,Green Channel
-http://193.160.32.112:9090/hstv.php?id=140
-#EXTINF:-1,J Sports 1
-http://193.160.32.112:9090/hstv.php?id=129
-#EXTINF:-1,J Sports 2
-http://193.160.32.112:9090/hstv.php?id=130
-#EXTINF:-1,J Sports 3
-http://193.160.32.112:9090/hstv.php?id=131
-#EXTINF:-1,J Sports 4
-http://193.160.32.112:9090/hstv.php?id=132
-#EXTINF:-1,Kids Station
-http://193.160.32.112:9090/hstv.php?id=289
-#EXTINF:-1,MBS
-http://193.160.32.112:9090/hstv.php?id=199
-#EXTINF:-1,Music Japan
-http://193.160.32.112:9090/hstv.php?id=288
-#EXTINF:-1,NHK BSI
-http://193.160.32.112:9090/hstv.php?id=128
-#EXTINF:-1,NHK Educational TV
-http://193.160.32.112:9090/hstv.php?id=120
-#EXTINF:-1,NHK General TV
-http://193.160.32.112:9090/hstv.php?id=121
-#EXTINF:-1,Star 1
-http://193.160.32.112:9090/hstv.php?id=136
-#EXTINF:-1,Star 2
-http://193.160.32.112:9090/hstv.php?id=137
-#EXTINF:-1,Star 3
-http://193.160.32.112:9090/hstv.php?id=138
-#EXTINF:-1,SUN STATION 2
-http://193.160.32.112:9090/hstv.php?id=125
-#EXTINF:-1,SUN STATION 4
-http://193.160.32.112:9090/hstv.php?id=127
-#EXTINF:-1,Sun TV
-http://193.160.32.112:9090/hstv.php?id=238
-#EXTINF:-1,TBS
-http://193.160.32.112:9090/hstv.php?id=124
-#EXTINF:-1,TVO
-http://193.160.32.112:9090/hstv.php?id=126
-#EXTINF:-1,WOWOW Cinema
-http://193.160.32.112:9090/hstv.php?id=135
-#EXTINF:-1,WOWOW Live
-http://193.160.32.112:9090/hstv.php?id=134
-#EXTINF:-1,WOWOW Prime
-http://193.160.32.112:9090/hstv.php?id=133
-#EXTINF:-1,ytv JP
+#EXTINF:-1 tvg-id="ytvJP.jp" tvg-name="ytv JP" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",ytv JP
 http://193.160.32.112:9090/hstv.php?id=198
-#EXTINF:-1,ファミリー劇場
+#EXTINF:-1 tvg-id="huamiriJuChang.jp" tvg-name="ファミリー劇場" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",ファミリー劇場
 http://193.160.32.112:9090/hstv.php?id=298
-#EXTINF:-1,Bs12
-http://redlabmcdn.s.llnwi.net/jp01/bs08/index.m3u8
-#EXTINF:-1,NHK BS1
-http://redlabmcdn.s.llnwi.net/jp01/bs01/index.m3u8
-#EXTINF:-1,NHK BSP
-http://redlabmcdn.s.llnwi.net/jp01/bs02/index.m3u8
-#EXTINF:-1,BS NIPPON
-http://redlabmcdn.s.llnwi.net/jp01/bs03/index.m3u8
-#EXTINF:-1,BS Asahi
-http://redlabmcdn.s.llnwi.net/jp01/bs04/index.m3u8
-#EXTINF:-1,BS TBS
-http://redlabmcdn.s.llnwi.net/jp01/bs05/index.m3u8
-#EXTINF:-1,BS TV Tokyo
-http://redlabmcdn.s.llnwi.net/jp01/bs06/index.m3u8
-#EXTINF:-1,BS Fuji
-http://redlabmcdn.s.llnwi.net/jp01/bs07/index.m3u8
-#EXTINF:-1,Star 1
-http://redlabmcdn.s.llnwi.net/jp01/bs09/index.m3u8
-#EXTINF:-1,Star 2
-http://redlabmcdn.s.llnwi.net/jp01/bs10/index.m3u8
-#EXTINF:-1,J Sports 2
-http://redlabmcdn.s.llnwi.net/jp01/bs11/index.m3u8
-#EXTINF:-1,J Sports 3
-http://redlabmcdn.s.llnwi.net/jp01/bs12/index.m3u8
-#EXTINF:-1,BS Animax
-http://redlabmcdn.s.llnwi.net/jp01/bs14/index.m3u8
-#EXTINF:-1,J Sports 1
-http://redlabmcdn.s.llnwi.net/jp01/bs15/index.m3u8
+#EXTINF:-1 tvg-id="Riterenews24NipponNews24.jp" tvg-name="日テレnews24 (Nippon News 24)" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",日テレnews24 (Nippon News 24)
+http://193.160.32.112:9090/hstv.php?id=42
+#EXTINF:-1 tvg-id="RiJuChang.jp" tvg-name="日劇場" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",日劇場
+http://193.160.32.112:9090/hstv.php?id=287
+#EXTINF:-1 tvg-id="RiBenXiaWei.jp" tvg-name="日本下位" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",日本下位
+http://193.160.32.112:9090/hstv.php?id=119
+#EXTINF:-1 tvg-id="RiBenYuLe.jp" tvg-name="日本娛樂" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",日本娛樂
+http://193.160.32.112:9090/hstv.php?id=122
+#EXTINF:-1 tvg-id="RiBenXiPian.jp" tvg-name="日本西片" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",日本西片
+http://193.160.32.112:9090/hstv.php?id=240
+#EXTINF:-1 tvg-id="RiBenDianShiHuanLe.jp" tvg-name="日本電視歡樂" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",日本電視歡樂
+http://193.160.32.112:9090/hstv.php?id=237
diff --git a/channels/lb.m3u b/channels/lb.m3u
index e6e7c2a35..39cb6efec 100644
--- a/channels/lb.m3u
+++ b/channels/lb.m3u
@@ -20,9 +20,9 @@ https://futuretv.cdn.mangomolo.com/futuretv/smil:futuretv.smil/master.m3u8
 #EXTINF:-1 tvg-id="FutureTV.lb" tvg-name="Future TV" tvg-country="LB" tvg-language="Arabic" tvg-logo="http://futuretvnetwork.com/images/logo.png" group-title="General",Future TV (486p)
 https://futuretv.cdn.mangomolo.com/futuretv/smil:futuretv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="LBCInternational.lb" tvg-name="LBC International" tvg-country="LB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/YPR45yP.png" group-title="General",LBC International (1080p)
-https://shls-lbci-prod-dub.shahid.net/out/v1/d8cce30036e743318a7f338539689968/index.m3u8
-#EXTINF:-1 tvg-id="LBCInternational.lb" tvg-name="LBC International" tvg-country="LB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/YPR45yP.png" group-title="General",LBC International (1080p)
 http://93.184.1.247/LBC-International/index.m3u8
+#EXTINF:-1 tvg-id="LBCInternational.lb" tvg-name="LBC International" tvg-country="LB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/YPR45yP.png" group-title="General",LBC International (1080p)
+https://shls-lbci-prod-dub.shahid.net/out/v1/d8cce30036e743318a7f338539689968/index.m3u8
 #EXTINF:-1 tvg-id="NabaaTV.lb" tvg-name="Nabaa TV" tvg-country="LB" tvg-language="Arabic" tvg-logo="https://nabaa.tv/wp-content/uploads/2018/07/nabaa-logo-66x116.png" group-title="News",Nabaa TV
 http://31.14.40.237:1935/live/Nabaa/chunklist.m3u8
 #EXTINF:-1 tvg-id="NabaaTV.lb" tvg-name="Nabaa TV" tvg-country="LB" tvg-language="Arabic" tvg-logo="https://nabaa.tv/wp-content/uploads/2018/07/nabaa-logo-66x116.png" group-title="News",Nabaa TV (480p)
@@ -46,10 +46,10 @@ https://svs.itworkscdn.net/otvlebanonlive/otv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TahaTV.lb" tvg-name="Taha TV" tvg-country="LB" tvg-language="Arabic" tvg-logo="https://i.imgur.com/wOxnItQ.png" group-title="Kids",Taha TV (360p)
 https://media2.livaat.com/TAHA-TV/index.m3u8
 #EXTINF:-1 tvg-id="Tele Liban ARB" tvg-name="Tele Liban ARB" tvg-country="LB" tvg-language="Arabic" tvg-logo="http://www.teleliban.com.lb/images/telelogo.png" group-title="General",Tele Liban (576p)
+http://93.184.1.247/TeleLeban/index.m3u8
+#EXTINF:-1 tvg-id="Tele Liban ARB" tvg-name="Tele Liban ARB" tvg-country="LB" tvg-language="Arabic" tvg-logo="http://www.teleliban.com.lb/images/telelogo.png" group-title="General",Tele Liban (576p)
 #EXTVLCOPT:http-referrer=https://www.teleliban.com.lb/live
 http://cdn.catiacast.video/abr/ed8f807e2548db4507d2a6f4ba0c4a06/playlist.m3u8
-#EXTINF:-1 tvg-id="Tele Liban ARB" tvg-name="Tele Liban ARB" tvg-country="LB" tvg-language="Arabic" tvg-logo="http://www.teleliban.com.lb/images/telelogo.png" group-title="General",Tele Liban (576p)
-http://93.184.1.247/TeleLeban/index.m3u8
 #EXTINF:-1 tvg-id="TVSeventeen.lb" tvg-name="TV Seventeen" tvg-country="LB" tvg-language="Arabic" tvg-logo="https://www.tvseventeen.com/img/logo.png" group-title="News",TV Seventeen (720p)
 https://cdn.tvseventeen.com/test_tv_seventeen/index.m3u8
 #EXTINF:-1 tvg-id="Unews.lb" tvg-name="Unews" tvg-country="LB" tvg-language="Arabic" tvg-logo="http://www.u-news.net/themes/publication_1/theme_1/_img/logoimg.png" group-title="News",Unews (360p)
diff --git a/channels/lk.m3u b/channels/lk.m3u
index e740e2c43..4cd704fb5 100644
--- a/channels/lk.m3u
+++ b/channels/lk.m3u
@@ -1,45 +1,45 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="athavantv.com" tvg-name="" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/U4RQ4pT.png" group-title="",Athavan TV (360p)
-http://45.77.66.224:1935/athavantv/live_360p/playlist.m3u8
-#EXTINF:-1 tvg-id="athavantv.com" tvg-name="" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/U4RQ4pT.png" group-title="",Athavan TV (360p)
-http://45.77.66.224:1935/athavantv/live_360p/chunklist_w927840159.m3u8
-#EXTINF:-1 tvg-id="athavantv.com" tvg-name="" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/U4RQ4pT.png" group-title="",Athavan TV (360p)
-http://45.77.66.224:1935/athavantv/live_360p/chunklist_w675822075.m3u8
-#EXTINF:-1 tvg-id="athavantv.com" tvg-name="" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/U4RQ4pT.png" group-title="",Athavan TV (360p)
+#EXTINF:-1 tvg-id="athavantv.com" tvg-name="Athavan TV" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/U4RQ4pT.png" group-title="",Athavan TV (360p)
 http://45.77.66.224:1935/athavantv/live_360p/chunklist_w305811568.m3u8
-#EXTINF:-1 tvg-id="channeleye.lk" tvg-name="Channel Eye" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/dDCHZwA.png" group-title="",Channel Eye (480p)
-http://dammikartmp.tulix.tv/slrc2/slrc2/playlist.m3u8	
+#EXTINF:-1 tvg-id="athavantv.com" tvg-name="Athavan TV" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/U4RQ4pT.png" group-title="",Athavan TV (360p)
+http://45.77.66.224:1935/athavantv/live_360p/chunklist_w675822075.m3u8
+#EXTINF:-1 tvg-id="athavantv.com" tvg-name="Athavan TV" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/U4RQ4pT.png" group-title="",Athavan TV (360p)
+http://45.77.66.224:1935/athavantv/live_360p/chunklist_w927840159.m3u8
+#EXTINF:-1 tvg-id="athavantv.com" tvg-name="Athavan TV" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/U4RQ4pT.png" group-title="",Athavan TV (360p)
+http://45.77.66.224:1935/athavantv/live_360p/playlist.m3u8
 #EXTINF:-1 tvg-id="channeleye.lk" tvg-name="Channel Eye" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/dDCHZwA.png" group-title="",Channel Eye (480p)
 http://dammikartmp.tulix.tv/slrc2/slrc2/chunklist_w475891209.m3u8
+#EXTINF:-1 tvg-id="channeleye.lk" tvg-name="Channel Eye" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/dDCHZwA.png" group-title="",Channel Eye (480p)
+http://dammikartmp.tulix.tv/slrc2/slrc2/playlist.m3u8
 #EXTINF:-1 tvg-id="HiruTV.lk" tvg-name="Hiru TV" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/u4et3kY.png" group-title="",Hiru TV (360p)
 http://cdncities.com/8012/8012/playlist.m3u8
 #EXTINF:-1 tvg-id="hirutv.lk" tvg-name="Hiru TV" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/u4et3kY.png" group-title="",Hiru TV (360p)
-https://eu10b.serverse.com:1936/8012/8012/playlist.m3u8
-#EXTINF:-1 tvg-id="hirutv.lk" tvg-name="Hiru TV" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/u4et3kY.png" group-title="",Hiru TV (360p)
 https://eu10b.serverse.com:1936/8012/8012/chunklist_w73015902.m3u8
-#EXTINF:-1 tvg-id="rupavahini.lk" tvg-name="" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/3krjTFe.png" group-title="",Rupavahini (480p)
-http://dammikartmp.tulix.tv/slrc1/slrc1/playlist.m3u8
-#EXTINF:-1 tvg-id="rupavahini.lk" tvg-name="" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/3krjTFe.png" group-title="",Rupavahini (480p)
+#EXTINF:-1 tvg-id="hirutv.lk" tvg-name="Hiru TV" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/u4et3kY.png" group-title="",Hiru TV (360p)
+https://eu10b.serverse.com:1936/8012/8012/playlist.m3u8
+#EXTINF:-1 tvg-id="rupavahini.lk" tvg-name="Rupavahini" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/3krjTFe.png" group-title="",Rupavahini (480p)
 http://dammikartmp.tulix.tv/slrc1/slrc1/chunklist_w1998132387.m3u8
-#EXTINF:-1 tvg-id="SanthoraTV.lk" tvg-name="Santhora TV" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/yJs9KYP.png" group-title="",Santhora TV (720p)
-http://rtmp.santhoratv.zecast.net/santhoratv/santhoratv/playlist.m3u8
+#EXTINF:-1 tvg-id="rupavahini.lk" tvg-name="Rupavahini" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/3krjTFe.png" group-title="",Rupavahini (480p)
+http://dammikartmp.tulix.tv/slrc1/slrc1/playlist.m3u8
 #EXTINF:-1 tvg-id="SanthoraTV.lk" tvg-name="Santhora TV" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/yJs9KYP.png" group-title="",Santhora TV (720p)
 http://rtmp.santhoratv.zecast.net/santhoratv/santhoratv/chunklist_w52779246.m3u8
-#EXTINF:-1 tvg-id="SanthoraTV.lk" tvg-name="Santhora TV" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/yJs9KYP.png" group-title="",Santhora TV - SHORTFILM (720p)
-http://rtmp.santhoratv.zecast.net/santhora/santhorashortfilm/playlist.m3u8
+#EXTINF:-1 tvg-id="SanthoraTV.lk" tvg-name="Santhora TV" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/yJs9KYP.png" group-title="",Santhora TV (720p)
+http://rtmp.santhoratv.zecast.net/santhoratv/santhoratv/playlist.m3u8
 #EXTINF:-1 tvg-id="SanthoraTV.lk" tvg-name="Santhora TV" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/yJs9KYP.png" group-title="",Santhora TV - SHORTFILM (720p)
 http://rtmp.santhoratv.zecast.net/santhora/santhorashortfilm/chunklist_w405490395.m3u8
-#EXTINF:-1 tvg-id="siyathatv.lk" tvg-name="" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/QZ39XHh.jpg" group-title="",Siyatha TV (360p)
+#EXTINF:-1 tvg-id="SanthoraTV.lk" tvg-name="Santhora TV" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/yJs9KYP.png" group-title="",Santhora TV - SHORTFILM (720p)
+http://rtmp.santhoratv.zecast.net/santhora/santhorashortfilm/playlist.m3u8
+#EXTINF:-1 tvg-id="siyathatv.lk" tvg-name="Siyatha TV" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/QZ39XHh.jpg" group-title="",Siyatha TV (360p)
 http://live.siyathatv.lk:19904/hls/siyatha_tv.m3u8
 #EXTINF:-1 tvg-id="SooriyanTV.lk" tvg-name="Sooriyan TV" tvg-country="LK" tvg-language="Sinhala" tvg-logo="https://i.imgur.com/nqAvA6W.png" group-title="",Sooriyan TV (864p)
 https://cdn.jwplayer.com/videos/1m0nMXhZ-3SDdwqdV.m3u8
-#EXTINF:-1 tvg-id="srisankaratv.com" tvg-name="" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/1QrwZKp.png" group-title="",Sri Sankara TV (360p)
-https://8noro432dm6g-hls-live.wmncdn.net/Sri/a5518065f47332dad6b509920c827474.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="srisankaratv.com" tvg-name="" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/1QrwZKp.png" group-title="",Sri Sankara TV (360p)
+#EXTINF:-1 tvg-id="srisankaratv.com" tvg-name="Sri Sankara TV" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/1QrwZKp.png" group-title="",Sri Sankara TV (360p)
 https://8noro432dm6g-hls-live.wmncdn.net/Sri/a5518065f47332dad6b509920c827474.sdp/chunks.m3u8
-#EXTINF:-1 tvg-id="swarnavahini.lk" tvg-name="" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/v8qciB6.png" group-title="",Swarnavahini (720p)
-https://jk3lz8xklw79-hls-live.5centscdn.com/live/6226f7cbe59e99a90b5cef6f94f966fd.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="swarnavahini.lk" tvg-name="" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/v8qciB6.png" group-title="",Swarnavahini (720p)
+#EXTINF:-1 tvg-id="srisankaratv.com" tvg-name="Sri Sankara TV" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/1QrwZKp.png" group-title="",Sri Sankara TV (360p)
+https://8noro432dm6g-hls-live.wmncdn.net/Sri/a5518065f47332dad6b509920c827474.sdp/playlist.m3u8
+#EXTINF:-1 tvg-id="swarnavahini.lk" tvg-name="Swarnavahini" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/v8qciB6.png" group-title="",Swarnavahini (720p)
 https://jk3lz8xklw79-hls-live.5centscdn.com/live/6226f7cbe59e99a90b5cef6f94f966fd.sdp/chunks.m3u8
-#EXTINF:-1 tvg-id="verbumtv.com" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/BzaJlR9.jpg" group-title="",VerbumTV (540p)
+#EXTINF:-1 tvg-id="swarnavahini.lk" tvg-name="Swarnavahini" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/v8qciB6.png" group-title="",Swarnavahini (720p)
+https://jk3lz8xklw79-hls-live.5centscdn.com/live/6226f7cbe59e99a90b5cef6f94f966fd.sdp/playlist.m3u8
+#EXTINF:-1 tvg-id="verbumtv.com" tvg-name="VerbumTV" tvg-country="LK" tvg-language="" tvg-logo="https://i.imgur.com/BzaJlR9.jpg" group-title="",VerbumTV (540p)
 https://verbumtv.livebox.co.in/verbumtvhls/live.m3u8
diff --git a/channels/my.m3u b/channels/my.m3u
index 50319809a..652f97c8b 100644
--- a/channels/my.m3u
+++ b/channels/my.m3u
@@ -31,6 +31,8 @@ http://185.180.221.194:8278/streams/d/Assp3/playlist.m3u8
 http://185.180.221.194:8278/streams/d/Assp4/playlist.m3u8
 #EXTINF:-1 tvg-id="AstroVaanavil.my" tvg-name="Astro Vaanavil" tvg-country="MY" tvg-language="" tvg-logo="" group-title="",Astro Vaanavil
 https://agsplayback01.astro.com.my/CH3/master_VAANGOSHOP5.m3u8
+#EXTINF:-1 tvg-id="AstroVaanavil.my" tvg-name="Astro Vaanavil" tvg-country="MY" tvg-language="Tamil" tvg-logo="" group-title="",Astro Vaanavil
+https://agsplayback01.astro.com.my:443/CH3/master_VAANGOSHOP5_04.m3u8
 #EXTINF:-1 tvg-id="AstroWahLaiToi.my" tvg-name="Astro Wah Lai Toi" tvg-country="MY" tvg-language="" tvg-logo="https://upload.wikimedia.org/wikipedia/zh/9/94/Astro_%E8%8F%AF%E9%BA%97%E5%8F%B0.jpg" group-title="",Astro 华丽台 (Astro Wah Lai Toi)
 http://185.180.221.194:8278/streams/d/Wlt/playlist.m3u8
 #EXTINF:-1 tvg-id="AstroXiaoTaiYang.my" tvg-name="Astro Xiao Tai Yang" tvg-country="MY" tvg-language="" tvg-logo="http://astrokentico.s3.amazonaws.com/xuan/channels/325.png" group-title="",Astro 小太阳 (Astro Xiao Tai Yang)
@@ -55,12 +57,20 @@ https://agsplayback01.astro.com.my/CH1/master_HELLOGOSHOP6_04.m3u8
 https://agsplayback01.astro.com.my/CH2/master_NAURAGOSHOP4.m3u8
 #EXTINF:-1 tvg-id="NTV7.my" tvg-name="NTV 7" tvg-country="MY" tvg-language="" tvg-logo="https://www.xtra.com.my/wp-content/themes/xtra_revamp/assets/img/ntv7.png" group-title="",NTV 7
 http://50.7.161.82:8278/streams/d/Rtmntv7/playlist.m3u8
-#EXTINF:-1 tvg-id="TVOkey.my" tvg-name="TV Okey" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/7/7f/TV_Okey_RTM.png" group-title="",TV Okey (1080p)
-https://rtmokeymobile.secureswiftcontent.com/Origin02/ngrp:RTM2/playlist.m3u8
 #EXTINF:-1 tvg-id="RTMParlimenDewanRakyat.my" tvg-name="RTM Parlimen (Dewan Rakyat)" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="" group-title="",RTM Parlimen (Dewan Rakyat) (1080p)
 https://parlimenrakyat.secureswiftcontent.com/Origin04/ngrp:RTM4/playlist.m3u8
 #EXTINF:-1 tvg-id="RTMSports.my" tvg-name="RTM Sports" tvg-country="MY" tvg-language="" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/0/02/RTM_HD_Sports.png" group-title="Sport",RTM Sports
 http://50.7.161.82:8278/streams/d/Rtmsport/playlist.m3u8
+#EXTINF:-1 tvg-id="TVAlhijrah.my" tvg-name="TV Alhijrah" tvg-country="MY" tvg-language="" tvg-logo="" group-title="",TV Alhijrah
+http://50.7.161.82:8278/streams/d/Alhijrah/playlist.m3u8
+#EXTINF:-1 tvg-id="TVIkim.my" tvg-name="TV Ikim" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://i.imgur.com/Z0dyJK7.jpg" group-title="",TV Ikim (360p)
+http://edge.vediostream.com/abr/tvikim/live/tvikim_360p/playlist.m3u8
+#EXTINF:-1 tvg-id="TVIkim.my" tvg-name="TV Ikim" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://i.imgur.com/Z0dyJK7.jpg" group-title="",TV Ikim (480p)
+http://edge.vediostream.com/abr/tvikim/live/tvikim_480p/playlist.m3u8
+#EXTINF:-1 tvg-id="TVIkim.my" tvg-name="TV Ikim" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://i.imgur.com/Z0dyJK7.jpg" group-title="",TV Ikim (1080p)
+http://edge.vediostream.com/abr/tvikim/live/tvikim_source/playlist.m3u8
+#EXTINF:-1 tvg-id="TVOkey.my" tvg-name="TV Okey" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/7/7f/TV_Okey_RTM.png" group-title="",TV Okey (1080p)
+https://rtmokeymobile.secureswiftcontent.com/Origin02/ngrp:RTM2/playlist.m3u8
 #EXTINF:-1 tvg-id="TV1.my" tvg-name="TV1" tvg-country="MY" tvg-language="" tvg-logo="https://tv1.rtm.gov.my/assets/img/logo3.png" group-title="",TV1
 https://rtm1mobile.secureswiftcontent.com/Origin01/ngrp:RTM1/chunklist_b4064000.m3u8
 #EXTINF:-1 tvg-id="TV1.my" tvg-name="TV1" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://i.imgur.com/u9uPPgo.jpg" group-title="",TV1 (1080p)
@@ -73,15 +83,5 @@ https://rtm2mobile.secureswiftcontent.com/Origin01/ngrp:RTM1/playlist.m3u8
 http://50.7.161.82:8278/streams/d/TV3/playlist.m3u8
 #EXTINF:-1 tvg-id="TV9.my" tvg-name="TV9" tvg-country="MY" tvg-language="" tvg-logo="https://www.xtra.com.my/wp-content/themes/xtra_revamp/assets/img/tv9.png" group-title="",TV9
 http://50.7.161.82:8278/streams/d/TV9/playlist.m3u8
-#EXTINF:-1 tvg-id="TVAlhijrah.my" tvg-name="TV Alhijrah" tvg-country="MY" tvg-language="" tvg-logo="" group-title="",TV Alhijrah
-http://50.7.161.82:8278/streams/d/Alhijrah/playlist.m3u8
-#EXTINF:-1 tvg-id="TVIkim.my" tvg-name="TV Ikim" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://i.imgur.com/Z0dyJK7.jpg" group-title="",TV Ikim (360p)
-http://edge.vediostream.com/abr/tvikim/live/tvikim_360p/playlist.m3u8
-#EXTINF:-1 tvg-id="TVIkim.my" tvg-name="TV Ikim" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://i.imgur.com/Z0dyJK7.jpg" group-title="",TV Ikim (480p)
-http://edge.vediostream.com/abr/tvikim/live/tvikim_480p/playlist.m3u8
-#EXTINF:-1 tvg-id="TVIkim.my" tvg-name="TV Ikim" tvg-country="MY" tvg-language="Malay (macrolanguage)" tvg-logo="https://i.imgur.com/Z0dyJK7.jpg" group-title="",TV Ikim (1080p)
-http://edge.vediostream.com/abr/tvikim/live/tvikim_source/playlist.m3u8
 #EXTINF:-1 tvg-id="TVS.my" tvg-name="TVS" tvg-country="MY" tvg-language="" tvg-logo="" group-title="",TVS
 https://agsplayback01.astro.com.my/CH1/master_AGS_TVS.m3u8
-#EXTINF:-1 tvg-id="AstroVaanavil.my" tvg-name="Astro Vaanavil" tvg-country="MY" tvg-language="Tamil" tvg-logo="" group-title="",Astro Vaanavil
-https://agsplayback01.astro.com.my:443/CH3/master_VAANGOSHOP5_04.m3u8
diff --git a/channels/nl.m3u b/channels/nl.m3u
index 36c2631c1..6914cf2f0 100644
--- a/channels/nl.m3u
+++ b/channels/nl.m3u
@@ -11,6 +11,8 @@ https://58e4d59f4ba2c.streamlock.net/streektv/streektv/playlist.m3u8
 https://ms7.mx-cd.net/tv/113-474263/EdeTV.smil/chunklist.m3u8
 #EXTINF:-1 tvg-id="GORTV.nl" tvg-name="GO-RTV" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://i.imgur.com/zAFt893.png" group-title="Music",GO-RTV (720p)
 http://593aed234297b.streamlock.net:1935/gotvsjoerd/gotvsjoerd/playlist.m3u8
+#EXTINF:-1 tvg-id="InsightHD.nl" tvg-name="Insight HD" tvg-country="NL;DE" tvg-language="German" tvg-logo="https://i.imgur.com/gKNP2Gd.png" group-title="",Insight HD
+https://insighttv-samsung-de.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Insight TV HD" tvg-name="Insight TV" tvg-country="NL" tvg-language="Dutch" tvg-logo="https://i.imgur.com/IexUICA.png" group-title="",Insight TV (1080p)
 https://dai.google.com/linear/hls/event/KAfBFcVrQgKmHhpzvkEn9A/master.m3u8
 #EXTINF:-1 tvg-id="InsightTV.nl" tvg-name="Insight TV" tvg-country="NL;AU" tvg-language="English" tvg-logo="https://i.imgur.com/gKNP2Gd.png" group-title="",Insight TV
@@ -113,7 +115,5 @@ http://stream.visit-x.tv:1935/vxtv/live_360p/playlist.m3u8
 http://stream.visit-x.tv:1935/vxtv/live_720p/playlist.m3u8
 #EXTINF:-1 tvg-id="VisitXTV.nl" tvg-name="Visit-X TV" tvg-country="INT" tvg-language="Dutch" tvg-logo="https://i.imgur.com/RJ9wbNF.jpg" group-title="XXX",Visit-X TV (720p)
 https://stream.visit-x.tv/vxtv/live/playlist.m3u8
-#EXTINF:-1 tvg-id="InsightHD.nl" tvg-name="Insight HD" tvg-country="NL;DE" tvg-language="German" tvg-logo="https://i.imgur.com/gKNP2Gd.png" group-title="",Insight HD
-https://insighttv-samsung-de.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Xite.nl" tvg-name="Xite" tvg-country="NL" tvg-language="" tvg-logo="https://i.imgur.com/VaDrfKr.png" group-title="",Xite
 https://xite-samsung-de.amagi.tv/playlist.m3u8
diff --git a/channels/no.m3u b/channels/no.m3u
index 6aac57d16..b5046b318 100644
--- a/channels/no.m3u
+++ b/channels/no.m3u
@@ -1,57 +1,57 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="canalmotor.tv" tvg-name="Canal Motor" tvg-country="NO" tvg-language="English" tvg-logo="https://i.imgur.com/9z3mzDJ.jpg" group-title="Sport",Canal Motor (720p)
-https://digicom.hls.iptvdc.com/motorstv/index.m3u8
-#EXTINF:-1 tvg-id="canalmotor.tv" tvg-name="Canal Motor" tvg-country="NO" tvg-language="English" tvg-logo="https://i.imgur.com/9z3mzDJ.jpg" group-title="Sport",Canal Motor (720p)
 http://digicom.hls.iptvdc.com/canalmotor/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="frikanalen.no" tvg-name="" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/6pHnO2r.png" group-title="",Frikanalen (720p)
+#EXTINF:-1 tvg-id="canalmotor.tv" tvg-name="Canal Motor" tvg-country="NO" tvg-language="English" tvg-logo="https://i.imgur.com/9z3mzDJ.jpg" group-title="Sport",Canal Motor (720p)
+https://digicom.hls.iptvdc.com/motorstv/index.m3u8
+#EXTINF:-1 tvg-id="frikanalen.no" tvg-name="Frikanalen" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/6pHnO2r.png" group-title="",Frikanalen (720p)
 https://frikanalen.no/stream/index.m3u8
-#EXTINF:-1 tvg-id="frikanalen.no" tvg-name="" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/6pHnO2r.png" group-title="",Frikanalen (720p)
+#EXTINF:-1 tvg-id="frikanalen.no" tvg-name="Frikanalen" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/6pHnO2r.png" group-title="",Frikanalen (720p)
 https://frikanalen.no/stream/stream_1.m3u8
-#EXTINF:-1 tvg-id="frikanalen.no" tvg-name="" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/6pHnO2r.png" group-title="",Frikanalen (720p)
+#EXTINF:-1 tvg-id="frikanalen.no" tvg-name="Frikanalen" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/6pHnO2r.png" group-title="",Frikanalen (720p)
 https://frikanalen.no/stream/stream_2.m3u8
-#EXTINF:-1 tvg-id="hopechannel.no" tvg-name="" tvg-country="NO" tvg-language="English" tvg-logo="https://i.imgur.com/tEgDEp6.png" group-title="Religion",Hope Channel Norge (360p)
-http://media1.adventist.no:1935/live/hope3/playlist.m3u8
-#EXTINF:-1 tvg-id="hopechannel.no" tvg-name="" tvg-country="NO" tvg-language="English" tvg-logo="https://i.imgur.com/tEgDEp6.png" group-title="Religion",Hope Channel Norge (360p)
+#EXTINF:-1 tvg-id="hopechannel.no" tvg-name="Hope Channel Norge" tvg-country="NO" tvg-language="English" tvg-logo="https://i.imgur.com/tEgDEp6.png" group-title="",Hope Channel Norge (360p)
 http://media1.adventist.no:1935/live/hope3/chunklist_w1848872903.m3u8
+#EXTINF:-1 tvg-id="hopechannel.no" tvg-name="Hope Channel Norge" tvg-country="NO" tvg-language="English" tvg-logo="https://i.imgur.com/tEgDEp6.png" group-title="",Hope Channel Norge (360p)
+http://media1.adventist.no:1935/live/hope3/playlist.m3u8
 #EXTINF:-1 tvg-id="Kanal10Norge.no" tvg-name="Kanal 10 Norge" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/XZHqsMw.png" group-title="",Kanal 10 Norge (720p)
 https://cdn-kanal10.crossnet.net/kanal10no/live1/playlist.m3u8
 #EXTINF:-1 tvg-id="Kanal10Norge.no" tvg-name="Kanal 10 Norge" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/PWNNpB6.png" group-title="",Kanal 10 Norge (720p)
 https://cdn-kanal10.crossnet.net/kanal10no/mp4:live1/chunklist.m3u8
 #EXTINF:-1 tvg-id="MTV-NO" tvg-name="MTV-NO" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/iviMrbO.jpg" group-title="Entertainment",MTV (720p)
 https://unilivemtveu-lh.akamaihd.net/i/mtvno_1@346424/master.m3u8
-#EXTINF:-1 tvg-id="stortinget.no" tvg-name="" tvg-country="NO" tvg-language="" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="Legistlative",Stortinget - Stortingssalen (576P)
-https://bf75c7afaa4f8698042ab38336a843a0-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-stortinget_1/playlist.m3u8?dvr
-#EXTINF:-1 tvg-id="stortinget.no" tvg-name="" tvg-country="NO" tvg-language="" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="Legistlative",Stortinget - Stortingssalen (576P)
-https://bf75c7afaa4f8698042ab38336a843a0-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-stortinget_1/chunklist_b1264000_DVR_t64MTI2NCBrYnBz.m3u8
-#EXTINF:-1 tvg-id="stortinget.no" tvg-name="" tvg-country="NO" tvg-language="" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="Legistlative",Stortinget - HS1 (180p)
-https://25480cc657998e13839139df392b46eb-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-sal1_1/playlist.m3u8?dvr
-#EXTINF:-1 tvg-id="stortinget.no" tvg-name="" tvg-country="NO" tvg-language="" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="Legistlative",Stortinget - HS1 (576P)
+#EXTINF:-1 tvg-id="stortinget.no" tvg-name="Stortinget - HS1" tvg-country="NO" tvg-language="" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="",Stortinget - HS1 (576p)
 https://25480cc657998e13839139df392b46eb-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-sal1_1/chunklist_b1264000_DVR_t64MTI2NCBrYnBz.m3u8
-#EXTINF:-1 tvg-id="stortinget.no" tvg-name="" tvg-country="NO" tvg-language="" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="Legistlative",Stortinget - HS2 (576P)
-https://bbe19a83414b545d91f32f94316aab71-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-sal2_1/playlist.m3u8?dvr
-#EXTINF:-1 tvg-id="stortinget.no" tvg-name="" tvg-country="NO" tvg-language="" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="Legistlative",Stortinget - HS2 (576P)
+#EXTINF:-1 tvg-id="stortinget.no" tvg-name="Stortinget - HS1" tvg-country="NO" tvg-language="" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="",Stortinget - HS1 (180p)
+https://25480cc657998e13839139df392b46eb-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-sal1_1/playlist.m3u8?dvr
+#EXTINF:-1 tvg-id="stortinget.no" tvg-name="Stortinget - HS2" tvg-country="NO" tvg-language="" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="",Stortinget - HS2 (576p)
 https://bbe19a83414b545d91f32f94316aab71-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-sal2_1/chunklist_b1264000_DVR_t64MTI2NCBrYnBz.m3u8
-#EXTINF:-1 tvg-id="stortinget.no" tvg-name="" tvg-country="NO" tvg-language="" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="Legistlative",Stortinget - N-202 (576P)
-https://98d91ca32ff6fbca255f6ec9f29fc4d0-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-sal3_1/playlist.m3u8?dvr
-#EXTINF:-1 tvg-id="stortinget.no" tvg-name="" tvg-country="NO" tvg-language="" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="Legistlative",Stortinget - N-202 (576P)
+#EXTINF:-1 tvg-id="stortinget.no" tvg-name="Stortinget - HS2" tvg-country="NO" tvg-language="" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="",Stortinget - HS2 (576p)
+https://bbe19a83414b545d91f32f94316aab71-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-sal2_1/playlist.m3u8?dvr
+#EXTINF:-1 tvg-id="stortinget.no" tvg-name="Stortinget - N-202" tvg-country="NO" tvg-language="" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="",Stortinget - N-202 (576p)
 https://98d91ca32ff6fbca255f6ec9f29fc4d0-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-sal3_1/chunklist_b1264000_DVR_t64MTI2NCBrYnBz.m3u8
-#EXTINF:-1 tvg-id="tv2.no" tvg-name="" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/horCLMX.jpg" group-title="",tv2 - Nyhetsstrømmen (720p)
-https://ws15-hls-live.akamaized.net/out/u/1153546.m3u8
-#EXTINF:-1 tvg-id="tv2.no" tvg-name="" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/SCeh3KR.png" group-title="Sport",tv2 - Sport (720p)
-https://ws31-hls-live.akamaized.net/out/u/1416253.m3u8
-#EXTINF:-1 tvg-id="TVHaugaland.no" tvg-name="TV Haugaland" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/5SkiUk2.png" group-title="",TV Haugaland (720p)
-https://900c544ac47302fffd7d3f12b4c745fd-httpcache0-90216-cachelive0.dna.qbrick.com/90216-cachelive0/smil:APPLETV/playlist.m3u8
-#EXTINF:-1 tvg-id="tvh.no" tvg-name="TV Haugaland" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/lHDz1bm.png" group-title="",TV Haugaland (720p)
-https://900c544ac47302fffd7d3f12b4c745fd-httpcache0-90216-cachelive0.dna.ip-only.net/90216-cachelive0/smil:APPLETV/playlist.m3u8
+#EXTINF:-1 tvg-id="stortinget.no" tvg-name="Stortinget - N-202" tvg-country="NO" tvg-language="" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="",Stortinget - N-202 (576p)
+https://98d91ca32ff6fbca255f6ec9f29fc4d0-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-sal3_1/playlist.m3u8?dvr
+#EXTINF:-1 tvg-id="stortinget.no" tvg-name="Stortinget - Stortingssalen" tvg-country="NO" tvg-language="" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="",Stortinget - Stortingssalen (576p)
+https://bf75c7afaa4f8698042ab38336a843a0-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-stortinget_1/chunklist_b1264000_DVR_t64MTI2NCBrYnBz.m3u8
+#EXTINF:-1 tvg-id="stortinget.no" tvg-name="Stortinget - Stortingssalen" tvg-country="NO" tvg-language="" tvg-logo="https://i.imgur.com/tg1YbfY.png" group-title="",Stortinget - Stortingssalen (576p)
+https://bf75c7afaa4f8698042ab38336a843a0-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-stortinget_1/playlist.m3u8?dvr
 #EXTINF:-1 tvg-id="tvh.no" tvg-name="TV Haugaland" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/lHDz1bm.png" group-title="",TV Haugaland (720p)
 https://900c544ac47302fffd7d3f12b4c745fd-httpcache0-90216-cachelive0.dna.ip-only.net/90216-cachelive0/smil:APPLETV/chunklist_b2372000.m3u8
+#EXTINF:-1 tvg-id="tvh.no" tvg-name="TV Haugaland" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/lHDz1bm.png" group-title="",TV Haugaland (720p)
+https://900c544ac47302fffd7d3f12b4c745fd-httpcache0-90216-cachelive0.dna.ip-only.net/90216-cachelive0/smil:APPLETV/playlist.m3u8
+#EXTINF:-1 tvg-id="TVHaugaland.no" tvg-name="TV Haugaland" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/5SkiUk2.png" group-title="",TV Haugaland (720p)
+https://900c544ac47302fffd7d3f12b4c745fd-httpcache0-90216-cachelive0.dna.qbrick.com/90216-cachelive0/smil:APPLETV/playlist.m3u8
 #EXTINF:-1 tvg-id="tvvest.no" tvg-name="TV Vest Rogaland" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/KMb5M7X.png" group-title="",TV Vest Rogaland (720p)
-https://live.23video.com/live/amlst:t87e64vmortcv328kdt1u83thq:11596818-d53ea5a866639438de94.mp4/playlist.m3u8
+https://live.23video.com/live/amlst:t87e64vmortcv328kdt1u83thq:11596818-d53ea5a866639438de94.mp4/chunklist_b2128000.m3u8
 #EXTINF:-1 tvg-id="tvvest.no" tvg-name="TV Vest Rogaland" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/KMb5M7X.png" group-title="",TV Vest Rogaland (720p)
 https://live.23video.com/live/amlst:t87e64vmortcv328kdt1u83thq:11596818-d53ea5a866639438de94.mp4/chunklist_b428000.m3u8
 #EXTINF:-1 tvg-id="tvvest.no" tvg-name="TV Vest Rogaland" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/KMb5M7X.png" group-title="",TV Vest Rogaland (720p)
-https://live.23video.com/live/amlst:t87e64vmortcv328kdt1u83thq:11596818-d53ea5a866639438de94.mp4/chunklist_b2128000.m3u8
-#EXTINF:-1 tvg-id="tvvest.no" tvg-name="TV Vest Vestland" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/KMb5M7X.png" group-title="",TV Vest Vestland (720p)
-https://live.23video.com/live/amlst:kik9c7r3ns8ts2b5f12tibd2bh:20918017-d27c6c32d3789bc7c10d.mp4/playlist.m3u8
+https://live.23video.com/live/amlst:t87e64vmortcv328kdt1u83thq:11596818-d53ea5a866639438de94.mp4/playlist.m3u8
 #EXTINF:-1 tvg-id="tvvest.no" tvg-name="TV Vest Vestland" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/KMb5M7X.png" group-title="",TV Vest Vestland (720p)
 https://live.23video.com/live/amlst:kik9c7r3ns8ts2b5f12tibd2bh:20918017-d27c6c32d3789bc7c10d.mp4/chunklist_b2128000.m3u8
+#EXTINF:-1 tvg-id="tvvest.no" tvg-name="TV Vest Vestland" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/KMb5M7X.png" group-title="",TV Vest Vestland (720p)
+https://live.23video.com/live/amlst:kik9c7r3ns8ts2b5f12tibd2bh:20918017-d27c6c32d3789bc7c10d.mp4/playlist.m3u8
+#EXTINF:-1 tvg-id="tv2.no" tvg-name="tv2 - Nyhetsstrømmen" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/horCLMX.jpg" group-title="",tv2 - Nyhetsstrømmen (720p)
+https://ws15-hls-live.akamaized.net/out/u/1153546.m3u8
+#EXTINF:-1 tvg-id="tv2.no" tvg-name="tv2 - Sport" tvg-country="NO" tvg-language="Norwegian Bokmål" tvg-logo="https://i.imgur.com/SCeh3KR.png" group-title="Sport",tv2 - Sport (720p)
+https://ws31-hls-live.akamaized.net/out/u/1416253.m3u8
diff --git a/channels/ps.m3u b/channels/ps.m3u
index 403673134..0dd0c2117 100644
--- a/channels/ps.m3u
+++ b/channels/ps.m3u
@@ -15,7 +15,7 @@ http://vstream3.hadara.ps:8081/marahFM_web/web/playlist.m3u8
 http://htvpalsat.mada.ps:8888/musawa/index.m3u8
 #EXTINF:-1 tvg-id="OrientRadioPlusPalestineMubasher.ps" tvg-name="Orient Radio + Palestine Mubasher" tvg-country="PS" tvg-language="Arabic" tvg-logo="https://i.imgur.com/EKGnd0S.png" group-title="Music",Orient Radio + Palestine Mubasher
 http://htvint.mada.ps:8889//orient/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id=" tvg-name="" tvg-country="PS" tvg-language="Arabic" tvg-logo="" group-title="Education",Palestine Education
+#EXTINF:-1 tvg-id=" tvg-name=" tvg-name="Palestine Education" tvg-country="PS" tvg-language="Arabic" tvg-logo="" group-title="Education",Palestine Education
 http://93.184.1.247:8080/Paestin_Edu/index.m3u8
 #EXTINF:-1 tvg-id="PalestineMubasher.ps" tvg-name="Palestine Mubasher" tvg-country="PS" tvg-language="Arabic" tvg-logo="https://i.imgur.com/bYz6HUG.png" group-title="General",Palestine Mubasher
 http://htvpalsat.mada.ps:8888/PBCLive/tracks-v1a1/mono.m3u8
diff --git a/channels/uk.m3u b/channels/uk.m3u
index a10b89904..6a2e5235d 100644
--- a/channels/uk.m3u
+++ b/channels/uk.m3u
@@ -44,6 +44,8 @@ https://dust-gb.samsung.wurl.com/manifest/playlist.m3u8
 https://dust-samsung-uk-ca.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="EdgeSport.uk" tvg-name="Edge Sport" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/6h10JDk.png" group-title="",Edge Sport
 https://edgesport-samsunguk.amagi.tv/playlist.m3u8
+#EXTINF:-1 tvg-id="ElevenSports.uk" tvg-name="Eleven Sports" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/5m0i9if.png" group-title="Sport",Eleven Sports
+https://elevensports-samsunguk-de.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="EmanChannel.uk" tvg-name="Eman Channel" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/NWljgKa.png" group-title="Religious",Eman Channel (576p)
 https://ap02.iqplay.tv:8082/iqb8002/3m9n/playlist.m3u8
 #EXTINF:-1 tvg-id="EnglishClubTV.uk" tvg-name="English Club TV" tvg-country="UK" tvg-language="English" tvg-logo="http://ocdn.eu/images/program-tv/NTU7MDA_/e7114237dc0731c7dd660c32d6822432.png" group-title="",English Club TV (480p)
@@ -153,6 +155,8 @@ https://realstories-samsung-uk.amagi.tv/playlist.m3u8
 https://api.new.livestream.com/accounts/6986636/events/5362122/live.m3u8
 #EXTINF:-1 tvg-id="SheffieldLiveTV.uk" tvg-name="Sheffield Live TV" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/eUqnYU1.png" group-title="Local",Sheffield Live TV
 http://tv.sheffieldlive.org/hls/main.m3u8
+#EXTINF:-1 tvg-id="SkiTV.uk" tvg-name="Ski TV" tvg-country="UK" tvg-language="English" tvg-logo="https://content.weyyak.com/af0ecf95-8dc9-443d-9b4f-bc01eab7bd30/poster-image" group-title="Sport",Ski TV
+https://d2xeo83q8fcni6.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/SkiTV-Zee/193.m3u8
 #EXTINF:-1 tvg-id="SkyNews.uk" tvg-name="Sky News" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/WvNd8yg.png" group-title="News",Sky News (720p) [Geo-blocked]
 http://skydvn-sn-mobile-prod.skydvn.com/skynews/1404/latest.m3u8
 #EXTINF:-1 tvg-id="SkyNews.uk" tvg-name="Sky News" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/WvNd8yg.png" group-title="News",Sky News (720p) [Geo-blocked]
@@ -177,8 +181,6 @@ https://vod365-sports-channel-network-1-gb.samsung.wurl.com/manifest/playlist.m3
 https://securecontributions.sechls01.visionip.tv/live/securecontributions-securecontributions-spotlighttv-hsslive-25f-SD/chunklist.m3u8
 #EXTINF:-1 tvg-id="StingrayKaraoke.uk" tvg-name="Stingray Karaoke" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/XkBOu3Q.jpg" group-title="",Stingray Karaoke
 https://stingray-karaoke-1-gb.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="UK" tvg-language="English" tvg-logo="https://content.weyyak.com/af0ecf95-8dc9-443d-9b4f-bc01eab7bd30/poster-image" group-title="Sport",Ski TV
-https://d2xeo83q8fcni6.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/SkiTV-Zee/193.m3u8
 #EXTINF:-1 tvg-id="SupertoonsTV.uk" tvg-name="Supertoons TV" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/35BpWJh.jpg" group-title="",Supertoons TV
 https://kedoo-supertoonstv-1-gb.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="Tastemade.uk" tvg-name="Tastemade" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/dwMUVhs.png" group-title="",Tastemade
@@ -209,5 +211,3 @@ https://de1se01.v2beat.live/playlist.m3u8
 https://wonder-samsung-uk.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Dorama.uk" tvg-name="Дорама" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Movies",Дорама
 http://188.40.68.167/russia/dorama/playlist.m3u8
-#EXTINF:-1 tvg-id="ElevenSports.uk" tvg-name="Eleven Sports" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/5m0i9if.png" group-title="Sport",Eleven Sports
-https://elevensports-samsunguk-de.samsung.wurl.com/manifest/playlist.m3u8
diff --git a/channels/unsorted.m3u b/channels/unsorted.m3u
index 033f43bda..4ac81bdd9 100644
--- a/channels/unsorted.m3u
+++ b/channels/unsorted.m3u
@@ -1772,8 +1772,6 @@ https://fash2043.cloudycdn.services//slive/_definst_/ftv_ftv_4k_hevc_73d_42080_d
 https://a.jsrdn.com/broadcast/ftv2/-0500/c.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://i.imgur.com/Lk8azuc.png" group-title="",Fashion TV (US Pacific)
 https://a.jsrdn.com/broadcast/ftv2/-0800/c.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://www.fashiontv.com/wp-content/uploads/2017/01/fashuiontvlogo-horisontal-300x90.png" group-title="Fashion",Fashion TV Midnight Secert
-https://fash1043.cloudycdn.services/slive/_definst_/ftv_midnite_secrets_adaptive.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://static.iptv-epg.com/fr/FashionTV.fr.png" group-title="Entertainment",Fashion TV Midnite
 https://fash1043.cloudycdn.services/slive/_definst_/ftv_ftv_midnite_k1y_27049_midnite_secr_108_hls.smil/chunklist_b2800000_t64NzIwcA==.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-country="" tvg-language="" tvg-logo="https://static.iptv-epg.com/fr/FashionTV.fr.png" group-title="Entertainment",Fashion TV Paris
diff --git a/channels/us.m3u b/channels/us.m3u
index 7da3de038..39db3587a 100644
--- a/channels/us.m3u
+++ b/channels/us.m3u
@@ -500,6 +500,8 @@ http://1111296894.rsc.cdn77.org/ls-54548-1/index.m3u8
 http://203.162.235.41:16918
 #EXTINF:-1 tvg-id="CNNINTERNACIONAL.us" tvg-name="CNN INTERNACIONAL" tvg-country="US" tvg-language="Spanish" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQmbyQkZMsuM4Sw9sHfBlotwQchGnLR6g4uMt79XhtEaLRAcS92rw" group-title="",CNN INTERNACIONAL
 http://us1-external-sources.iptvserver.tv:80/kkkrkDp2a9KNwAwGzpb/QT94uK5NNQw4r4Qs/656
+#EXTINF:-1 tvg-id="CNNInternational.us" tvg-name="CNN International" tvg-country="INT" tvg-language="English" tvg-logo="https://i.imgur.com/bD9jUgK.png" group-title="News",CNN International
+https://cnn-cnninternational-1-de.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="CNNInternational.us" tvg-name="CNN International" tvg-country="INT" tvg-language="English" tvg-logo="https://i.imgur.com/2BXCg0x.jpg" group-title="News",CNN International (720p)
 https://cnn-cnninternational-1-gb.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="CNNInternationalMeiGuo.us" tvg-name="CNN International (美国)" tvg-country="US" tvg-language="English" tvg-logo="http://static.epg.best/gb/CNN.uk.png" group-title="News",CNN International (美国)
@@ -564,6 +566,8 @@ https://endemol-dealornodeal-1.roku.wurl.com/manifest/playlist.m3u8
 https://dai.google.com/linear/hls/event/9cq79TtPR6WbyaQGeDlHjA/master.m3u8
 #EXTINF:-1 tvg-id="Denver8TV.us" tvg-name="Denver 8 TV" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/q66RMSc.png" group-title="Local",Denver 8 TV
 https://granicusliveus8-a.akamaihd.net/denver/G0080_002/chunklist.m3u8
+#EXTINF:-1 tvg-id="DisneyChannelJapan.us" tvg-name="Disney Channel Japan" tvg-country="JP" tvg-language="Japan" tvg-logo="" group-title="",Disney Channel Japan
+http://redlabmcdn.s.llnwi.net/jp01/bs13/index.m3u8
 #EXTINF:-1 tvg-id="DisneyChannelSouthKorea.us" tvg-name="Disney Channel South Korea" tvg-country="KR" tvg-language="Korean" tvg-logo="https://img.pooq.co.kr/BMS/ChannelImg/30_disney.png" group-title="",Disney Channel South Korea
 http://182.216.142.247:9999/klive/api/url.m3u8?m=url&s=wavve&i=D01&q=SD&apikey=196JE7PCDI
 #EXTINF:-1 tvg-id="DisneyChannelSouthKorea.us" tvg-name="Disney Channel South Korea" tvg-country="KR" tvg-language="Korean" tvg-logo="https://img.pooq.co.kr/BMS/ChannelImg/30_disney.png" group-title="",Disney Channel South Korea
@@ -654,6 +658,8 @@ https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5dc0c7828
 https://a.jsrdn.com/broadcast/7b1451fa52/+0000/high/c.m3u8
 #EXTINF:-1 tvg-id="EVRGRNSTIRR.us" tvg-name="EVRGRN (STIRR)" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/84a96620-2c59-4a44-bfed-bdec3fdf7451-small3x1_STIRR_Logo_0520_EVRGRN_1920x1080_EPG.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="",EVRGRN (STIRR)
 https://dai.google.com/linear/hls/event/TDUiZE57Q3-CS7Its4kLDQ/master.m3u8
+#EXTINF:-1 tvg-id="EWTNaufDeutsch.us" tvg-name="EWTN auf Deutsch" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",EWTN auf Deutsch (720p)
+https://d3j0n5al39mfyd.cloudfront.net/p/GERG.m3u8
 #EXTINF:-1 tvg-id="Eye95America.us" tvg-name="Eye 95 America" tvg-country="US" tvg-language="Urdu" tvg-logo="" group-title="News",Eye 95 America
 https://cdn20.liveonlineservices.com/hls/eye95tv.m3u8
 #EXTINF:-1 tvg-id="Eye95AmericaUS.us" tvg-name="Eye 95 America (US)" tvg-country="US" tvg-language="English" tvg-logo="" group-title="",Eye 95 America (US)
@@ -774,6 +780,8 @@ https://edge.free-speech-tv-live.top.comcast.net/out/u/fstv.m3u8
 https://eleven-rebroadcast-samsung.roku.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="FuelTV.us" tvg-name="Fuel TV" tvg-country="US;AU" tvg-language="English" tvg-logo="https://i.imgur.com/XboGSjX.png" group-title="",Fuel TV
 https://fueltv-fueltv-1-au.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="FuelTV.us" tvg-name="Fuel TV" tvg-country="US;AU" tvg-language="English" tvg-logo="https://i.imgur.com/XboGSjX.png" group-title="",Fuel TV
+https://fueltv-fueltv-8-fr.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="FuelTV.us" tvg-name="Fuel TV" tvg-country="AU" tvg-language="English" tvg-logo="http://i.mjh.nz/.images/tv.7fueltv.png" group-title="",Fuel TV [Geo-blocked]
 https://i.mjh.nz/au/Sydney/tv.7fueltv.m3u8
 #EXTINF:-1 tvg-id="Futurism.us" tvg-name="Futurism" tvg-country="US" tvg-language="English" tvg-logo="" group-title="News",Futurism (720p)
@@ -1214,6 +1222,20 @@ https://content.uplynk.com/channel/4bb4901b934c4e029fd4c1abfc766c37.m3u8
 https://content.uplynk.com/channel/4bb4901b934c4e029fd4c1abfc766c37.m3u8?ad=newsyweb
 #EXTINF:-1 tvg-id="Newsy.us" tvg-name="Newsy" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/eEqyFBX.jpg" group-title="News",Newsy (1080p)
 https://dai.google.com/linear/hls/event/0PopB0AoSiClAGrHVHBTlw/master.m3u8
+#EXTINF:-1 tvg-id="NickPlutoTV.us" tvg-name="Nick (Pluto TV)" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5ca673e0d0bd6c2689c94ce3/colorLogoPNG.png" group-title="",Nick (Pluto TV)
+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="NICKHD.us" tvg-name="NICK HD" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.argentino.com.ar/images/2013/0518/776750-nickelodeon-senal-de-cable-infantil-20130518113628521.jpg" group-title="",Nick (Pluto TV)
+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="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="NickJrPlutoTV.us" tvg-name="Nick Jr (Pluto TV)" tvg-country="US" tvg-language="English" tvg-logo="http://static.epg.best/sa/NickJr.sa.png" group-title="",Nick Jr (Pluto TV)
+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="NickJrPlutoTV.us" tvg-name="Nick Jr. (Pluto TV)" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5ca6748a37b88b269472dad9/colorLogoPNG.png" group-title="",Nick Jr (Pluto TV)
+https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ca6748a37b88b269472dad9/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="NickJrPlutoTV.us" tvg-name="Nick Jr (Pluto TV)" tvg-country="DE" tvg-language="German" tvg-logo="https://images.pluto.tv/channels/5ede45451dce190007ef9ff2/colorLogoPNG.png" group-title="",Nick Jr (Pluto TV)
+https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ede45451dce190007ef9ff2/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="NickJrClubPlutoTV.us" tvg-name="Nick Jr. Club (Pluto TV)" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5ddd7cb2cbb9010009b4fe32/colorLogoPNG.png" group-title="",Nick Jr. Club (Pluto TV)
+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="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="NickelodeonSouthKorea.us" tvg-name="Nickelodeon South Korea" tvg-country="KR" tvg-language="Korean" tvg-logo="http://image.tving.com/upload/cms/caic/CAIC1900/C43241.png" group-title="",Nickelodeon South Korea
@@ -1322,6 +1344,8 @@ https://dai.google.com/linear/hls/event/qJU_NkxXQoCbACvG5BWrXQ/master.m3u8
 https://dai.google.com/linear/hls/event/jlf2tRLPTg2xjMtKe5ey-w/master.m3u8
 #EXTINF:-1 tvg-id="PeopleareAwesome.us" tvg-name="People are Awesome" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/msHBlDz.png" group-title="",People are Awesome
 https://jukin-peopleareawesome-1.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="PeopleareAwesome.us" tvg-name="People are Awesome" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/2U84ozo.png" group-title="",People are Awesome
+https://jukin-peopleareawesome-2-de.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="PeopleTV.us" tvg-name="People TV" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/lSAfKXY.jpg" group-title="General",People TV
 https://a.jsrdn.com/broadcast/b5d2k0x/playlist1080p.m3u8
 #EXTINF:-1 tvg-id="PeopleTVSTIRR.us" tvg-name="People TV (STIRR)" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/649c7a9c-8b5b-4494-bb0a-a5e8e4cc20fb-small3x1_STIRR_Logo_0420_PeopleTV_1920x1080_EPG.png?cb=c81e728d9d4c2f636f067f89cc14862c" group-title="Lifestyle",People TV (STIRR)
@@ -2278,24 +2302,10 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ddd7c348520b40009
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f12151794c1800007a8ae63/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="nickEmmaeinfachmagisch.us" tvg-name="nick Emma einfach magisch!" tvg-country="DE" tvg-language="German" tvg-logo="https://images.pluto.tv/channels/5f4796368174910007756454/colorLogoPNG.png" group-title="",Pluto TV nick Emma einfach magisch!
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f4796368174910007756454/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="NICKHD.us" tvg-name="NICK HD" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.argentino.com.ar/images/2013/0518/776750-nickelodeon-senal-de-cable-infantil-20130518113628521.jpg" group-title="",Nick (Pluto TV)
-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="NickJrPlutoTV.us" tvg-name="Nick Jr (Pluto TV)" tvg-country="US" tvg-language="English" tvg-logo="http://static.epg.best/sa/NickJr.sa.png" group-title="",Nick Jr (Pluto TV)
-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="NickJrClubPlutoTV.us" tvg-name="Nick Jr. Club (Pluto TV)" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5ddd7cb2cbb9010009b4fe32/colorLogoPNG.png" group-title="",Nick Jr. Club (Pluto TV)
-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="",Pluto TV Nick Jr. Club
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f121460b73ac6000719fbaf/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="NickJrLatino.us" tvg-name="Nick Jr. Latino" tvg-country="US" tvg-language="Spanish" tvg-logo="http://images.pluto.tv/channels/5d8d0ec7b0f7015fbe0a3bf7/colorLogoPNG.png" group-title="",Pluto TV Nick Jr. Latino
 https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5d8d0ec7b0f7015fbe0a3bf7/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="NickJrPlutoTV.us" tvg-name="Nick Jr. (Pluto TV)" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5ca6748a37b88b269472dad9/colorLogoPNG.png" group-title="",Nick Jr (Pluto TV)
-https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ca6748a37b88b269472dad9/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="NickJrPlutoTV.us" tvg-name="Nick Jr (Pluto TV)" tvg-country="DE" tvg-language="German" tvg-logo="https://images.pluto.tv/channels/5ede45451dce190007ef9ff2/colorLogoPNG.png" group-title="",Nick Jr (Pluto TV)
-https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5ede45451dce190007ef9ff2/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="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5ca673e0d0bd6c2689c94ce3/colorLogoPNG.png" group-title="",Nick (Pluto TV)
-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="nickrewind.us" tvg-name="nickrewind" tvg-country="US" tvg-language="English" tvg-logo="https://images.pluto.tv/channels/5ed106ce4bf2e80007700bb3/colorLogoPNG.png" group-title="",Pluto TV 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="Nosey.us" tvg-name="Nosey" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5aec96ec5126c2157123c657/colorLogoPNG.png" group-title="",Pluto TV Nosey
@@ -2910,6 +2920,8 @@ https://dai.google.com/linear/hls/event/YF2jfXh_QROPxoHEwp1Abw/master.m3u8
 https://cdn61.liveonlineservices.com/hls/subrang.m3u8
 #EXTINF:-1 tvg-id="TAGTV.us" tvg-name="TAG TV" tvg-country="US" tvg-language="Hindi" tvg-logo="" group-title="News",TAG TV
 https://cdn30.liveonlineservices.com/hls/tagtv.m3u8
+#EXTINF:-1 tvg-id="Tastemade.us" tvg-name="Tastemade" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/dwMUVhs.png" group-title="",Tastemade
+https://tastemade-de-samsung.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Tastemade.us" tvg-name="Tastemade" tvg-country="US" tvg-language="English" tvg-logo="https://yt3.ggpht.com/a-/AAuE7mB9l6rHPU5feWQg5I7xyag5bc9-fS-suqi5sg=s900-mo-c-c0xffffffff-rj-k-no" group-title="Food",Tastemade (1080p)
 https://tastemadessai.akamaized.net/amagi_hls_data_tastemade-tastemade/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="TBD.us" tvg-name="TBD" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Fbzbq1y.png" group-title="General",TBD (720p)
@@ -3000,6 +3012,8 @@ http://edge1.tikilive.com:1935/unrestricted_tikilive/25947/amlst:NWKlw6jwyXpz/pl
 https://ch.iptvmate.net/11e118e202992ae500578c6f72bcf142.m3u8
 #EXTINF:-1 tvg-id="ThePetCollective.us" tvg-name="The Pet Collective" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/DPls9e7.png" group-title="Hobby",The Pet Collective
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-petcollective/CDN/1280x720_5000000/index.m3u8
+#EXTINF:-1 tvg-id="ThePetCollective.de" tvg-name="The Pet Collective" tvg-country="INT" tvg-language="" tvg-logo="https://i.imgur.com/RHqiy4Z.png" group-title="",The Pet Collective
+https://the-pet-collective-international-de.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="ThePetCollectiveRedbox.us" tvg-name="The Pet Collective (Redbox)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/xhsHccQ.png" group-title="",The Pet Collective (Redbox)
 https://dai2.xumo.com/xumocdn/p=redbox&deviceid=&is_lat=&subp=RedboxdesktopWebLinux/amagi_hls_data_xumo1212A-redboxpetcollective/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="TheShoppingChannel.us" tvg-name="The Shopping Channel" tvg-country="US" tvg-language="English" tvg-logo="http://cdn.iphoneincanada.ca/wp-content/uploads/2015/07/the-shopping-channel-logo.jpg" group-title="Shop",The Shopping Channel (720p)
@@ -3286,17 +3300,3 @@ https://y5w8j4a9.ssl.hwcdn.net/zlivingusa_r_prod/tracks-v1a1/index.m3u8
 https://rockentertainment-zoomoo-1.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="KanalDisney.us" tvg-name="Канал Disney" tvg-country="RU" tvg-language="Russian" tvg-logo="" group-title="Kids",Канал Disney
 http://188.40.68.167/russia/disney/playlist.m3u8
-#EXTINF:-1 tvg-id="CNNInternational.us" tvg-name="CNN International" tvg-country="INT" tvg-language="English" tvg-logo="https://i.imgur.com/bD9jUgK.png" group-title="News",CNN International
-https://cnn-cnninternational-1-de.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="EWTNaufDeutsch.us" tvg-name="EWTN auf Deutsch" tvg-country="DE" tvg-language="German" tvg-logo="" group-title="",EWTN auf Deutsch (720p)
-https://d3j0n5al39mfyd.cloudfront.net/p/GERG.m3u8
-#EXTINF:-1 tvg-id="FuelTV.us" tvg-name="Fuel TV" tvg-country="US;AU" tvg-language="English" tvg-logo="https://i.imgur.com/XboGSjX.png" group-title="",Fuel TV
-https://fueltv-fueltv-8-fr.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="PeopleareAwesome.us" tvg-name="People are Awesome" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/2U84ozo.png" group-title="",People are Awesome
-https://jukin-peopleareawesome-2-de.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="Tastemade.us" tvg-name="Tastemade" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/dwMUVhs.png" group-title="",Tastemade
-https://tastemade-de-samsung.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="ThePetCollective.de" tvg-name="The Pet Collective" tvg-country="INT" tvg-language="" tvg-logo="https://i.imgur.com/RHqiy4Z.png" group-title="",The Pet Collective
-https://the-pet-collective-international-de.samsung.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-country="JP" tvg-language="Japan",Disney Channel Japan
-http://redlabmcdn.s.llnwi.net/jp01/bs13/index.m3u8