diff --git a/channels/ir.m3u b/channels/ir.m3u
index 13ae6129ed..9a2cedab23 100644
--- a/channels/ir.m3u
+++ b/channels/ir.m3u
@@ -64,18 +64,15 @@ http://216.66.42.47:7777/GemComedy_HD.m3u8
 #EXTINF:-1 tvg-id="GEMCrypto.ir" tvg-country="IR" tvg-language="English" tvg-logo="https://i.imgur.com/Pt59QNN.png" group-title="",GEM Crypto (576p) [Offline]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gem_crypto
 https://stream-cdn.gemonline.tv/live/gemcrypto/index.m3u8
-#EXTINF:-1 tvg-id="GEMDrama.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gemdrama.png" group-title="Movies",GEM Drama (576p) [Offline]
-#EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gemdrama
-https://stream-cdn.gemonline.tv/live/gemdrama/index.m3u8
+#EXTINF:-1 tvg-id="GEMDrama.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gemdrama.png" group-title="Movies",GEM Drama (576p)
+http://65.21.196.79/gem_drama/master.m3u8
 #EXTINF:-1 tvg-id="GEMFilm.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gem_film.png?14" group-title="Movies",GEM Film (576p) [Offline]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gem_film
 https://stream-cdn.gemonline.tv/live/gemfilm/index.m3u8
-#EXTINF:-1 tvg-id="GEMFit.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.net/Assets/channels-box/gem_fit.png?14" group-title="Sports",GEM Fit [Offline]
-#EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gem_fit
-https://stream-cdn.gemonline.tv/live/gemfit/index.m3u8
-#EXTINF:-1 tvg-id="GEMFood.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gem_food.png?14" group-title="Cooking",GEM Food (576p) [Offline]
-#EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gem_food
-https://stream-cdn.gemonline.tv/live/gemfood/index.m3u8
+#EXTINF:-1 tvg-id="GEMFit.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.net/Assets/channels-box/gem_fit.png?14" group-title="Sports",GEM Fit
+http://65.21.196.79/30tv/master.m3u8
+#EXTINF:-1 tvg-id="GEMFood.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gem_food.png?14" group-title="Cooking",GEM Food (576p)
+http://65.21.196.79/gem_food/master.m3u8
 #EXTINF:-1 tvg-id="GEMJunior.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gemjunior.png" group-title="Kids",GEM Junior (576p) [Offline]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gemjunior
 https://stream-cdn.gemonline.tv/live/gemjunior/index.m3u8
@@ -96,30 +93,28 @@ http://65.21.196.79/mifa/master.m3u8
 #EXTINF:-1 tvg-id="GEMModernEconomy.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/modern_economy.png" group-title="Documentary",GEM Modern Economy (540p) [Geo-blocked]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=modern_economy
 https://d2e40kvaojifd6.cloudfront.net/stream/modern_economy/playlist.m3u8
-#EXTINF:-1 tvg-id="GEMNature.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gem_nature.png" group-title="Entertainment",GEM Nature (540p) [Geo-blocked]
-#EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gem_nature
-https://d2e40kvaojifd6.cloudfront.net/stream/gem_nature/playlist.m3u8
+#EXTINF:-1 tvg-id="GEMNature.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gem_nature.png" group-title="Entertainment",GEM Nature (540p)
+http://65.21.196.79/gem_nature/master.m3u8
 #EXTINF:-1 tvg-id="GEMOnyx.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/onyx.png" group-title="Movies",GEM Onyx (1080p) [Geo-blocked]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=onyx
 https://d2e40kvaojifd6.cloudfront.net/stream/onyx/playlist.m3u8
 #EXTINF:-1 tvg-id="GEMProperty.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gem_property.png?14" group-title="",GEM Property (540p) [Geo-blocked]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gem_property
 https://d2e40kvaojifd6.cloudfront.net/stream/gem_property/playlist.m3u8
-#EXTINF:-1 tvg-id="GEMRiver.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/river.png?14" group-title="Entertainment",GEM River (576p) [Offline]
-#EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=river
-https://stream-cdn.gemonline.tv/live/river/index.m3u8
+#EXTINF:-1 tvg-id="GEMRiver.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/river.png?14" group-title="Entertainment",GEM River (576p)
+http://65.21.196.79/gem_river/master.m3u8
 #EXTINF:-1 tvg-id="GEMRubix.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/rubix.png?14" group-title="Movies",GEM Rubix (576p) [Offline]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=rubix
 https://stream-cdn.gemonline.tv/live/rubix/index.m3u8
 #EXTINF:-1 tvg-id="GEMSeries.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gemseries.png" group-title="Movies",GEM Series (576p) [Offline]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gemseries
-https://stream-cdn.gemonline.tv/live/gemseries/index.m3u8
+http://65.21.196.79/gem_series/master.m3u8
 #EXTINF:-1 tvg-id="GEMTravel.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gem_travel.png" group-title="Entertainment",GEM Travel (576p) [Offline]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gem_travel
 https://stream-cdn.gemonline.tv/live/gemtravel/index.m3u8
 #EXTINF:-1 tvg-id="GEMTv.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="https://www.gemonline.tv/Assets/channels-box/gemtv.png" group-title="Movies",GEM Tv (576p) [Offline]
 #EXTVLCOPT:http-referrer=https://www.gemonline.tv/en-US/Live/Index?channelname=gemtv
