diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js
index e2f29ddf..8d42b599 100644
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -417,7 +417,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			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];
@@ -474,6 +474,40 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		var viewer = "";
 		var hasmedia = "";
 		var youtube = "";
+		//Poll
+		var poll="";
+		if(toot.poll){
+			var choices=toot.poll.options;
+			if(toot.poll.voted){
+				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>';
+				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>";
+				}
+				var result_hide="hide";
+			}
+			if(toot.poll.expired){
+				var ended=lang.lang_parse_endedvote;
+			}else{
+				var ended=date(toot.poll.expires_at, datetype);
+			}
+			Object.keys(choices).forEach(function(keyc) {
+				var choice = choices[keyc];
+				if(!toot.poll.voted && !toot.poll.expired){
+					var votesel='voteSelMastodon(\''+acct_id+'\',\''+toot.poll.id+'\','+keyc+','+toot.poll.multiple+')';
+					var voteclass="pointer waves-effect waves-light";
+				}else{
+					var votesel="";
+					var voteclass="";
+				}
+				poll=poll+'<div class="'+voteclass+' vote vote_'+acct_id+'_'+toot.poll.id+'_'+keyc+'" onclick="'+votesel+'">'+escapeHTML(choice.title)+'<span class="vote_'+acct_id+'_'+toot.poll.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
+			});
+			poll='<div class="vote_'+acct_id+'_'+toot.poll.id+'">'+poll+myvote+'<span class="cbadge cbadge-hover" title="' + date(toot.poll.expires_at, 'absolute') +
+			'"><i class="far fa-calendar-times"></i>' +
+			 ended+ '</span></div>';
+		}
 		if(toot.emojis){
 			var emojick = toot.emojis[0];
 		}else{
@@ -489,6 +523,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				content = content.replace(regExp, emoji_url);
 				spoil = spoil.replace(regExp, emoji_url);
+				poll = poll.replace(regExp, emoji_url);
 			});
 		}
 		//ニコフレ絵文字
@@ -507,6 +542,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				content = content.replace(regExp, emoji_url);
 				spoil = spoil.replace(regExp, emoji_url);
+				poll = poll.replace(regExp, emoji_url);
 			});
 		}
 		//デフォ絵文字
@@ -523,6 +559,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		if(notice){
 			notice=twemoji.parse(notice);
 		}
+		if(poll){
+			poll=twemoji.parse(poll);
+		}
 		var mediack = toot.media_attachments[0];
 		//メディアがあれば
 		var media_ids="";
@@ -726,40 +765,6 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		   }
 		}
 		}
-		//Poll
-		var poll="";
-		if(toot.poll){
-			var choices=toot.poll.options;
-			if(toot.poll.voted){
-				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>';
-				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>";
-				}
-				var result_hide="hide";
-			}
-			if(toot.poll.expired){
-				var ended=lang.lang_parse_endedvote;
-			}else{
-				var ended=date(toot.poll.expires_at, datetype);
-			}
-			Object.keys(choices).forEach(function(keyc) {
-				var choice = choices[keyc];
-				if(!toot.poll.voted && !toot.poll.expired){
-					var votesel='voteSelMastodon(\''+acct_id+'\',\''+toot.poll.id+'\','+keyc+','+toot.poll.multiple+')';
-					var voteclass="pointer waves-effect waves-light";
-				}else{
-					var votesel="";
-					var voteclass="";
-				}
-				poll=poll+'<div class="'+voteclass+' vote vote_'+acct_id+'_'+toot.poll.id+'_'+keyc+'" onclick="'+votesel+'">'+escapeHTML(choice.title)+'<span class="vote_'+acct_id+'_'+toot.poll.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
-			});
-			poll='<div class="vote_'+acct_id+'_'+toot.poll.id+'">'+poll+myvote+'<span class="cbadge cbadge-hover" title="' + date(toot.poll.expires_at, 'absolute') +
-			'"><i class="far fa-calendar-times"></i>' +
-			 ended+ '</span></div>';
-		}
 		//Quote
 		if(toot.quote){
 			poll=poll+'<div class="quote-renote"><div class="renote-icon"><img src="'+toot.quote.account.avatar+'"></div><div class="renote-user">'+escapeHTML(toot.quote.account.display_name)+'</div><div class="renote-text">'+toot.quote.content+'</div></div>'
diff --git a/app/view/en/index.html b/app/view/en/index.html
index 19746733..a07505f2 100644
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
@@ -580,24 +580,19 @@ 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-2-3" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-3-0" 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.2.3)</h5>
-					・バグの修正
-					<h5>Release Note Usamin (18.2.0)</h5>
-・tootsearchをひとつのカラムにしてエゴサが捗る<br>
-・イントロダクション(初回起動時)の挙動修正<br>
-・リンクプレビューを最大1行ずつに省略(タイトルと本文)<br>
-・ブロックされたときのプロフィールの動作(Mastodon 2.8~)<br>
-・(Misskey)MFM追加flipやjumpなど<br>
-・(Misskey)リストに対応<br>
-・(Misskey)カスタム絵文字に対応。カスタム絵文字によるリアクションに対応(対応インスタンスに限る)。<br>
-・<b>カスタム絵文字をゼロ幅スペースによる挿入に変更する機能</b><br>
-・一部機能の統廃合とバグの修正<br>
-・best-friends.chatやキュアスタ！、misskey.devをサポートインスタンスに追加
+					<h5>Release Note Usamin (18.3.0)</h5>
+・(既定はオフ)ふぁぼ、フォロー、BTごとの通知音追加(なし/既定/カスタム(4種))<br>
+・(Misskey)引用Renoteの簡易表示<br>
+・(dtp-mstdn.jp他)引用(quote)の簡易表示<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>
diff --git a/app/view/en/setting.html b/app/view/en/setting.html
index 5e655d7b..9b54e80d 100644
--- a/app/view/en/setting.html
+++ b/app/view/en/setting.html
@@ -131,9 +131,9 @@
 				<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea"
 						placeholder="About this theme..."></textarea></div>
 				<h5>Color scheme</h5>
