diff --git a/app/js/common/version.js b/app/js/common/version.js
index c25fc035..b45088be 100644
--- a/app/js/common/version.js
+++ b/app/js/common/version.js
@@ -190,7 +190,7 @@ function verck(ver) {
 					}
 				}
 				if(show){
-					Materialize.toast(obj.Text+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
+					Materialize.toast(escapeHTML(obj.Text)+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
 				}
 			}
 			
@@ -211,9 +211,6 @@ function infowebsocket(){
 		console.log(JSON.parse(mess.data));
 		var obj=JSON.parse(mess.data);
 		if(obj.type!="counter"){
-		if(obj.id*1<=localStorage.getItem("last-notice-id")){
-			
-		}else{
 			localStorage.setItem("last-notice-id",obj.id)
 			var show=true;
 			if(obj.toot!=""){
@@ -242,9 +239,8 @@ function infowebsocket(){
 				}
 			}
 			if(show){
-				Materialize.toast(obj.text+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
+				Materialize.toast(escapeHTML(obj.Text)+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
 			}
-		}
 	}else{
 		$("#persons").text(obj.text);
 	}
diff --git a/app/js/lang/lang.en.js b/app/js/lang/lang.en.js
index bab2f536..2b4baef2 100644
--- a/app/js/lang/lang.en.js
+++ b/app/js/lang/lang.en.js
@@ -189,7 +189,7 @@ var lang={
     "lang_parse_clientmute":"muted",
     "lang_parse_mute":" will be muted. You can remove on preferences.",
     "lang_parse_voted":"Voted",
-    "lang_parse_vote":"Voted",
+    "lang_parse_vote":"Vote",
     "lang_parse_unvoted":"Show the result without voting",
     "lang_parse_endedvote":"Expired",
     "lang_parse_thread":"Show thread",
diff --git a/app/js/login/manager.js b/app/js/login/manager.js
index efaf09b2..6c17a406 100644
--- a/app/js/login/manager.js
+++ b/app/js/login/manager.js
@@ -542,7 +542,7 @@ function getdata(domain, at) {
 		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
-			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error,
+			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + escapeHTML(json.error),
 				5000);
 			return;
 		}
@@ -817,7 +817,7 @@ input.addEventListener("focus", function() {
 						Object.keys(json.instances).forEach(function(key) {
 							var url = json.instances[key];
 							urls = urls + '　<a onclick="login(\'' + url.name +
-								'\')" class="pointer">' + url.name + '</a>  ';
+								'\')" class="pointer">' +escapeHTML(url.name)  + '</a>  ';
 						});
 						$("#ins-suggest").html(urls);
 					}
diff --git a/app/js/platform/first.js b/app/js/platform/first.js
index a95edd06..4f1525d4 100644
--- a/app/js/platform/first.js
+++ b/app/js/platform/first.js
@@ -62,7 +62,7 @@ function formattime(date){
 	}else{
 		str=str+date.getMinutes()
 	}
-	return str;
+	return escapeHTML(str);
 }
 function formattimeutc(date){
 	var str=date.getUTCFullYear()+"-";
@@ -87,7 +87,7 @@ function formattimeutc(date){
 	}else{
 		str=str+date.getUTCMinutes()
 	}
-	return str;
+	return escapeHTML(str);
 }
 var electron = require("electron");
 var ipc = electron.ipcRenderer;
diff --git a/app/js/post/emoji.js b/app/js/post/emoji.js
index 5f571c46..19038798 100644
--- a/app/js/post/emoji.js
+++ b/app/js/post/emoji.js
@@ -35,7 +35,7 @@ function emojiToggle(reaction) {
 
 //絵文字リスト挿入
 function emojiGet(parse, started) {
-	$('#emoji-list').html('Loading...');
+	$('#emoji-list').text('Loading...');
 	var acct_id = $("#post-acct-sel").val();
 	var domain = localStorage.getItem("domain_" + acct_id);
 	if (localStorage.getItem("mode_" + domain) != "misskey") {
@@ -52,7 +52,7 @@ function emojiGet(parse, started) {
 			console.error(error);
 		}).then(function (json) {
 			if (parse == "true") {
-				$('#emoji-list').html('Parsing...');
+				$('#emoji-list').text('Parsing...');
 				//絵文字をマストドン公式と同順にソート
 				json.sort(function (a, b) {
 					if (a.shortcode < b.shortcode) return -1;
@@ -96,7 +96,7 @@ function emojiGet(parse, started) {
 				})
 			});
 			if (parse == "true") {
-				$('#emoji-list').html('Parsing...');
+				$('#emoji-list').text('Parsing...');
 				//絵文字をマストドン公式と同順にソート
 				md.sort(function (a, b) {
 					if (a.shortcode < b.shortcode) return -1;
diff --git a/app/js/post/misskeystatus.js b/app/js/post/misskeystatus.js
index 84366e83..ef78f07f 100644
--- a/app/js/post/misskeystatus.js
+++ b/app/js/post/misskeystatus.js
@@ -234,7 +234,7 @@ function voterefresh(acct_id,id){
                     }else{
                            var myvote="";
                     }
-                    poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+json.id+'\','+choice.id+')">'+choice.text+'('+choice.votes+''+myvote+')</div>';
+                    poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+json.id+'\','+choice.id+')">'+escapeHTML(choice.text)+'('+choice.votes+''+myvote+')</div>';
                 });
                 $(".vote_"+json.id).html(poll)
 		    }
diff --git a/app/js/post/post.js b/app/js/post/post.js
index e6a47ee1..c1b1a34f 100644
--- a/app/js/post/post.js
+++ b/app/js/post/post.js
@@ -298,7 +298,7 @@ function clear() {
 	$("#post-acct-sel").prop("disabled", false);
 	$("#days_poll").val(0);
   $("#hours_poll").val(0);
-	$("#mins_poll").val(0);
+	$("#mins_poll").val(6);
 	$(".mastodon-choice").map(function() {
 		$(this).val("");
 	});
diff --git a/app/js/post/suggest.js b/app/js/post/suggest.js
index fcd502e0..ba5a9188 100644
--- a/app/js/post/suggest.js
+++ b/app/js/post/suggest.js
@@ -169,7 +169,7 @@ function cgNPs(q){
 						var tags = "";
 						Object.keys(json).forEach(function(key4) {
 							var tag = json[key4];
-							tags = tags + '<a onclick="cgNP(\''+json[key4]+'\')" class="pointer">' + json[key4] + '</a>  ';
+							tags = tags + '<a onclick="cgNP(\''+json[key4]+'\')" class="pointer">' + escapeHTML(json[key4]) + '</a>  ';
 						});
 						$("#suggest").html("Cinderella NowPlaying:" + tags);
 					}else{
diff --git a/app/js/tl/card.js b/app/js/tl/card.js
index b6c1395e..1b638c14 100644
--- a/app/js/tl/card.js
+++ b/app/js/tl/card.js
@@ -63,8 +63,8 @@ function additional(acct_id, tlid) {
 				}).then(function(json) {
 					if (json.title) {
 						$("[toot-id=" + id + "] .additional").html(
-							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + json.title + "<br>" +
-							json.description + "</span>");
+							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + escapeHTML(json.title) + "<br>" +
+							escapeHTML(json.description) + "</span>");
 						$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
 						$("[toot-id=" + id + "]").addClass("parsed");
 					}
@@ -148,8 +148,8 @@ function additionalIndv(tlid, acct_id, id) {
 				}).then(function(json) {
 					if (json.title) {
 						$("[toot-id=" + id + "] .additional").html(
-							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + json.title + "<br>" +
-							json.description + "</span>");
+							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + escapeHTML(json.title) + "<br>" +
+							escapeHTML(json.description) + "</span>");
 						$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
 						$("[toot-id=" + id + "]").addClass("parsed");
 					}
diff --git a/app/js/tl/dm.js b/app/js/tl/dm.js
index c434c1ef..657b0d3a 100644
--- a/app/js/tl/dm.js
+++ b/app/js/tl/dm.js
@@ -251,7 +251,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			var via = '';
 			viashow="hide";
 		} else {
-			var via = toot.application.name;
+			var via = escapeHTML(toot.application.name);
 			//強調チェック
 			Object.keys(emp).forEach(function(key6) {
 				var cli = emp[key6];
@@ -432,7 +432,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				if(word){
 					var word=word.tag;
 					var regExp = new RegExp( word, "g" ) ;
-					content=content.replace(regExp,'<span class="emp">'+word+"</span>");
+					content=content.replace(regExp,'<span class="emp">'+escapeHTML(word)+"</span>");
 				}
 			});
 		}
@@ -483,7 +483,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			for( var i=0; i<tickerdata.length; i++) {
 				var value=tickerdata[i];
 				if(value.domain==thisdomain){
-					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
+					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+escapeHTML(value.name)+'</span></div>';
 					break;
 				}
 		   }
diff --git a/app/js/tl/list.js b/app/js/tl/list.js
index 73be7ce7..109dee45 100644
--- a/app/js/tl/list.js
+++ b/app/js/tl/list.js
@@ -30,7 +30,7 @@ function list(){
 				var lists = "";
 				Object.keys(json).forEach(function(key) {
 					var list = json[key];
-					lists = lists + list.title+':<a onclick="listShow(\'' + list.id + '\',\'' + list.title + '\',\'' + acct_id +
+					lists = lists + escapeHTML(list.title)+':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
 						'\')" class="pointer">'+lang.lang_list_show+'</a><br>';
 				});
 				$("#lists").html(lists);
@@ -57,7 +57,7 @@ function list(){
 				var lists = "";
 				Object.keys(json).forEach(function(key) {
 					var list = json[key];
-					lists = lists + list.title+':<a onclick="listShow(\'' + list.id + '\',\'' + list.title + '\',\'' + acct_id +
+					lists = lists + escapeHTML(list.title)+':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
 						'\')" class="pointer">'+lang.lang_list_show+'</a>/<a onclick="listUser(\'' + list.id + '\',' + acct_id +
 						')" class="pointer">'+lang.lang_list_users+'</a><br>';
 				});
@@ -193,7 +193,7 @@ function hisList(user,acct_id){
 			Object.keys(json).forEach(function(key) {
                 var list = json[key];
 				lists = lists + '<a onclick="listRemove(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
-					'\')" class="pointer">'+list.title+'</a><br> ';
+					'\')" class="pointer">'+escapeHTML(list.title)+'</a><br> ';
 			});
 			$("#his-lists-b").html(lists);
 		}else{
@@ -217,7 +217,7 @@ function hisList(user,acct_id){
 				var lists = "";
 				Object.keys(json).forEach(function(key) {
 					var list = json[key];
-					lists = lists + list.title+':<a onclick="listShow(\'' + list.id + '\',\'' + list.title + '\',\'' + acct_id +
+					lists = lists + list.title+':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
 						'\')" class="pointer">'+lang.lang_list_show+'</a>/<a onclick="listAdd(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
 						'\')" class="pointer">'+lang.lang_list_add+lang.lang_list_add_misskey+'</a><br>';
 				});
diff --git a/app/js/tl/misskeyparse.js b/app/js/tl/misskeyparse.js
index 761e4d96..2d6caeba 100644
--- a/app/js/tl/misskeyparse.js
+++ b/app/js/tl/misskeyparse.js
@@ -286,7 +286,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			}
 			var if_notf='data-notfIndv="'+acct_id+"_"+toot.id+'"';
 			var toot = toot.note;
-			var dis_name=escapeHTMLtemp(toot.user.name);
+			var dis_name=escapeHTML(toot.user.name);
 		}else{
 			var if_notf="";
 			if (toot.renote) {
@@ -299,7 +299,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				if(!toot.text){
 					var toot = toot.renote;
 				}
-				var dis_name=escapeHTMLtemp(toot.user.name);
+				var dis_name=escapeHTML(toot.user.name);
 			    var uniqueid=toot.id;
 				var actemojick=false
 			} else {
@@ -342,7 +342,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
             if(toot.viaMobile){
                 var via = '<span style="font-style: italic;">Mobile</span>';
             }else{
-                var via = '<span style="font-style: italic;">Unknown</span>';
+                var via = '';
             }
 		} else {
 			var via = toot.app.name;
@@ -362,7 +362,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			});
 		}
 		if ((toot.cw || toot.cw=="") && cw) {
-			var content = toot.text;
+			var content = escapeHTML(toot.text);
 			var spoil = escapeHTMLtemp(toot.cw);
 			var spoiler = "cw cw_hide_" + toot.id;
 			var api_spoil = "gray";
@@ -618,7 +618,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			for( var i=0; i<tickerdata.length; i++) {
 				var value=tickerdata[i];
 				if(value.domain==thisdomain){
-					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
+					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+escapeHTML(value.name)+'</span></div>';
 					break;
 				}
 		   }
@@ -634,7 +634,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				}else{
 					var myvote="";
 				}
-				poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+toot.id+'\','+choice.id+')">'+choice.text+'('+choice.votes+''+myvote+')</div>';
+				poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+toot.id+'\','+choice.id+')">'+escapeHTML(choice.text)+'('+choice.votes+''+myvote+')</div>';
 			});
 			poll='<div class="vote_'+toot.id+'">'+poll+'</div>';
 		}
@@ -841,7 +841,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			acct_id +
 			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_redraft+'"><i class="material-icons">redo</i></a></div>'+trans+
 			'<span class="cbadge viabadge waves-effect '+viashow+' '+mine_via+'" onclick="client(\''+$.strip_tagstemp(via)+'\')" title="via ' + $.strip_tagstemp(via) + '">via ' +
-			via +
+			escapeHTML(via) +
 			'</span>'+
 			'</div><div class="area-side '+mouseover+'"><div class="action ' + if_mine + ' '+noauth+'"><a onclick="toggleAction(\'' + toot.id + '\',\''+tlid+'\',\''+acct_id+'\')" class="waves-effect waves-dark btn-flat" style="padding:0"><i class="text-darken-3 material-icons act-icon">expand_more</i></a></div>' +
 			'<div class="action '+noauth+'"><a onclick="details(\'' + toot.id + '\',' + acct_id +
@@ -917,7 +917,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 				var dis_name=escapeHTMLtemp(toot.name);
 				dis_name=twemoji.parse(dis_name);
 			}else{
-				var dis_name=toot.name;
+				var dis_name=toot.username;
 			}
 		templete = templete +
 			'<div class="cvo" style="padding-top:5px;" user-id="' + toot.id + '"><div class="area-notice">' +
diff --git a/app/js/tl/mix.js b/app/js/tl/mix.js
index 06e23787..7b2ea0e0 100644
--- a/app/js/tl/mix.js
+++ b/app/js/tl/mix.js
@@ -94,12 +94,14 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 	websocketLocal[wslid] = new WebSocket(startLocal);
 	websocketHome[wshid].onopen = function(mess) {
 		localStorage.setItem("wssH_" + tlid, wshid);
-		console.log("Connect Streaming API(Integrated:Home)");
+		console.log(tlid + ":Connect Streaming API(Integrated:Home)");
+		console.log(mess);
 		$("#notice_icon_" + tlid).removeClass("red-text");
 	}
 	websocketLocal[wslid].onopen = function(mess) {
 		localStorage.setItem("wssL_" + tlid, wslid);
-		console.log("Connect Streaming API(Integrated:Local)");
+		console.log(tlid + ":Connect Streaming API(Integrated:Local)");
+		console.log(mess);
 		$("#notice_icon_" + tlid).removeClass("red-text");
 	}
 	websocketLocal[wslid].onmessage = function(mess) {
@@ -195,39 +197,57 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 		}
 	}
 	websocketLocal[wslid].onerror = function(error) {
-		console.error('WebSocket Error ' + error);
+		console.error('WebSocketLocal Error')
+		console.error(error);
 		if(mode=="error"){
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Error ' + error);
 		}else{
-			reconnector(tlid,TLtype,acct_id,"","error");
+			var errorct=localStorage.getItem("wserror_" + tlid)*1+1;
+			localStorage.setItem("wserror_" + tlid,errorct);
+			if(errorct<3){
+				reconnector(tlid,TLtype,acct_id,"","error");
+			}
 		}
 	};
 	websocketLocal[wslid].onclose = function() {
-		console.error('WebSocketLocal Closing by error:' + tlid);
+		console.log('WebSocketLocal Closing:' + tlid);
 		if(mode=="error"){
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Closed');
 		}else{
-			reconnector(tlid,TLtype,acct_id,"","error");
+			var errorct=localStorage.getItem("wserror_" + tlid)*1+1;
+			localStorage.setItem("wserror_" + tlid,errorct);
+			if(errorct<3){
+				reconnector(tlid,TLtype,acct_id,"","error");
+			}
 		}
 	};
 	websocketHome[wshid].onerror = function(error) {
-		console.error('WebSocket Error ' + error);
+		console.error('WebSocketHome Error')
+		console.error(error);
 		if(mode=="error"){
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Error ' + error);
 		}else{
-			reconnector(tlid,TLtype,acct_id,"","error");
+			var errorct=localStorage.getItem("wserror_" + tlid)*1+1;
+			localStorage.setItem("wserror_" + tlid,errorct);
+			if(errorct<3){
+				reconnector(tlid,TLtype,acct_id,"","error");
+			}
 		}
 	};
 	websocketHome[wshid].onclose = function() {
-		console.error('WebSocketHome Closing by error:' + tlid);
+		console.log('WebSocketHome Closing:' + tlid);
 		if(mode=="error"){
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Closed');
 		}else{
-			reconnector(tlid,TLtype,acct_id,"","error");
+			var errorct=localStorage.getItem("wserror_" + tlid)*1+1;
+			localStorage.setItem("wserror_" + tlid,errorct);
+			if(errorct<3){
+				reconnector(tlid,TLtype,acct_id,"","error");
+			}
 		}
 		
 	};
diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js
index 8d42b599..a41406eb 100644
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -252,18 +252,27 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						localStorage.setItem("notf-reply_" + acct_id,replyct*1-(-1))
 						$(".notf-reply_" + acct_id).removeClass("hide")
 						var sound=localStorage.getItem("replySound");
+						if(sound=="default"){
+							var file="../../source/notif3.wav"
+						}
 					}else if (toot.type == "reblog") {
 						var btct=localStorage.getItem("notf-bt_" + acct_id)
 						$(".notf-bt_" + acct_id).text(btct*1-(-1));
 						localStorage.setItem("notf-bt_" + acct_id,btct*1-(-1))
 						$(".notf-bt_" + acct_id).removeClass("hide")
 						var sound=localStorage.getItem("btSound");
+						if(sound=="default"){
+							var file="../../source/notif2.wav"
+						}
 					}else if (toot.type == "favourite") {
 						var favct=localStorage.getItem("notf-fav_" + acct_id)
 						$(".notf-fav_" + acct_id).text(favct*1-(-1));
 						localStorage.setItem("notf-fav_" + acct_id,favct*1-(-1))
 						$(".notf-fav_" + acct_id).removeClass("hide")
 						var sound=localStorage.getItem("favSound");
+						if(sound=="default"){
+							var file="../../source/notif.wav"
+						}
 					}
 				}
 				
@@ -272,9 +281,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					Materialize.toast("["+domain+"]"+escapeHTML(toot.account.display_name)+what, popup * 1000);
 				}
 				//通知音
-				if(sound=="default" || !sound){
-					var file="../../source/notif.wav"
-				}else if(sound=="c1"){
+				if(sound=="c1"){
 					var file=localStorage.getItem("custom1");
 				}else if(sound=="c2"){
 					var file=localStorage.getItem("custom2");
@@ -482,7 +489,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var myvote=lang.lang_parse_voted;
 				var result_hide="";
 			}else{
-				myvote='<a onclick="voteMastodon(\''+acct_id+'\',\''+toot.poll.id+'\')" class="votebtn">'+lang.lang_parse_vote+'</a><br>';
+				var myvote='<a onclick="voteMastodon(\''+acct_id+'\',\''+toot.poll.id+'\')" class="votebtn">'+lang.lang_parse_vote+'</a><br>';
 				if(choices[0].votes_count===0 || choices[0].votes_count>0){
 					myvote=myvote+'<a onclick="showResult(\''+acct_id+'\',\''+toot.poll.id+'\')" class="pointer">'+lang.lang_parse_unvoted+"</a>";
 				}
@@ -759,7 +766,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			for( var i=0; i<tickerdata.length; i++) {
 				var value=tickerdata[i];
 				if(value.domain==thisdomain){
-					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img draggable="false" src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
+					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img draggable="false" src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+escapeHTML(value.name)+'</span></div>';
 					break;
 				}
 		   }
@@ -791,8 +798,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			'</div></div>' +
 			'<div class="area-toot">'+tickerdom+'<span class="' +
 			api_spoil + ' cw_text_' + toot.id + '"><span class="cw_text">' + spoil + "</span>" + spoiler_show +
-			'</span><span class="toot ' + spoiler + '">' + content +poll+
-			'</span>' +
+			'</span><span class="toot ' + spoiler + '">' + content +
+			'</span>' + poll +
 			'' + viewer + '' +
 			'</div><div class="area-additional"><span class="additional">' + analyze +
 			'</span>' +
@@ -822,7 +829,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			'</a></span></div>' +
 			'<div class="' + if_mine + ' action '+disp["del"]+' '+noauth+'"><a onclick="del(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="far fa-trash"></i></a></div>' +
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="fas fa-trash"></i></a></div>' +
 			'<div class="' + if_mine + ' action pin '+disp["pin"]+' '+noauth+'"><a onclick="pin(\'' + toot.id + '\',' +
 			acct_id +
 			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fas fa-map-pin pin_' + toot.id + ' '+if_pin+'"></i></a></div>' 
@@ -993,7 +1000,7 @@ function client(name) {
 			if(!obj){
 				var obj=[];
 				obj.push(name);
-				Materialize.toast(name+lang.lang_status_emphas, 2000);
+				Materialize.toast(escapeHTML(name)+lang.lang_status_emphas, 2000);
 			}else{
 			var can;
 			Object.keys(obj).forEach(function(key) {
@@ -1003,12 +1010,12 @@ function client(name) {
 				}else{
 					can=true;
 					obj.splice(key, 1);
-					Materialize.toast(name+lang.lang_status_unemphas, 2000);
+					Materialize.toast(escapeHTML(name)+lang.lang_status_unemphas, 2000);
 				}
 			});
 			if(!can){
 				obj.push(name);
-				Materialize.toast(name+lang.lang_status_emphas, 2000);
+				Materialize.toast(escapeHTML(name)+lang.lang_status_emphas, 2000);
 			}else{
 				
 			}
@@ -1024,7 +1031,7 @@ function client(name) {
 			obj.push(name);
 			var json = JSON.stringify(obj);
 			localStorage.setItem("client_mute", json);
-			Materialize.toast(name+lang.lang_parse_mute, 2000);
+			Materialize.toast(escapeHTML(name)+lang.lang_parse_mute, 2000);
 		}else{
 			return;
 		}
diff --git a/app/js/tl/src.js b/app/js/tl/src.js
index 7f6bcbb6..f788afe7 100644
--- a/app/js/tl/src.js
+++ b/app/js/tl/src.js
@@ -52,7 +52,7 @@ function src(mode) {
 				var tag = json.hashtags[key4];
 				if(mode){
 					tags = tags + '<a onclick="tl(\'tag\',\'' + tag + '\',\'' + acct_id +
-					'\',\'add\')" class="pointer">#' + tag + '</a><br> ';
+					'\',\'add\')" class="pointer">#' + escapeHTML(tag) + '</a><br> ';
 				}else{
 					tags=tags+graphDraw(tag);
 				}
@@ -186,13 +186,13 @@ function graphDraw(tag){
 		var zero=50-(his[0].uses/max*50);
 		if(max===0){
 			tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">'+
-	'</svg><span style="font-size:200%">'+his[0].uses+'</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + tag.name + '\',\'' + acct_id +
-			'\',\'add\')" class="pointer">#' + tag.name + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
+	'</svg><span style="font-size:200%">'+his[0].uses+'</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
+			'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
 		}else{
 			tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">'+
 			'<g><path d="M0,'+six+' L10,'+five+' 20,'+four+' 30,'+three+' 40,'+two+' 50,'+one+' 60,'+zero+'" style="stroke: #9e9e9e; stroke-width: 1;fill: none;"></path></g>'+
-		'</svg><span style="font-size:200%">'+his[0].uses+'</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + tag.name + '\',\'' + acct_id +
-				'\',\'add\')" class="pointer">#' + tag.name + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
+		'</svg><span style="font-size:200%">'+his[0].uses+'</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
+				'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
 		}
 		
 	return tags;
diff --git a/app/js/tl/tag.js b/app/js/tl/tag.js
index dbe046fc..0c7eda77 100644
--- a/app/js/tl/tag.js
+++ b/app/js/tl/tag.js
@@ -65,6 +65,7 @@ function favTag(){
             var ptt=lang.lang_tags_unrealtime;
             var nowon="("+lang.lang_tags_realtime+")";
         }
+        tag=escapeHTML(tag);
         tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a>'+nowon+'<span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="' +lang.lang_parse_tagTL.replace("{{tag}}" ,'#'+tag)+ '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}" ,'#'+tag) + '">Toot</a>　'+
             '<a onclick="autoToot(\'' + tag + '\');" class="pointer" title="'+lang.lang_tags_always + lang.lang_parse_tagtoot.replace("{{tag}}" ,'#'+tag) + '">'+ptt+'</a>　<a onclick="tagRemove(\'' + key + '\')" class="pointer" title="' +lang.lang_tags_tagunpin.replace("{{tag}}" ,'#'+tag)+ '">'+lang.lang_del+'</a></span> ';
     });
@@ -96,6 +97,7 @@ function trendTag(){
             var tags="";
             json=json.score;
             Object.keys(json).forEach(function(tag) {
+                tag=escapeHTML(tag);
                 tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span> ';
              });
              $("#taglist").append('<div class="trendtag">アイマストドントレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' + tags+'</div>');
@@ -115,6 +117,7 @@ function tagTL(a,b,c,d){
     tl(a,b,acct_id,d);
 }
 function autoToot(tag){
+    tag=escapeHTML(tag)
     var nowPT=localStorage.getItem("stable")
     if(nowPT==tag){
         localStorage.removeItem("stable");
diff --git a/app/js/tl/tl.js b/app/js/tl/tl.js
index d6451b6d..2d597738 100644
--- a/app/js/tl/tl.js
+++ b/app/js/tl/tl.js
@@ -337,8 +337,8 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 		return false;
 	};
 	websocket[wsid].onclose = function() {
-		console.error("Closing");
-		console.error(tlid);
+		console.log("Closing");
+		console.log(tlid);
 		if(mode=="error"){
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Closed');
@@ -660,7 +660,7 @@ function cap(type, data, acct_id) {
 			var response="Federated TL(Media)";
 		}
 	} else if (type == "tag") {
-		var response= "#" + data
+		var response= "#" + escapeHTML(data)
 	} else if (type == "list") {
 		var ltitle=localStorage.getItem("list_"+data+"_"+acct_id);
 		var response= "List(" + ltitle + ")"
@@ -685,7 +685,7 @@ function cap(type, data, acct_id) {
 	}else if (type == "webview") {
 		var response="Twitter"
 	}else if (type == "tootsearch") {
-		var response="tootsearch(" + data + ")";
+		var response="tootsearch(" + escapeHTML(data) + ")";
 	}
 	return response;
 }
@@ -788,7 +788,7 @@ function strAliveInt(){
 }
 function reconnector(tlid,type,acct_id,data,mode){
 	console.log("Reconnector:"+mode)
-	if(type=="mix" || type=="plus"){
+	if(type=="mix" || type=="integrated" || type=="plus"){
 		if(localStorage.getItem("voice_" + tlid)){
 			var voice=true;
 		}else{
@@ -801,10 +801,11 @@ function reconnector(tlid,type,acct_id,data,mode){
 		}
 		var wssh=localStorage.getItem("wssH_" + tlid);
 		websocketHome[wssh].close();
-		var wssh=localStorage.getItem("wssL_" + tlid);
+		var wssl=localStorage.getItem("wssL_" + tlid);
 		websocketLocal[wssl].close();
 		mixre(acct_id, tlid, type, mute,"",voice,mode);
 	}else if(type=="notf"){
+		notfColumn(acct_id, tlid, "")
 	}else{
 		var wss=localStorage.getItem("wss_" + tlid);
 		websocket[wss].close();
diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js
index b37f12ae..3716e92c 100644
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -28,6 +28,9 @@ function parseColumn() {
 		$(".toot-reset").css("font-size", size + "px");
 		$(".cont-series").css("font-size", size + "px");
 	}
+	if(localStorage.getItem("menu-done")){
+		$("#fukidashi").addClass("hide")
+	}
 	tlCloser();
 	var multi = localStorage.getItem("multi");
 	if (multi) {
@@ -198,7 +201,7 @@ function parseColumn() {
 		  key + '">On</span></a>'+lang.lang_layout_linkana +'<br><a onclick="voiceToggle(' + key +
 		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_tts +'">hearing</i><span id="sta-voice-' +
 		  key + '">On</span></a>'+lang.lang_layout_tts +'TL<br><a onclick="reconnector(' + key +
-		  ',\''+acct.type+'\',\''+acct.domain+'\',\''+acct.data+'\')" class="setting nex '+if_notf+'"><i class="material-icons waves-effect nex '+if_notf+'" title="'+lang.lang_layout_reconnect+'">low_priority</i></a><span class="'+if_notf+'">'+lang.lang_layout_reconnect+'</span><br>'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
+		  ',\''+acct.type+'\',\''+acct.domain+'\',\''+escapeHTML(acct.data)+'\')" class="setting nex '+if_notf+'"><i class="material-icons waves-effect nex '+if_notf+'" title="'+lang.lang_layout_reconnect+'">low_priority</i></a><span class="'+if_notf+'">'+lang.lang_layout_reconnect+'</span><br>'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
 			'" class="tl '+acct.type+'-timeline " tlid="' + key + '" data-type="' + acct.type + '" data-acct="'+acct.domain+'" data-const="' + acct.type + '_'+acct.domain+'"><div id="landing_'+key+'" style="text-align:center">'+lang.lang_layout_nodata +'</div></div></div>'
 			$('#timeline_box_' + basekey + '_parentBox').append(html);
 		localStorage.removeItem("pool_" + key);
diff --git a/app/js/ui/menu.js b/app/js/ui/menu.js
index 429fba4e..0c46ae93 100644
--- a/app/js/ui/menu.js
+++ b/app/js/ui/menu.js
@@ -1,4 +1,6 @@
 function menu(){
+    localStorage.setItem("menu-done",true);
+    $("#fukidashi").addClass("hide")
     if(!$("#menu").hasClass("appear")){
         $("#menu").addClass("appear")
         var left=localStorage.getItem("menu-left");
diff --git a/app/js/ui/sort.js b/app/js/ui/sort.js
index 8286d16b..0d350657 100644
--- a/app/js/ui/sort.js
+++ b/app/js/ui/sort.js
@@ -32,7 +32,7 @@ function sortload(){
 				var acctdata=user+"@"+domain;
 			}
 			
-			var html='<li class="drag-content" data-id="'+key+'" data-flag="'+flag+'"'+insert+'><div class="sorticon"><i class="material-icons">'+icon(acct.type)+'</i></div><div class="sorttitle">'+cap(acct.type, acct.data,acct.domain)+'</div><div class="sortaction"><a onclick="goColumn(' + key +
+			var html='<li class="drag-content" data-id="'+key+'" data-flag="'+flag+'"'+insert+'><div class="sorticon"><i class="material-icons">'+icon(acct.type)+'</i></div><div class="sorttitle">'+cap(acct.type, escapeHTML(acct.data),acct.domain)+'</div><div class="sortaction"><a onclick="goColumn(' + key +
 			')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_sort_gothis+'">forward</i></a> <a onclick="removeColumn(' + key +
 			')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a></div><div class="sortacct">'+acctdata+'</div></li>';
 			$("#sort").append(html);
@@ -103,7 +103,7 @@ function sort(){
 	var json = JSON.stringify(newobj);
 	localStorage.setItem("column", json);
 	$("#sort").html("");
-	Materialize.toast("並べ替え完了。", 3000);
+	Materialize.toast("Sorted", 3000);
 	sortload();
 	parseColumn();
 	sortMenu()
diff --git a/app/js/ui/tips.js b/app/js/ui/tips.js
index a1d735be..e7871c7e 100644
--- a/app/js/ui/tips.js
+++ b/app/js/ui/tips.js
@@ -57,7 +57,7 @@ function startmem(){
 		var use=arg[0];
 		var cpu=arg[1];
 		var total=arg[2]
-		$("#tips-text").html(cpu+"<br>Memory:"+Math.floor(use/1024/1024/102.4)/10+"/"+Math.floor(total/1024/1024/102.4)/10+"GB("+Math.floor(use/total*100)+"%)")
+		$("#tips-text").html(escapeHTML(cpu)+"<br>Memory:"+Math.floor(use/1024/1024/102.4)/10+"/"+Math.floor(total/1024/1024/102.4)/10+"GB("+Math.floor(use/total*100)+"%)")
 	})
 }
 //トレンドタグ
@@ -83,7 +83,7 @@ function trendTagonTip(){
             var tags="";
             json=json.score;
             Object.keys(json).forEach(function(tag) {
-                tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span><br>';
+                tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + escapeHTML(tag) + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span><br>';
              });
              $("#tips-text").html('<div class="trendtag">トレンドタグ<i class="material-icons pointer" onclick="trendTagonTip()" style="font-size:12px">refresh</i>:<br>' + tags+'</div>');
              trendTagonTipInterval()
diff --git a/app/js/userdata/his-data.js b/app/js/userdata/his-data.js
index 851b20cd..2ddede9f 100644
--- a/app/js/userdata/his-data.js
+++ b/app/js/userdata/his-data.js
@@ -571,9 +571,9 @@ function udAdd(start) {
 		for(var i=0;i<fields.length;i++){
 			if(fields[i].type=="IdentityProof"){
 				if(fields[i].signatureAlgorithm=="keybase"){
-					var html='<a href="https://keybase.io/'+fields[i].name+'" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;" title="'+lang.lang_hisdata_key.replace("{{set}}",fields[i].signatureAlgorithm)+'"><i class="fas fa-key" aria-hidden="true"></i>'+fields[i].signatureAlgorithm+':'+fields[i].name+'</a>';
+					var html='<a href="https://keybase.io/'+fields[i].name+'" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;" title="'+lang.lang_hisdata_key.replace("{{set}}",escapeHTML(fields[i].signatureAlgorithm))+'"><i class="fas fa-key" aria-hidden="true"></i>'+escapeHTML(fields[i].signatureAlgorithm)+':'+escapeHTML(fields[i].name)+'</a>';
 				}else{
-					var html='<span class="cbadge teal" style="max-width:200px;" title="'+lang.lang_hisdata_key.replace("{{set}}",fields[i].signatureAlgorithm)+'"><i class="fas fa-key" aria-hidden="true"></i>'+fields[i].signatureAlgorithm+':'+fields[i].name+'</span>';
+					var html='<span class="cbadge teal" style="max-width:200px;" title="'+lang.lang_hisdata_key.replace("{{set}}",escapeHTML(fields[i].signatureAlgorithm))+'"><i class="fas fa-key" aria-hidden="true"></i>'+escapeHTML(fields[i].signatureAlgorithm)+':'+escapeHTML(fields[i].name)+'</span>';
 				}
 				$("#his-proof-prof").append(html)
 			}
diff --git a/app/js/userdata/showOnTL.js b/app/js/userdata/showOnTL.js
index 8c72c2e3..f7c40fdf 100644
--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@@ -278,7 +278,7 @@ function misskeyUdg(user, acct_id) {
 			$("#his-follow").text(json.followingCount);
 			$("#his-follower").text(json.followersCount);
 			$("#his-since").text(crat(json.createdAt));
-			var note=json.description;
+			var note=escapeHTML(json.description);
 			$("#his-des").html(twemoji.parse(note));
 			if(json.isCat){
 				$("#his-bot").html("Cat"+twemoji.parse("😺"));
diff --git a/app/package.json b/app/package.json
index c1c8a382..e18fd0bb 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "thedesk",
-  "version": "18.3.0",
+  "version": "18.3.1",
   "description": "TheDesk is a Mastodon client for PC.",
   "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
diff --git a/app/source/notif2.wav b/app/source/notif2.wav
new file mode 100644
index 00000000..e150f1c8
Binary files /dev/null and b/app/source/notif2.wav differ
diff --git a/app/source/notif3.wav b/app/source/notif3.wav
new file mode 100644
index 00000000..4d250ffe
Binary files /dev/null and b/app/source/notif3.wav differ
diff --git a/app/view/en/index.html b/app/view/en/index.html
index d5e8dceb..f0360aa2 100644
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
@@ -32,7 +32,7 @@
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Usamin (18.3.0)";
+var ver="Usamin (18.3.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -270,7 +270,7 @@ var tlid=0;
 			<label for="poll-until">Hide 'votes' count until people vote it.</label><br>
 			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">day(s)
 			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">hour(s)
-			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">minute(s)
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="6">minute(s)
 		</div>
 	</div>
 </div>
@@ -580,19 +580,17 @@ var tlid=0;
 		<a href="https://thedesk.top" target="_blank">HP</a><br>
 		<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 		<br>
-			<div id="release-Usamin_18-3-0" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-3-1" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.3.0)</h5>
-・(既定はオフ)ふぁぼ、フォロー、BTごとの通知音追加(なし/既定/カスタム(4種))<br>
-・(Misskey)引用Renoteの簡易表示<br>
-・(dtp-mstdn.jp他)引用(quote)の簡易表示<br>
+					<h5>Release Note Usamin (18.3.1)</h5>
+・通知音が種別ごとに追加(すべて適当に自分で打ったやつです。)<br>
+・Integrated TLのタイムラインの再接続(kPherox)<br>
+・一部ロケーションの変更や投票に関するバグ(kPherox)<br>
 ・バグと脆弱性の修正
 <br>
-通知音「Arctic Bleeze in East 7」はクリエイティブコモンズ(CC BY)で利用できます。<br>
-(C) Cutls P 2019<s>GarageBand適当に叩いたらできた音ですのでご自由に変更どうぞ</s>
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -601,9 +599,6 @@ var tlid=0;
 			<br><br>
 			<h3>Support TheDesk!</h3>
 			TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!<br>
-			<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
-  				Support on Enty
-			</a>
 			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
 				Support on Pixiv FANBOX
 		</a>
@@ -807,6 +802,7 @@ var tlid=0;
 							<a onclick="menu()" class="nex waves-effect" id="list-tgl">
 									<i class="material-icons" title="List">apps</i>
 							</a>
+							<span id="fukidashi"><- Add TL</span>
 						</div>
     </div></div>
     <div>
diff --git a/app/view/en/setting.html b/app/view/en/setting.html
index 31909688..e766aad1 100644
--- a/app/view/en/setting.html
+++ b/app/view/en/setting.html
@@ -407,8 +407,6 @@
 			class="material-icons left">info</i>About TheDesk</button>
 	<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">web</i>Website</a>
-	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
-			class="material-icons left">trending_up</i>Support(Enty)</a>
 	<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2"
 		style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>Support(Pixiv FANBOX)</a>
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
diff --git a/app/view/en/update.html b/app/view/en/update.html
index d3ac393d..d3708a7b 100644
--- a/app/view/en/update.html
+++ b/app/view/en/update.html
@@ -197,10 +197,24 @@ function verck(){
         todo(error);
 		console.error(error);
     }).then(function(json) {
-		    console.log(json);
-             $("#ver").text(json.desk);
-             localStorage.setItem("next-ver",json.desk);
-			 $("#det").html(json.detail);
+            console.log(json);
+            if(platform=="win32"){
+                $("#ver").text(json.desk);
+                localStorage.setItem("next-ver",json.desk);
+	        }else if(platform=="linux"){
+                $("#ver").text(json.desk_linux);
+                localStorage.setItem("next-ver",json.desk_linux);
+	        }else if(platform=="darwin"){
+                $("#ver").text(json.desk_mac);
+                localStorage.setItem("next-ver",json.desk_mac);
+            }
+            var lang="en";
+            if(lang=="ja"){
+                $("#det").html(json.detail);
+            }else{
+                $("#det").html(json.detail_en);
+            }
+			 
              $("#now").text(localStorage.getItem("ver"));
              
     });
diff --git a/app/view/ja/index.html b/app/view/ja/index.html
index f4018f21..7f458dd4 100644
--- a/app/view/ja/index.html
+++ b/app/view/ja/index.html
@@ -32,7 +32,7 @@
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Usamin (18.3.0)";
+var ver="Usamin (18.3.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -270,7 +270,7 @@ var tlid=0;
 			<label for="poll-until">投票するまで票数を隠す</label><br>
 			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">日
 			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">時間
-			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">分
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="6">分
 		</div>
 	</div>
 </div>
@@ -580,19 +580,17 @@ var tlid=0;
 		<a href="https://thedesk.top" target="_blank">HP</a><br>
 		<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 		<br>
-			<div id="release-Usamin_18-3-0" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-3-1" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.3.0)</h5>
-・(既定はオフ)ふぁぼ、フォロー、BTごとの通知音追加(なし/既定/カスタム(4種))<br>
-・(Misskey)引用Renoteの簡易表示<br>
-・(dtp-mstdn.jp他)引用(quote)の簡易表示<br>
+					<h5>Release Note Usamin (18.3.1)</h5>
+・通知音が種別ごとに追加(すべて適当に自分で打ったやつです。)<br>
+・Integrated TLのタイムラインの再接続(kPherox)<br>
+・一部ロケーションの変更や投票に関するバグ(kPherox)<br>
 ・バグと脆弱性の修正
 <br>
-通知音「Arctic Bleeze in East 7」はクリエイティブコモンズ(CC BY)で利用できます。<br>
-(C) Cutls P 2019<s>GarageBand適当に叩いたらできた音ですのでご自由に変更どうぞ</s>
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -601,9 +599,6 @@ var tlid=0;
 			<br><br>
 			<h3>ご支援ください。</h3>
 			TheDeskは営利目的ではないため、有料機能や広告は一切ありません。<br>皆様のあたたかいご支援のもとで製作されています。<br>
-			<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
-  				Entyで支援
-			</a>
 			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
 				Pixiv FANBOXで支援
 		</a>
@@ -807,6 +802,7 @@ var tlid=0;
 							<a onclick="menu()" class="nex waves-effect" id="list-tgl">
 									<i class="material-icons" title="リスト">apps</i>
 							</a>
+							<span id="fukidashi">←ここからTL追加</span>
 						</div>
     </div></div>
     <div>
diff --git a/app/view/ja/setting.html b/app/view/ja/setting.html
index b1bcc99f..499495bd 100644
--- a/app/view/ja/setting.html
+++ b/app/view/ja/setting.html
@@ -407,8 +407,6 @@
 			class="material-icons left">info</i>このソフトについて</button>
 	<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">web</i>公式HP</a>
-	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
-			class="material-icons left">trending_up</i>支援(Enty)</a>
 	<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2"
 		style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>支援(Pixiv FANBOX)</a>
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
diff --git a/app/view/ja/update.html b/app/view/ja/update.html
index 5fe1e70b..d2b54f88 100644
--- a/app/view/ja/update.html
+++ b/app/view/ja/update.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="ja">
 <head>
 <title>Update - TheDesk</title>
 <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
@@ -197,10 +197,24 @@ function verck(){
         todo(error);
 		console.error(error);
     }).then(function(json) {
-		    console.log(json);
-             $("#ver").text(json.desk);
-             localStorage.setItem("next-ver",json.desk);
-			 $("#det").html(json.detail);
+            console.log(json);
+            if(platform=="win32"){
+                $("#ver").text(json.desk);
+                localStorage.setItem("next-ver",json.desk);
+	        }else if(platform=="linux"){
+                $("#ver").text(json.desk_linux);
+                localStorage.setItem("next-ver",json.desk_linux);
+	        }else if(platform=="darwin"){
+                $("#ver").text(json.desk_mac);
+                localStorage.setItem("next-ver",json.desk_mac);
+            }
+            var lang="ja";
+            if(lang=="ja"){
+                $("#det").html(json.detail);
+            }else{
+                $("#det").html(json.detail_en);
+            }
+			 
              $("#now").text(localStorage.getItem("ver"));
              
     });
diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html
index fc7538a8..d92c44c1 100644
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -270,7 +270,7 @@ var tlid=0;
 			<label for="poll-until">{{polluntil}}</label><br>
 			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">{{days}}
 			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">{{hours}}
-			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">{{mins}}
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="6">{{mins}}
 		</div>
 	</div>
 </div>
@@ -580,19 +580,17 @@ var tlid=0;
 		<a href="https://thedesk.top" target="_blank">HP</a><br>
 		<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 		<br>
-			<div id="release-Usamin_18-3-0" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-3-1" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.3.0)</h5>
-・(既定はオフ)ふぁぼ、フォロー、BTごとの通知音追加(なし/既定/カスタム(4種))<br>
-・(Misskey)引用Renoteの簡易表示<br>
-・(dtp-mstdn.jp他)引用(quote)の簡易表示<br>
+					<h5>Release Note Usamin (18.3.1)</h5>
+・通知音が種別ごとに追加(すべて適当に自分で打ったやつです。)<br>
+・Integrated TLのタイムラインの再接続(kPherox)<br>
+・一部ロケーションの変更や投票に関するバグ(kPherox)<br>
 ・バグと脆弱性の修正
 <br>
-通知音「Arctic Bleeze in East 7」はクリエイティブコモンズ(CC BY)で利用できます。<br>
-(C) Cutls P 2019<s>GarageBand適当に叩いたらできた音ですのでご自由に変更どうぞ</s>
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -601,9 +599,6 @@ var tlid=0;
 			<br><br>
 			<h3>{{supportme}}</h3>
 			{{TheDeskDes}}<br>
-			<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
-  				{{EntySupport}}
-			</a>
 			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
 				{{PixivSupport}}
 		</a>
@@ -807,6 +802,7 @@ var tlid=0;
 							<a onclick="menu()" class="nex waves-effect" id="list-tgl">
 									<i class="material-icons" title="{{list}}">apps</i>
 							</a>
+							<span id="fukidashi">{{hereAddColumns}}</span>
 						</div>
     </div></div>
     <div>
diff --git a/app/view/make/language/index.en.json b/app/view/make/language/index.en.json
index 79d85d0d..53f59fb3 100644
--- a/app/view/make/language/index.en.json
+++ b/app/view/make/language/index.en.json
@@ -158,5 +158,6 @@
     "ramTips":"RAM status",
     "changeTips":"Change Tips",
     "help":"Help",
-    "about":"About TheDesk"
+    "about":"About TheDesk",
+    "hereAddColumns":"<- Add TL"
 }
\ No newline at end of file
diff --git a/app/view/make/language/index.ja.json b/app/view/make/language/index.ja.json
index 5a817e21..48788a02 100644
--- a/app/view/make/language/index.ja.json
+++ b/app/view/make/language/index.ja.json
@@ -158,5 +158,6 @@
     "ramTips":"システムメモリ容量",
     "changeTips":"Tips変更",
     "help":"ヘルプ",
-    "about":"このソフトについて"
+    "about":"このソフトについて",
+    "hereAddColumns":"←ここからTL追加"
 }
\ No newline at end of file
diff --git a/app/view/make/setting.sample.html b/app/view/make/setting.sample.html
index df425039..74af818b 100644
--- a/app/view/make/setting.sample.html
+++ b/app/view/make/setting.sample.html
@@ -407,8 +407,6 @@
 			class="material-icons left">info</i>@@about@@</button>
 	<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">web</i>@@hp@@</a>
-	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
-			class="material-icons left">trending_up</i>@@support@@(Enty)</a>
 	<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2"
 		style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>@@support@@(Pixiv FANBOX)</a>
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
diff --git a/app/view/make/update.sample.html b/app/view/make/update.sample.html
index f9cca1c8..d1b3a28a 100644
--- a/app/view/make/update.sample.html
+++ b/app/view/make/update.sample.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="{{lang}}">
 <head>
 <title>Update - TheDesk</title>
 <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
@@ -197,10 +197,24 @@ function verck(){
         todo(error);
 		console.error(error);
     }).then(function(json) {
-		    console.log(json);
-             $("#ver").text(json.desk);
-             localStorage.setItem("next-ver",json.desk);
-			 $("#det").html(json.detail);
+            console.log(json);
+            if(platform=="win32"){
+                $("#ver").text(json.desk);
+                localStorage.setItem("next-ver",json.desk);
+	        }else if(platform=="linux"){
+                $("#ver").text(json.desk_linux);
+                localStorage.setItem("next-ver",json.desk_linux);
+	        }else if(platform=="darwin"){
+                $("#ver").text(json.desk_mac);
+                localStorage.setItem("next-ver",json.desk_mac);
+            }
+            var lang="{{lang}}";
+            if(lang=="ja"){
+                $("#det").html(json.detail);
+            }else{
+                $("#det").html(json.detail_en);
+            }
+			 
              $("#now").text(localStorage.getItem("ver"));
              
     });
diff --git a/app/view/ps/index.html b/app/view/ps/index.html
index a41e3df2..fd373fa0 100644
--- a/app/view/ps/index.html
+++ b/app/view/ps/index.html
@@ -32,7 +32,7 @@
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Usamin (18.3.0)";
+var ver="Usamin (18.3.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -270,7 +270,7 @@ var tlid=0;
 			<label for="poll-until">crwdns2412:0crwdne2412:0</label><br>
 			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">crwdns507:0crwdne507:0
 			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">crwdns508:0crwdne508:0
-			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">crwdns509:0crwdne509:0
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="6">crwdns509:0crwdne509:0
 		</div>
 	</div>
 </div>
@@ -580,19 +580,17 @@ var tlid=0;
 		<a href="https://thedesk.top" target="_blank">HP</a><br>
 		<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 		<br>
-			<div id="release-Usamin_18-3-0" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-3-1" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.3.0)</h5>
-・(既定はオフ)ふぁぼ、フォロー、BTごとの通知音追加(なし/既定/カスタム(4種))<br>
-・(Misskey)引用Renoteの簡易表示<br>
-・(dtp-mstdn.jp他)引用(quote)の簡易表示<br>
+					<h5>Release Note Usamin (18.3.1)</h5>
+・通知音が種別ごとに追加(すべて適当に自分で打ったやつです。)<br>
+・Integrated TLのタイムラインの再接続(kPherox)<br>
+・一部ロケーションの変更や投票に関するバグ(kPherox)<br>
 ・バグと脆弱性の修正
 <br>
-通知音「Arctic Bleeze in East 7」はクリエイティブコモンズ(CC BY)で利用できます。<br>
-(C) Cutls P 2019<s>GarageBand適当に叩いたらできた音ですのでご自由に変更どうぞ</s>
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -601,9 +599,6 @@ var tlid=0;
 			<br><br>
 			<h3>crwdns473:0crwdne473:0</h3>
 			crwdns474:0crwdne474:0<br>
-			<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
-  				crwdns475:0crwdne475:0
-			</a>
 			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
 				{{PixivSupport}}
 		</a>
@@ -807,6 +802,7 @@ var tlid=0;
 							<a onclick="menu()" class="nex waves-effect" id="list-tgl">
 									<i class="material-icons" title="crwdns444:0crwdne444:0">apps</i>
 							</a>
+							<span id="fukidashi">{{hereAddColumns}}</span>
 						</div>
     </div></div>
     <div>
diff --git a/app/view/ps/setting.html b/app/view/ps/setting.html
index 03ee78a4..c3309f04 100644
--- a/app/view/ps/setting.html
+++ b/app/view/ps/setting.html
@@ -407,8 +407,6 @@
 			class="material-icons left">info</i>crwdns662:0crwdne662:0</button>
 	<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">web</i>crwdns663:0crwdne663:0</a>
-	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
-			class="material-icons left">trending_up</i>crwdns664:0crwdne664:0(Enty)</a>
 	<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2"
 		style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>crwdns664:0crwdne664:0(Pixiv FANBOX)</a>
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
diff --git a/app/view/ps/update.html b/app/view/ps/update.html
index ada34fe2..2f45976f 100644
--- a/app/view/ps/update.html
+++ b/app/view/ps/update.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="ps">
 <head>
 <title>Update - TheDesk</title>
 <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
@@ -197,10 +197,24 @@ function verck(){
         todo(error);
 		console.error(error);
     }).then(function(json) {
-		    console.log(json);
-             $("#ver").text(json.desk);
-             localStorage.setItem("next-ver",json.desk);
-			 $("#det").html(json.detail);
+            console.log(json);
+            if(platform=="win32"){
+                $("#ver").text(json.desk);
+                localStorage.setItem("next-ver",json.desk);
+	        }else if(platform=="linux"){
+                $("#ver").text(json.desk_linux);
+                localStorage.setItem("next-ver",json.desk_linux);
+	        }else if(platform=="darwin"){
+                $("#ver").text(json.desk_mac);
+                localStorage.setItem("next-ver",json.desk_mac);
+            }
+            var lang="ps";
+            if(lang=="ja"){
+                $("#det").html(json.detail);
+            }else{
+                $("#det").html(json.detail_en);
+            }
+			 
              $("#now").text(localStorage.getItem("ver"));
              
     });