diff --git a/channels/gr.m3u b/channels/gr.m3u
index 6c0a5aea5..d4fbf5b03 100644
--- a/channels/gr.m3u
+++ b/channels/gr.m3u
@@ -1,63 +1,143 @@
-#EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",4E TV
+#EXTM3U x-tvg-url="http://195.154.221.171/epg/guidegreece.xml.gz"
+#EXTINF:-1 tvg-id="4E GR" tvg-name="4E GR" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=56014332&t=1544180299920" group-title="",4E
 http://82.192.84.30:554/live/myStream.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://nrg91.gr/wp-content/uploads/2017/07/originalNRG-300x128.png" group-title="",91 NRG
-https://w1.viastreaming.net/onweb/live/chunklist_w1080573781.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://www.worldtvpc.com/onlinevideosites/img/ant1.jpg" group-title="",ANT1
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://greektv.pbworks.com/w/file/fetch/98921626/SUNNY.png" group-title="Local",Alert
+https://itv.streams.ovh/ALEERT/ALEERT/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/39l3uRU.jpg" group-title="Local",Alfa Dramas
+http://www.hellasnet.tv/rest.live.hn/ws.alf/playlist.m3u8
+#EXTINF:-1 tvg-id="ALPHA GR" tvg-name="ALPHA GR" tvg-logo="http://greektv.pbworks.com/f/ALPHA.png" group-title="",Alpha
+https://alphalive-i.akamaihd.net/hls/live/682300/live/master.m3u8
+#EXTINF:-1 tvg-id="ANT1 GR" tvg-name="ANT1 GR" tvg-logo="https://www.worldtvpc.com/onlinevideosites/img/ant1.jpg" group-title="",ANT1 (Opt-1)
 https://antennalivesp-lh.akamaihd.net/i/live_1@715138/index_1500_av-p.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://goo.gl/q5aDRg" group-title="",ANT1 HD
+#EXTINF:-1 tvg-id="ANT1 GR" tvg-name="ANT1 GR" tvg-logo="https://goo.gl/q5aDRg" group-title="",ANT1 (Opt-2)
 https://antennalivesp-lh.akamaihd.net/i/live_1@715138/master.m3u8
+#EXTINF:-1 tvg-id="ART GR" tvg-name="ART GR" tvg-logo="https://i.imgur.com/ZgKZ5u9.jpg" group-title="Local",ART
+http://176.9.123.140:1935/arttv/arttv/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/s3qWC9W.png" group-title="",Attica TV
 http://176.9.123.140:1935/atticatv/atticatv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://goo.gl/mNqHoo" group-title="",AXELOOS
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://goo.gl/mNqHoo" group-title="",Axeloos
 http://srv.viiideo.gr:1935/axeloos/live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://corfutvnews.gr/wp-content/uploads/corfu-tv-news-logo-main.png" group-title="",Corfu TV
-https://itv.streams.ovh/corfuchannel/corfuchannel/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://goo.gl/naS6gM" group-title="",CretaTV
-http://live.streams.ovh:1935/tvcreta/tvcreta/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="Crete TV (ΚρήτηTV)" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/1025.png" group-title="",Crete TV (ΚρήτηTV)
-http://live.cretetv.gr:1935/cretetv/myStream/f1tv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://v4.deltatv.gr/images/deltaTV-logo.png" group-title="",DELTA TV
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://greektv.pbworks.com/w/file/fetch/51254401/BEST.PNG" group-title="Local",Best TV
+https://best-tv.gr/HLS/hls/best/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/24uaLwh.png" group-title="Local",Channel 9
+http://176.9.123.140:1935/channel9/channel9/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/bh1iOFz.png" group-title="Movies",Cinefil GR
+http://bit.ly/2Dn2Yty
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/kpOpUWX.jpg" group-title="Movies",Cyprus Cinema
+http://master.cystreams.com:25461/live/cycinema/cycinema123/1868.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://v4.deltatv.gr/images/deltaTV-logo.png" group-title="",Delta TV
 http://video.onestreaming.com:8081/deltatv/live/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://goo.gl/hlH9Uc" group-title="",EBS
