diff --git a/channels/md.m3u b/channels/md.m3u
index c91dede10..a4121b819 100644
--- a/channels/md.m3u
+++ b/channels/md.m3u
@@ -1,37 +1,35 @@
-#EXTM3U
+#EXTM3U x-tvg-url="https://iptvx.one/epg/epg.xml.gz"
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://acasatv.perfecte.md/design/acasatv_md/images/acasa_in_moldova_logo5.png" group-title="",Acasa TV
 http://hls.protv.md/acasatv/acasatv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://a-tv.md/templates/test/img/logo-site.png" group-title="",Accent TV
+#EXTINF:-1 tvg-id="accent-tv" tvg-name="Accent TV" tvg-logo="http://a-tv.md/templates/test/img/logo-site.png" group-title="",Accent TV
 http://video.a-tv.md/hls/accent.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canal Regional (Moldova)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Canal Regional
 http://canalregional.md/tv/live/canalregional.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.trm.md/img/pages/2018/10/18/moldova-1/moldova-1.png" group-title="",Moldova 1
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Elita TV
+http://46.55.111.242:8080/Rezina.m3u8
+#EXTINF:-1 tvg-id="moldova-1" tvg-name="Moldova 1" tvg-logo="https://www.trm.md/img/pages/2018/10/18/moldova-1/moldova-1.png" group-title="",Moldova 1 (Opt-1)
 http://live.trm.md:1935/live/MoldovaUnu1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Moldova 1 [432p]
+#EXTINF:-1 tvg-id="moldova-1" tvg-name="Moldova 1" tvg-logo="" group-title="",Moldova 1 (Opt-2)
 http://live.trm.md:1935/live/M1Mlive/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Moldova 1 [432p]
+#EXTINF:-1 tvg-id="moldova-1" tvg-name="Moldova 1" tvg-logo="" group-title="",Moldova 1 (Opt-3)
 http://212.0.209.209:1935/live/MoldovaUnu1/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.trm.md/img/pages/2018/10/18/moldova-2/moldova-2.png" group-title="",Moldova 2
+#EXTINF:-1 tvg-id="moldova-2" tvg-name="" tvg-logo="https://www.trm.md/img/pages/2018/10/18/moldova-2/moldova-2.png" group-title="",Moldova 2
 http://live.trm.md:1935/live/MoldovaDoi2/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://oklivetv.com/wp-content/uploads/2015/02/noroctv1.png" group-title="",Noroc TV
+#EXTINF:-1 tvg-id="noroc-tv-md" tvg-name="Noroc TV Moldova" tvg-logo="http://oklivetv.com/wp-content/uploads/2015/02/noroctv1.png" group-title="",Noroc TV
 http://live.noroc.tv/hls/noroctv_chisinau.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ProTV Chișinău
+#EXTINF:-1 tvg-id="pro-tv-md" tvg-name="Pro TV Moldova" tvg-logo="" group-title="",Pro TV
 http://hls.protv.md/hls/protv.m3u8
-#EXTINF:-1 tvg-id="publika" tvg-name="" tvg-logo="" group-title="",Publika TV
+#EXTINF:-1 tvg-id="publika-tv" tvg-name="Publika TV" tvg-logo="" group-title="",Publika TV (Opt-1)
 http://livebeta.publika.md/LIVE/P/1000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="News",Publika TV
+#EXTINF:-1 tvg-id="publika-tv" tvg-name="Publika TV" tvg-logo="" group-title="",Publika TV (Opt-2)
 http://livebeta.publika.md/LIVE/P/6810.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Publika TV
+#EXTINF:-1 tvg-id="publika-tv" tvg-name="Publika TV" tvg-logo="" group-title="",Publika TV (Opt-3)
 http://livebeta.publika.md/LIVE/P/1500.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.manutv.net/wp-content/uploads/893793546.png" group-title="",Tele M
 http://webmobile.xdev.ro:81/tv16/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV ELITA
-http://46.55.111.242:8080/Rezina.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",TV8 Moldova
+#EXTINF:-1 tvg-id="tv8-md" tvg-name="TV8 Moldova" tvg-logo="" group-title="",TV8
 http://live.cdn.tv8.md/TV7/video1.m3u8?token=1
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://tvrmoldova.md/img/tvr-moldova-oriz-mic.png" group-title="",TVR Moldova
 http://89.136.209.26:1935/liveedge/TVRMOLDOVA.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/zFYfPjp.png" group-title="",TVR Moldova
-http://mn-nl.mncdn.com/tvr_moldova/smil:TVRMOLDOVA.smil/playlist.m3u8?fluxustv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",НТВ Moldova
+#EXTINF:-1 tvg-id="ntv-moldova" tvg-name="НТВ-Молдова" tvg-logo="" group-title="",НТВ-Молдова
 http://93.115.137.166/hls/ntvm.m3u8