diff --git a/channels/es.m3u b/channels/es.m3u
index 5665a7158..eacb2188e 100644
--- a/channels/es.m3u
+++ b/channels/es.m3u
@@ -323,20 +323,6 @@ https://cdn01.yowi.tv/lleida/playlist.m3u8
 http://streamer1.streamhost.org/salive/logosH/playlist.m3u8
 #EXTINF:-1 tvg-id="LogosTV.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://proyectoesperanza.es/wp-content/uploads/2017/02/logos-logo-big.png" group-title="",Logos TV (720p)
 https://streamer1.streamhost.org/salive/logosH/master.m3u8
-#EXTINF:-1 tvg-id="MAccion.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",M. Accion [Offline]
-http://5.255.90.184:2001/play/a048
-#EXTINF:-1 tvg-id="MComedia.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",M. Comedia [Offline]
-http://5.255.90.184:2001/play/a03y
-#EXTINF:-1 tvg-id="MDeportes.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",M. Deportes [Offline]
-http://5.255.90.184:2001/play/a04h
-#EXTINF:-1 tvg-id="MDrama.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",M. Drama [Offline]
-http://5.255.90.184:2001/play/a049
-#EXTINF:-1 tvg-id="MFest.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",M. Fest [Offline]
-http://5.255.90.184:2001/play/a046
-#EXTINF:-1 tvg-id="MLaLiga.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",M. La Liga [Offline]
-http://5.255.90.184:2001/play/a04b
-#EXTINF:-1 tvg-id="MLaLiga2.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",M. La Liga 2 [Offline]
-http://5.255.90.184:2001/play/a03u
 #EXTINF:-1 tvg-id="M95TelevisionMarbella.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/m95tvmarbella/picture?width=320&height=320" group-title="Local",M95 Televisión Marbella (576p) [Not 24/7]
 https://limited2.todostreaming.es/live/m95-livestream.m3u8
 #EXTINF:-1 tvg-id="MaestratTV.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",Maestrat TV [Not 24/7]
@@ -347,10 +333,8 @@ http://iptv.btpba1.es.network.do:8080/martv-web/video.m3u8
 https://mdssplive-lh.akamaihd.net/i/mtmad_1@744785/master.m3u8
 #EXTINF:-1 tvg-id="MirameTV.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",Mírame TV [Not 24/7]
 https://bit.controlstreams.com:5443/LiveApp/streams/mirametv.m3u8
-#EXTINF:-1 tvg-id="NavarraTV.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",Navarra TV (480p)
-https://pc-sumandocomunicacion-hls.flumotion.com/promecal/live1_480p/chunks.m3u8
-#EXTINF:-1 tvg-id="NavarraTV.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",Navarra TV (576p)
-https://pc-sumandocomunicacion-hls.flumotion.com/promecal/live1_720p/chunks.m3u8
+#EXTINF:-1 tvg-id="NavarraTV.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",Navarra TV (720p)
+https://pc-sumandocomunicacion-hls.flumotion.com/playlist.m3u8
 #EXTINF:-1 tvg-id="NegociosTV.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",Negocios TV (720p)
 https://play.gooru.live/playnegocios/5646-1603313320000/master.m3u8
 #EXTINF:-1 tvg-id="NIUS.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/NiusDiario/picture?width=320&height=320" group-title="",NIUS (720p)
@@ -363,8 +347,8 @@ https://mdslivehlsb-i.akamaihd.net/hls/live/875601/niusdiario/01.m3u8
 https://mdslivehlsb-i.akamaihd.net/hls/live/875601/niusdiario/03.m3u8
 #EXTINF:-1 tvg-id="NoroesteTV.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",Noroeste TV (720p) [Not 24/7]
 https://cloudvideo.servers10.com:8081/8032/index.m3u8
-#EXTINF:-1 tvg-id="NORTEvision.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",NORTEvisión [Offline]
-http://amaru.dyndns.org:8835/0.m3u8
+#EXTINF:-1 tvg-id="NORTEvision.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",NORTEvisión
+https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://facebook.com/1918671788399481/videos/3060444244223429/
 #EXTINF:-1 tvg-id="OizmendiTelebista.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/oizmenditelebista/picture?width=320&height=320" group-title="",Oizmendi Telebista (404p) [Not 24/7]
 https://5940924978228.streamlock.net/8161/8161/master.m3u8
 #EXTINF:-1 tvg-id="OlympicsChannel.es" tvg-country="INT" tvg-language="English" tvg-logo="http://i.mjh.nz/.images/tv.7olympics.png" group-title="",Olympics Channel (1080p)
@@ -509,7 +493,7 @@ http://ventdelnord.tv:8080/hls/directe.m3u8
 https://secure3.todostreaming.es/live/visionseis-livestream.m3u8
 #EXTINF:-1 tvg-id="XtraTV.es" tvg-country="ES" tvg-language="" tvg-logo="https://i.imgur.com/w1Lc150.jpg" group-title="Music",Xtra TV (720p) [Offline]
 https://mccdn-hls-a01-rbx.datah0stn3t.com/live/xtra/playlist.m3u8
-#EXTINF:-1 tvg-id="XtraHitsTV.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",XtraHits TV (720p) [Offline]
+#EXTINF:-1 tvg-id="XtraTV.es" tvg-country="ES" tvg-language="" tvg-logo="https://i.imgur.com/w1Lc150.jpg" group-title="Music",Xtra TV (720p) [Offline]
 https://mccdn-hls-a01-rbx.datah0stn3t.com/live/xtra/index.m3u8
 #EXTINF:-1 tvg-id="ZafraTV.es" tvg-country="ES" tvg-language="" tvg-logo="" group-title="",Zafra TV [Not 24/7]
 https://cloud.streamingconnect.tv:455/radiotvzafra/radiotvzafra.m3u8