-http://ott.ec.streamcloud.be/live/disk1/EBS/hls_el/EBS.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://goo.gl/uJqLc6" group-title="",EBS PLUS
-http://ott.ec.streamcloud.be/live/disk1/EBSplus/hls_el/EBSplus.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/rff1DsY.gif" group-title="",Fox TV
-http://live.streams.ovh:1935/foxtv/foxtv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",HIGH TV [200p]
-http://live.streams.ovh:1935/hightv/hightv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Kontra [400p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0klufvz.jpg" group-title="Local",Diktyo 1
+http://www.hellasnet.tv/rest.live.hn/diktyo1r/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ASNgEZI.jpg" group-title="Local",E TV
+http://176.9.30.75:1935/live/epsilon/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://207.36.91.70/images/2015/ellastv-logo-2015-main.png" group-title="",Ellas TV
+http://ellastv.gotdns.com:88/freetv/promo/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://greektv.pbworks.com/f/ENA_CHANNEL.png" group-title="Local",Ena Channel
+http://176.9.123.140:1935/1c/stream/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/AIPYTd0.png" group-title="",Eoe TV
+https://live.cast-control.eu:443/organismos/organismos/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://greektv.pbworks.com/f/EPIRUS_TV1.png" group-title="Local",Epirus TV1
+http://176.9.123.140:1935/radioepirus/radioepirus/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/uet8P2n.jpg" group-title="",ERT World
+http://wpso.com:1936/hls/wzra.m3u8
+#EXTINF:-1 tvg-id="Extra GR" tvg-name="Extra GR" tvg-logo="https://i.imgur.com/v9tPr4k.jpg" group-title="Local",Extra
+https://extratv.streamings.gr/live/tv/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/jdMlstR.jpg" group-title="",Faros TV
+http://master.cystreams.com:25461/live/faros/farostv/154.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/jdMlstR.jpg" group-title="",Faros TV2
+http://master.cystreams.com:25461/live/faros/farostv/1866.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/0iklNh2.png" group-title="Movies",Groovy
+http://bit.ly/2p6JqSo
+#EXTINF:-1 tvg-id="Ionian TV GR" tvg-name="Ionian TV GR" tvg-logo="http://greektv.pbworks.com/w/file/fetch/51254412/IONIAN.PNG" group-title="Local",Ionian TV
+https://stream.ioniantv.gr/ionian/live_abr/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/gn5sdCt.png" group-title="Local",Irida TV
+https://www.hellasnet.tv/rest.live.hn/ws.iri/playlist.m3u8
+#EXTINF:-1 tvg-id="Kontra Channel GR" tvg-name="Kontra Channel GR" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=56014296&t=1544180280413" group-title="",Kontra Channel
 http://flashcloud.mediacdn.com/live/kontratv/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Kontra [400p]
+#EXTINF:-1 tvg-id="Kontra Channel GR" tvg-name="Kontra Channel GR" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=56014296&t=1544180280413" group-title="",Kontra Channel
 http://flashcloud.mediacdn.com/live/kontratv/.m3u8
-#EXTINF:-1 tvg-id="KritiTV.gr" tvg-name="Κρήτη TV" tvg-logo="https://goo.gl/BnX9DJ" group-title="",KRHTHTV
-http://live.cretetv.gr:1935/cretetv/myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/w37uJo1.png" group-title="",Mega Cosmos (CA)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/QZQhg6C.png" group-title="Music",Magic TV
+https://itv.streams.ovh/magictv/magictv/playlist.m3u8
+#EXTINF:-1 tvg-id="MEGA GR" tvg-name="MEGA GR" tvg-logo="http://i.imgur.com/w37uJo1.png" group-title="",MEGA
 http://stream2.svbllc.com:1935/mega/mega.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://ik.imagekit.io/ulangotv/image/upload/tr:w-150/1564276_logo_messinia_tv1.png" group-title="",Messinia TV
