diff --git a/channels/kw.m3u b/channels/kw.m3u
index acdaaa080..c4bfe210a 100644
--- a/channels/kw.m3u
+++ b/channels/kw.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://f.alrai.tv/TV/Programs/60_Alrai_Tv21_-__RT655x0-_OS492x240-_RD492x240-.png" group-title="",Al Rai *
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://f.alrai.tv/TV/Programs/60_Alrai_Tv21_-__RT655x0-_OS492x240-_RD492x240-.png" group-title="",Al Rai HD (Opt-1)
 http://stream02.fasttelco.net/4/pub/asset/28/streams.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",AL RAI HD [AR][1080p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",Al Rai HD (Opt-2)
 http://stream02.fasttelco.net/4/pub/asset/28/streams.m3u8?v=1053886998
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.ashura.tv/live-tv/al-awhad-tv/logo.jpg" group-title="",Al-Awhad TV
 http://213.162.202.9:8000/play/a02c/index.m3u8
@@ -9,43 +9,43 @@ http://213.162.202.9:8000/play/a02c/index.m3u8
 http://213.162.202.9:8000/play/a022/index.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="https://upload.wikimedia.org/wikipedia/en/3/3b/Tv_funoon_tv.png" group-title="",Fuoon TV
 http://livecdnh3.tvanywhere.ae:80/hls/funoon/04.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.freeetv.com/images/03_logo/KTV1_Kuwait.jpg" group-title="",KTV 1 (Opt-2)
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.freeetv.com/images/03_logo/KTV1_Kuwait.jpg" group-title="",KTV 1 HD (Opt-1)
 http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv1
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.freeetv.com/images/03_logo/ktv2_Kuwait.jpg" group-title="",KTV 2
-http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv2
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV AL ARABI [406p]
-https://svs.itworkscdn.net/ktvarabelive/karabe.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV AL MAJLIS [406p]
-https://svs.itworkscdn.net/ktvalmajlislive/kalmajlis.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i5.satexpat.com/cha/kw/ktv_ethra_95x94.gif" group-title="",KTV Ethraa
-http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv5
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i5.satexpat.com/cha/kw/ktv_ethra_95x94.gif" group-title="",KTV Ethraa
-https://svs.itworkscdn.net/ktvethraalive/smil:kethraa.smil/chunklist_b2400000.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV ETHRAA [406p]
-https://svs.itworkscdn.net/ktvethraalive/kethraa.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i5.satexpat.com/cha/kw/ktv-kids-95x77.gif" group-title="",KTV Kids
-http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv4
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV PLUS [406p]
-https://svs.itworkscdn.net/ktvpluslive/kplus.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://oklivetv.com/wp-content/uploads/2015/09/ktv3.jpg" group-title="",KTV Sport
-http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv3
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",ktv sports plus
-https://svs.itworkscdn.net/ktvsportspluslive/ksportsplus.smil/gmswf.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV1 HD [360p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV 1 HD (Opt-2)
 https://svs.itworkscdn.net/ktv1live/ktv1.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV2 [360p]
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.freeetv.com/images/03_logo/ktv2_Kuwait.jpg" group-title="",KTV 2 (Opt-1)
+http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv2
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV 2 (Opt-2)
 https://svs.itworkscdn.net/ktv2live/ktv2.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.osn.com/bob/745x419/KTA.jpg" group-title="",Kuwait Arabe
-http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv6
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="Sport",Kuwait One
-http://wms.tecnoxia.com:1935/8158/8158/chunklist_w299184953.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.goalzz.com/images/logo_sport/kuwaitsport.jpg" group-title="Sport",Kuwait Sport (Opt-1)
-https://svs.itworkscdn.net/ktvsportslive/ksports.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.osn.com/bob/745x419/KT2.jpg" group-title="",Kuwait TV 2
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.osn.com/bob/745x419/KT2.jpg" group-title="",KTV 2 (Opt-3)
 http://109.236.92.216:9090/Kuwait2/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i4.yhk0.net/cha/kw/almajlis-95x41.gif" group-title="",Kuwait TV Al Majlis
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Al Majlis (Opt-1)
+https://svs.itworkscdn.net/ktvalmajlislive/kalmajlis.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i4.yhk0.net/cha/kw/almajlis-95x41.gif" group-title="",KTV Al Majlis (Opt-2)
 http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv7
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.1arablive.com/livetv/assets/images/1536610958.png" group-title="",Kuwait TV Al Qurain
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Arabe (Opt-1)
+https://svs.itworkscdn.net/ktvarabelive/karabe.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://content.osn.com/bob/745x419/KTA.jpg" group-title="",KTV Arabe (Opt-2)
+http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv6
+#EXTINF:-1 tvg-id="" tvg-name="KTV" tvg-logo="" group-title="",KTV Arabe (Opt-3)
+http://www.elahmad.com/tv/m3u8/ktv.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i5.satexpat.com/cha/kw/ktv_ethra_95x94.gif" group-title="",KTV Ethraa (Opt-1)
+https://svs.itworkscdn.net/ktvethraalive/smil:kethraa.smil/chunklist_b2400000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Ethraa (Opt-2)
+https://svs.itworkscdn.net/ktvethraalive/kethraa.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i5.satexpat.com/cha/kw/ktv_ethra_95x94.gif" group-title="",KTV Ethraa (Opt-3)
+http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv5
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Kids (Opt-1)
+https://svs.itworkscdn.net/ktvsportspluslive/ksportsplus.smil/gmswf.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://i5.satexpat.com/cha/kw/ktv-kids-95x77.gif" group-title="",KTV Kids (Opt-2)
+http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv4
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.1arablive.com/livetv/assets/images/1536610958.png" group-title="",KTV Plus (Opt-1)
 http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.1arablive.com/livetv/assets/images/1536610958.png" group-title="",Kuwait TV Al Qurain
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.1arablive.com/livetv/assets/images/1536610958.png" group-title="",KTV Plus (Opt-2)
 https://svs.itworkscdn.net/ktvpluslive/smil:kplus.smil/chunklist_b2400000.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="" group-title="",KTV Plus (Opt-3)
+https://svs.itworkscdn.net/ktvpluslive/kplus.smil/playlist.m3u8
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://oklivetv.com/wp-content/uploads/2015/09/ktv3.jpg" group-title="Sport",KTV Sport HD (Opt-1)
+http://www.elahmad.com/tv/m3u8/ktv.m3u8?id=ktv3
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-logo="http://www.goalzz.com/images/logo_sport/kuwaitsport.jpg" group-title="Sport",KTV Sport HD (Opt-2)
+https://svs.itworkscdn.net/ktvsportslive/ksports.smil/chunklist.m3u8