diff --git a/channels/jp.m3u b/channels/jp.m3u
index e8b73d930..d72bad880 100644
--- a/channels/jp.m3u
+++ b/channels/jp.m3u
@@ -73,49 +73,47 @@ https://liveanevia.mncnow.id/live/eds/WakuWakuJapan/sa_dash_vmx/WakuWakuJapan.mp
 http://movie.mcas.jp/mcas/wn1_2/master.m3u8
 #EXTINF:-1 tvg-id="WeatherNews.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://dbbovgtu2bg0x.cloudfront.net/uploads/program/main_image/749853303/app_app_wether_news.png" group-title="Weather",Weather News (720p)
 https://movie.mcas.jp/mcas/smil:wn1.smil/master.m3u8
-#EXTINF:-1,NHK-E Tokyo
+#EXTINF:-1 tvg-id="NHKE.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",NHK E
 http://redlabmcdn.s.llnwi.net/jp01/ryowa1hd/index.mpd
-#EXTINF:-1,NHK-G Tokyo
+#EXTINF:-1 tvg-id="NHKG.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",NHK G
 http://redlabmcdn.s.llnwi.net/jp01/ryowa2hd/index.mpd
-#EXTINF:-1,Nippon TV
+#EXTINF:-1 tvg-id="NipponTV.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",Nippon TV
 http://redlabmcdn.s.llnwi.net/jp01/ryowa3hd/index.mpd
-#EXTINF:-1,TV Asahi
+#EXTINF:-1 tvg-id="TVAsahi.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",TV Asahi
 http://redlabmcdn.s.llnwi.net/jp01/ryowa4hd/index.mpd
-#EXTINF:-1,TBS
+#EXTINF:-1 tvg-id="TBS.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",TBS
 http://redlabmcdn.s.llnwi.net/jp01/ryowa5hd/index.mpd
-#EXTINF:-1,TV Tokyo
+#EXTINF:-1 tvg-id="TVTokyo.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://i.imgur.com/vgEnHX6.png" group-title="",TV Tokyo
 http://redlabmcdn.s.llnwi.net/jp01/ryowa6hd/index.mpd
-#EXTINF:-1,Fuji TV
+#EXTINF:-1 tvg-id="FujiTV.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",Fuji TV
 http://redlabmcdn.s.llnwi.net/jp01/ryowa7hd/index.mpd
-#EXTINF:-1,TOKYO MX1
+#EXTINF:-1 tvg-id="TokyoMX1.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/6f/Tokyo_metropolitan_television_logo_%28rainbow%29.svg/800px-Tokyo_metropolitan_television_logo_%28rainbow%29.svg.png" group-title="Local",Tokyo MX1
 http://redlabmcdn.s.llnwi.net/jp01/ryowa8hd/index.mpd
-#EXTINF:-1,NHK BS1
+#EXTINF:-1 tvg-id="NHKBS1.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="General",NHK BS1
 http://redlabmcdn.s.llnwi.net/jp01/bs01hd/index.mpd
-#EXTINF:-1,NHK BS Premium
+#EXTINF:-1 tvg-id="NHKBSP.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="General",NHK BSP
 http://redlabmcdn.s.llnwi.net/jp01/bs02hd/index.mpd
-#EXTINF:-1,BS Nippon TV
+#EXTINF:-1 tvg-id="BSNipponTV.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="General",BS Nippon TV
 http://redlabmcdn.s.llnwi.net/jp01/bs03hd/index.mpd
-#EXTINF:-1,BS Asahi
+#EXTINF:-1 tvg-id="BSAsahi.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="General",BS Asahi
 http://redlabmcdn.s.llnwi.net/jp01/bs04hd/index.mpd
-#EXTINF:-1,BS-TBS
+#EXTINF:-1 tvg-id="BSTBS.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="General",BS-TBS
 http://redlabmcdn.s.llnwi.net/jp01/bs05hd/index.mpd
-#EXTINF:-1,BS TV Tokyo
+#EXTINF:-1 tvg-id="BSTVTokyo.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="General",BS TV Tokyo
 http://redlabmcdn.s.llnwi.net/jp01/bs06hd/index.mpd