-http://176.9.123.140:1935/messinia/messinia/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/pK2p5ey.png" group-title="",New Generation (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/2tB3wqn.png" group-title="",Montreal Greek TV
+http://94.130.180.175:8081/live/greektv/playlist.m3u8
+#EXTINF:-1 tvg-id="Nea TV GR" tvg-name="Nea TV GR" tvg-logo="http://greektv.pbworks.com/w/file/fetch/46926622/NEA_TV.png" group-title="Local",Nea TV
+https://live.neatv.gr:8888/hls/neatv_high/index.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/pK2p5ey.png" group-title="Music",NG (Opt-1)
+https://live.streams.ovh/NGradio/NGradio/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/pK2p5ey.png" group-title="Music",NG (Opt-2)
 http://live.streams.ovh:1935/NGradio/NGradio/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1Zl1OJ5.png" group-title="",NRG TV
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://nrg91.gr/wp-content/uploads/2017/07/originalNRG-300x128.png" group-title="",NRG 91 (Opt-1)
+https://w1.viastreaming.net/onweb/live/chunklist_w1080573781.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/1Zl1OJ5.png" group-title="",NRG 91 (Opt-2)
 http://tv.nrg91.gr:1935/onweb/live/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/c9hgL1c.jpg" group-title="",Open TV
+https://liveopen.siliconweb.com/openTvLive/stream2a/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/br722T6.jpg" group-title="",Orasi TV
+http://orasi.tv:1935/live/myStream/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/100uuWA.png" group-title="Music",Play TV
+http://web.onair-radio.eu:1935/Alpha-Host/Alpha-Host/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/qa3Lurc.png" group-title="Local",PLP
+https://www.hellasnet.tv/rest.live.hn/ws.plp/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/SjoxYxX.png" group-title="",Pluton TV
+http://web.onair-radio.eu:1935/plutonchannel/plutonchannel/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/AZteACJ.jpgE" group-title="",Radio Epistrofi
+http://master.cystreams.com:25461/live/epistrofi/epistrofi123/44.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://reloadplay.com/wp-content/uploads/2017/04/logo-foto-tv.jpg" group-title="",Reload Play
 http://web.onair-radio.eu:1935/video/video/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://cdn.sat.tv/wp-content/uploads/2016/05/RIK-Sat.png" group-title="",Rik Sat (Κύπρος)
-http://l3.cloudskep.com/cybcsat/abr/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Sigma TV (Greek)
+#EXTINF:-1 tvg-id="Sigma CY" tvg-name="Sigma CY" tvg-logo="" group-title="",Sigma TV
 http://81.21.47.74/hls/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://goo.gl/aVVUtg" group-title="",SYROS TV1
+#EXTINF:-1 tvg-id="Skai GR" tvg-name="Skai GR" tvg-logo="https://i.imgur.com/xokA84y.png" group-title="",Skai
+http://master.cystreams.com:25461/live/greek/macedonia/42.ts
+#EXTINF:-1 tvg-id="Smile TV GR" tvg-name="Smile TV GR" tvg-logo="http://i.imgur.com/fExrqlx.png" group-title="Kids",Smile TV
+http://master.cystreams.com:25461/live/greek/macedonia/119.ts
+#EXTINF:-1 tvg-id="STAR GR" tvg-name="STAR GR" tvg-logo="http://greektv.pbworks.com/f/STAR.png" group-title="",Star
+http://master.cystreams.com:25461/live/greek/macedonia/40.ts
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://greektv.pbworks.com/f/START_TV.png" group-title="Local",Start TV
+https://live.cast-control.eu/StartMedia/StartMedia/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://goo.gl/aVVUtg" group-title="",Syros TV1
 http://176.9.123.140:1935/msg116s/msg116s/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://goo.gl/oJ9YrY" group-title="",THRAKI NET
