diff --git a/lists/japan.md b/lists/japan.md
index 4182b61b2..9fe11e3a4 100644
--- a/lists/japan.md
+++ b/lists/japan.md
@@ -1,26 +1,60 @@
 <h1>Japan</h1>
 
-| #   | Channel        | Link  | Logo | EPG id |
-|:---:|:--------------:|:-----:|:----:|:------:|
-| 1   | ANN News Ⓨ     | [>](https://www.youtube.com/user/ANNnewsCH/live) | <img height="20" src="https://i.imgur.com/9IVsFXz.png"/> |
-| 2   | NHK General TV Ⓢ | [>](https://nhk3.mov3.co/hls/nhk.m3u8) | <img height="20" src="https://i.imgur.com/ns0PHbl.png"/> | NHKGeneralTV.jp |
-| 3   | NHK World-Japan | [>](https://nhkwlive-ojp.akamaized.net/hls/live/2003459/nhkwlive-ojp-en/index_4M.m3u8) | <img height="20" src="https://i.imgur.com/TDCuUDs.png"/> | NHKWorldJapan.jp |
-| 4   | 日テレ Ⓢ     | [>](https://ntv3.mov3.co/hls/ntv.m3u8) | <img height="20" src="https://i.imgur.com/IGu52nM.png"/> | NipponTV.jp |
-| 5   | 日テレNEWS24 Ⓢ     | [>](https://n24-cdn-live.ntv.co.jp/ch01/index.m3u8) | <img height="20" src="https://i.imgur.com/tVNZ0BU.png"/> | NTVNews24.jp |
-| 6   | フジテレビ Ⓢ     | [>](https://fujitv3.mov3.co/hls/fujitv.m3u8) | <img height="20" src="https://i.imgur.com/CjoqJXh.png"/> | FujiTV.jp |
-| 7   | TBS Ⓢ     | [>](https://tbs2.mov3.co/hls/tbs.m3u8) | <img height="20" src="https://i.imgur.com/SzWJscr.png"/> |
-| 8   | TBS News Ⓨ     | [>](https://www.youtube.com/c/tbsnews/live) | <img height="20" src="https://i.imgur.com/hk0oZab.png"/> | TBSNews.jp |
-| 9   | BS-TBS         | [>](http://cdnv148.cloudrsst.com:1935/jptv/bstbs_720/playlist.m3u8) | <img height="20" src="https://i.imgur.com/g1pTQIm.png"/> | BSTBS.jp |
-| 10  | BSテレ東        | [>](http://cdnv148.cloudrsst.com:1935/jptv/bsjapan_720/playlist.m3u8) | <img height="20" src="https://i.imgur.com/yJfA6ak.png"/> | BSTVTokyo.jp |
-| 11  | TV Tokyo     | [>](https://bcsecurelivehls-i.akamaihd.net/hls/live/265320/5043843989001/140130JTDX/index.m3u8) | <img height="20" src="https://i.imgur.com/BMXZjA1.png"/> |
-| 12  | Tokyo MX1    | [>](https://movie.mcas.jp/mcas/mx1_2/master.m3u8) | <img height="20" src="https://i.imgur.com/ghRFrKj.png"/> | TokyoMX1.jp |
-| 13  | Tokyo MX2    | [>](https://movie.mcas.jp/mcas/mx2_2/master.m3u8) | <img height="20" src="https://i.imgur.com/ghRFrKj.png"/> | TokyoMX2.jp |
-| 14  | TV Asahi     | [>](http://redlabmcdn.s.llnwi.net/nv02/ryowa4hd/index.m3u8) | <img height="20" src="https://i.imgur.com/rls8NVc.png"/> | TVAsahi.jp |
-| 15  | HTB Ⓨ          | [>](https://www.youtube.com/c/htbnews/live) | <img height="20" src="https://i.imgur.com/A0Wj0Ys.png"/> |
-| 16  | Gunma TV    | [>](https://movie.mcas.jp/switcher/smil:mcas8.smil/master.m3u8) | <img height="20" src="https://i.imgur.com/Fik3Nm9.png"/> | GunmaTV.jp |
-| 17  | Weathernews     | [>](http://movie.mcas.jp/mcas/wn1_2/master.m3u8) | <img height="20" src="https://i.imgur.com/7YLRtla.png"/> | Weathernews.jp |
-| 18  | GSTV            | [>](https://gemstv.wide-stream.net/gemstv01/smil:gemstv01.smil/chunklist.m3u8) | <img height="20" src="https://i.imgur.com/0wds9n8.png"/> | GSTV.jp |
-| 19  | QVC Ⓢ          | [>](http://cdn-live1.qvc.jp/iPhone/800/800.m3u8) | <img height="20" src="https://i.imgur.com/B74hZKd.png"/> | QVCJapan.jp |
-| 20  | Shop Channel    | [>](http://stream1.shopch.jp/HLS/out1/prog_index.m3u8) | <img height="20" src="https://i.imgur.com/rkdKa5a.png"/> | ShopChannel.jp |
-| 21  | Animax   | [>](http://redlabmcdn.s.llnwi.net/nv02/bs14hd/index.m3u8) | <img height="20" src="https://upload.wikimedia.org/wikipedia/commons/thumb/1/1d/Animax.svg/250px-Animax.svg.png"/> | Animax.jp |
-| 22  | Disney Channel Japan    | [>](http://redlabmcdn.s.llnwi.net/nv02/bs13hd/index.m3u8) | <img height="20" src="https://upload.wikimedia.org/wikipedia/commons/thumb/d/d2/2019_Disney_Channel_logo.svg/220px-2019_Disney_Channel_logo.svg.png"/> | DisneyChannelJapan.jp |
+<h2> Terrestrial/IPTV </h2>
+
+| #  |        Channel        |                                                                                    Link                                                                                     |                                                                                     Logo                                                                                      |         EPG id         |
+|:--:|:---------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:----------------------:|
+| 1  |    NHK G (Tokyo) Ⓢ    |                                                [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd01)                                                 |                                                           <img height="20" src="https://i.imgur.com/fAZ2BEZ.png"/>                                                            |       JOAKDTV.jp       |
+| 1  |    NHK G (Osaka) Ⓢ    |                                                [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx06)                                                 |                                                           <img height="20" src="https://i.imgur.com/fAZ2BEZ.png"/>                                                            |       JOBKDTV.jp       |
+| 2  |        NHK E Ⓢ        |                                                [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd02)                                                 |                                                           <img height="20" src="https://i.imgur.com/WxtftlO.png"/>                                                            |       JOABDTV.jp       |
+| 3  |    NHK World-Japan    |                                           [>](https://nhkwlive-ojp.akamaized.net/hls/live/2003459/nhkwlive-ojp-en/index_4M.m3u8)                                            |                  <img height="20" src="https://upload.wikimedia.org/wikipedia/commons/thumb/8/8d/NHK_World-Japan_TV.svg/512px-NHK_World-Japan_TV.svg.png"/>                   |    NHKWorldJapan.jp    |
+| 4  |   Nippon TV (日テレ) Ⓢ   |                                                [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd03)                                                 |                                                           <img height="20" src="https://i.imgur.com/IxD8V5X.png"/>                                                            |       JOAXDTV.jp       |
+| 5  |      日テレNEWS24 Ⓢ      |                                                             [>](https://n24-cdn-live.ntv.co.jp/ch01/index.m3u8)                                                             |                                                           <img height="20" src="https://i.imgur.com/Wfu61ZU.png"/>                                                            |      NTVNEWS24.jp      |
+| 6  |      TV Asahi Ⓢ       |                                                [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd06)                                                 |                                                           <img height="20" src="https://i.imgur.com/rls8NVc.png"/>                                                            |       JOEXDTV.jp       |
+| 7  |         TBS Ⓢ         |                                                [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd04)                                                 | <img height="20" src="https://upload.wikimedia.org/wikipedia/commons/thumb/1/14/Tokyo_Broadcasting_System_logo_2020.svg/1200px-Tokyo_Broadcasting_System_logo_2020.svg.png"/> |       JORXDTV.jp       |
+| 8  |       TBS News        |                                                    [>](https://ythls.armelin.one/channel/UC6AG81pAkf6Lbi_1VC5NmPA.m3u8)                                                     |                                                           <img height="20" src="https://i.imgur.com/GoNmywa.png"/>                                                            |       TBSNEWS.jp       |
+| 9  |      TV Tokyo Ⓢ       |                                                [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd07)                                                 |                                                           <img height="20" src="https://i.imgur.com/tDyxk0Y.png"/>                                                            |       JOTXDTV.jp       |
+| 10 |   Fuji TV (フジテレビ) Ⓢ   |                                                [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd05)                                                 |                                                           <img height="20" src="https://i.imgur.com/sEWDmMD.png"/>                                                            |       JOCXDTV.jp       |
+| 11 |      Tokyo MX1 Ⓢ      |                                                [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gd08)                                                 |                                                           <img height="20" src="https://i.imgur.com/igia8OX.png"/>                                                            |       JOMXDTV.jp       |
+| 12 | HBC Hokkaido News 24  |                                                    [>](https://ythls.armelin.one/channel/UCCTpf5c_9HDo_OSu3aX8uFQ.m3u8)                                                     |                                                           <img height="20" src="https://i.imgur.com/vcGsZVD.png"/>                                                            |  HBCHokkaidoNews24.jp  |
+| 13 | HTB Hokkaido News 24  |                                                    [>](https://ythls.armelin.one/channel/UCSWOnDD1KIriGmyQ7SgNA4A.m3u8)                                                     |                                                           <img height="20" src="https://i.imgur.com/yqUItvM.png"/>                                                            |  HTBHokkaidoNews24.jp  |
+| 14 |   Hokkaido News UHB   |                                                    [>](https://ythls.armelin.one/channel/UCpQs_warGhUzJhBdwLfF34g.m3u8)                                                     |                                                           <img height="20" src="https://i.imgur.com/G8lAJYc.png"/>                                                            |   HokkaidoNewsUHB.jp   |
+| 15 |   Niigata News NST    |                                                    [>](https://ythls.armelin.one/channel/UC8iN-WKPu820ve-4t9NxHRw.m3u8)                                                     |                                                           <img height="20" src="https://i.imgur.com/5dJE8Fc.jpg"/>                                                            |   NiigataNewsNST.jp    |
+| 16 |     SATV News 24H     |                                                    [>](https://ythls.armelin.one/channel/UCvF5vIejmf-H_XSluaBldfg.m3u8)                                                     |                                                           <img height="20" src="https://i.imgur.com/PxFcRh9.jpg"/>                                                            |     SATVNews24H.jp     |
+| 17 |   STV News Hokkaido   |                                                    [>](https://ythls.armelin.one/channel/UCOZv-6MiXqJdLpmYtR431Ow.m3u8)                                                     |                                                           <img height="20" src="https://i.imgur.com/oyQ2FnC.jpg"/>                                                            |   STVNewsHokkaido.jp   |
+| 18 |       TOS News        |                                                    [>](https://ythls.armelin.one/channel/UChx_y6aLWNkifSDUt2TVAzg.m3u8)                                                     |                                                           <img height="20" src="https://i.imgur.com/JBkXyvj.jpg"/>                                                            |       TOSNews.jp       |
+| 19 |      Weathernews      |                                                    [>](https://ythls.armelin.one/channel/UCNsidkYpIAQ4QaufptQBPHQ.m3u8)                                                     |                                                           <img height="20" src="https://i.imgur.com/A8uRSTS.png"/>                                                            |     Weathernews.jp     |
+| 20 |         GSTV          | [>](https://gstv-tnz-gsmediastreaming.preview-jpea.channel.media.azure.net/dfd06b62-e9d1-4a7f-bcbb-89d2ecbc82ee/preview.ism/manifest(format=mpd-time-csf,audio-only=false)) |                                                           <img height="20" src="https://i.imgur.com/ECnVG5I.png"/>                                                            |        GSTV.jp         |
+| 21 |          QVC          |                                                             [>](https://cdn-live1.qvc.jp/iPhone/1501/1501.m3u8)                                                             |                                                           <img height="20" src="https://i.imgur.com/xWSzQ34.png"/>                                                            |         QVC.jp         |
+| 22 |     Shop Channel      |                                                               [>](https://stream3.shopch.jp/HLS/master.m3u8)                                                                |                                                           <img height="20" src="https://i.imgur.com/GTyQhBF.png"/>                                                            |     ShopChannel.jp     |
+| 23 |       ANN News        |                                                    [>](https://ythls.armelin.one/channel/UCGCZAYq5Xxojl_tSXcVJhiQ.m3u8)                                                     |                                                           <img height="20" src="https://i.imgur.com/9IVsFXz.png"/>                                                            |     JapaNews24.jp      |
+| 24 | Asahi Shimbun Digital |                                                    [>](https://ythls.armelin.one/channel/UCMKvT0YVLufHMdGLH89J1oA.m3u8)                                                     |                                                           <img height="20" src="https://i.imgur.com/DuGepQp.jpg"/>                                                            | AsahiShimbunDigital.jp |
+| 25 |    Chukyo TV News     |                                                    [>](https://ythls.armelin.one/channel/UCxiRdfyH0FtFCRZTRfRsdsA.m3u8)                                                     |                                                           <img height="20" src="https://i.imgur.com/fSNc0jP.png"/>                                                            |    ChukyoTVNews.jp     |
+| 26 |   MBS TV (MBSテレビ) Ⓢ   |                                                [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx01)                                                 |                                                           <img height="20" src="https://i.imgur.com/RfrkGrd.png"/>                                                            |       JOOYDTV.jp       |
+| 27 |   ABC TV (ABCテレビ) Ⓢ   |                                                [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx02)                                                 | <img height="20" src="https://upload.wikimedia.org/wikipedia/commons/thumb/d/d0/Asahi_Broadcasting_Corporation_Logo.svg/1920px-Asahi_Broadcasting_Corporation_Logo.svg.png"/> |       JOAYDTV.jp       |
+| 28 |  Kansai TV (カンテレ) Ⓢ   |                                                [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx03)                                                 |                            <img height="20" src="https://upload.wikimedia.org/wikipedia/commons/thumb/b/b9/Ktv_logo.svg/1920px-Ktv_logo.svg.png"/>                            |       JODXDTV.jp       |
+| 29 | Yomiuri TV (読売テレビ) Ⓢ  |                                                [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx04)                                                 |                                                           <img height="20" src="https://i.imgur.com/ONbuWvo.png"/>                                                            |       JOIXDTV.jp       |
+| 30 |  TV Osaka (テレビ大阪) Ⓢ   |                                                [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx05)                                                 |                                                           <img height="20" src="https://i.imgur.com/rUmrruq.png"/>                                                            |       JOBHDTV.jp       |
+| 31 |   Sun TV (サンテレビ) Ⓢ    |                                                [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=gx07)                                                 |                                                           <img height="20" src="https://i.imgur.com/0qtXIRM.png"/>                                                            |       JOUHDTV.jp       |
+| 32 |  NHK Kishou-Saigai Ⓢ  |                                               [>](https://newssimul-stream.nhk.jp/hls/live/2010561/nhknewssimul/master.m3u8)                                                |                                                           <img height="20" src="https://i.imgur.com/oWKCBIz.png"/>                                                            |   NHKKishouSaigai.jp   |
+| 33 |    JapanesePod101     |                                                    [>](https://ythls.armelin.one/channel/UC0ox9NuTHYeRys63yZpBFuA.m3u8)                                                     |                                          <img height="20" src="https://upload.wikimedia.org/wikipedia/en/9/96/Japanesepod101.png"/>                                           |                        |
+
+<h2> BS (Satellite) </h2>
+
+| # |       Channel        |                                                       Link                                                       |                           Logo                           |    EPG id     |
+|:-:|:--------------------:|:----------------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------:|:-------------:|
+| 1 |        NHK BS        |                   [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs11)                   | <img height="20" src="https://i.imgur.com/t0uZcSR.png"/> |   NHKBS.jp    |
+| 2 |      NHK BSP4K       |                   [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs01)                   | <img height="20" src="https://i.imgur.com/uvPpFo5.png"/> |  NHKBSP4K.jp  |
+| 3 | BS Nippon TV (BS日テレ) |                   [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs02)                   | <img height="20" src="https://i.imgur.com/D8lhZCI.png"/> | BSNipponTV.jp |
+| 4 |       BS Asahi       | [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs03&isp=10&bind=0&uin=159413&playseek=0) | <img height="20" src="https://i.imgur.com/huXFL3A.png"/> |  BSAsahi.jp   |
+| 5 |        BS-TBS        |                   [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs04)                   | <img height="20" src="https://i.imgur.com/h20eGKq.png"/> |   BSTBS.jp    |
+| 6 |     BS TV Tokyo      | [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs05&isp=10&bind=0&uin=159413&playseek=0) | <img height="20" src="https://i.imgur.com/yJfA6ak.png"/> | BSTVTokyo.jp  |
+| 7 | BS Fuji TV (BSフジテレビ) |                   [>](http://cdns.jp-primehome.com:8000/zhongying/live/playlist.m3u8?cid=bs06)                   | <img height="20" src="https://i.imgur.com/aDdwjjc.png"/> |   BSFuji.jp   |
+
+
+<h2> Invalid </h2>
+
+| # |  Channel  | Link  |                           Logo                           |   EPG id    |
+|:-:|:---------:|:-----:|:--------------------------------------------------------:|:-----------:|
+| # | Tokyo MX2 | [x]() | <img height="20" src="https://i.imgur.com/igia8OX.png"/> | TokyoMX2.jp |
+| # | Gunma TV  | [x]() | <img height="20" src="https://i.imgur.com/iPPQRBc.png"/> | JOMLDTV.jp  |
\ No newline at end of file