-#EXTINF:-1,BS Fuji
+#EXTINF:-1 tvg-id="BSFujiTV.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="General",BS Fuji TV
 http://redlabmcdn.s.llnwi.net/jp01/bs07hd/index.mpd
-#EXTINF:-1,BS12
+#EXTINF:-1 tvg-id="BS12.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="General",BS 12
 http://redlabmcdn.s.llnwi.net/jp01/bs08hd/index.mpd
-#EXTINF:-1,Star 1
+#EXTINF:-1 tvg-id="Star1.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",Star 1
 http://redlabmcdn.s.llnwi.net/jp04/bs09hd/index.mpd
-#EXTINF:-1,Star 2
+#EXTINF:-1 tvg-id="Star2.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",Star 2
 http://redlabmcdn.s.llnwi.net/jp04/bs10hd/index.mpd
-#EXTINF:-1,J Sports 1
+#EXTINF:-1 tvg-id="JSports1.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="Sports",J Sports 1
 http://redlabmcdn.s.llnwi.net/jp04/bs15hd/index.mpd
-#EXTINF:-1,J Sports 2
+#EXTINF:-1 tvg-id="JSports2.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="Sports",J Sports 2
 http://redlabmcdn.s.llnwi.net/jp04/bs11hd/index.mpd
-#EXTINF:-1,J Sports 3
+#EXTINF:-1 tvg-id="JSports3.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="Sports",J Sports 3
 http://redlabmcdn.s.llnwi.net/jp04/bs12hd/index.mpd
-#EXTINF:-1,Disney Channel Japan
-http://redlabmcdn.s.llnwi.net/jp04/bs13hd/index.mpd
-#EXTINF:-1,Animax
+#EXTINF:-1 tvg-id="Animax.jp" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="Animation",Animax
 http://redlabmcdn.s.llnwi.net/jp04/bs14hd/index.mpd
diff --git a/channels/us.m3u b/channels/us.m3u
index ce37fb4e8..6987c3eb9 100644
--- a/channels/us.m3u
+++ b/channels/us.m3u
@@ -560,8 +560,8 @@ http://americaneagle-lh.akamaihd.net/i/AEF_DC1@31049/master.m3u8
 http://198.16.106.62:8278/streams/d/Disneyxd/playlist.m3u8
 #EXTINF:-1 tvg-id="DisneyChannelEspana.es" tvg-country="ES" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/f/f4/Disney_Channel_logo_%282014%29.svg/792px-Disney_Channel_logo_%282014%29.svg.png" group-title="Kids",Disney Channel España (1080p)
 http://5.255.90.184:2004/play/a006/index.m3u8
-#EXTINF:-1 tvg-id="DisneyChannelJapan.us" tvg-country="JP" tvg-language="Japan" tvg-logo="https://i.imgur.com/H2O9F2E.png" group-title="",Disney Channel Japan (360p) [Not 24/7]
-https://redlabmcdn.s.llnwi.net/jp04/bs13hd/index.m3u8
+#EXTINF:-1 tvg-id="DisneyChannelJapan.us" tvg-country="JP" tvg-language="Japan" tvg-logo="https://i.imgur.com/H2O9F2E.png" group-title="Entertainment",Disney Channel Japan (720p) [Not 24/7]
+http://redlabmcdn.s.llnwi.net/jp04/bs13hd/index.mpd
 #EXTINF:-1 tvg-id="DisneyChannelPortugal.es" tvg-country="PT" tvg-language="Portuguese;English" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/f/f4/Disney_Channel_logo_%282014%29.svg/792px-Disney_Channel_logo_%282014%29.svg.png" group-title="Kids",Disney Channel Portugal [Offline]
 http://185.236.229.21:9981/play/a056
 #EXTINF:-1 tvg-id="DisneyJuniorAsia.us" tvg-country="ASIA" tvg-language="Arabic" tvg-logo="" group-title="Kids",Disney Junior Asia (720p) [Offline]