-http://video.onestreaming.com:8081/thraki/thrakinettv/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/piGhf3m.png" group-title="Music",Tile Mousiki
+http://wpso.com:1936/hls/music1.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://greektv.pbworks.com/f/TOP_KOZANIS.png" group-title="Local",Top Channel
+https://itv.streams.ovh/topchannel/topchannel/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/nAzfWx5.png" group-title="Local",TRT TV
+http://trtstream.hellasnet.tv:1935/rest/trt2/playlist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://greektv.pbworks.com/w/file/fetch/45193860/TV_100.png" group-title="",TV 100
 http://178.62.176.153/hls/tv100/index.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/GdgekUL.png" group-title="",TV FILOPOLI
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/GdgekUL.png" group-title="",TV Filopoli
 http://live.streams.ovh:1935/tvfilopoli/tvfilopoli/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Vouli Tileorasi (Opt-2)
-http://streamer-cache.grnet.gr/parliament/parltv.sdp/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",VOULI TV
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://greektv.pbworks.com/w/file/fetch/60551556/KOSMOS_TV.png" group-title="Local",TV Kosmos
+https://5948d12b760bb.streamlock.net/TvKosmosLive/TvKosmosLive/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/3Juhubo.png" group-title="",TV Mall
+http://master.cystreams.com:25461/live/tvmall/tvmall/539.m3u8
+#EXTINF:-1 tvg-id="Vouli GR" tvg-name="Vouli GR" tvg-logo="https://www.cosmote.gr/portal/image/journal/article?img_id=41706922&t=1524412256156" group-title="",Vouli Tileorasi (Opt-1)
 http://streamer-cache.grnet.gr/parliament/hls/webtv.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",WZRA Kids
-mmsh://wpso.com:200/kids?MSWMExt=.asf
+#EXTINF:-1 tvg-id="Vouli GR" tvg-name="Vouli GR" tvg-logo="https://i.imgur.com/7A86yAv.png" group-title="",Vouli Tileorasi (Opt-2)
+http://streamer-cache.grnet.gr/parliament/parltv.sdp/master.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/hfia0wN.png" group-title="Movies",Wixlar
+http://web.onair-radio.eu:1935/wixlar/wixlar/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/7sUmqv2.png" group-title="Kids",WZra Kids TV
+http://wpso.com:1936/hls/kidshd.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/LgQBtTh.jpg" group-title="Music",Xalastra TV
+https://live.cast-control.eu:443/xalastratv/xalastratv/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/ErFj6rR.png" group-title="",Xplore TV
+http://web.onair-radio.eu:1935/explorecy/explorecy/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/2hU849d.jpg" group-title="",ΕΚΠ-ΔΙΨΩ
+https://live.cast-control.eu/ekpdipso/ekpdipso/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i.imgur.com/dW08jNe.png" group-title="Music",Ζούγκλα
+https://zouglacam-mdc-secure.akamaized.net/zouglalive/mainnew/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://goo.gl/oJ9YrY" group-title="",Θράκη Νετ TV
+http://video.onestreaming.com:8081/thraki/thrakinettv/playlist.m3u8
+#EXTINF:-1 tvg-id="Krete TV GR" tvg-name="Krete TV GR" tvg-logo="http://content.iptvprivateserver.tv/stalker_portal/misc/logos/240/1025.png" group-title="",ΚρήτηTV
+http://live.cretetv.gr:1935/cretetv/myStream/f1tv.m3u8
+#EXTINF:-1 tvg-id="Krete TV GR" tvg-name="Krete TV GR" tvg-logo="https://goo.gl/BnX9DJ" group-title="",ΚρήτηTV
+http://live.cretetv.gr:1935/cretetv/myStream/playlist.m3u8
+#EXTINF:-1 tvg-id="Krete TV GR" tvg-name="Krete TV GR" tvg-logo="https://goo.gl/naS6gM" group-title="",ΚρήτηTV
+http://live.streams.ovh:1935/tvcreta/tvcreta/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://greektv.pbworks.com/w/file/fetch/51265944/LYCHNOS.PNG" group-title="Local",λύχνος TV
+http://erato.multiserver.gr:1935/imp/imp/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://i.imgur.com/OnB6n3C.jpg" group-title="Local",Μεσογειος TV
+http://176.9.123.140:1935/mesogeiostv/stream/master.m3u8