diff --git a/lists/japan.md b/lists/japan.md
index 945c655..0bbaabb 100644
--- a/lists/japan.md
+++ b/lists/japan.md
@@ -4,35 +4,35 @@
 
 | #  |        Channel        |                                                                                    Link                                                                                     |                                                                                     Logo                                                                                      |         EPG id         |
 |:--:|:---------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:----------------------:|
-| D011  |    NHK総合 (東京) 　    |                                 [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS291&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1)                                                 |                                                           <img height="30" src="https://i.imgur.com/fAZ2BEZ.png"/>                                                            |       JOAKDTV.jp       |
-| D021  |    NHK Eテレ（東京） 　   |                         [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS292&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1)                                                 |                                                           <img height="30" src="https://i.imgur.com/WxtftlO.png"/>                                                            |       JOABDTV.jp       |
-| D041  |   日本テレビ   |                                                [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS294&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1)                                                 |                                                           <img height="30" src="https://i.imgur.com/ecbM7QS.png"/>                                                            |       JOAXDTV.jp       |
-| D051  |    テレビ朝日       |                                           [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS295&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1)                                                 |                                                           <img height="30" src="https://i.imgur.com/5XnMfcR.png"/>                                                            |       JOEXDTV.jp       |
-| D061  |    TBSテレビ        |                                           [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS296&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1)                                                 |                                                          <img height="30" src="https://i.imgur.com/jIZ9TlO.png"/> |       JORXDTV.jp       |
-| D071  |   テレビ東京       |                                             [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS297&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1)                                                 |                                                           <img height="30" src="https://i.imgur.com/U8jBxEi.png"/>                                                            |       JOTXDTV.jp       |
-| D081 |   フジテレビ   |                                                [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS298&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1)                                                 |                                                           <img height="30" src="https://i.imgur.com/epJYc7P.png"/>                                                            |       JOCXDTV.jp       |
+| D011  |    NHK総合 (東京) 　    |                                 [>](https://naori-test.netgenx.site/pxx.php?shk_cid=hdgd01#.m3u8)                                                 |                                                           <img height="30" src="https://i.imgur.com/fAZ2BEZ.png"/>                                                            |       JOAKDTV.jp       |
+| D021  |    NHK Eテレ（東京） 　   |                         [>](https://naori-test.netgenx.site/pxx.php?shk_cid=hdgd02#.m3u8)                                                 |                                                           <img height="30" src="https://i.imgur.com/WxtftlO.png"/>                                                            |       JOABDTV.jp       |
+| D041  |   日本テレビ   |                                                [>](https://naori-test.netgenx.site/pxx.php?shk_cid=hdgd03#.m3u8)                                                 |                                                           <img height="30" src="https://i.imgur.com/ecbM7QS.png"/>                                                            |       JOAXDTV.jp       |
+| D051  |    テレビ朝日       |                                           [>](https://naori-test.netgenx.site/pxx.php?shk_cid=hdgd06#.m3u8)                                                 |                                                           <img height="30" src="https://i.imgur.com/5XnMfcR.png"/>                                                            |       JOEXDTV.jp       |
+| D061  |    TBSテレビ        |                                           [>](https://naori-test.netgenx.site/pxx.php?shk_cid=hdgd04#.m3u8)                                                 |                                                          <img height="30" src="https://i.imgur.com/jIZ9TlO.png"/> |       JORXDTV.jp       |
+| D071  |   テレビ東京       |                                             [>](https://naori-test.netgenx.site/pxx.php?shk_cid=hdgd07#.m3u8)                                                 |                                                           <img height="30" src="https://i.imgur.com/U8jBxEi.png"/>                                                            |       JOTXDTV.jp       |
+| D081 |   フジテレビ   |                                                [>](https://naori-test.netgenx.site/pxx.php?shk_cid=hdgd05#.m3u8)                                                 |                                                           <img height="30" src="https://i.imgur.com/epJYc7P.png"/>                                                            |       JOCXDTV.jp       |
 
 <h2> BS/CS (Satellite) </h2>
 
 | # |       Channel        |                                                       Link                                                       |                           Logo                           |    EPG id     |
 |:-:|:--------------------:|:----------------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------:|:-------------:|
-| BS101 |        NHK BS        |                   [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS101&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1)                   | <img height="30" src="https://i.imgur.com/t0uZcSR.png"/> |   NHKBS.jp    |
-| BS4K101 |      NHK BSP4K       |                   [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS103&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1)                   | <img height="30" src="https://i.imgur.com/uvPpFo5.png"/> |  NHKBSP4K.jp  |
-| BS141 |       BS日テレ        |                   [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS141&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1)                   | <img height="30" src="https://i.imgur.com/26ATUNc.png"/> | BSNipponTV.jp |
-| BS151 |       BS朝日       | [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS151&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1) | <img height="30" src="https://i.imgur.com/Cl68ZMA.png"/> |  BSAsahi.jp   |
-| BS161 |        BS-TBS        |                   [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS161&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1)                   | <img height="30" src="https://i.imgur.com/BSt9UG2.png"/> |   BSTBS.jp    |
-| BS171 |     BSテレ東      | [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS171&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1) | <img height="30" src="https://i.imgur.com/LsQlNcz.png"/> | BSTVTokyo.jp  |
-| BS181 |     BSフジ        |                   [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS181&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1)                   | <img height="30" src="https://i.imgur.com/N4xeDxJ.png"/> |   BSFuji.jp   |
-| BS191 |  WOWOWプライム     |    [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS191&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1) | <img height="30" src="https://www.lyngsat.com/logo/tv/ww/wowow_prime.png"/> | WOWOWPrime.jp |
-| BS192 |  WOWOWライブ         |     [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS192&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1) |  <img height="30" src="https://www.lyngsat.com/logo/tv/ww/wowow_live.png"/> | WOWOWLive.jp |
-| BS193 |  WOWOWシネマ　     |     [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS193&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1) |  <img height="30" src="https://www.lyngsat.com/logo/tv/ww/wowow_cinema.png"/> | WOWOWCinema.jp |
-| BS200 |     BS10        |      [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS263&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1) |  <img height="30" src="https://i.imgur.com/KPZiuHl.png"/> | jcom_120_110_4 |
-| BS201 | BS10スターチャンネル  |      [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS200&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1) |  <img height="30" src="https://i.imgur.com/SN0ED0U.png"/> | jcom_120_200_4 |
-| BS236 |  アニマックス  |      [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS236&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1) |  <img height="30" src="https://i.imgur.com/jO0qUvj.png"/> | AnimaxAsia.sg@Japan |
-| BS242 |  J SPORTS 1     |　  [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS242&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1) |  <img height="30" src="https://www.starcat.co.jp/ch/upload/channel/69/jsports1_logo.jpg"/> | JSPORTS1.jp |
-| BS243 |  J SPORTS 2     |　  [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS243&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1) |  <img height="30" src="https://www.starcat.co.jp/ch/upload/channel/70/jsports2_logo.jpg"/> | JSPORTS2.jp |
-| BS244 |  J SPORTS 3     |　 [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS244&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1) |  <img height="30" src="https://www.starcat.co.jp/ch/upload/channel/71/jsports3_logo.jpg"/> | JSPORTS3.jp |
-| BS245 |  J SPORTS 4     |　  [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS245&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1) |  <img height="30" src="https://www.starcat.co.jp/ch/upload/channel/74/jsports4_logo.jpg"/> | JSPORTS4.jp |
+| BS101 |        NHK BS        |                   [>](https://naori-test.netgenx.site/pxx.php?shk_cid=bs02#.m3u8)                   | <img height="30" src="https://i.imgur.com/t0uZcSR.png"/> |   NHKBS.jp    |
+| BS4K101 |      NHK BSP4K       |                   [>]([NO PUBLIC STREAM])                   | <img height="30" src="https://i.imgur.com/uvPpFo5.png"/> |  NHKBSP4K.jp  |
+| BS141 |       BS日テレ        |                   [>](https://naori-test.netgenx.site/pxx.php?shk_cid=bs03#.m3u8)                   | <img height="30" src="https://i.imgur.com/26ATUNc.png"/> | BSNipponTV.jp |
+| BS151 |       BS朝日       | [>](https://naori-test.netgenx.site/pxx.php?shk_cid=bs04#.m3u8) | <img height="30" src="https://i.imgur.com/Cl68ZMA.png"/> |  BSAsahi.jp   |
+| BS161 |        BS-TBS        |                   [>](https://naori-test.netgenx.site/pxx.php?shk_cid=bs05#.m3u8)                   | <img height="30" src="https://i.imgur.com/BSt9UG2.png"/> |   BSTBS.jp    |
+| BS171 |     BSテレ東      | [>](https://naori-test.netgenx.site/pxx.php?shk_cid=bs06#.m3u8) | <img height="30" src="https://i.imgur.com/LsQlNcz.png"/> | BSTVTokyo.jp  |
+| BS181 |     BSフジ        |                   [>](https://naori-test.netgenx.site/pxx.php?shk_cid=bs11#.m3u8)                   | <img height="30" src="https://i.imgur.com/N4xeDxJ.png"/> |   BSFuji.jp   |
+| BS191 |  WOWOWプライム     |    [>]([NO PUBLIC STREAM]) | <img height="30" src="https://www.lyngsat.com/logo/tv/ww/wowow_prime.png"/> | WOWOWPrime.jp |
+| BS192 |  WOWOWライブ         |     [>]([NO PUBLIC STREAM]) |  <img height="30" src="https://www.lyngsat.com/logo/tv/ww/wowow_live.png"/> | WOWOWLive.jp |
+| BS193 |  WOWOWシネマ　     |     [>]([NO PUBLIC STREAM]) |  <img height="30" src="https://www.lyngsat.com/logo/tv/ww/wowow_cinema.png"/> | WOWOWCinema.jp |
+| BS200 |     BS10        |      [>](https://naori-test.netgenx.site/pxx.php?shk_cid=bs10#.m3u8) |  <img height="30" src="https://i.imgur.com/KPZiuHl.png"/> | jcom_120_110_4 |
+| BS201 | BS10スターチャンネル  |      [>](https://naori-test.netgenx.site/pxx.php?shk_cid=bs07#.m3u8) |  <img height="30" src="https://i.imgur.com/SN0ED0U.png"/> | jcom_120_200_4 |
+| BS236 |  アニマックス  |      [>]([NO PUBLIC STREAM]) |  <img height="30" src="https://i.imgur.com/jO0qUvj.png"/> | AnimaxAsia.sg@Japan |
+| BS242 |  J SPORTS 1     |　  [>]([NO PUBLIC STREAM]) |  <img height="30" src="https://www.starcat.co.jp/ch/upload/channel/69/jsports1_logo.jpg"/> | JSPORTS1.jp |
+| BS243 |  J SPORTS 2     |　  [>]([NO PUBLIC STREAM]) |  <img height="30" src="https://www.starcat.co.jp/ch/upload/channel/70/jsports2_logo.jpg"/> | JSPORTS2.jp |
+| BS244 |  J SPORTS 3     |　 [>]([NO PUBLIC STREAM]) |  <img height="30" src="https://www.starcat.co.jp/ch/upload/channel/71/jsports3_logo.jpg"/> | JSPORTS3.jp |
+| BS245 |  J SPORTS 4     |　  [>]([NO PUBLIC STREAM]) |  <img height="30" src="https://www.starcat.co.jp/ch/upload/channel/74/jsports4_logo.jpg"/> | JSPORTS4.jp |
 | BS251 |   釣りビジョン     |　  [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS251&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1) |  <img height="30" src="https://i.imgur.com/Yc7JvSK.png"/> | FishingVision.jp |
 | BS255 | 日本映画専門チャンネル|  [>](https://stream01.willfonk.com/live_playlist.m3u8?cid=BS255&r=FHD&ccode=JP&m=d0:20:20:04:35:cc&t=0d6938cb3dcf4b79848bc1753a59daf1) |  <img height="30" src="https://i.imgur.com/HdC3Hdc.png"/> | NihonEigaSenmonChannel.jp |
 | CS055 |     ショップチャンネル      |                                                               [>](https://stream3.shopch.jp/HLS/master.m3u8)                                                                |                                                           <img height="30" src="https://i.imgur.com/CCMAF7W.png"/>                                                            |     ShopChannel.jp     |