-				<input class="with-gap" name="derection" type="radio" id="dark" value="dark" checked="true" />
+				<input class="with-gap" name="direction" type="radio" id="dark" value="dark" checked="true" />
 				<label for="dark">Dark</label>
-				<input class="with-gap" name="derection" type="radio" id="light" value="light" />
+				<input class="with-gap" name="direction" type="radio" id="light" value="light" />
 				<label for="light">Light</label>
 				<div id="pickers">
 					<div>
@@ -425,7 +425,7 @@
 	<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';"
 		class="pointer">Check update</a><br>
 	<a href="oss.html">OSS License</a><br>
-	<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved.
+	<span style="font-family:Open Sans;">Copyright &copy; Cutls P 2018 All Rights Reserved.
 		Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a
 			href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy
 			Policy</a>
diff --git a/app/view/en/setting.vue.js b/app/view/en/setting.vue.js
index f28ee016..58b4e065 100644
--- a/app/view/en/setting.vue.js
+++ b/app/view/en/setting.vue.js
@@ -311,7 +311,7 @@ var tlConstruction=[
         id:"replySound",
         storage:"replySound",
         checkbox:true,
-        setValue:"default",
+        setValue:"none",
         text:{
             head:"Sound(Reply)",
             desc:"",
@@ -321,7 +321,7 @@ var tlConstruction=[
         id:"favSound",
         storage:"favSound",
         checkbox:true,
-        setValue:"default",
+        setValue:"none",
         text:{
             head:"Sound(Fav)",
             desc:"",
@@ -331,7 +331,7 @@ var tlConstruction=[
         id:"btSound",
         storage:"btSound",
         checkbox:true,
-        setValue:"default",
+        setValue:"none",
         text:{
             head:"Sound(Boost)",
             desc:"",
@@ -341,7 +341,7 @@ var tlConstruction=[
         id:"followSound",
         storage:"followSound",
         checkbox:true,
-        setValue:"default",
+        setValue:"none",
         text:{
             head:"Sound(Follow)",
             desc:"",
diff --git a/app/view/ja/index.html b/app/view/ja/index.html
index efd64916..3499edb5 100644
--- a/app/view/ja/index.html
+++ b/app/view/ja/index.html
@@ -580,24 +580,19 @@ 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-2-3" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-3-0" 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.2.3)</h5>
-					・バグの修正
-					<h5>Release Note Usamin (18.2.0)</h5>
-・tootsearchをひとつのカラムにしてエゴサが捗る<br>
-・イントロダクション(初回起動時)の挙動修正<br>
-・リンクプレビューを最大1行ずつに省略(タイトルと本文)<br>
-・ブロックされたときのプロフィールの動作(Mastodon 2.8~)<br>
-・(Misskey)MFM追加flipやjumpなど<br>
-・(Misskey)リストに対応<br>
-・(Misskey)カスタム絵文字に対応。カスタム絵文字によるリアクションに対応(対応インスタンスに限る)。<br>
-・<b>カスタム絵文字をゼロ幅スペースによる挿入に変更する機能</b><br>
-・一部機能の統廃合とバグの修正<br>
-・best-friends.chatやキュアスタ！、misskey.devをサポートインスタンスに追加
+					<h5>Release Note Usamin (18.3.0)</h5>
+・(既定はオフ)ふぁぼ、フォロー、BTごとの通知音追加(なし/既定/カスタム(4種))<br>
+・(Misskey)引用Renoteの簡易表示<br>
+・(dtp-mstdn.jp他)引用(quote)の簡易表示<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>
diff --git a/app/view/ja/setting.html b/app/view/ja/setting.html
index f59d9966..0639414d 100644
--- a/app/view/ja/setting.html
+++ b/app/view/ja/setting.html
@@ -131,9 +131,9 @@
 				<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea"
 						placeholder="説明..."></textarea></div>
 				<h5>色の系統</h5>
-				<input class="with-gap" name="derection" type="radio" id="dark" value="dark" checked="true" />
+				<input class="with-gap" name="direction" type="radio" id="dark" value="dark" checked="true" />
 				<label for="dark">Dark</label>
-				<input class="with-gap" name="derection" type="radio" id="light" value="light" />
+				<input class="with-gap" name="direction" type="radio" id="light" value="light" />
 				<label for="light">Light</label>
 				<div id="pickers">
 					<div>
@@ -425,7 +425,7 @@
 	<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';"
 		class="pointer">アップデートを確認</a><br>
 	<a href="oss.html">OSS License(オープンソースライセンス)</a><br>
-	<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved.
+	<span style="font-family:Open Sans;">Copyright &copy; Cutls P 2018 All Rights Reserved.
 		Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a
 			href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy
 			Policy</a>
diff --git a/app/view/ja/setting.vue.js b/app/view/ja/setting.vue.js
index 8f91e9b2..32f4d993 100644
--- a/app/view/ja/setting.vue.js
+++ b/app/view/ja/setting.vue.js
@@ -311,7 +311,7 @@ var tlConstruction=[
         id:"replySound",
         storage:"replySound",
         checkbox:true,
-        setValue:"default",
+        setValue:"none",
         text:{
             head:"リプライの通知音",
             desc:"",
@@ -321,7 +321,7 @@ var tlConstruction=[
         id:"favSound",
         storage:"favSound",
         checkbox:true,
-        setValue:"default",
+        setValue:"none",
         text:{
             head:"お気に入り登録の通知音",
             desc:"",
@@ -331,7 +331,7 @@ var tlConstruction=[
         id:"btSound",
         storage:"btSound",
         checkbox:true,
-        setValue:"default",
+        setValue:"none",
         text:{
             head:"ブーストの通知音",
             desc:"",
@@ -341,7 +341,7 @@ var tlConstruction=[
         id:"followSound",
         storage:"followSound",
         checkbox:true,
-        setValue:"default",
+        setValue:"none",
         text:{
             head:"フォローの通知音",
             desc:"",
diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html
index f0ce65f9..fc7538a8 100644
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -589,6 +589,7 @@ var tlid=0;
 ・(既定はオフ)ふぁぼ、フォロー、BTごとの通知音追加(なし/既定/カスタム(4種))<br>
 ・(Misskey)引用Renoteの簡易表示<br>
 ・(dtp-mstdn.jp他)引用(quote)の簡易表示<br>
+・バグと脆弱性の修正
 <br>
 通知音「Arctic Bleeze in East 7」はクリエイティブコモンズ(CC BY)で利用できます。<br>
 (C) Cutls P 2019<s>GarageBand適当に叩いたらできた音ですのでご自由に変更どうぞ</s>
diff --git a/app/view/make/setting.sample.html b/app/view/make/setting.sample.html
index 7039f7ab..26c98aff 100644
--- a/app/view/make/setting.sample.html
+++ b/app/view/make/setting.sample.html
@@ -131,9 +131,9 @@
 				<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea"
 						placeholder="@@desc@@..."></textarea></div>
 				<h5>@@customthemeDirection@@</h5>
-				<input class="with-gap" name="derection" type="radio" id="dark" value="dark" checked="true" />
+				<input class="with-gap" name="direction" type="radio" id="dark" value="dark" checked="true" />
 				<label for="dark">Dark</label>
-				<input class="with-gap" name="derection" type="radio" id="light" value="light" />
+				<input class="with-gap" name="direction" type="radio" id="light" value="light" />
 				<label for="light">Light</label>
 				<div id="pickers">
 					<div>
diff --git a/app/view/ps/index.html b/app/view/ps/index.html
index 710c1d67..3c490b8a 100644
--- a/app/view/ps/index.html
+++ b/app/view/ps/index.html
@@ -580,24 +580,19 @@ 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-2-3" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-3-0" 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.2.3)</h5>
-					・バグの修正
-					<h5>Release Note Usamin (18.2.0)</h5>
-・tootsearchをひとつのカラムにしてエゴサが捗る<br>
-・イントロダクション(初回起動時)の挙動修正<br>
-・リンクプレビューを最大1行ずつに省略(タイトルと本文)<br>
-・ブロックされたときのプロフィールの動作(Mastodon 2.8~)<br>
-・(Misskey)MFM追加flipやjumpなど<br>
-・(Misskey)リストに対応<br>
-・(Misskey)カスタム絵文字に対応。カスタム絵文字によるリアクションに対応(対応インスタンスに限る)。<br>
-・<b>カスタム絵文字をゼロ幅スペースによる挿入に変更する機能</b><br>
-・一部機能の統廃合とバグの修正<br>
-・best-friends.chatやキュアスタ！、misskey.devをサポートインスタンスに追加
+					<h5>Release Note Usamin (18.3.0)</h5>
+・(既定はオフ)ふぁぼ、フォロー、BTごとの通知音追加(なし/既定/カスタム(4種))<br>
+・(Misskey)引用Renoteの簡易表示<br>
+・(dtp-mstdn.jp他)引用(quote)の簡易表示<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>
diff --git a/app/view/ps/setting.html b/app/view/ps/setting.html
index 2ad65593..764b15e3 100644
--- a/app/view/ps/setting.html
+++ b/app/view/ps/setting.html
@@ -131,9 +131,9 @@
 				<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea"
 						placeholder="crwdns2440:0crwdne2440:0..."></textarea></div>
 				<h5>crwdns2426:0crwdne2426:0</h5>
-				<input class="with-gap" name="derection" type="radio" id="dark" value="dark" checked="true" />
+				<input class="with-gap" name="direction" type="radio" id="dark" value="dark" checked="true" />
 				<label for="dark">Dark</label>
-				<input class="with-gap" name="derection" type="radio" id="light" value="light" />
+				<input class="with-gap" name="direction" type="radio" id="light" value="light" />
 				<label for="light">Light</label>
 				<div id="pickers">
 					<div>
@@ -425,7 +425,7 @@
 	<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';"
 		class="pointer">crwdns667:0crwdne667:0</a><br>
 	<a href="oss.html">OSS Licensecrwdns668:0crwdne668:0</a><br>
-	<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved.
+	<span style="font-family:Open Sans;">Copyright &copy; Cutls P 2018 All Rights Reserved.
 		Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a
 			href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy
 			Policy</a>
diff --git a/app/view/ps/setting.vue.js b/app/view/ps/setting.vue.js
index c3f38d07..0ec8aea0 100644
--- a/app/view/ps/setting.vue.js
+++ b/app/view/ps/setting.vue.js
@@ -311,7 +311,7 @@ var tlConstruction=[
         id:"replySound",
         storage:"replySound",
         checkbox:true,
-        setValue:"default",
+        setValue:"none",
         text:{
             head:"@@replySound@@",
             desc:"",
@@ -321,7 +321,7 @@ var tlConstruction=[
         id:"favSound",
         storage:"favSound",
         checkbox:true,
-        setValue:"default",
+        setValue:"none",
         text:{
             head:"@@favSound@@",
             desc:"",
@@ -331,7 +331,7 @@ var tlConstruction=[
         id:"btSound",
         storage:"btSound",
         checkbox:true,
-        setValue:"default",
+        setValue:"none",
         text:{
             head:"@@btSound@@",
             desc:"",
@@ -341,7 +341,7 @@ var tlConstruction=[
         id:"followSound",
         storage:"followSound",
         checkbox:true,
-        setValue:"default",
+        setValue:"none",
         text:{
             head:"@@followSound@@",
             desc:"",