-https://stream-cdn.gemonline.tv/live/gem/index.m3u8
+http://65.21.196.79/gem_tv/master.m3u8
 #EXTINF:-1 tvg-id="GOLESTAN.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",GOLESTAN (240p)
 http://cdn1.live.irib.ir:1935/epg-live/smil:golestan/playlist.m3u8
 #EXTINF:-1 tvg-id="HastiTV.ir" tvg-country="IR" tvg-language="Persian" tvg-logo="" group-title="",Hasti TV (1080p)
diff --git a/channels/ni.m3u b/channels/ni.m3u
index fe55095dc3..e1fa6a2b5c 100644
--- a/channels/ni.m3u
+++ b/channels/ni.m3u
@@ -1,21 +1,21 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="Canal2.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://imagenes.gatotv.com/logos/canales/oscuros/2_de_nicaragua-mediano.png" group-title="",Canal 2 (480p) [Offline]
+#EXTINF:-1 tvg-id="Canal2.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://imagenes.gatotv.com/logos/canales/oscuros/2_de_nicaragua-mediano.png" group-title="Local",Canal 2 (480p) [Offline]
 https://cootv.cootel.com.ni/streams/d/SSLCH02-HD-YON/playlist.m3u8
-#EXTINF:-1 tvg-id="Canal6.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="" group-title="",Canal 6 [Offline]
-http://209.91.213.10:8088/play/a01k
-#EXTINF:-1 tvg-id="Canal8.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="" group-title="",Canal 8 (720p)
+#EXTINF:-1 tvg-id="Canal6.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="" group-title="Local",Canal 6
+http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/canal6nicaraguaoficial
+#EXTINF:-1 tvg-id="Canal8.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="" group-title="Local",tn8 (720p)
 https://60417ddeaf0d9.streamlock.net/tn8/videotn8/playlist.m3u8
-#EXTINF:-1 tvg-id="Canal9.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTawbZLCedJzRX06CAyU-jX37n9iyTxMVcIfg&usqp=CAU" group-title="",Canal 9 (480p) [Offline]
+#EXTINF:-1 tvg-id="Canal9.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTawbZLCedJzRX06CAyU-jX37n9iyTxMVcIfg&usqp=CAU" group-title="Local",Canal 9 (480p) [Offline]
 https://cootv.cootel.com.ni/streams/d/SSLCH09-HD-CVS/playlist.m3u8
-#EXTINF:-1 tvg-id="Canal10.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://tvonlinegratis.com/wp-content/uploads/2014/05/Canal10-Nicaragua-Logo.jpg" group-title="",Canal 10 (576p) [Offline]
+#EXTINF:-1 tvg-id="Canal10.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://tvonlinegratis.com/wp-content/uploads/2014/05/Canal10-Nicaragua-Logo.jpg" group-title="Local",Canal 10 (576p) [Offline]
 https://cootv.cootel.com.ni/streams/d/SSLCH10-SD-ZUK/playlist.m3u8
-#EXTINF:-1 tvg-id="Canal11.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcQm2ZYMFAUHTdq_BjIfNchqFkNhPo5eqjZm26zyahtBlWLjXDAZ" group-title="",Canal 11 (480p) [Offline]
+#EXTINF:-1 tvg-id="Canal11.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcQm2ZYMFAUHTdq_BjIfNchqFkNhPo5eqjZm26zyahtBlWLjXDAZ" group-title="Local",Canal 11 (480p) [Offline]
 https://cootv.cootel.com.ni/streams/d/SSLCH11-SD-GZN/playlist.m3u8
-#EXTINF:-1 tvg-id="Canal12.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/6/6a/Nicavision1993.png/revision/latest?cb=20180426154048" group-title="",Canal 12 (720p)
+#EXTINF:-1 tvg-id="Canal12.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://vignette.wikia.nocookie.net/logopedia/images/6/6a/Nicavision1993.png/revision/latest?cb=20180426154048" group-title="Local",Canal 12 (720p) [Not 24/7]
 https://5ca9af4645e15.streamlock.net/canal12/videocanal12/playlist.m3u8
 #EXTINF:-1 tvg-id="MasTV.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="" group-title="",MasTV (Canal 23) [Offline]
 http://209.91.213.10:8088/play/a01p
-#EXTINF:-1 tvg-id="VivaNicaraguaCanal13.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://imagenes.gatotv.com/logos/canales/oscuros/13_de_nicaragua-mediano.png" group-title="",Viva Nicaragua Canal 13 [Offline]
-http://209.91.213.10:8088/play/a01l
+#EXTINF:-1 tvg-id="VivaNicaraguaCanal13.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://imagenes.gatotv.com/logos/canales/oscuros/13_de_nicaragua-mediano.png" group-title="Local",Viva Nicaragua Canal 13 
+http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/vivanicaragua13
 #EXTINF:-1 tvg-id="wtv.ni" tvg-country="NI" tvg-language="Spanish" tvg-logo="https://wmediosnicaragua.com/img/LOGO-CANAL.png" group-title="Entertainment",WTV Canal 20 (720p)
 https://cloudvideo.servers10.com:8081/8130/index.m3u8