diff --git a/lib/webViewInjectjavascript.ts b/lib/webViewInjectjavascript.ts
index 3e37195..38ea7e1 100644
--- a/lib/webViewInjectjavascript.ts
+++ b/lib/webViewInjectjavascript.ts
@@ -1068,59 +1068,89 @@ export const injectJavascriptData: InjectJavascriptData = (
 
   const normal_train_name = `
   const nameReplace = (列車名データ,列番データ,行き先情報) =>{
+    let isWanman = false;
+    let trainName = "";
+    let viaData = "";
+    let ToData = "";
+    let TrainNumber = 列番データ;
+    
+    if(列車名データ.split(":")[1]){
+      const textBase = 列車名データ.split(":")[1].replace("\\r","");
+      
+      trainName = textBase;
+    }
     if(列車名データ.match("サンポート")){
-      const textBase = 列車名データ.split(":")[1];
+      const textBase = 列車名データ.split(":")[1].replace("\\r","");
       行き先情報.innerText = textBase+行き先情報.innerText;
+      trainName = textBase;
     }
     if(new RegExp(/^4[1-9]\\d\\d[DM]$/).test(列番データ) || new RegExp(/^5[1-7]\\d\\d[DM]$/).test(列番データ) || 列番データ ==="3621D"){
       行き先情報.innerText = "ワンマン\\n"+行き先情報.innerText;
       flag=true;
+      isWanman = true;
     }
     if(new RegExp(/^49[0-4]\\dD$/).test(列番データ) || new RegExp(/^9[0-4]\\dD$/).test(列番データ)){
       行き先情報.innerText = "(海経由)"+(flag ? "" : "\\n")+行き先情報.innerText;
+      viaData = "(海経由)";
     }
     if(new RegExp(/^46\\d\\dD$/).test(列番データ) || new RegExp(/^6\\d\\dD$/).test(列番データ)){
       行き先情報.innerText = "(内子経由)"+(flag ? "" : "\\n")+行き先情報.innerText;
+      viaData = "(内子経由)";
     }
     if(列番データ.indexOf("H") != -1){
       行き先情報.innerText = 行き先情報.innerText+"試運転\\n";
+      trainName = "試運転";
     }
     else if(列番データ.indexOf("R") != -1){
       行き先情報.innerText = 行き先情報.innerText+"回送\\n";
+      trainName = "回送";
     }
     else if(列番データ.indexOf("S") != -1){
       行き先情報.innerText = 行き先情報.innerText+"臨時列車\\n";
+      trainName = "臨時列車";
     }
 
     let JRF = false;
     const getJRF = num =>{
       switch(num){
         case "71":
+          trainName = "東京(タ)→高松(タ)";
           return "東京(タ)→高松(タ)"+"\\n";
         case "73":
         case "75":
+          trainName = "大阪(タ)→高松(タ)";
           return "大阪(タ)→高松(タ)"+"\\n";
         case "3079":
+          trainName = "高松(タ)→伊予三島";
           return "高松(タ)→伊予三島"+"\\n";
         case "3071":
         case "3077":
+          trainName = "高松(タ)→新居浜";
           return "高松(タ)→新居浜"+"\\n";
         case "3073":
+          trainName = "高松(タ)→松山貨物";
           return "高松(タ)→松山貨物"+"\\n";
         case "70":
+          trainName = "高松(タ)→東京(タ)";
           return "高松(タ)→東京(タ)"+"\\n";
         case "74":
         case "76":
+          trainName = "高松(タ)→大阪(タ)";
           return "高松(タ)→大阪(タ)"+"\\n";
         case "3078":
+          trainName = "伊予三島→高松(タ)";
           return "伊予三島→高松(タ)"+"\\n";
         case "3070":
+          trainName = "新居浜→高松(タ)";
           return "新居浜→高松(タ)"+"\\n";
         case "3076":
+          trainName = "新居浜→高松(タ)";
           return "新居浜→高松(タ)"+"\\n";
         case "3072":
+          trainName = "松山貨物→高松(タ)";
           return "松山貨物→高松(タ)"+"\\n";
         case "9070":
+          trainName = "臨時貨物";
           return "臨時貨物"+"\\n";
         default:
           JRF = true;
@@ -1137,58 +1167,88 @@ export const injectJavascriptData: InjectJavascriptData = (
       case "351D":
       case "468D":
       case "484D":
+        viaData = "牟岐線直通";
+        ToData = "牟岐";
         return "牟岐線直通\\n牟岐行";
       case "951D":
+        viaData = "牟岐線直通";
+        ToData = "桑野";
         return "牟岐線直通\\n桑野行";
       case "4430D":
       case "4472D":
+        viaData = "牟岐線直通";
+        isWanman = true;
+        ToData = "牟岐";
         return "牟岐線直通\\nワンマン 牟岐行";
       case "434D":
       case "474D":
       case "478D":
       case "480D":
+        viaData = "牟岐線直通";
+        ToData = "阿南";
         return "牟岐線直通\\n阿南行";
       case "5444D":
       case "4452D":
       case "4458D":
       case "4460D":
       case "4466D":
+        viaData = "牟岐線直通";
+        isWanman = true;
+        ToData = "阿南";
         return "牟岐線直通\\nワンマン 阿南行";
       case "4464D":
+        viaData = "牟岐線直通";
+        isWanman = true;
+        ToData = "阿波海南"
         return "牟岐線直通\\nワンマン 阿波海南行";
       
       //安芸行と併結列車を個別に表示、それ以外をdefaultで下りなら既定の行き先を、上りなら奈半利行を設定
-        case "5814D":
-        case "5816D":
+      case "5814D":
+      case "5816D":
+        viaData = "ごめん・なはり線[快速]";
+        ToData = "奈半利";
+        return "ごめん・なはり線直通\\n快速 奈半利行";
+      case "5812D":
+        viaData = "ごめん・なはり線[快速]";
+        ToData = "安芸";
+        return "ごめん・なはり線直通\\n快速 安芸行";
+      case "5874D":
+      case "5882D":
+      case "5878D":
+        viaData = "ごめん・なはり線[各停]";
+        ToData = "安芸";
+        return "ごめん・なはり線直通\\n各停 安芸行";
+      case "246D":
+      case "750D":
+        viaData = "ごめん・なはり線[快速]";
+        ToData = "(後免にて解結)土佐山田/奈半利";
+        return "土佐山田/奈半利行\\n(後免にて解結)\\nごめん・なはり線快速";
+      default:
+        if(new RegExp(/^58[1-3][1,3,5,7,9][DM]$/).test(列番データ)){
+          viaData = "ごめん・なはり線[快速]";
+          return "ごめん・なはり線直通\\n快速 "+行き先情報.innerText;
+        }
+        else if(new RegExp(/^58[4-9][1,3,5,7,9][DM]$/).test(列番データ)){
+          viaData = "ごめん・なはり線[各停]";
+          return "ごめん・なはり線直通\\n各停 "+行き先情報.innerText;
+        }
+        else if(new RegExp(/^58[3-4][0,2,4,6,8][DM]$/).test(列番データ)){
+          viaData = "ごめん・なはり線[快速]";
+          ToData = "奈半利";
           return "ごめん・なはり線直通\\n快速 奈半利行";
-        case "5812D":
-          return "ごめん・なはり線直通\\n快速 安芸行";
-        case "5874D":
-        case "5882D":
-        case "5878D":
-          return "ごめん・なはり線直通\\n各停 安芸行";
-        case "246D":
-        case "750D":
-          return "土佐山田/奈半利行\\n(後免にて解結)\\nごめん・なはり線快速";
-        default:
-          if(new RegExp(/^58[1-3][1,3,5,7,9][DM]$/).test(列番データ)){
-            return "ごめん・なはり線直通\\n快速 "+行き先情報.innerText;
-          }
-          else if(new RegExp(/^58[4-9][1,3,5,7,9][DM]$/).test(列番データ)){
-            return "ごめん・なはり線直通\\n各停 "+行き先情報.innerText;
-          }
-          else if(new RegExp(/^58[3-4][0,2,4,6,8][DM]$/).test(列番データ)){
-            return "ごめん・なはり線直通\\n快速 奈半利行";
-          }
-          else if(new RegExp(/^58[5-9][0,2,4,6,8][DM]$/).test(列番データ)){
-            return "ごめん・なはり線直通\\n各停 奈半利行";
-          }
+        }
+        else if(new RegExp(/^58[5-9][0,2,4,6,8][DM]$/).test(列番データ)){
+          viaData = "ごめん・なはり線[各停]";
+          ToData = "奈半利";
+          return "ごめん・なはり線直通\\n各停 奈半利行";
         }
       }
-      行き先情報.innerText = getThrew(列番データ) || 行き先情報.innerText;
-      //列番付与
-      行き先情報.innerText = 行き先情報.innerText+列番データ+(JRF ? "":"レ");
     }
+    行き先情報.innerText = getThrew(列番データ) || 行き先情報.innerText;
+    //列番付与
+    行き先情報.innerText = 行き先情報.innerText+列番データ+(JRF ? "":"レ");
+    const returnText = (isWanman ? "ワンマン" : "") + trainName + viaData + "\\n" + ToData + TrainNumber;
+  }
   `;
 
   const textInsert =