diff --git a/components/custom-train-data.ts b/components/custom-train-data.ts
index ce61121..575ef1e 100644
--- a/components/custom-train-data.ts
+++ b/components/custom-train-data.ts
@@ -185,38 +185,22 @@ export const customTrainDataDetector = (TrainNumber: string) => {
 
     //南風 2700ノーマル
     case "34D":
-    case "58D":
-    case "31D":
-    case "51D":
-      return {
-        type: "LTDEXP",
-        trainName: "南風",
-        trainIcon: "https://storage.haruk.in/s2700.png",
-        infoUrl: "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/nanpu.html",
-        trainNumDistance: 30,
-        info: "しまんとと併結 / 2700系で運転",
-      };
-    case "52D":
-    case "53D":
-      return {
-        type: "LTDEXP",
-        trainName: "南風",
-        trainIcon: "https://storage.haruk.in/s2700.png",
-        infoUrl: "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/nanpu.html",
-        trainNumDistance: 30,
-        info: "うずしおと併結 / 2700系で運転",
-      };
     case "38D":
     case "40D":
     case "42D":
     case "46D":
     case "50D":
+    case "52D":
     case "54D":
+    case "58D":
+    case "31D":
     case "35D":
     case "39D":
     case "41D":
     case "43D":
     case "47D":
+    case "51D":
+    case "53D":
     case "55D":
       return {
         type: "LTDEXP",
@@ -228,18 +212,6 @@ export const customTrainDataDetector = (TrainNumber: string) => {
       };
 
     //2700アンパン
-    case "36D":
-    case "37D":
-      return {
-        type: "LTDEXP",
-        trainName: "南風",
-        trainIcon: `https://n8n.haruk.in/webhook/dosan-anpanman-pictures.png?trainNum=${TrainNumber}&day=${dayjs().format(
-          "yyyy-MM-DD"
-        )}`,
-        infoUrl: "https://www.jr-eki.com/aptrain/naani/dosan/train.html",
-        trainNumDistance: 30,
-        info: "うずしおと連結 / アンパンマン列車で運転",
-      };
     case "32D":
     case "36D":
     case "44D":
@@ -263,27 +235,18 @@ export const customTrainDataDetector = (TrainNumber: string) => {
 
     //うずしお
     //2700
-    case "5006D":
-    case "5022D":
-    case "5013D":
-    case "5029D":
-      return {
-        type: "LTDEXP",
-        trainName: "うずしお",
-        trainIcon: "https://storage.haruk.in/s2700_uzu.png",
-        infoUrl:
-          "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/uzushio.html",
-        trainNumDistance: 5000,
-        info: "南風と併結 / 高松-宇多津間進行方向逆転 / 2700系で運転",
-      };
     case "3004D":
+    case "3006D":
     case "3010D":
     case "3014D":
     case "3016D":
+    case "3022D":
     case "3028D":
     case "3003D":
     case "3007D":
+    case "3013D":
     case "3025D":
+    case "3029D":
     case "3031D":
       return {
         type: "LTDEXP",
@@ -299,7 +262,6 @@ export const customTrainDataDetector = (TrainNumber: string) => {
 
     case "3020D":
     case "3026D":
-    case "3032D":
     case "3005D":
     case "3011D":
     case "3017D":
@@ -467,21 +429,22 @@ export const customTrainDataDetector = (TrainNumber: string) => {
     //宇和海
     //2000 ノーマル
     case "1052D":
+    case "1054D":
     case "1056D":
-    case "1058D":
+    case "1060D":
     case "1062D":
     case "1064D":
     case "1068D":
     case "1070D":
-    case "1074D":
+    case "1072D":
     case "1076D":
     case "1078D":
     case "1080D":
     case "1082D":
     case "1051D":
-    case "1053D":
+    case "1055D":
     case "1057D":
-    case "1059D":
+    case "1061D":
     case "1063D":
     case "1065D":
     case "1069D":
@@ -490,6 +453,7 @@ export const customTrainDataDetector = (TrainNumber: string) => {
     case "1075D":
     case "1077D":
     case "1079D":
+    case "1081D":
       return {
         type: "LTDEXP",
         trainName: "宇和海",
@@ -499,14 +463,12 @@ export const customTrainDataDetector = (TrainNumber: string) => {
         info: "2000系で運転",
       };
     //2000 アンパン込み
-    case "1054D":
-    case "1060D":
+    case "1058D":
     case "1066D":
-    case "1072D":
-    case "1055D":
-    case "1061D":
+    case "1074D":
+    case "1053D":
+    case "1059D":
     case "1067D":
-    case "1081D":
       return {
         type: "LTDEXP",
         trainName: "宇和海",
@@ -517,9 +479,9 @@ export const customTrainDataDetector = (TrainNumber: string) => {
       };
     //しまんと
     case "2002D":
-    case "2008D":
+    case "2004D":
     case "2001D":
-    case "2005D":
+    case "2003D":
       return {
         type: "LTDEXP",
         trainName: "しまんと",
@@ -529,19 +491,6 @@ export const customTrainDataDetector = (TrainNumber: string) => {
         trainNumDistance: 2000,
         info: "2700系で運転",
       };
-    case "2004D":
-    case "2006D":
-    case "2003D":
-    case "2007D":
-      return {
-        type: "LTDEXP",
-        trainName: "しまんと",
-        trainIcon: "https://storage.haruk.in/s2700_smn.png",
-        infoUrl:
-          "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/shimanto.html",
-        trainNumDistance: 2000,
-        info: "南風と併結 / 2700系で運転",
-      };
 
     //あしずり 2000
     case "2074D":
@@ -563,12 +512,11 @@ export const customTrainDataDetector = (TrainNumber: string) => {
       };
 
     //あしずり 2700
+    case "2072D":
     case "2078D":
     case "2084D":
-    case "2088D":
     case "2075D":
     case "2077D":
-    case "2072D":
     case "2083D":
       return {
         type: "LTDEXP",
@@ -584,14 +532,10 @@ export const customTrainDataDetector = (TrainNumber: string) => {
     case "4002D":
     case "4004D":
     case "4006D":
-    case "4008D":
-    case "4010D":
     case "4001D":
     case "4003D":
     case "4005D":
     case "4007D":
-    case "4009D":
-    case "4011D":
       return {
         type: "LTDEXP",
         trainName: "剣山",
@@ -602,18 +546,6 @@ export const customTrainDataDetector = (TrainNumber: string) => {
         info: "キハ185系で運転",
       };
 
-    //むろと
-    case "8051D":
-    case "8052D":
-      return {
-        type: "LTDEXP",
-        trainName: "むろと",
-        trainIcon: "https://storage.haruk.in/s185_mrt.png",
-        infoUrl: "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/muroto.html",
-        trainNumDistance: 5050,
-        info: "キハ185系で運転",
-      };
-
     //よしのがわトロッコ
     case "8452D":
     case "8451D":
@@ -695,7 +627,7 @@ export const customTrainDataDetector = (TrainNumber: string) => {
       if (
         new RegExp(/^4[1-9]\d\d[DM]$/).test(TrainNumber) ||
         new RegExp(/^5[1-7]\d\d[DM]$/).test(TrainNumber) ||
-        TrainNumber === "3621D"
+        new RegExp(/^3[2-9]\d\d[DM]$/).test(TrainNumber)
       )
         return {
           type: "OneMan",
diff --git a/lib/webViewInjectjavascript.ts b/lib/webViewInjectjavascript.ts
index aad21e1..37d24fe 100644
--- a/lib/webViewInjectjavascript.ts
+++ b/lib/webViewInjectjavascript.ts
@@ -198,18 +198,18 @@ export const injectJavascriptData: InjectJavascriptData = (
 
       //うずしお
       //2700
-      case "5006D":
-      case "5022D":
-      case "5013D":
-      case "5029D":
       case "3004D":
+      case "3006D":
       case "3010D":
       case "3014D":
       case "3016D":
+      case "3022D":
       case "3028D":
       case "3003D":
       case "3007D":
+      case "3013D":
       case "3025D":
+      case "3029D":
       case "3031D":
         setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s2700_uzu.png');
         break;
@@ -218,7 +218,6 @@ export const injectJavascriptData: InjectJavascriptData = (
       
       case "3020D":
       case "3026D":
-      case "3032D":
       case "3005D":
       case "3011D":
       case "3017D":
@@ -337,21 +336,22 @@ export const injectJavascriptData: InjectJavascriptData = (
       //宇和海
       //2000 ノーマル
       case "1052D":
+      case "1054D":
       case "1056D":
-      case "1058D":
+      case "1060D":
       case "1062D":
       case "1064D":
       case "1068D":
       case "1070D":
-      case "1074D":
+      case "1072D":
       case "1076D":
       case "1078D":
       case "1080D":
       case "1082D":
       case "1051D":
-      case "1053D":
+      case "1055D":
       case "1057D":
-      case "1059D":
+      case "1061D":
       case "1063D":
       case "1065D":
       case "1069D":
@@ -360,28 +360,23 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "1075D":
       case "1077D":
       case "1079D":
+      case "1081D":
         setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s2000_uwa.png');
       break;
       //2000 アンパン込み
-      case "1054D":
-      case "1060D":
+      case "1058D":
       case "1066D":
-      case "1072D":
-      case "1055D":
-      case "1061D":
+      case "1074D":
+      case "1053D":
+      case "1059D":
       case "1067D":
-      case "1081D":
         setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s2002a.png');
       break;
       //しまんと
       case "2002D":
       case "2004D":
-      case "2006D":
-      case "2008D":
       case "2001D":
       case "2003D":
-      case "2005D":
-      case "2007D":
         setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s2700_smn.png');
       break;
 
@@ -398,34 +393,23 @@ export const injectJavascriptData: InjectJavascriptData = (
       break;
 
       //あしずり 2700
+      case "2072D":
       case "2078D":
       case "2084D":
-      case "2088D":
       case "2075D":
       case "2077D":
-      case "2072D":
-      case "2083D":
         setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s2700_asi.png');
       break;
       //剣山
       case "4002D":
       case "4004D":
       case "4006D":
-      case "4008D":
-      case "4010D":
       case "4001D":
       case "4003D":
       case "4005D":
       case "4007D":
-      case "4009D":
-      case "4011D":
         setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185tu.png');
       break;
-      //むろと
-      case "8051D":
-      case "8052D":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185_mrt.png');
-      break;
 
 
       //よしのがわトロッコ
@@ -466,8 +450,6 @@ export const injectJavascriptData: InjectJavascriptData = (
       // 貨物
       case "74":
       case "75":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/ef65_rp0.png');
-        break;
       case "70":
       case "71":
       case "73":
@@ -534,524 +516,524 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "6222D":
         setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png');
         break;
-      // それ以外の土讃線ごな線直通列車
-      case "5811D":
-      case "5813D":
-      case "5815D":
-      case "5817D":
-      case "5843D":
-      case "5853D":
-      case "5855D":
-      case "5859D":
-      case "5861D":
-      case "5865D":
-      case "5881D":
-      case "5885D":
-      case "5889D":
+      // // それ以外の土讃線ごな線直通列車
+      // case "5811D":
+      // case "5813D":
+      // case "5815D":
+      // case "5817D":
+      // case "5843D":
+      // case "5853D":
+      // case "5855D":
+      // case "5859D":
+      // case "5861D":
+      // case "5865D":
+      // case "5881D":
+      // case "5885D":
+      // case "5889D":
       
-      case "5812D":
-      case "5814D":
-      case "5816D":
-      case "5852D":
-      case "5856D":
-      case "5860D":
-      case "5862D":
-      case "5872D":
-      case "5874D":
-      case "5876D":
-      case "5880D":
-      case "5882D":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/tosa9640.png');
-        break;
-      // それ以外の土讃線普通列車(1000)
-      case "4210D":
-      case "4212D":
-      case "4214D":
-      case "4218D":
-      case "4220D":
-      case "4222D":
-      case "4224D":
-      case "4226D":
-      case "4228D":
-      case "4230D":
-      case "4232D":
-      case "4234D":
-      case "4236D":
-      case "4238D":
-      case "4240D":
-      case "4242D":
-      case "4244D":
-      case "4250D":
-      case "4252D":
-      case "4254D":
-      case "4256D":
+      // case "5812D":
+      // case "5814D":
+      // case "5816D":
+      // case "5852D":
+      // case "5856D":
+      // case "5860D":
+      // case "5862D":
+      // case "5872D":
+      // case "5874D":
+      // case "5876D":
+      // case "5880D":
+      // case "5882D":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/tosa9640.png');
+      //   break;
+      // // それ以外の土讃線普通列車(1000)
+      // case "4210D":
+      // case "4212D":
+      // case "4214D":
+      // case "4218D":
+      // case "4220D":
+      // case "4222D":
+      // case "4224D":
+      // case "4226D":
+      // case "4228D":
+      // case "4230D":
+      // case "4232D":
+      // case "4234D":
+      // case "4236D":
+      // case "4238D":
+      // case "4240D":
+      // case "4242D":
+      // case "4244D":
+      // case "4250D":
+      // case "4252D":
+      // case "4254D":
+      // case "4256D":
 
-      case "4211D":
-      case "4221D":
-      case "4223D":
-      case "4225D":
-      case "4227D":
-      case "4229D":
-      case "4231D":
-      case "4235D":
-      case "4237D":
-      case "4239D":
-      case "4241D":
-      case "4245D":
-      case "4247D":
-      case "4249D":
-      case "4251D":
-      case "4253D":
-      case "4255D":
-      case "4257D":
-      case "4259D":
-      case "4261D":
+      // case "4211D":
+      // case "4221D":
+      // case "4223D":
+      // case "4225D":
+      // case "4227D":
+      // case "4229D":
+      // case "4231D":
+      // case "4235D":
+      // case "4237D":
+      // case "4239D":
+      // case "4241D":
+      // case "4245D":
+      // case "4247D":
+      // case "4249D":
+      // case "4251D":
+      // case "4253D":
+      // case "4255D":
+      // case "4257D":
+      // case "4259D":
+      // case "4261D":
 
-      case "4710D":
-      case "4726D":
-      case "4730D":
-      case "4732D":
-      case "4734D":
-      case "4738D":
-      case "4740D":
-      case "4742D":
-      case "4744D":
-      case "4746D":
-      case "4752D":
-      case "4756D":
-      case "4762D":
-      case "4764D":
-      case "4766D":
+      // case "4710D":
+      // case "4726D":
+      // case "4730D":
+      // case "4732D":
+      // case "4734D":
+      // case "4738D":
+      // case "4740D":
+      // case "4742D":
+      // case "4744D":
+      // case "4746D":
+      // case "4752D":
+      // case "4756D":
+      // case "4762D":
+      // case "4764D":
+      // case "4766D":
 
-      case "4711D":
-      case "4713D":
-      case "4723D":
-      case "4725D":
-      case "4727D":
-      case "4729D":
-      case "4731D":
-      case "4737D":
-      case "4739D":
-      case "4745D":
-      case "4753D":
-      case "4755D":
-      case "4759D":
-      case "4761D":
-      case "4763D":
+      // case "4711D":
+      // case "4713D":
+      // case "4723D":
+      // case "4725D":
+      // case "4727D":
+      // case "4729D":
+      // case "4731D":
+      // case "4737D":
+      // case "4739D":
+      // case "4745D":
+      // case "4753D":
+      // case "4755D":
+      // case "4759D":
+      // case "4761D":
+      // case "4763D":
 
-      case "216D":
-      case "238D":
-      case "246D":
-      case "248D":
+      // case "216D":
+      // case "238D":
+      // case "246D":
+      // case "248D":
 
-      case "213D":
-      case "215D":
-      case "217D":
-      case "219D":
-      case "233D":
-      case "243D":
+      // case "213D":
+      // case "215D":
+      // case "217D":
+      // case "219D":
+      // case "233D":
+      // case "243D":
         
-      case "710D":
-      case "712D":
-      case "714D":
-      case "716D":
-      case "720D":
-      case "722D":
-      case "724D":
-      case "728D":
-      case "736D":
-      case "748D":
-      case "750D":
-      case "754D":
-      case "758D":
-      case "760D":
-      case "768D":
+      // case "710D":
+      // case "712D":
+      // case "714D":
+      // case "716D":
+      // case "720D":
+      // case "722D":
+      // case "724D":
+      // case "728D":
+      // case "736D":
+      // case "748D":
+      // case "750D":
+      // case "754D":
+      // case "758D":
+      // case "760D":
+      // case "768D":
 
-      case "717D":
-      case "719D":
-      case "721D":
-      case "733D":
-      case "735D":
-      case "737D":
-      case "741D":
-      case "743D":
-      case "747D":
-      case "749D":
-      case "751D":
-      case "755D":
-      case "757D":
-      case "761D":
+      // case "717D":
+      // case "719D":
+      // case "721D":
+      // case "733D":
+      // case "735D":
+      // case "737D":
+      // case "741D":
+      // case "743D":
+      // case "747D":
+      // case "749D":
+      // case "751D":
+      // case "755D":
+      // case "757D":
+      // case "761D":
         
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png');
-        break;
-      // 予讃線/土讃線普通列車運用(7000,7200)
-      // 下り列車(伊予西条-松山は全て7000系)
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png');
+      //   break;
+      // // 予讃線/土讃線普通列車運用(7000,7200)
+      // // 下り列車(伊予西条-松山は全て7000系)
 
-      case "5519M":
-      case "5525M":
-      case "5215M":
-      case "5103M":
-      case "107M":
-      case "1219M":
-      case "5109M":
-      case "6109M":
-      case "5531M":
-      case "1221M":
-      case "5225M":
-      case "5111M":
-      case "1227M":
-      case "115M":
-      case "5229M":
-      case "5117M":
-      case "5119M":
-      case "119M":
-      case "5231M":
-      case "4537M":
-      case "5233M":
-      case "123M":
-      case "125M":
-      case "5235M":
-      case "5239M":
-      case "5547M":
-      case "129M":
-      case "5241M":
-      case "5133M":
-      case "135M":
-      case "1243M":
-      case "137M":
-      case "5139M":
-      case "4559M":
-      case "1245M":
-      case "141M":
-      case "1247M":
-      case "5249M":
-      case "145M":
-      case "5253M":
-      case "5149M":
-      case "5255M":
-      case "151M":
-      case "5257M":
-      case "153M":
-      case "5259M":
-      case "155M":
-      case "1263M":
-      case "157M":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7200.png');
-        break;
-        // 下り7000系
-      case "101M":
-      case "4601M":
-      case "4113M":
-      case "121M":
-      case "127M":
-      case "131M":
-      case "555M":
-      case "4565M":
-      case "159M":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7000.png');
-        break;
-        // 上り列車 7200系
-      case "5102M":
-      case "104M":
-      case "5210M":
-      case "5108M":
-      case "4108M":
-      case "110M":
-      case "112M":
-      case "118M":
-      case "5218M":
-      case "5120M":
-      case "5220M":
-      case "5512M":
-      case "1602M":
-      case "1224M":
-      case "5124M":
-      case "5226M":
-      case "5126M":
-      case "5128M":
-      case "1230M":
-      case "4128M":
-      case "130M":
-      case "4522M":
-      case "5232M":
-      case "132M":
-      case "5234M":
-      case "136M":
-      case "5236M":
-      case "5140M":
-      case "5238M":
-      case "5240M":
-      case "142M":
-      case "4530M":
-      case "144M":
-      case "5242M":
-      case "146M":
-      case "5244M":
-      case "4148M":
-      case "1246M":
-      case "150M":
-      case "5538M":
-      case "5152M":
-      case "154M":
-      case "156M":
-      case "1252M":
-      case "158M":
-      case "4604M":
-      case "548M":
-      case "5254M":
-      case "1606M":
-      case "5160M":
-      case "5256M":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7200.png');
-        break;
-      // 上り7000系
-      case "114M":
-      case "122M":
-      case "134M":
-      case "4138M":
-      case "138M":
-      case "4542M":
-      case "162M":
-      case "4166M":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7000.png');
-        break;
-      // 松山界隈気動車運用
-      // 上り下りの概念アリ
-      // キハ32 通常運用
-      case "4625D":
-      case "4916D":
-      case "925D":
-      case "4618D":
-      case "4913D":
-      case "4918D":
-      case "4643D":
-      case "4654D":
-      case "4657D":
-      case "4928D":
-      case "4667D":
-      case "653D":
-      case "3621D":
-      case "4818D":
-      case "4821D":
-      case "4824D":
-      case "4813D":
-      case "4664D":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32s.png');
-        break;
-      // 河童うようよ号偶数
-      case "4816D":
-      case "4830D":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32kpuy2.png');
-        break;
-      // 河童うようよ号奇数
-      case "4827D":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32kpuy1.png');
-        break;
-      // 新幹線偶数
-      case "4810D":
-      case "4822D":
-      case "4826D":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32tht.png');
-        break;
-      // 新幹線奇数
-      case "4817D":
-      case "4823D":
-      case "4829D":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32thtk.png');
-        break;
-      // キハ54 通常運用
-      case "4632D":
-      case "4634D":
-      case "4921D":
-      case "4926D": 
-      case "4927D":
-      case "912D":
-      case "4917D":
-      case "4641D":
-      case "4652D":
-      case "4651D":
-      case "4666D":
-      case "4820D":
-      case "4825D":
-      case "4828D":
-      case "4811D":
-      case "4640D":
-      case "622D":
-      case "4633D":
-      case "4920D":
-      case "4637D":
-      case "4648D":
-      case "620D":
-      case "4627D":
-      case "4624D":
-      case "4915D":
-      case "4924D":
-      case "4649D":
-      case "4812D":
-      case "4815D":
-      case "4659D":
-      case "4658D":
-      case "4665D":
-      case "4914D":
-      case "4626D":
-      case "4631D":
-      case "4636D":
-      case "4919D":
-      case "4922D":
-      case "4923D":
-      case "4663D":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s54s.png');
-        break;
-      // 54しまんとろっこ
-      case "4623D":
-      case "8814D":
-      case "8819D":
-      case "4662D":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s54to0ys.png');
-        break;
-      // キハ185 通常運用
-      case "911D":
-      case "628D":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185cm.png');
-        break;
-      // 伊予灘ものがたり 赤
-      case "8091D":
-      case "8093D":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185iyor.png');
-        break;
-      // 伊予灘ものがたり 黄
-      case "8092D":
-      case "8094D":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185iyoy.png');
-        break;
-      // 高徳線、徳島線、牟岐線、鳴門線普通列車系統
-      // キハ40・47
-      case "4303D":
-      case "363D":
-      case "369D":
-      case "314D":
-      case "316D":
-      case "368D":
-      case "4382D":
-      case "951D":
-      case "953D":
-      case "955D":
-      case "973D":
-      case "975D":
-      case "977D":
-      case "979D":
-      case "981D":
-      case "950D":
-      case "968D":
-      case "970D":
-      case "972D":
-      case "974D":
-      case "976D":
-      case "980D":
-      case "982D":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s40.png');
-        break;
-      // 1000形
-      case "4309D":
-      case "4311D":
-      case "371D":
-      case "4318D":
-      case "358D":
-      case "4380D":
-      case "433D":
-      case "473D":
-      case "450D":
-      case "480D":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png');
-        break;
-      // 1200形
-      case "4301D":
-      case "4327D":
-      case "4329D":
-      case "4343D":
-      case "351D":
-      case "353D":
-      case "355D":
-      case "4355D":
-      case "4361D":
-      case "367D":
-      case "4330D":
-      case "4336D":
-      case "4346D":
-      case "360D":
-      case "362D":
-      case "4370D":
-      case "374D":
-      case "4378D":
-      case "451D":
-      case "4453D":
-      case "4455D":
-      case "4459D":
-      case "471D":
-      case "475D":
-      case "485D":
-      case "4430D":
-      case "434D":
-      case "438D":
-      case "4460D":
-      case "4466D":
-      case "4470D":
-      case "474D":
-      case "484D":
-      case "957D":
-      case "4959D":
-      case "4963D":
-      case "4967D":
-      case "4971D":
-      case "4983D":
-      case "952D":
-      case "4954D":
-      case "4958D":
-      case "4962D":
-      case "4966D":
-      case "4978D":
-        setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1200n.png');
-        break;
+      // case "5519M":
+      // case "5525M":
+      // case "5215M":
+      // case "5103M":
+      // case "107M":
+      // case "1219M":
+      // case "5109M":
+      // case "6109M":
+      // case "5531M":
+      // case "1221M":
+      // case "5225M":
+      // case "5111M":
+      // case "1227M":
+      // case "115M":
+      // case "5229M":
+      // case "5117M":
+      // case "5119M":
+      // case "119M":
+      // case "5231M":
+      // case "4537M":
+      // case "5233M":
+      // case "123M":
+      // case "125M":
+      // case "5235M":
+      // case "5239M":
+      // case "5547M":
+      // case "129M":
+      // case "5241M":
+      // case "5133M":
+      // case "135M":
+      // case "1243M":
+      // case "137M":
+      // case "5139M":
+      // case "4559M":
+      // case "1245M":
+      // case "141M":
+      // case "1247M":
+      // case "5249M":
+      // case "145M":
+      // case "5253M":
+      // case "5149M":
+      // case "5255M":
+      // case "151M":
+      // case "5257M":
+      // case "153M":
+      // case "5259M":
+      // case "155M":
+      // case "1263M":
+      // case "157M":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7200.png');
+      //   break;
+      //   // 下り7000系
+      // case "101M":
+      // case "4601M":
+      // case "4113M":
+      // case "121M":
+      // case "127M":
+      // case "131M":
+      // case "555M":
+      // case "4565M":
+      // case "159M":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7000.png');
+      //   break;
+      //   // 上り列車 7200系
+      // case "5102M":
+      // case "104M":
+      // case "5210M":
+      // case "5108M":
+      // case "4108M":
+      // case "110M":
+      // case "112M":
+      // case "118M":
+      // case "5218M":
+      // case "5120M":
+      // case "5220M":
+      // case "5512M":
+      // case "1602M":
+      // case "1224M":
+      // case "5124M":
+      // case "5226M":
+      // case "5126M":
+      // case "5128M":
+      // case "1230M":
+      // case "4128M":
+      // case "130M":
+      // case "4522M":
+      // case "5232M":
+      // case "132M":
+      // case "5234M":
+      // case "136M":
+      // case "5236M":
+      // case "5140M":
+      // case "5238M":
+      // case "5240M":
+      // case "142M":
+      // case "4530M":
+      // case "144M":
+      // case "5242M":
+      // case "146M":
+      // case "5244M":
+      // case "4148M":
+      // case "1246M":
+      // case "150M":
+      // case "5538M":
+      // case "5152M":
+      // case "154M":
+      // case "156M":
+      // case "1252M":
+      // case "158M":
+      // case "4604M":
+      // case "548M":
+      // case "5254M":
+      // case "1606M":
+      // case "5160M":
+      // case "5256M":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7200.png');
+      //   break;
+      // // 上り7000系
+      // case "114M":
+      // case "122M":
+      // case "134M":
+      // case "4138M":
+      // case "138M":
+      // case "4542M":
+      // case "162M":
+      // case "4166M":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7000.png');
+      //   break;
+      // // 松山界隈気動車運用
+      // // 上り下りの概念アリ
+      // // キハ32 通常運用
+      // case "4625D":
+      // case "4916D":
+      // case "925D":
+      // case "4618D":
+      // case "4913D":
+      // case "4918D":
+      // case "4643D":
+      // case "4654D":
+      // case "4657D":
+      // case "4928D":
+      // case "4667D":
+      // case "653D":
+      // case "3621D":
+      // case "4818D":
+      // case "4821D":
+      // case "4824D":
+      // case "4813D":
+      // case "4664D":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32s.png');
+      //   break;
+      // // 河童うようよ号偶数
+      // case "4816D":
+      // case "4830D":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32kpuy2.png');
+      //   break;
+      // // 河童うようよ号奇数
+      // case "4827D":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32kpuy1.png');
+      //   break;
+      // // 新幹線偶数
+      // case "4810D":
+      // case "4822D":
+      // case "4826D":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32tht.png');
+      //   break;
+      // // 新幹線奇数
+      // case "4817D":
+      // case "4823D":
+      // case "4829D":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32thtk.png');
+      //   break;
+      // // キハ54 通常運用
+      // case "4632D":
+      // case "4634D":
+      // case "4921D":
+      // case "4926D": 
+      // case "4927D":
+      // case "912D":
+      // case "4917D":
+      // case "4641D":
+      // case "4652D":
+      // case "4651D":
+      // case "4666D":
+      // case "4820D":
+      // case "4825D":
+      // case "4828D":
+      // case "4811D":
+      // case "4640D":
+      // case "622D":
+      // case "4633D":
+      // case "4920D":
+      // case "4637D":
+      // case "4648D":
+      // case "620D":
+      // case "4627D":
+      // case "4624D":
+      // case "4915D":
+      // case "4924D":
+      // case "4649D":
+      // case "4812D":
+      // case "4815D":
+      // case "4659D":
+      // case "4658D":
+      // case "4665D":
+      // case "4914D":
+      // case "4626D":
+      // case "4631D":
+      // case "4636D":
+      // case "4919D":
+      // case "4922D":
+      // case "4923D":
+      // case "4663D":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s54s.png');
+      //   break;
+      // // 54しまんとろっこ
+      // case "4623D":
+      // case "8814D":
+      // case "8819D":
+      // case "4662D":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s54to0ys.png');
+      //   break;
+      // // キハ185 通常運用
+      // case "911D":
+      // case "628D":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185cm.png');
+      //   break;
+      // // 伊予灘ものがたり 赤
+      // case "8091D":
+      // case "8093D":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185iyor.png');
+      //   break;
+      // // 伊予灘ものがたり 黄
+      // case "8092D":
+      // case "8094D":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s185iyoy.png');
+      //   break;
+      // // 高徳線、徳島線、牟岐線、鳴門線普通列車系統
+      // // キハ40・47
+      // case "4303D":
+      // case "363D":
+      // case "369D":
+      // case "314D":
+      // case "316D":
+      // case "368D":
+      // case "4382D":
+      // case "951D":
+      // case "953D":
+      // case "955D":
+      // case "973D":
+      // case "975D":
+      // case "977D":
+      // case "979D":
+      // case "981D":
+      // case "950D":
+      // case "968D":
+      // case "970D":
+      // case "972D":
+      // case "974D":
+      // case "976D":
+      // case "980D":
+      // case "982D":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s40.png');
+      //   break;
+      // // 1000形
+      // case "4309D":
+      // case "4311D":
+      // case "371D":
+      // case "4318D":
+      // case "358D":
+      // case "4380D":
+      // case "433D":
+      // case "473D":
+      // case "450D":
+      // case "480D":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png');
+      //   break;
+      // // 1200形
+      // case "4301D":
+      // case "4327D":
+      // case "4329D":
+      // case "4343D":
+      // case "351D":
+      // case "353D":
+      // case "355D":
+      // case "4355D":
+      // case "4361D":
+      // case "367D":
+      // case "4330D":
+      // case "4336D":
+      // case "4346D":
+      // case "360D":
+      // case "362D":
+      // case "4370D":
+      // case "374D":
+      // case "4378D":
+      // case "451D":
+      // case "4453D":
+      // case "4455D":
+      // case "4459D":
+      // case "471D":
+      // case "475D":
+      // case "485D":
+      // case "4430D":
+      // case "434D":
+      // case "438D":
+      // case "4460D":
+      // case "4466D":
+      // case "4470D":
+      // case "474D":
+      // case "484D":
+      // case "957D":
+      // case "4959D":
+      // case "4963D":
+      // case "4967D":
+      // case "4971D":
+      // case "4983D":
+      // case "952D":
+      // case "4954D":
+      // case "4958D":
+      // case "4962D":
+      // case "4966D":
+      // case "4978D":
+      //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1200n.png');
+      //   break;
 
         
-      default: //指定車両でなく、Regexでの指定に移動
-          // 琴平直通系普通電車  
-        if(new RegExp(/^(1|4|5)2\\d\\dM$/).test(列番データ)){
-          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7200.png');
-          break;
-        }
-        else if(new RegExp(/^(1|4|5)(1|5|6)\\d\\dM$/).test(列番データ)){
-          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7000.png');
-          break;
-        }
-        else if(new RegExp(/^(1|5|6)\\d\\dM$/).test(列番データ)){
-          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7000.png');
-          break;
-        }// 高徳線 普通列車系統
-        else if(new RegExp(/^(4|5)3\\d\\dD$/).test(列番データ)){
-          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
-          break;
-        }
-        else if(new RegExp(/^3\\d\\dD$/).test(列番データ)){
-          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
-          break;
-        }// 徳島線 普通列車系統
-        else if(new RegExp(/^(4|5)4\\d\\dD$/).test(列番データ)){
-          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
-          break;
-        }
-        else if(new RegExp(/^4\\d\\dD$/).test(列番データ)){
-          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
-          break;
-        }// 鳴門線普通列車系統
-        else if(new RegExp(/^(4|5)9(5|6|7|8)\\dD$/).test(列番データ)){
-          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
-          break;
-        }
-        else if(new RegExp(/^9(5|6|7|8)\\dD$/).test(列番データ)){
-          setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
-          break;
-        }
+      // default: //指定車両でなく、Regexでの指定に移動
+      //     // 琴平直通系普通電車  
+      //   if(new RegExp(/^(1|4|5)2\\d\\dM$/).test(列番データ)){
+      //     setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7200.png');
+      //     break;
+      //   }
+      //   else if(new RegExp(/^(1|4|5)(1|5|6)\\d\\dM$/).test(列番データ)){
+      //     setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7000.png');
+      //     break;
+      //   }
+      //   else if(new RegExp(/^(1|5|6)\\d\\dM$/).test(列番データ)){
+      //     setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7000.png');
+      //     break;
+      //   }// 高徳線 普通列車系統
+      //   else if(new RegExp(/^(4|5)3\\d\\dD$/).test(列番データ)){
+      //     setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
+      //     break;
+      //   }
+      //   else if(new RegExp(/^3\\d\\dD$/).test(列番データ)){
+      //     setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
+      //     break;
+      //   }// 徳島線 普通列車系統
+      //   else if(new RegExp(/^(4|5)4\\d\\dD$/).test(列番データ)){
+      //     setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
+      //     break;
+      //   }
+      //   else if(new RegExp(/^4\\d\\dD$/).test(列番データ)){
+      //     setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
+      //     break;
+      //   }// 鳴門線普通列車系統
+      //   else if(new RegExp(/^(4|5)9(5|6|7|8)\\dD$/).test(列番データ)){
+      //     setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
+      //     break;
+      //   }
+      //   else if(new RegExp(/^9(5|6|7|8)\\dD$/).test(列番データ)){
+      //     setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1500.png');
+      //     break;
+      //   }
         // 牟岐線普通列車系統 一旦閉鎖
         // else if(new RegExp(/^(4|5)5\\d\\dD$/).test(列番データ)){
         //   setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s7200.png');
@@ -1090,7 +1072,7 @@ export const injectJavascriptData: InjectJavascriptData = (
       const textBase = 列車名データ.split(":")[1].replace("\\r","");
       trainName = textBase;
     }
-    if(new RegExp(/^4[1-9]\\d\\d[DM]$/).test(列番データ) || new RegExp(/^5[1-7]\\d\\d[DM]$/).test(列番データ) || 列番データ ==="3621D"){
+    if(new RegExp(/^4[1-9]\\d\\d[DM]$/).test(列番データ) || new RegExp(/^5[1-7]\\d\\d[DM]$/).test(列番データ) || new RegExp(/^3[2-9]\\d\\d[DM]$/).test(TrainNumber) ){
       flag=true;
       isWanman = true;
     }
diff --git a/stateBox/useBusAndTrainData.js b/stateBox/useBusAndTrainData.js
index 3758419..e66d9f4 100644
--- a/stateBox/useBusAndTrainData.js
+++ b/stateBox/useBusAndTrainData.js
@@ -37,20 +37,12 @@ export const BusAndTrainDataProvider = ({ children }) => {
       });
   }, []);
   useEffect(() => {
-    AS.getItem("trainPairData202503")
+    fetch(
+      "https://script.google.com/macros/s/AKfycbyoBH7_rBwzPmhU1ghRBNTAVuvGltIrZtWxE07gDdhGGlDL9Ip2qk3pFM5u2xtRBl8/exec"
+    )
+      .then((d) => d.json())
       .then((d) => {
-        const returnData = JSON.parse(d);
-        setTrainPairData(returnData);
-      })
-      .catch(() => {
-        fetch(
-          "https://script.google.com/macros/s/AKfycbyoBH7_rBwzPmhU1ghRBNTAVuvGltIrZtWxE07gDdhGGlDL9Ip2qk3pFM5u2xtRBl8/exec"
-        )
-          .then((d) => d.json())
-          .then((d) => {
-            setTrainPairData(d);
-            AS.setItem("trainPairData202503", JSON.stringify(d));
-          });
+        setTrainPairData(d);
       });
   }, []);
   const initializeTrainPairList = () => {
@@ -304,7 +296,7 @@ export const BusAndTrainDataProvider = ({ children }) => {
     }
 
     if (!returnArray.length) return [];
-    const TDArray = returnArray.map((d) => {
+    const TDArray = returnArray.filter(d => trainList.hasOwnProperty(d)).map((d) => {
       const TD = trainList[d];
       if (!TD) return;
       return { id: d, TrainData: TD.split("#").filter((d) => d != "") };
diff --git a/stateBox/useTrainMenu.js b/stateBox/useTrainMenu.js
index 67a3f78..8fcf424 100644
--- a/stateBox/useTrainMenu.js
+++ b/stateBox/useTrainMenu.js
@@ -65,7 +65,7 @@ export const TrainMenuProvider = ({ children }) => {
   //地図表示テキスト
   const injectJavascript = injectJavascriptData(
     mapSwitch,
-    "false",//iconSetting,
+    iconSetting,
     stationMenu,
     trainMenu
   );