Merge pull request #63 from cutls/WIP-(before-CI)

Wip (before ci)
add note
2019-04-22 23:20:07 +09:00 · 2019-04-22 23:19:34 +09:00 · 2019-04-22 23:18:12 +09:00 · 2019-04-22 23:17:46 +09:00 · 2019-04-22 23:16:57 +09:00 · 2019-04-22 03:33:56 +09:00
76 changed files with 4653 additions and 2899 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,34 @@
-os: windows
-language: node_js
-node_js:
- '10.15.2'
+language: objective-c
+cache:
+  directories:
+    - node_modules
+env:
+  - NODE_VERSION="10.15.2"
+before_install:
+  - git clone https://github.com/creationix/nvm.git /tmp/.nvm
+  - source /tmp/.nvm/nvm.sh
+  - nvm install $NODE_VERSION
+  - nvm use --delete-prefix $NODE_VERSION
+  - node --version
 script: node -v
 before_deploy:
-  - cd app
  - npm install electron-builder -g
+  - cd app
  - npm install
-  - electron-builder --win --ia32
-  - mv ../build/TheDesk-setup.exe ../TheDesk-setup-ia32.exe
-  - mv ../build/TheDesk*.exe ../TheDesk-ia32.exe
-  - electron-builder --win --x64
-  - mv ../build/TheDesk-setup.exe ../TheDesk-setup.exe
-  - mv ../build/TheDesk*.exe ../TheDesk.exe
+  - electron-builder --mac --x64 -p never
+  - mv ../build/TheDesk*.dmg ../TheDesk.dmg
+  - mv ../build/TheDesk*.zip ../TheDesk-darwin-x64.zip
  - cd ../
-  - ls
-after_deploy: ls
 deploy:
-  skip_cleanup: true
  provider: releases
+  # GitHub にリリースするための API KEY を暗号化した値
  api_key:
    secure: jndR02p5KRTtcJk18b3YsXL2cC+yzEf1AOqXdpWciF8f3lO5oY01jlxd17xdHIcK7VywSsLVZpLToSdqAoIEhJ5OxEQ/FmA3FlmbwwD6ou13gLa4VGIvsBHveCmKGjVu0Z++atIy76tZYU1SOWFWv4B0ZhnVz2ca2VZynvLgw3YNsPJH7rHO966GXgRkGYJAJ4UvLg3sj/iztVh2FSfbUj5IGO1e/JHJO63wAo1MSQtRjkutVgl/djnBLC6vbL4YHkM3Ynpkx/YQEcxwrmeY0Ra8D5yYDq4MNIDMmZahWC+k4u2eA2Cj2ifBFNxbZvTN75vLwRBp6DsTNHsiqkXrSPDBdNeet31RbwTQ6LtsK8jqmL4S/59dmLcj7uCU2WxyBLPbJdbdZWlqW2ZQvfQY8QVAYy7S3MiHQWQN0oP5wqXk89jcgR42ig/zsqFNPpXHM4mExR7l/gDLPg0j9c3XEF6sWtk3FmJN1i4+B+9kn09b6UKlV7EFPKp8XcFNrz4ZcE9/I8lKwsqLVG2jAXIk7Z9LwDRcAmK5eG348X5zwFtOY6raKIvRw2cn92bPnEI+55v8A4WANS2647GFTgxHj30D0d/sOZmJ5BS34zpdWTgE0AlKg7sOqkncjqoW5J5zCh5Ow7b3KXvEvlAts44mAag8tZTectxMP4iguXvTnv4=
-  file: 
-    - TheDesk.exe
-    - TheDesk-setup.exe
-    - TheDesk-ia32.exe
-    - TheDesk-setup-ia32.exe
+  # Releases ページにアップロードするファイル
+  file:
+    - TheDesk.dmg
+    - TheDesk-darwin-x64.zip
+  skip_cleanup: true
  on:
    repo: cutls/TheDesk
 branches:
--- a/README.md
+++ b/README.md
@@ -27,6 +27,8 @@ The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.o
 * [ico](https://dl.thedesk.top/press/TheDesk.ico)
 * [icns](https://dl.thedesk.top/press/TheDesk.icns)

+The default sound of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/)
+
 ## Terms of Use/利用規約

 * [利用規約(Terms of Use(ja))](https://thedesk.top/tos.html)
@@ -73,11 +75,38 @@ iTunes NowPlayingにアルバムアートワークを付けてくれた人
 ## Build/ビルド

 Misskey(misskey.xyz) application token is not in cutls/TheDesk  
-Misskey(misskey.xyz)のトークンは含まれておりません。  
-`git clone https://github.com/cutls/TheDesk`  
-`npm install electron -g`  
-`cd TheDesk/app`  
-`npm install`  
+Misskey(misskey.xyz)のトークンは含まれておりません。
+
+```sh
+git clone https://github.com/cutls/TheDesk
+cd TheDesk/app
+npm install
+npm install --only=dev
+```
+
+### electron-builder(推奨)
+Use npm scripts.  
+npm scriptsを利用します
+
+```sh
+# Build for current platform
+# 実行している環境向けにビルド
+npm run build
+
+# Select build target
+# ターゲットを指定してビルド
+## Windows
+npm run build:win
+
+## Windows and Linux (The macOS target should run on macOS. So, this option hasn't include the build for macOS)
+## macOS向けのビルドにはmacOSで実行する必要があるためこのコマンドではビルドされません
+npm run build:all
+```
+
+Config is all on package.json  
+ビルド設定はすべてpackage.jsonに記載しています。  
+
+### electron-packager(非推奨)
 `npm install --save-dev electron-rebuild`  
  
 Linux/macOS  
@@ -91,8 +120,6 @@ WindowsでPython 2.xやVisualC++を一発でインストールできるツール
  
 日本語話者向けですが、macOSビルドにはXCodeが要るとの情報があります。([とねぢ](https://minohdon.jp/@toneji)氏談)  

-### electron-packager
-
 Windows  
 `electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=4.0.5 --icon=.\app\thedesk.ico --overwrite`  
 Linux  
@@ -100,11 +127,6 @@ Linux
 macOS  
 `electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=4.0.5 --icon=./app/icon.icns --overwrite`  

-### electron-builder
-
-Config is all on package.json  
-ビルド設定はすべてpackage.jsonに記載しています。  
-
 ## Pleroma support

 Did you find a bug with Pleroma accounts?  
--- a/app/about.html
+++ b/app/about.html
@@ -76,7 +76,7 @@ a,button{
 <img src="./img/desk.png" style="max-width:70%;">
 <h5>TheDesk</h5>
 <div class='container'>
-    <div class='area-name1'>バージョン</div>
+    <div class='area-name1'>Display version</div>
    <div class='area-data1' id="now"></div>
    <div class='area-name2'>Internal version</div>
    <div class='area-data2' id="ver"></div>
@@ -87,13 +87,17 @@ a,button{
    <div class='area-name5'>Node.js</div>
    <div class='area-data5' id="node"></div>
  </div>
-  <div class="cp">Copyright &copy; TheDesk 2018 All rights reserved.<br><a href="https://thedesk.top" target="_blank">Web site</a></div>
+  <div class="cp">Copyright &copy; <a href="https://kirishima.cloud/@Cutls" target="_blank">Cutls P</a> 2018 All rights reserved.<br>
+    Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a href="https://pawoo.net/@kPherox" target="_blank">kPherox</a> and all users
+    <img draggable="false" style="width:0.8rem;top: 1px;margin-left: 1px;position: relative;" alt="❤️" title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png">
+<br><a href="https://thedesk.top" target="_blank">Web site</a></div>
 <button onclick="window.close()" class="btn waves-effect indigo" style="width:calc(100% - 10px);"><i class="material-icons left">close</i>Close</button>
 <script type="text/javascript" src="./js/ui/theme.js"></script>
 <script>
    $("#now").text(localStorage.getItem("ver"));
    var electron = require("electron");
    var remote=electron.remote;
+    const shell=electron.shell;
    //JSON.parse(fs.readFileSync(info_path, 'utf8'));
    console.log(process.versions);
    $("#node").text(process.version);
@@ -104,6 +108,9 @@ a,button{
        var ver=m[1];
        $("#ver").text(ver);
    }
-    
-</script>
-<script type="text/javascript" src="./js/platform/end.js"></script>
+$(document).on('click', 'a', e => {
+    var url =  $(e.target).attr('href');
+    shell.openExternal(url);
+    return false;
+});
+</script>
--- a/app/css/master.css
+++ b/app/css/master.css
@@ -30,6 +30,8 @@ option {
 }
 #mainView {
  padding: 10px;
+  overflow:scroll;
+  height: auto;
 }
 #message {
  display: none;
@@ -389,6 +391,9 @@ blockquote:before, .quote:before {
  font-size:16px;
  padding:4px;
 }
+#something-wrong{
+  width:100%; height:100%; position:absolute; display:flex; justify-content: center; align-items:center
+}

 /*スクロールバー*/
 ::-webkit-scrollbar {
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -224,7 +224,10 @@ grid-area: toot;
  cursor:text;
  user-select: auto;
  grid-area: additional;
-  }
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}

 .area-actions {
  padding:0; 
@@ -246,6 +249,29 @@ grid-area: toot;
  margin:2px;
  grid-area: side;
 }
+
+.quote-renote{
+  display: grid;
+  grid-template-columns: 43px 2fr 1fr;
+  grid-template-areas: 'ricon ruser' 'ricon rtext';
+  border: 1px solid;
+  margin-top: 3px;
+  padding: 1px;
+  border-radius: 3px;
+}
+.renote-icon{
+  grid-area: ricon;
+}
+.renote-icon img{
+  width:43px;
+}
+.renote-user{
+  grid-area: ruser;
+}
+.renote-text{
+  grid-area: rtext;
+}
+
 .btn-flat{
  color:var(--color);
 }
@@ -334,6 +360,7 @@ p:not(:last-child){
 .notice-box {
  top: 0;
  background-color:var(--notfbox);
+  filter: brightness(110%);
  position: relative;
  margin-right: 10px;
  width:100%;
@@ -501,7 +528,26 @@ p:not(:last-child){
 .votebtn:hover{
  background-color:var(--color);
 }
-
+.jump{
+  display: inline-block; animation: jump 0.75s linear infinite;
+}
+@keyframes jump {
+  0% {
+    transform: translateY(0);
+}
+25% {
+  transform: translateY(-16px);
+}
+50% {
+  transform: translateY(0);
+}
+75% {
+  transform: translateY(-8px);
+}
+100% {
+  transform: translateY(0);
+}
+}
@keyframes fadeInDown {
  from {
    opacity: 0;
--- a/app/css/userdata.css
+++ b/app/css/userdata.css
@@ -45,6 +45,7 @@
  height:1.5rem; padding:0; background-color:#757575; text-align:center; 
  padding:5px;
  margin-bottom:1px;
+  width:30%;
 }
 .his-field-content{
  height:1.5rem; padding:0; padding-left:5px;
@@ -89,4 +90,11 @@
 #his-des .mention{
  color: #039be5;
  cursor: pointer;
+}
+#his-float-blocked{
+  display:flex; justify-content: center; align-items:center;
+  font-size:2rem;
+  width: 90%;
+  height: 100%;
+  position: absolute;
 }
--- 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);
 	}
--- a/app/js/lang/lang.en.js
+++ b/app/js/lang/lang.en.js
@@ -91,6 +91,7 @@ var lang={
    "lang_list_users":"Users list",
    "lang_list_nouser":"No users in this list.",
    "lang_list_add":"Add to the list",
+    "lang_list_add_misskey":"(perhaps this user has been listed)",
    "lang_list_remove":"Remove from the list",
    //tl/notification.js
    "lang_notf_new":" new notifications",
@@ -140,6 +141,7 @@ var lang={
    "lang_hisdata_frcwarn":"Unfollow accounts will be shown.",
    "lang_hisdata_taketime":"It will take 30s ~ several minutes",
    "lang_hisdata_notonmisskey":"Misskey is unable to request.",
+    "lang_hisdata_key":"This user is proofed by {{set}}",
    //userdata/showOnTL.js
    "lang_showontl_movetxt":"This account was moved",
    "lang_showontl_movebtn":"Continue on the new account",
@@ -148,6 +150,7 @@ var lang={
    "lang_showontl_notf":"Notification ",
    "lang_showontl_domain":"Domain ",
    "lang_showontl_listwarn":"Follow to add this user to lists.",
+    "lang_showontl_verified":"This website is verified by owner at ",
 //parse
    "lang_parse_mentioned":" replied to you",
    "lang_parse_faved":" favourited your toot",
@@ -186,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",
--- a/app/js/lang/lang.ja.js
+++ b/app/js/lang/lang.ja.js
@@ -91,6 +91,7 @@ var lang={
    "lang_list_users":"ユーザー一覧",
    "lang_list_nouser":"ユーザーはいません",
    "lang_list_add":"リストに追加",
+    "lang_list_add_misskey":"(重複追加の可能性があります)",
    "lang_list_remove":"リストから削除",
 //tl/notification.js
    "lang_notf_new":"件の新しい通知",
@@ -142,6 +143,7 @@ var lang={
    "lang_hisdata_frcwarn":"非フォローだけど絡みがある時に表示されます。",
    "lang_hisdata_taketime":"30秒から数分かかります",
    "lang_hisdata_notonmisskey":"このシステムはMisskeyにはありません。",
+    "lang_hisdata_key":"このユーザーの信頼性は{{set}}によって示されています",
 //userdata/showOnTL.js
    "lang_showontl_movetxt":"このアカウントは移行しています",
    "lang_showontl_movebtn":"移行先を見る",
@@ -150,6 +152,7 @@ var lang={
    "lang_showontl_notf":"通知",
    "lang_showontl_domain":"ドメイン",
    "lang_showontl_listwarn":"リストに追加するためにはフォローが必要です。",
+    "lang_showontl_verified":"このユーザーの所持するWebサイトであると証明されています。",
 //parse
   "lang_parse_mentioned":"が返信しました",
    "lang_parse_faved":"がお気に入り登録しました",
--- a/app/js/login/instance.js
+++ b/app/js/login/instance.js
@@ -8,17 +8,17 @@ var idata={
 	"kirishima.cloud_glitch":"enabled",
 	"kirishima.cloud_public":"パブリックタイムライン",
 	"minohdon.jp":"instance",
-	"minohdon.jp_name":"箕面丼",
+	"minohdon.jp_name":"箕面どん",
 	"minohdon.jp_letters":"500",
 	"minohdon.jp_bbcode":"disabled",
 	"minohdon.jp_markdown":"disabled",
 	"minohdon.jp_glitch":"disabled",
 	"knzk.me":"instance",
-	"knzk.me_name":"神崎丼",
+	"knzk.me_name":"Knzk",
 	"knzk.me_letters":"5000",
 	"knzk.me_bbcode":"disabled",
 	"knzk.me_markdown":"disabled",
-	"knzk.me_glitch":"enabled",
+	"knzk.me_glitch":"disabled",
 	"mastodos.com":"instance",
 	"mastodos.com_name":"マストどす",
 	"mastodos.com_letters":"500",
@@ -32,7 +32,7 @@ var idata={
 	"dev.kirishima.cloud_markdown":"enabled",
 	"dev.kirishima.cloud_glitch":"enabled",
 	"mstdn.y-zu.org":"instance",
-	"mstdn.y-zu.org_name":"Yづドン!(502 BadGateway)",
+	"mstdn.y-zu.org_name":"Yづドン(Y-zuDon)",
 	"mstdn.y-zu.org_letters":"500",
 	"mstdn.y-zu.org_bbcode":"disabled",
 	"mstdn.y-zu.org_markdown":"enabled",
@@ -84,20 +84,14 @@ var idata={
 	"itabashi.0j0.jp_bbcode":"disabled",
 	"itabashi.0j0.jp_markdown":"disabled",
 	"itabashi.0j0.jp_glitch":"disabled",
-	"theboss.tech":"instance",
-	"theboss.tech_name":"theboss.tech",
-	"theboss.tech_letters":"1000",
-	"theboss.tech_bbcode":"disabled",
-	"theboss.tech_markdown":"disabled",
-	"theboss.tech_glitch":"disabled",
 	"dtp-mstdn.jp":"instance",
 	"dtp-mstdn.jp_name":"DTP鯖",
 	"dtp-mstdn.jp_letters":"500",
 	"dtp-mstdn.jp_bbcode":"disabled",
 	"dtp-mstdn.jp_markdown":"disabled",
 	"dtp-mstdn.jp_glitch":"disabled",
-	"misskey.xyz":"instance",
-	"misskey.xyz_name":"Misskey",
+	"misskey.xyz":"misskey",
+	"misskey.xyz_name":"misskey.xyz",
 	"misskey.xyz_letters":"1000",
 	"misskey.xyz_bbcode":"disabled",
 	"misskey.xyz_markdown":"enabled",
@@ -105,6 +99,28 @@ var idata={
 	"misskey.xyz_post":"Post",
 	"misskey.xyz_fav":" reacted your post.",
 	"misskey.xyz_bt":" reposted your post.",
+	"misskey.dev":"misskey",
+	"misskey.dev_name":"misskey.dev",
+	"misskey.dev_letters":"1024",
+	"misskey.dev_bbcode":"disabled",
+	"misskey.dev_markdown":"enabled",
+	"misskey.dev_public":"Global",
+	"misskey.dev_post":"Post",
+	"misskey.dev_fav":" reacted your post.",
+	"misskey.dev_bt":" reposted your post.",
+	"precure.ml":"instance",
+	"precure.ml_name":"キュアスタ！",
+	"precure.ml_letters":"1024",
+	"precure.ml_bbcode":"disabled",
+	"precure.ml_markdown":"disabled",
+	"precure.ml_post":"キュア！",
+	"precure.ml_glitch":"disabled",
+	"best-friends.chat":"instance",
+	"best-friends.chat_name":"Best Friends",
+	"best-friends.chat_letters":"500",
+	"best-friends.chat_bbcode":"disabled",
+	"best-friends.chat_markdown":"disabled",
+	"best-friends.chat_glitch":"disabled",
 };

 localStorage.setItem("instance", JSON.stringify(idata));
--- a/app/js/login/login.js
+++ b/app/js/login/login.js
@@ -42,29 +42,24 @@ function ck() {
 		}
 	}
 	var multi = localStorage.getItem("multi");
-	if (!multi) {
-		var obj = [];
-		var json = JSON.stringify(obj);
-		localStorage.setItem("multi", json);
-	} else {
+	if(!multi || multi=="[]"){
+		location.href="acct.html?mode=first&code=true"
+	}else{
 		var obj = JSON.parse(multi);
-	}
 	Object.keys(obj).forEach(function(key) {
 		var acct=obj[key];
 		if(acct.domain){
 			refresh(key,true)
 		}
 	});
-	console.log(obj);
-	if (obj[0].domain) {
+if (obj[0].domain) {
 		$("#tl").show();
 		ticker();
 		multiSelector();
-	} else {
-		$("#tl").show();
-		$("#post-box").hide();
+		verck(ver);
 	}
 }
+}
 ck();
 //ログインポップアップ
 function login(url) {
--- a/app/js/login/manager.js
+++ b/app/js/login/manager.js
@@ -2,6 +2,15 @@
 //最初に読むやつ
 function load() {
 	$("#acct-list").html("");
+	if(location.search){
+		var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
+		var mode=m[1];
+		var codex=m[2];
+		if(mode=="first" && codex=="true"){
+			$("body").addClass("first")
+		}else{	
+		}
+	}
 	var prof = localStorage.getItem("prof");
 	$(".my-prof").attr("src", prof);
 	var name = localStorage.getItem("name");
@@ -57,14 +66,8 @@ function load() {
 		localStorage.setItem("acct", 0);
 		var acctN = 0;
 	}
-	var electron = require("electron");
-          var remote=electron.remote;
-          var platform=remote.process.platform;
-	    if(localStorage.getItem("winstore")!="localinstall"){
-			$("#linux").prop("checked", false);
-        }else{
-			$("#linux").prop("checked", true);
-		}
+	//全部チェックアリでいいと思うの
+	$("#linux").prop("checked", true);

 }
 //最初に読む
@@ -262,6 +265,10 @@ function support() {
 				templete = '<a onclick="login(\'' + key +
 					'\')" class="collection-item pointer transparent">' + idata[key + "_name"] + '(' + key + ')</a>';
 				$("#support").append(templete);
+			}else if (instance == "misskey") {
+				templete = '<a onclick="misskeyLogin(\'' + key +
+					'\')" class="collection-item pointer transparent">' + idata[key + "_name"] + '(' + key + ')</a>';
+				$("#support").append(templete);
 			}
 		});
 }
@@ -270,7 +277,7 @@ function support() {
 function login(url) {
 	var multi = localStorage.getItem("multi");
 	var obj = JSON.parse(multi);
-	if($('#misskey:checked').val()=="on" || url=="misskey.xyz"){
+	if($('#misskey:checked').val()=="on"){
 		$("#misskey").prop("checked", true);
 		misskeyLogin(url);
 		return;
@@ -357,6 +364,28 @@ function misskeyLogin(url) {
 				"reaction-write",
 				"vote-read",
 				"vote-write"
+				/*
+				"read:account",
+				"write:account",
+				"read:drive",
+				"write:drive",
+				"read:blocks",
+				"write:blocks",
+				"read:favorites",
+				"write:favorites",
+				"read:following",
+				"write:following",
+				"read:messaging",
+				"write:messaging",
+				"read:mutes",
+				"write:mutes",
+				"write:notes",
+				"read:notifications",
+				"write:notifications",
+				"read:reactions",
+				"write:reactions",
+				"write:votes"
+				*/
 			]
 	}));
    httpreq.onreadystatechange = function() {
@@ -458,7 +487,9 @@ function code(code) {
 				console.log(obj);
 				var json = JSON.stringify(obj);
 				localStorage.setItem("multi", json);
-
+				if($("body").hasClass("first")){
+					location.href="index.html"
+				}
 				load();
 				return;
 			}
@@ -511,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;
 		}
@@ -546,6 +577,9 @@ function getdata(domain, at) {
 		console.log(obj);
 		var json = JSON.stringify(obj);
 		localStorage.setItem("multi", json);
+		if($("body").hasClass("first")){
+			location.href="index.html"
+		}
 		load();
 	});
 }
@@ -783,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);
 					}
--- a/app/js/platform/end.js
+++ b/app/js/platform/end.js
@@ -19,7 +19,7 @@
 		//メンションっぽかったら
 		var ats=[];
 			ats = url.match(
-				/https:\/\/([-a-zA-Z0-9@.]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#]+)/
+				/https:\/\/([-a-zA-Z0-9.]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#@]+)/
 			);
 		console.log(toot);
 		if(toot){
@@ -35,13 +35,17 @@
 			
 		}else if(tags){
 			if(tags[2]){
-				tagShow(tags[2]);
-				Materialize.toast('<a class="btn-flat toast-action" href="detEx(\''+url+'\')">Open in browser</a>', 86400);
+				var acct_id=$a.parent().attr("data-acct");
+				if(!acct_id){
+					acct_id=0;
+				}
+				tl('tag',decodeURI(tags[2]),acct_id,'add')
 			}
 		}else if(ats){
 			console.log(ats);
 			if(ats[2]){
-				if(ats[1]!="quesdon.rinsuki.net"){
+				//Quesdon判定
+				if(!~ats[2].indexOf("@")){
 					udgEx(ats[2]+"@"+ats[1],"main");
 					return false
 				}else{
@@ -177,4 +181,21 @@ const {
 } = require('electron');
 webviewDom.addEventListener('new-window', function(e) {
    shell.openExternal(e.url);
-});
+});
+function playSound() {
+	window.AudioContext = window.AudioContext || window.webkitAudioContext;
+	context = new AudioContext();
+	context.createBufferSource().start(0);
+	context.decodeAudioData(request.response, function (buf) {
+		console.log(source)
+		source.buffer = buf;
+		source.loop = false;
+	});
+	source = context.createBufferSource();
+	volumeControl = context.createGain();
+	source.connect(volumeControl);
+	volumeControl.connect(context.destination);
+	volumeControl.gain.value=0.8
+	console.log(volumeControl)
+	source.start(0);
+}
--- a/app/js/platform/first.js
+++ b/app/js/platform/first.js
@@ -32,6 +32,13 @@ function nl2br(str) {
 	str = str.replace(/(\n|\r)/g, "<br />");
    return str;
 }
+function br2nl(str) {
+	if(!str){
+		return "";
+	}
+    str = str.replace(/<br \/>/g, "\r\n");
+    return str;
+}
 function formattime(date){
 	var str=date.getFullYear()+"-";
 	if(date.getMonth()+1<10){
@@ -55,7 +62,7 @@ function formattime(date){
 	}else{
 		str=str+date.getMinutes()
 	}
-	return str;
+	return escapeHTML(str);
 }
 function formattimeutc(date){
 	var str=date.getUTCFullYear()+"-";
@@ -80,7 +87,7 @@ function formattimeutc(date){
 	}else{
 		str=str+date.getUTCMinutes()
 	}
-	return str;
+	return escapeHTML(str);
 }
 var electron = require("electron");
 var ipc = electron.ipcRenderer;
--- a/app/js/post/emoji.js
+++ b/app/js/post/emoji.js
@@ -4,11 +4,11 @@ $("#emoji-before").addClass("disabled");
 $("#emoji-next").addClass("disabled");

 //絵文字ボタンのトグル
-function emojiToggle() {
+function emojiToggle(reaction) {
 	var acct_id = $("#post-acct-sel").val();
 	var selin = $("#textarea").prop('selectionStart');
-	if(!selin){
-		selin=0;
+	if (!selin) {
+		selin = 0;
 	}
 	localStorage.setItem("cursor", selin);

@@ -18,10 +18,10 @@ function emojiToggle() {
 		$("#suggest").html("");
 		if (!localStorage.getItem("emoji_" + acct_id)) {
 			var html =
-				'<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="emojiGet(\'true\');">'+lang.lang_emoji_get+'</button>';
+				'<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="emojiGet(\'true\');">' + lang.lang_emoji_get + '</button>';
 			$("#emoji-list").html(html);
 		} else {
-			emojiList('home');
+			emojiList('home', reaction);
 		}
 	} else {
 		$("#poll").addClass("hide")
@@ -34,43 +34,97 @@ function emojiToggle() {
 }

 //絵文字リスト挿入
-function emojiGet(parse) {
-	$('#emoji-list').html('Loading...');
+function emojiGet(parse, started) {
+	$('#emoji-list').text('Loading...');
 	var acct_id = $("#post-acct-sel").val();
 	var domain = localStorage.getItem("domain_" + acct_id);
-	var start = "https://" + domain + "/api/v1/custom_emojis";
-	fetch(start, {
-		method: 'GET',
-		headers: {
-			'content-type': 'application/json'
-		},
-	}).then(function(response) {
-		return response.json();
-	}).catch(function(error) {
-		todo(error);
-		console.error(error);
-	}).then(function(json) {
-		if (parse == "true") {
-			$('#emoji-list').html('Parsing...');
-			//絵文字をマストドン公式と同順にソート
-			json.sort(function(a, b) {
-				if (a.shortcode < b.shortcode) return -1;
-				if (a.shortcode > b.shortcode) return 1;
-				return 0;
+	if (localStorage.getItem("mode_" + domain) != "misskey") {
+		var start = "https://" + domain + "/api/v1/custom_emojis";
+		fetch(start, {
+			method: 'GET',
+			headers: {
+				'content-type': 'application/json'
+			},
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (json) {
+			if (parse == "true") {
+				$('#emoji-list').text('Parsing...');
+				//絵文字をマストドン公式と同順にソート
+				json.sort(function (a, b) {
+					if (a.shortcode < b.shortcode) return -1;
+					if (a.shortcode > b.shortcode) return 1;
+					return 0;
+				});
+				localStorage.setItem("emoji_" + acct_id, JSON.stringify(json));
+			} else {
+				localStorage.setItem("emoji_" + acct_id, JSON.stringify(json));
+			}
+			localStorage.setItem("emojiseek", 0);
+			if (!started) {
+				emojiList('home')
+			}
+		});
+	} else {
+		var start = "https://" + domain + "/api/meta";
+		fetch(start, {
+			method: 'POST',
+			headers: {
+				'content-type': 'application/json'
+			},
+		}).then(function (response) {
+			return response.json();
+		}).catch(function (error) {
+			todo(error);
+			console.error(error);
+		}).then(function (json) {
+			if (json.enableEmojiReaction) {
+				localStorage.setItem("emojiReaction_" + acct_id, "true");
+			} else {
+				localStorage.setItem("emojiReaction_" + acct_id, "disabled");
+			}
+			var emojis = json.emojis;
+			var md = [];
+			Object.keys(emojis).forEach(function (key) {
+				var emoji = emojis[key];
+				md.push({
+					"shortcode": emoji.name,
+					"url": emoji.url
+				})
 			});
-			localStorage.setItem("emoji_" + acct_id, JSON.stringify(json));
-		} else {
-			localStorage.setItem("emoji_" + acct_id, JSON.stringify(json));
-		}
-		localStorage.setItem("emojiseek", 0);
-		emojiList('home')
-	});
+			if (parse == "true") {
+				$('#emoji-list').text('Parsing...');
+				//絵文字をマストドン公式と同順にソート
+				md.sort(function (a, b) {
+					if (a.shortcode < b.shortcode) return -1;
+					if (a.shortcode > b.shortcode) return 1;
+					return 0;
+				});
+				localStorage.setItem("emoji_" + acct_id, JSON.stringify(md));
+			} else {
+				localStorage.setItem("emoji_" + acct_id, JSON.stringify(md));
+			}
+			localStorage.setItem("emojiseek", 0);
+			if (!started) {
+				emojiList('home')
+			}
+		});
+	}
 }

 //リストの描画
-function emojiList(target) {
+function emojiList(target, reaction) {
 	$("#now-emoji").text(lang.lang_emoji_custom);
 	var acct_id = $("#post-acct-sel").val();
+	if (reaction && localStorage.getItem("emojiReaction_" + acct_id) != "true") {
+		console.error("Disabled")
+		clear()
+		hide();
+		return false;
+	}
 	var start = localStorage.getItem("emojiseek");
 	if (target == "next") {
 		var start = start * 1 + 127;
@@ -103,8 +157,14 @@ function emojiList(target) {
 	for (i = start; i < start + 126; i++) {
 		var emoji = obj[i];
 		if (emoji) {
-			html = html + '<a onclick="emojiInsert(\':' + emoji.shortcode +
-				': \')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
+			if (reaction) {
+				html = html + '<a onclick="emojiReaction(\':' + emoji.shortcode +
+					':\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
+			} else {
+				html = html + '<a onclick="emojiInsert(\':' + emoji.shortcode +
+					':\')" class="pointer"><img src="' + emoji.url + '" width="20"></a>';
+			}
+
 		}
 	}
 	$("#emoji-list").html(html);
@@ -114,14 +174,19 @@ function emojiList(target) {
 function emojiInsert(code, del) {
 	var now = $("#textarea").val();
 	var selin = localStorage.getItem("cursor");
+	if (localStorage.getItem("emoji-zero-width") == "yes") {
+		var brank = "";
+	} else {
+		var brank = " ";
+	}
 	console.log(selin);
 	var now = $("#textarea").val();
-	if(selin>0){
-		var before   = now.substr(0, selin);
-		var after    = now.substr(selin, now.length);
-		newt = before + " "+ code+" " + after;
-	}else{
-		newt = code+" ";
+	if (selin > 0) {
+		var before = now.substr(0, selin);
+		var after = now.substr(selin, now.length);
+		newt = before + brank + code + brank + after;
+	} else {
+		newt = code + brank;
 	}
 	if (!del) {
 		$("#textarea").val(newt);
@@ -129,20 +194,20 @@ function emojiInsert(code, del) {
 	} else {
 		var regExp = new RegExp(del, "g");
 		var now = now.replace(regExp, "");
-		$("#textarea").val(now + " " + code);
+		$("#textarea").val(now + brank + code);
 	}
-	
+
 	$("#textarea").focus();
 	var selin = $("#textarea").prop('selectionStart');
-	if(!selin){
-		selin=0;
+	if (!selin) {
+		selin = 0;
 	}
 	localStorage.setItem("cursor", selin);
 }
 //改行挿入
 function brInsert(code) {
-	if(!$('#post-box').hasClass("appear")){
-		localStorage.setItem("nohide",true);
+	if (!$('#post-box').hasClass("appear")) {
+		localStorage.setItem("nohide", true);
 		show();
 	}
 	var now = $("#textarea").val();
--- a/app/js/post/misskeystatus.js
+++ b/app/js/post/misskeystatus.js
@@ -65,7 +65,7 @@ function reactiontoggle(id,acct_id,tlid){
            var json = httpreq.response;
            console.log(json);
            if(json.reactionCounts){
-                var reactions=["like","love","laugh","hmm","surprise","congrats","angry","confused","pudding"];
+                var reactions=["like","love","laugh","hmm","surprise","congrats","angry","confused","pudding","star"];
                for(var i=0;i<reactions.length;i++){
                    if(json.reactionCounts[reactions[i]]){
                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(json.reactionCounts[reactions[i]])
@@ -93,7 +93,21 @@ function reactiontoggle(id,acct_id,tlid){
                }
            }
 		}
-	}
+    }
+    $("#pub_" + id +" .freeReact").toggleClass("hide");
+}
+//reactioncustom
+function reactioncustom(acct_id,id){
+    $("#reply").val(id);
+    $("#unreact").hide();
+    $("#addreact").removeClass("hide");
+	$("#post-acct-sel").val(acct_id);
+	$('select').material_select();
+    localStorage.setItem("nohide",true);
+    show()
+    emojiToggle(true)
+    $("#left-side").hide();
+    $("#default-emoji").hide();
 }
 function reactRefresh(acct_id,id){
    var domain = localStorage.getItem("domain_" + acct_id);
@@ -119,30 +133,42 @@ function reactRefresh(acct_id,id){
            return false;
        }
        var poll="";
-        console.log(json);
-        reactRefreshCore(json)
+        if(json.error){
+            $("[toot-id=" + id + "]").hide();
+			$("[toot-id=" + id + "]").remove();
+        }else{
+            reactRefreshCore(json)
+        }
    });
 }
 function reactRefreshCore(json){
    var id=json.id;
    if(json.reactionCounts){
-        var reactions=["like","love","laugh","hmm","surprise","congrats","angry","confused","pudding"];
        $("#pub_" + id +" .reactions").removeClass("hide")
-        for(var i=0;i<reactions.length;i++){
-            if(json.reactionCounts[reactions[i]]){
-                console.log(json.reactionCounts[reactions[i]])
-                $("#pub_" + id +" .re-"+reactions[i]+"ct").text(json.reactionCounts[reactions[i]])
-                $("#pub_" + id +" .re-"+reactions[i]).removeClass("hide")
+        var regExp = new RegExp( ":", "g" ) ;
+        Object.keys(json.reactionCounts).forEach(function(keye) {
+            keyeClass=keye.replace(regExp,'');
+            if(json.reactionCounts[keye]){
+                console.log(json.reactionCounts[keye])
+                $("#pub_" + id +" .re-"+keyeClass+"ct").text(json.reactionCounts[keye])
+                $("#pub_" + id +" .re-"+keyeClass).removeClass("hide")
            }else{
-                $("#pub_" + id +" .re-"+reactions[i]+"ct").text(0)
+                $("#pub_" + id +" .re-"+keyeClass+"ct").text(0)
                if($("#pub_" + id +" .reactions").hasClass("fullreact")){
-                    $("#pub_" + id +" .re-"+reactions[i]).addClass("hide")
+                    $("#pub_" + id +" .re-"+keyeClass).addClass("hide")
                }
-                $("#pub_" + id +" .re-"+reactions[i]+"ct").text(json.reactionCounts[reactions[i]])
+                $("#pub_" + id +" .re-"+keyeClass+"ct").text(json.reactionCounts[keye])
            }
-        }
+        });
    }
 }
+function emojiReaction(emoji){
+    var acct_id = $("#post-acct-sel").val();
+    var id = $("#reply").val();
+    reaction(emoji,id,acct_id,null)
+    clear();
+    hide();
+}
 function reaction(mode,id,acct_id,tlid){
    var domain = localStorage.getItem("domain_" + acct_id);
    var at = localStorage.getItem("acct_"+ acct_id + "_at");
@@ -208,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)
 		    }
--- 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("");
 	});
@@ -307,4 +307,8 @@ function clear() {
 		$("#post-acct-sel").val(localStorage.getItem("main"));
 	}
 	$('select').material_select();
+	$("#left-side").show();
+	$("#default-emoji").show();
+	$("#unreact").show();
+	$("#addreact").addClass("hide");
 }
--- a/app/js/post/status.js
+++ b/app/js/post/status.js
@@ -236,6 +236,8 @@ function del(id, acct_id) {
 		httpreq.setRequestHeader('Content-Type', 'application/json');
 		httpreq.responseType = "json";
 		httpreq.send(JSON.stringify({i:at,noteId:id}));
+		$("[toot-id=" + id+ "]").hide();
+					$("[toot-id=" + id + "]").remove();
 	}else{
 		var start = "https://" + domain + "/api/v1/statuses/" + id;
 		var httpreq = new XMLHttpRequest();
--- a/app/js/post/suggest.js
+++ b/app/js/post/suggest.js
@@ -53,16 +53,7 @@ input.addEventListener("focus", function() {
 			
 			var tag = new_val.match(/#(\S{3,})/);
 			var acct = new_val.match(/@(\S{3,})/);
-			if(localStorage.getItem("imas")){
-				//セルフNP
-				var cpnp = new_val.match(/^(?!.*http)\/\/(\S{1,})/);
-			}else{
-				var cpnp=[];
-			}
-			if (cpnp && cpnp[1]) {
-				var q = cpnp[1];
-				cgNPs(q);
-			} else if (tag && tag[1]) {
+			if (tag && tag[1]) {
 				var q = tag[1];
 			} else if (acct && acct[1]) {
 				var q = acct[1];
@@ -178,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{
--- a/app/js/tl/card.js
+++ b/app/js/tl/card.js
@@ -4,9 +4,9 @@ function additional(acct_id, tlid) {
 	//メンション系
 	//$(".mention").attr("href", "");
 	
-	$(".mention").addClass("parsed");
+	$("#timeline-container .mention").addClass("parsed");

-	$(".hashtag").each(function(i, elem) {
+	$("#timeline-container .hashtag").each(function(i, elem) {
 		var tags = $(this).attr("href").match(
 			/https?:\/\/([-a-zA-Z0-9@.]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
 		);
@@ -17,8 +17,6 @@ function additional(acct_id, tlid) {
 			}
 			
 		}
-		
-		
 	});
 	
 	//トゥートサムネ
@@ -34,6 +32,7 @@ function additional(acct_id, tlid) {
 				);
 			}
 		}else{
+			text=""
 			var urls =[]
 		}
 		
@@ -64,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");
 					}
@@ -149,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");
 					}
--- a/app/js/tl/dm.js
+++ b/app/js/tl/dm.js
@@ -243,7 +243,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
        var id = toot.id;
        var home = "";
 		if (toot.account.locked) {
-			var locked = ' <i class="fa fa-lock red-text"></i>';
+			var locked = ' <i class="fas fa-lock red-text"></i>';
 		} else {
 			var locked = "";
 		}
@@ -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;
 				}
 		   }
@@ -506,7 +506,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			toot.account.acct + locked + '</span></div>' +
 			'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'' +
 			toot.url + '\');" title="' + date(toot.created_at, 'absolute') +
-			'('+lang.lang_parse_clickcopyurl+')"><i class="fa fa-clock-o"></i>' +
+			'('+lang.lang_parse_clickcopyurl+')"><i class="far fa-clock-o"></i>' +
 			date(toot.created_at, datetype) + '</span>' +
 			'</div></div>' +
 			'<div class="area-toot">'+tickerdom+'<span class="' +
--- a/app/js/tl/filter.js
+++ b/app/js/tl/filter.js
@@ -146,6 +146,11 @@ function filter(){
        }
 	});
 }
+function filterTime(day,hour,min){
+	$("#days_filter").val(day)
+	$("#hours_filter").val(hour)
+	$("#mins_filter").val(min)
+}
 function makeNewFilter(){
 	var acct_id = $("#filter-acct-sel").val();
 	var phr=$("#filter-add-word").val();
--- a/app/js/tl/list.js
+++ b/app/js/tl/list.js
@@ -12,40 +12,68 @@ function list(){
    $("#lists-user").html("");
    var acct_id = $("#list-acct-sel").val();
    var domain = localStorage.getItem("domain_" + acct_id);
-    var at = localStorage.getItem("acct_"+ acct_id + "_at");
-    var start = "https://" + domain + "/api/v1/lists"
-	console.log(start)
-	fetch(start, {
-		method: 'GET',
-		headers: {
-			'content-type': 'application/json',
-			'Authorization': 'Bearer ' + at
-		},
-	}).then(function(response) {
-		return response.json();
-	}).catch(function(error) {
-		todo(error);
-		console.error(error);
-	}).then(function(json) {
-		if (json) {
-			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 +
-					'\')" class="pointer">'+lang.lang_list_show+'</a>/<a onclick="listUser(' + list.id + ',' + acct_id +
-					')" class="pointer">'+lang.lang_list_users+'</a><br> ';
-			});
-			$("#lists").html(lists);
-		}else{
-            $("#lists").html(lang.lang_list_nodata);
-        }
-	});
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	if(localStorage.getItem("mode_" + domain)=="misskey"){
+		var start = "https://" + domain + "/api/users/lists/list"
+		fetch(start, {
+			method: 'POST',
+			body: JSON.stringify({
+				i:at
+			}),
+		}).then(function(response) {
+			return response.json();
+		}).catch(function(error) {
+			todo(error);
+			console.error(error);
+		}).then(function(json) {
+			if (json) {
+				var lists = "";
+				Object.keys(json).forEach(function(key) {
+					var list = json[key];
+					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);
+			}else{
+				$("#lists").html(lang.lang_list_nodata);
+			}
+		});
+    }else{
+		var start = "https://" + domain + "/api/v1/lists"
+		console.log(start)
+		fetch(start, {
+			method: 'GET',
+			headers: {
+				'content-type': 'application/json',
+				'Authorization': 'Bearer ' + at
+			},
+		}).then(function(response) {
+			return response.json();
+		}).catch(function(error) {
+			todo(error);
+			console.error(error);
+		}).then(function(json) {
+			if (json) {
+				var lists = "";
+				Object.keys(json).forEach(function(key) {
+					var list = json[key];
+					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>';
+				});
+				$("#lists").html(lists);
+			}else{
+				$("#lists").html(lang.lang_list_nodata);
+			}
+		});
+	}
 }
 function makeNewList(){
    var acct_id = $("#list-acct-sel").val();
    var text=$("#list-add").val();
    var domain = localStorage.getItem("domain_" + acct_id);
-    var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	if(localStorage.getItem("mode_" + domain)!="misskey"){
    var start = "https://" + domain + "/api/v1/lists"
 	console.log(start)
 	var httpreq = new XMLHttpRequest();
@@ -63,6 +91,25 @@ function makeNewList(){
 			$("#list-add").val("")
 		}
 	}
+}else{
+	var start = "https://" + domain + "/api/users/lists/create"
+	console.log(start)
+	var httpreq = new XMLHttpRequest();
+	httpreq.open('POST', start, true);
+	httpreq.setRequestHeader('Content-Type', 'application/json');
+	httpreq.responseType = "json";
+	httpreq.send(JSON.stringify({
+		i:at,
+		title: text
+	}));
+    httpreq.onreadystatechange = function() {
+		if (httpreq.readyState === 4) {
+			var json = httpreq.response;
+			list();
+			$("#list-add").val("")
+		}
+	}
+}
 }
 function listShow(id,title,acct_id){
    localStorage.setItem("list_"+id+"_"+acct_id,title);
@@ -70,8 +117,8 @@ function listShow(id,title,acct_id){
 }
 function listUser(id,acct_id){
    var domain = localStorage.getItem("domain_" + acct_id);
-    var at = localStorage.getItem("acct_"+ acct_id + "_at");
-    var start = "https://" + domain + "/api/v1/lists/"+id+"/accounts"
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	var start = "https://" + domain + "/api/v1/lists/"+id+"/accounts"
 	console.log(start)
 	fetch(start, {
 		method: 'GET',
@@ -99,7 +146,8 @@ function listUser(id,acct_id){
 }
 function hisList(user,acct_id){
    var domain = localStorage.getItem("domain_" + acct_id);
-    var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	if(localStorage.getItem("mode_" + domain)!="misskey"){
    var start = "https://" + domain + "/api/v1/lists"
 	console.log(start)
 	fetch(start, {
@@ -118,7 +166,7 @@ function hisList(user,acct_id){
 			var lists = lang.lang_list_add+"<br>";
 			Object.keys(json).forEach(function(key) {
                var list = json[key];
-				lists = lists + '<a onclick="listAdd(' + list.id + ',\'' + user + '\',\'' + acct_id +
+				lists = lists + '<a onclick="listAdd(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
 					'\')" class="pointer">'+escapeHTML(list.title)+'</a><br> ';
 			});
 			$("#his-lists-a").html(lists);
@@ -144,28 +192,66 @@ function hisList(user,acct_id){
 			var lists = lang.lang_list_remove+"<br>";
 			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> ';
+				lists = lists + '<a onclick="listRemove(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
+					'\')" class="pointer">'+escapeHTML(list.title)+'</a><br> ';
 			});
 			$("#his-lists-b").html(lists);
 		}else{
            $("#his-lists-b").html(lang.lang_list_nodata);
        }
-    });
+	});
+}else{
+	var start = "https://" + domain + "/api/users/lists/list"
+		fetch(start, {
+			method: 'POST',
+			body: JSON.stringify({
+				i:at
+			}),
+		}).then(function(response) {
+			return response.json();
+		}).catch(function(error) {
+			todo(error);
+			console.error(error);
+		}).then(function(json) {
+			if (json) {
+				var lists = "";
+				Object.keys(json).forEach(function(key) {
+					var list = json[key];
+					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>';
+				});
+				$("#his-lists-a").html(lists);
+			}else{
+				$("#his-lists-a").html(lang.lang_list_nodata);
+			}
+		});
+		$("#his-lists-b").html("");
+}
 }
 function listAdd(id,user,acct_id){
    var domain = localStorage.getItem("domain_" + acct_id);
-    var at = localStorage.getItem("acct_"+ acct_id + "_at");
-    var start = "https://" + domain + "/api/v1/lists/"+id+"/accounts"
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	if(localStorage.getItem("mode_" + domain)=="misskey"){
+		var start = "https://" + domain + "/api/users/lists/push"
+		var i={
+			i:at,
+			listId:id,
+			userId:user
+		}
+	}else{
+		var start = "https://" + domain + "/api/v1/lists/"+id+"/accounts"
+		var i={
+			account_ids: [user]
+		}
+	}
 	console.log(start)
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
 	httpreq.responseType = "json";
-	httpreq.send(JSON.stringify({
-		account_ids: [user]
-	}));
+	httpreq.send(JSON.stringify(i));
    httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
@@ -176,16 +262,28 @@ function listAdd(id,user,acct_id){
 function listRemove(id,user,acct_id){
    var domain = localStorage.getItem("domain_" + acct_id);
    var at = localStorage.getItem("acct_"+ acct_id + "_at");
-    var start = "https://" + domain + "/api/v1/lists/"+id+"/accounts"
+    if(localStorage.getItem("mode_" + domain)=="misskey"){
+		var start = "https://" + domain + "/api/users/lists/push"
+		var method='POST'
+		var i={
+			i:at,
+			listId:id,
+			userId:user
+		}
+	}else{
+		var start = "https://" + domain + "/api/v1/lists/"+id+"/accounts"
+		var method='DELETE'
+		var i={
+			account_ids: [user]
+		}
+	}
 	console.log(start)
 	var httpreq = new XMLHttpRequest();
-	httpreq.open('DELETE', start, true);
+	httpreq.open(method, start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
 	httpreq.responseType = "json";
-	httpreq.send(JSON.stringify({
-		account_ids: [user]
-	}));
+	httpreq.send(JSON.stringify(i));
    httpreq.onreadystatechange = function() {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
--- a/app/js/tl/misskeyparse.js
+++ b/app/js/tl/misskeyparse.js
@@ -160,6 +160,17 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
        }else{
 			disname="";
 		}
+		//絵文字があれば
+		if(toot.user.emojis){
+			Object.keys(toot.user.emojis).forEach(function(key5) {
+				var emoji = toot.user.emojis[key5];
+				var shortcode = emoji.name;
+				var emoji_url = '<img draggable="false" src="' + emoji.url +
+					'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				dis_name = dis_name.replace(regExp, emoji_url);
+			});
+		}
 		if (mix == "notf") {
 			if (gif == "yes") {
 				noticeavatar = toot.user.avatarUrl;
@@ -173,14 +184,14 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'"></a>';
 			if (toot.type == "reply") {
 				var what = lang.lang_parse_mentioned;
-				var icon = '<i class="big-text fa fa-share teal-text"></i>';
+				var icon = '<i class="big-text fas fa-share teal-text"></i>';
 				noticeavatar="";
 			} else if (toot.type == "renote") {
 				var what = lang.lang_misskeyparse_renoted;
-				var icon = '<i class="big-text fa fa-retweet light-blue-text"></i>';
+				var icon = '<i class="big-text fas fa-retweet light-blue-text"></i>';
 			}  else if (toot.type == "quote") {
 				var what = lang.lang_misskeyparse_quoted;
-				var icon = '<i class="big-text fa fa-quote-right orange-text"></i>';
+				var icon = '<i class="big-text fas fa-quote-right orange-text"></i>';
 			} else if (toot.type == "reaction") {
 				var what = lang.lang_misskeyparse_reacted;
 				var reactions={
@@ -192,29 +203,30 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					"congrats":"🎉",
 					"amgry":"💢",
 					"confused":"😥",
-					"pudding":"🍮"
+					"pudding":"🍮",
+					"star":"⭐"
 				}
 				var icon=reactions[toot.reaction];
-				var reactions=["like","love","laugh","hmm","surprise","congrats","angry","confused","pudding"];
-                for(var i=0;i<reactions.length;i++){
-                    if(toot.note.reactionCounts[reactions[i]]){
-                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(toot.note.reactionCounts[reactions[i]])
-                        $("#pub_" + id +" .re-"+reactions[i]).removeClass("hide")
-                    }else{
-                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(0)
-                        if($("#pub_" + id +" .reactions").hasClass("fullreact")){
-                            $("#pub_" + id +" .re-"+reactions[i]).addClass("hide")
-                        }else{
-                            $("#pub_" + id +" .re-"+reactions[i]).removeClass("hide")
-                        }
-                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(toot.note.reactionCounts[reactions[i]])
-                    }
-                }
+				var emojisData = JSON.parse(localStorage.getItem("emoji_" + acct_id));
+				if(!icon){
+						if(emojisData){
+							var num = emojisData.length;
+							var ehtml="";
+							for (i = 0; i < num; i++) {
+								var emoji = emojisData[i];
+								if (":"+emoji.shortcode+":"==toot.reaction) {
+									if (emoji) {
+										icon='<img src="'+emoji.url+'" style="width:1rem">';
+									}
+								}
+								}
+						}
+				}
 			}else{
 				var icon = '<i class="big-text material-icons indigo-text" style="font-size:17px">info</i>';
 			}
 			var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.createdAt,
-				'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.createdAt,
+				'absolute') + '('+lang.lang_parse_notftime+')"><i class="far fa-clock"></i>' + date(toot.createdAt,
 				datetype) +
 			'</span>'+icon+'<a onclick="udg(\'' + toot.user.username +
 				'\',\'' + acct_id + '\')" class="pointer grey-text">' + dis_name +
@@ -250,19 +262,19 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					var ipc = electron.ipcRenderer;
 					var os = electron.remote.process.platform;
 					var options = {
-						body: toot.account.display_name+"(" + toot.account.acct +")"+what+"\n\n"+$.strip_tagstemp(toot.status.content),
-						icon: toot.account.avatar
+						body: toot.user.name+"(" + toot.user.username +")"+what+"\n\n"+$.strip_tagstemp(toot.note.text),
+						icon: toot.user.avatarUrl
 					  };
 					if(os=="darwin"){
 						var n = new Notification('TheDesk:'+domain, options);
 					}else{
 						ipc.send('native-notf', [
 							'TheDesk:'+domain,
-							toot.account.display_name+"(" + toot.account.acct +")"+what+"\n\n"+$.strip_tagstemp(toot.status.content),
-							toot.account.avatar,
+							toot.user.name+"(" + toot.user.username +")"+what+"\n\n"+$.strip_tagstemp(toot.note.text),
+							toot.user.avatarUrl,
 							"toot",
 							acct_id,
-							toot.status.id
+							toot.note.id
 						]);
 					}
 				}
@@ -274,18 +286,20 @@ 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) {
 				var rebtxt = lang.lang_parse_btedsimple;
 				var rticon = "fa-retweet light-blue-text";
-				var notice = '<i class="big-text fa '+rticon+'"></i>'+ dis_name + "(@" + toot.user.username +
+				var notice = '<i class="big-text fas '+rticon+'"></i>'+ dis_name + "(@" + toot.user.username +
 					")<br>";
 					var boostback = "shared";
 				var uniqueid=toot.id;
-				var toot = toot.renote;
-				var dis_name=escapeHTMLtemp(toot.user.name);
+				if(!toot.text){
+					var toot = toot.renote;
+				}
+				var dis_name=escapeHTML(toot.user.name);
 			    var uniqueid=toot.id;
 				var actemojick=false
 			} else {
@@ -328,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;
@@ -348,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";
@@ -395,7 +409,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			var emojick = toot.emojis[0];
 		}else{
 			var emojick=false;
-        }
+		}
        //デフォ絵文字
        if(content){
 			//MFM
@@ -403,17 +417,35 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			content=content.replace(/`(.+)`/gi, '<code>$1</code>')
 			content=content.replace(/(http(s)?:\/\/[\x21-\x7e]+)/gi, '<a href="$1" target="_blank">$1</a>')
 			content=content.replace(/\(\(\((.+)\)\)\)/gi, '<span class="shake">$1</span>')
-			content=content.replace(/<motion>(.+)<\/motion>/gi, '<span class="shake">$1</span>')
+			content=content.replace(/&lt;motion&gt;(.+)&lt;\/motion&gt;/gi, '<span class="shake">$1</span>')
 			content=content.replace(/\*\*\*([^*]+)\*\*\*/gi, '<span class="shake" style="font-size:200%">$1</span>')
 			content=content.replace(/\*\*([^*]+)\*\*/gi, '<b>$1</b>')
 			content=content.replace(/^(.+)\s(検索|search)$/gmi, '<div class="input-field"><i class="material-icons prefix">search</i><input type="text" style="width:calc( 60% - 80px);" name="q" value="$1" id="srcbox_'+toot.id+'"><label for="src" data-trans="src" class="">検索</label><button class="btn waves-effect indigo" style="width:40%;" data-trans-i="src" onclick="goGoogle(\''+toot.id+'\')">検索</button></div>')
 			content=content.replace(/\[(.+)\]\(<a href="(http(s)?:\/\/[\x21-\x7e]+)".+\)/gi,'<a href="$2" target="_blank">$1</a>');
-			
+			content=content.replace(/&lt;center&gt;/gi, '<div class="center">')
+			content=content.replace(/&lt;\/center&gt;/gi, '</div>')
+			content=content.replace(/&lt;flip&gt;(.+)&lt;\/flip&gt;/gi, '<span class="fa fa-flip-horizontal">$1</span>')
+			content=content.replace(/&lt;small&gt;(.+)&lt;\/small&gt;/gi, '<small>$1</small>')
+			content=content.replace(/&lt;i&gt;(.+)&lt;\/i&gt;/gi, '<i>$1</i>')
+			content=content.replace(/&lt;spin&gt;(.+)&lt;\/spin&gt;/gi, '<span class="fa fa-spin">$1</span>')
+			content=content.replace(/\*\*(.+)\*\*/gi, '<b>$1</b>')
+			content=content.replace(/&lt;jump&gt;(.+)&lt;\/jump&gt;/gi, '<span class="jump">$1</jump>')
            content=twemoji.parse(content);
        }else{
            content="";
        }
-		
+		//絵文字があれば
+		if (emojick) {
+			Object.keys(toot.emojis).forEach(function(key5) {
+				var emoji = toot.emojis[key5];
+				var shortcode = emoji.name;
+				var emoji_url = '<img draggable="false" src="' + emoji.url +
+					'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				content = content.replace(regExp, emoji_url);
+				spoil = spoil.replace(regExp, emoji_url);
+			});
+		}
 		if(dis_name){
 			dis_name=twemoji.parse(dis_name);
 		}else{
@@ -586,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;
 				}
 		   }
@@ -602,12 +634,52 @@ 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>';
 		}
+		//引用Renote
+		if(toot.renote){
+			poll=poll+'<div class="quote-renote"><div class="renote-icon"><a onclick="udg(\'' + toot.renote.user.id +
+			'\',' + acct_id + ');" user="' + toot.renote.user.username + '" class="udg"><img src="'+toot.renote.user.avatarUrl+'"></a></div><div class="renote-user">'+escapeHTML(toot.renote.user.name)+'</div><div class="renote-text">'+escapeHTML(toot.renote.text)+'</div></div>'
+		}
+			if(localStorage.getItem("emojiReaction_" + acct_id)=="disabled"){
+				var freeReact="hide";
+			}else{
+				var freeReact="";
+			}
 		//Reactions
        if(toot.reactionCounts){
+			var addReact="";
+			Object.keys(toot.reactionCounts).forEach(function(keye) {
+				var thisReact=toot.reactionCounts[keye];
+					 if(keye=="like"){ var defaultEmoji=true;}
+				else if(keye=="love"){ var defaultEmoji=true; }
+				else if(keye=="laugh"){ var defaultEmoji=true; }
+				else if(keye=="hmm"){ var defaultEmoji=true; }
+				else if(keye=="surprise"){ var defaultEmoji=true; }
+				else if(keye=="congrats"){ var defaultEmoji=true; }
+				else if(keye=="angry"){ var defaultEmoji=true; }
+				else if(keye=="confused"){ var defaultEmoji=true; }
+				else if(keye=="pudding"){ var defaultEmoji=true; }
+				else{
+					var obj = JSON.parse(localStorage.getItem("emoji_" + acct_id));
+				if(obj){
+					var num = obj.length;
+					var ehtml="";
+					for (i = 0; i < num; i++) {
+						var emoji = obj[i];
+						if (":"+emoji.shortcode+":"==keye) {
+							if (emoji) {
+								addReact=addReact+	'<span class="reaction"><a onclick="reaction(\''+keye+'\',\'' + toot.id + '\',' + acct_id +
+								',\'' + tlid +'\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;"><img src="'+emoji.url+'" style="width:13px;"></a><span class="re-'+emoji.shortcode+'ct">'+thisReact+
+								'</span></span>';
+							}
+						}
+						}
+				}
+				}
+			});
        if(toot.reactionCounts.like){
            var like=toot.reactionCounts.like;
            var likehide="";
@@ -676,7 +748,10 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
            var like=0;var love=0;var laugh=0;var hmm=0;var surprise=0;var congrats=0;var angry=0;var confused=0;var pudding=0;
            var likehide="hide";var lovehide="hide";var laughhide="hide";var hmmhide="hide";var suphide="hide";var conghide="hide";var anghide="hide";var confhide="hide";var pudhide="hide";
            var fullhide="hide";
-        }
+		}
+		if(!addReact && likehide=="hide"&& lovehide=="hide"&& laughhide=="hide"&&  hmmhide=="hide"&&  suphide=="hide"&& conghide=="hide"&&  anghide=="hide"&&  confhide=="hide"&& pudhide=="hide"){
+			var fullhide="hide";
+		}
        if(toot.myReaction){
            var reacted=toot.myReaction;
        }else{
@@ -687,6 +762,11 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			content='<span class="gray">This post has no content. It may be media-only, private or deleted.</span>';
 		}
 		var trans="";
+		if(toot.user.emojis){
+			var actemojick = toot.user.emojis[0];
+		}else{
+			var actemojick=false;
+		}
 		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
 			boostback + ' ' + fav_app + ' ' + rt_app + '  ' + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="'+media_ids+' " unixtime="' + date(obj[
 				key].created_at, 'unix') + '" '+if_notf+' onmouseover="mov(\'' + toot.id + '\',\''+tlid+'\',\'mv\')" onclick="mov(\'' + toot.id + '\',\''+tlid+'\',\'cl\')" onmouseout="resetmv(\'mv\')" reacted="'+reacted+'">' +
@@ -703,7 +783,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			toot.user.username + '</span></div>' +
 			'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'https://' +domain+"/notes/"+
 			toot.id + '\');" title="' + date(toot.createdAt, 'absolute') +
-			'('+lang.lang_parse_clickcopyurl+')"><i class="fa fa-clock-o"></i>' +
+			'('+lang.lang_parse_clickcopyurl+')"><i class="far fa-clock"></i>' +
 			date(toot.createdAt, datetype) + '</span>' +
 			'</div></div>' +
 			'<div class="area-toot">'+tickerdom+'<span class="toot ' + spoiler + '">' + content +
@@ -711,8 +791,8 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			api_spoil + ' cw_text_' + toot.id + '">' + spoil + spoiler_show +
 			'</span>' +
 			'' + viewer + '' +
-            '</div><div class="area-additional"><span class="additional">'+analyze+
-            '<div class="reactions '+fullhide+'" style="height: 25px;"><span class="'+likehide+' reaction re-like"><a onclick="reaction(\'like\',\'' + toot.id + '\',' + acct_id +
+			'</div><div class="area-additional"><span class="additional">'+analyze+
+			'<div class="reactions '+fullhide+'" style="height: 25px;"><span class="'+likehide+' reaction re-like"><a onclick="reaction(\'like\',\'' + toot.id + '\',' + acct_id +
            ',\'' + tlid +'\')" class="waves-effect waves-dark btn-flat" style="padding:0;margin-left:3px;">'+twemoji.parse("👍")+'</a><span class="re-likect">'+like+
            '</span></span><span class="'+lovehide+' reaction re-love"><a onclick="reaction(\'love\',\'' + toot.id + '\',' + acct_id +
            ',\'' + tlid +'\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;">'+twemoji.parse("💓")+'</a><span class="re-lovect">'+love+
@@ -730,7 +810,9 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
            ',\'' + tlid +'\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;">'+twemoji.parse("😥")+'</a><span class="re-confusedct">'+confused+
            '</span></span><span class="'+pudhide+' reaction re-pudding"><a onclick="reaction(\'pudding\',\'' + toot.id + '\',' + acct_id +
            ',\'' + tlid +'\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;">'+twemoji.parse("🍮")+'</a><span class="re-puddingct">'+pudding+
-			'</span></div>'+poll + mentions + tags + '</div>' +
+			'</span></span>'+addReact+
+			'<i class="material-icons pointer hide freeReact '+freeReact+'" style="font-size:1.0rem; padding-left:5px;position: relative;top: 3px;" onclick="reactioncustom(\''+acct_id+'\',\''+id+'\')">add_box</i></div>'
+			+poll + mentions + tags + '</div>' +
 			'<div class="area-vis"></div>'+
 			'<div class="area-actions '+mouseover+'">' +
 			'<div class="action">'+vis+'</div>'+
@@ -738,28 +820,28 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'<div class="action '+disp["re"]+' '+noauth+'"><a onclick="misskeyreply(\'' + toot.id +
 			'\',\'' + acct_id + '\',' +
 			acct_id + ',\''+visen+
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fa fa-share"></i></a></div>' +
+			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fas fa-share"></i></a></div>' +
 			'<div class="action '+can_rt+' '+disp["rt"]+' '+noauth+'"><a onclick="renote(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renote+'"><i class="text-darken-3 fa fa-retweet ' +
+			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renote+'"><i class="text-darken-3 fas fa-retweet ' +
 			if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct"></span></a></div>' +
 			'<div class="action '+can_rt+' '+disp["qt"]+' '+noauth+'"><a onclick="renoteqt(\'' + toot.id + '\',' + acct_id +
-			',\'misskey.xyz\',\'misskey.xyz\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renoteqt+'"><i class="text-darken-3 fa fa-quote-right"></i></a></div>' +
+			',\'misskey.xyz\',\'misskey.xyz\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renoteqt+'"><i class="text-darken-3 fas fa-quote-right"></i></a></div>' +
 			'<div class="action '+disp["fav"]+' '+noauth+'"><a onclick="reactiontoggle(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_reaction+'"><i class="fa text-darken-3 fa-plus' +
+			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_reaction+'"><i class="fas text-darken-3 fa-plus' +
 			if_fav + ' fav_' + toot.id + '"></i></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="fa fa-trash-o"></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="fa fa-map-pin pin_' + toot.id + '"></i></a></div>' 
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fas fa-map-pin pin_' + toot.id + '"></i></a></div>' 
 			+'<div class="' + if_mine + ' action '+disp["red"]+' '+noauth+'"><a onclick="redraft(\'' + toot.id + '\',' +
 			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 +
@@ -791,7 +873,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 		var ftxt=lang.lang_parse_followed;
 		if(popup > 0 || popup==-1){
 			var notftext='<span class="cbadge"title="' + date(toot.createdAt,
-				'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.createdAt,
+				'absolute') + '('+lang.lang_parse_notftime+')"><i class="far fa-clock"></i>' + date(toot.createdAt,
 				datetype) +
 			'</span>'+ftxt+'<br>';
 			var toot = toot.user;
@@ -835,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">' +
--- 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");
+			}
 		}
 		
 	};
--- a/app/js/tl/notification.js
+++ b/app/js/tl/notification.js
@@ -60,13 +60,13 @@ function notfColumn(acct_id, tlid, sys){
 						var ipc = electron.ipcRenderer;
 						var os = electron.remote.process.platform;
 							var options = {
-								body: ct+lang_notf_new[lang],
+								body: ct+lang.lang_notf_new,
 								icon: localStorage.getItem("prof_"+acct_id)
 							  };
 							if(os=="darwin"){
 								var n = new Notification('TheDesk:'+domain, options);
 							}else{
-								ipc.send('native-notf', ['TheDesk:'+domain,ct+lang_notf_new[lang],localStorage.getItem("prof_"+acct_id)]);
+								ipc.send('native-notf', ['TheDesk:'+domain,ct+lang.lang_notf_new,localStorage.getItem("prof_"+acct_id)]);
 							}
 						
 					}
@@ -112,73 +112,6 @@ function notfColumn(acct_id, tlid, sys){
 		at;
 	}

-	console.log(start);
-	var wsid = websocketNotf.length;
-	websocketNotf[acct_id] = new WebSocket(start);
-	console.log(websocketNotf);
-	websocketNotf[acct_id].onopen = function(mess) {
-		console.log("Connect Streaming API(Notf):");
-		console.log(mess);
-		$("i[data-notf=" + acct_id +"]").removeClass("red-text");
-
-	}
-	websocketNotf[acct_id].onmessage = function(mess) {
-		console.log("Receive Streaming API(Notf):"+acct_id);
-		var popup = localStorage.getItem("popup");
-			if (!popup) {
-				popup = 0;
-			}
-			console.log(domain)
-		if(misskey){
-			console.log("misskey")
-			console.log(JSON.parse(mess.data));
-			if (JSON.parse(mess.data).type == "notification") {
-				var obj = JSON.parse(mess.data).body;
-				console.log(obj);
-				if(obj.type!="follow"){
-					
-					templete = misskeyParse([obj], 'notf', acct_id, 'notf', popup);
-				}else{
-					templete = misskeyUserparse([obj], 'notf', acct_id, 'notf', popup);
-				}
-				if(obj.type=="reaction"){
-					console.log("refresh")
-					reactRefresh(acct_id,obj.note.id)
-				}
-				if(!$("div[data-notfIndv=" + acct_id +"_"+obj.id+"]").length){
-					$("div[data-notf=" + acct_id +"]").prepend(templete);
-				}
-				jQuery("time.timeago").timeago();
-			}else if(JSON.parse(mess.data).type == "note-updated"){
-				var obj = JSON.parse(mess.data).body.note;
-				reactRefreshCore(obj)
-			}
-		}else{
-		var obj = JSON.parse(JSON.parse(mess.data).payload);
-		console.log(obj);
-		var type = JSON.parse(mess.data).event;
-		if (type == "notification") {
-			var templete="";
-			localStorage.setItem("lastnotf_" + acct_id,obj.id);
-			if(obj.type!="follow"){
-				templete = parse([obj], 'notf', acct_id, 'notf', popup);
-			}else{
-				templete = userparse([obj], 'notf', acct_id, 'notf', popup);
-			}
-			if(!$("div[data-notfIndv=" + acct_id +"_"+obj.id+"]").length){
-				$(".tl[data-notf=" + acct_id +"]").prepend(templete);
-			}
-			$(".notf-timeline[data-acct=" + acct_id +"]").prepend(templete);
-			jQuery("time.timeago").timeago();
-		} else if (type == "delete") {
-			$("[toot-id=" + obj + "]").hide();
-			$("[toot-id=" + obj + "]").remove();
-		}
-		}
-	}
-	websocketNotf[acct_id].onerror = function(error) {
-		console.error('WebSocket Error ' + error);
-	};
 }
 function notfCommon(acct_id, tlid, sys) {
 	todo("Notifications Loading...");
@@ -233,13 +166,13 @@ function notfCommon(acct_id, tlid, sys) {
 				var ipc = electron.ipcRenderer;
 				var os = electron.remote.process.platform;
 					var options = {
-						body: ct+lang_notf_new[lang],
+						body: ct+lang.lang_notf_new,
 						icon: localStorage.getItem("prof_"+acct_id)
 					  };
 					if(os=="darwin"){
 						var n = new Notification('TheDesk:'+domain, options);
 					}else{
-						ipc.send('native-notf', ['TheDesk:'+domain,ct+lang_notf_new[lang],localStorage.getItem("prof_"+acct_id)]);
+						ipc.send('native-notf', ['TheDesk:'+domain,ct+lang.lang_notf_new,localStorage.getItem("prof_"+acct_id)]);
 					}
 				
 			}
@@ -318,6 +251,7 @@ function notfCommon(acct_id, tlid, sys) {
 				}
 				if(!$("div[data-notfIndv=" + acct_id +"_"+obj.id+"]").length){
 					$("div[data-notf=" + acct_id +"]").prepend(templete);
+					$("div[data-const=notf_"+acct_id+"]").prepend(templete);
 				}
 				jQuery("time.timeago").timeago();
 			}else if(JSON.parse(mess.data).type == "note-updated"){
@@ -338,6 +272,7 @@ function notfCommon(acct_id, tlid, sys) {
 			}
 			if(!$("div[data-notfIndv=" + acct_id +"_"+obj.id+"]").length){
 				$("div[data-notf=" + acct_id +"]").prepend(templete);
+				$("div[data-const=notf_"+acct_id+"]").prepend(templete);
 			}
 			jQuery("time.timeago").timeago();
 		} else if (type == "delete") {
@@ -482,23 +417,12 @@ function notfCanceler(acct){
 function allNotfRead(){
 	console.log(localStorage.getItem("notf-fav_2"));
 	var multi = localStorage.getItem("multi");
-	if (!multi) {
-		var obj = [{
-			at: localStorage.getItem("acct_0_at"),
-			name: localStorage.getItem("name_0"),
-			domain: localStorage.getItem("domain_0"),
-			user: localStorage.getItem("user_0"),
-			prof: localStorage.getItem("prof_0"),
-			id: localStorage.getItem("user-id_0")
-		}];
-		var json = JSON.stringify(obj);
-		localStorage.setItem("multi", json);
-	} else {
+	if (multi) {
 		var obj = JSON.parse(multi);
-	}
 	Object.keys(obj).forEach(function(key) {
 		console.log(key);
 		notfCanceler(key)
 	});
 }
+}
 allNotfRead()
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -33,6 +33,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 	var ltr = localStorage.getItem("letters");
 	var gif = localStorage.getItem("gif");
 	var imh = localStorage.getItem("img-height");
+	if(!imh){
+		imh=200;
+	}
 	if(imh=="full"){
 		imh="auto";
 	}else{
@@ -233,9 +236,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var icon = "fa-tasks  purple-text";
 			}
 			var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.created_at,
-				'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.created_at,
+				'absolute') + '('+lang.lang_parse_notftime+')"><i class="far fa-clock"></i>' + date(toot.created_at,
 				datetype) +
-			'</span><i class="big-text fa '+icon+'"></i><a onclick="udg(\'' + toot.account.id +
+			'</span><i class="big-text fas '+icon+'"></i><a onclick="udg(\'' + toot.account.id +
 				'\',\'' + acct_id + '\')" class="pointer grey-text">' + dis_name +
 				"(@" + toot.account.acct +
 				")</a>";
@@ -248,16 +251,28 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						$(".notf-reply_" + acct_id).text(replyct*1-(-1));
 						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"
+						}
 					}
 				}
 				
@@ -265,6 +280,23 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				if(popup>0){
 					Materialize.toast("["+domain+"]"+escapeHTML(toot.account.display_name)+what, popup * 1000);
 				}
+				//通知音
+				if(sound=="c1"){
+					var file=localStorage.getItem("custom1");
+				}else if(sound=="c2"){
+					var file=localStorage.getItem("custom2");
+				}else if(sound=="c3"){
+					var file=localStorage.getItem("custom3");
+				}else if(sound=="c4"){
+					var file=localStorage.getItem("custom4");
+				}
+				if(file){
+					request = new XMLHttpRequest();
+      				request.open("GET", file, true);
+      				request.responseType = "arraybuffer";
+      				request.onload = playSound;
+      				request.send();
+				}
 				if(native=="yes"){
 					var electron = require("electron");
 					var ipc = electron.ipcRenderer;
@@ -331,7 +363,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				}else if(localStorage.getItem("domain_" + acct_id)=="mstdn.osaka" && !locale){
 					rebtxt = "がしばいた";
 				}
-				var notice = '<i class="big-text fa '+rticon+'"></i>'+ dis_name + "(@" + toot.account.acct +
+				var notice = '<i class="big-text fas '+rticon+'"></i>'+ dis_name + "(@" + toot.account.acct +
 					")<br>";
 					var boostback = "shared";
 				var uniqueid=toot.id;
@@ -384,7 +416,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			var divider = '<div class="divider"></div>';
 		}
 		if (toot.account.locked) {
-			var locked = ' <i class="fa fa-lock red-text"></i>';
+			var locked = ' <i class="fas fa-lock red-text"></i>';
 		} else {
 			var locked = "";
 		}
@@ -392,7 +424,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];
@@ -449,6 +481,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{
+				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>";
+				}
+				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{
@@ -464,6 +530,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);
 			});
 		}
 		//ニコフレ絵文字
@@ -472,7 +539,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		}else{
 			var nicoemojick=false;
 		}
-		//絵文字があれば
+		//絵文字があれば(nico)
 		if (nicoemojick) {
 			Object.keys(toot.profile_emojis).forEach(function(keynico) {
 				var emoji = toot.profile_emojis[keynico];
@@ -482,6 +549,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);
 			});
 		}
 		//デフォ絵文字
@@ -498,6 +566,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="";
@@ -695,45 +766,15 @@ 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;
 				}
 		   }
 		}
 		}
-		//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+'">'+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="fa fa-calendar-times-o"></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>'
 		}
 		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
 			boostback + ' ' + fav_app + ' ' + rt_app + ' ' + pin_app +
@@ -752,17 +793,17 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			toot.account.acct + locked + '</span></div>' +
 			'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'' +
 			toot.url + '\');" title="' + date(toot.created_at, 'absolute') +
-			'('+lang.lang_parse_clickcopyurl+')"><i class="fa fa-clock-o"></i>' +
+			'('+lang.lang_parse_clickcopyurl+')"><i class="far fa-clock"></i>' +
 			date(toot.created_at, datetype) + '</span>' +
 			'</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 +
-			'</span>' +
+			'</span>' + poll +
 			'' + viewer + '' +
 			'</div><div class="area-additional"><span class="additional">' + analyze +
 			'</span>' +
-			'' +poll+ mentions + tags + '</div>' +
+			'' + mentions + tags + '</div>' +
 			'<div class="area-vis"></div>'+
 			'<div class="area-actions '+mouseover+'">' +
 			'<div class="action">'+vis+'</div>'+
@@ -771,27 +812,27 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			'<div class="action '+disp["re"]+' '+noauth+'"><a onclick="re(\'' + toot.id +
 			'\',\'' + to_mention + '\',' +
 			acct_id + ',\''+visen+
-			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fa fa-share"></i><span class="rep_ct">' + replyct +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fas fa-share"></i><span class="rep_ct">' + replyct +
 			'</a></span></a></div>' +
 			'<div class="action '+can_rt+' '+disp["rt"]+' '+noauth+'"><a onclick="rt(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_bt+'"><i class="fa fa-retweet ' +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_bt+'"><i class="fas fa-retweet ' +
 			if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct">' + toot.reblogs_count +
 			'</span></a></div>' +
 			'<div class="action '+can_rt+' '+disp["qt"]+' '+noauth+' '+qtClass+'"><a onclick="qt(\'' + toot.id + '\',' + acct_id +
 			',\'' + toot.account.acct +'\',\''+toot.url+
-			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_quote+'"><i class="text-darken-3 fa fa-quote-right"></i></a></div>' +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_quote+'"><i class="text-darken-3 fas fa-quote-right"></i></a></div>' +
 			'<div class="action '+disp["fav"]+' '+noauth+'"><a onclick="fav(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_fav+'"><i class="fa text-darken-3 fa-star' +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_fav+'"><i class="fas text-darken-3 fa-star' +
 			if_fav + ' fav_' + toot.id + '"></i><span class="fav_ct">' + toot.favourites_count +
 			'</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="fa fa-trash-o"></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="fa fa-map-pin pin_' + toot.id + ' '+if_pin+'"></i></a></div>' 
+			')" 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>' 
 			+'<div class="' + if_mine + ' action '+disp["red"]+' '+noauth+'"><a onclick="redraft(\'' + toot.id + '\',' +
 			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+
@@ -830,7 +871,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 			var notf=false;
 		}
 		if (toot.locked) {
-			var locked = ' <i class="fa fa-lock red-text"></i>';
+			var locked = ' <i class="fas fa-lock red-text"></i>';
 		} else {
 			var locked = "";
 		}
@@ -959,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) {
@@ -969,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{
 				
 			}
@@ -990,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;
 		}
--- a/app/js/tl/poll.js
+++ b/app/js/tl/poll.js
@@ -108,10 +108,10 @@ function voteMastodonrefresh(acct_id,id){
 				if(!json.voted){
 					votesel='voteSelMastodon(\''+acct_id+'\',\''+json.id+'\','+keyc+','+json.multiple+')';
 				}
-				poll=poll+'<div class="pointer vote vote_'+acct_id+'_'+json.id+'_'+keyc+'" onclick="'+votesel+'">'+choice.title+'<span class="vote_'+acct_id+'_'+json.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
+				poll=poll+'<div class="pointer vote vote_'+acct_id+'_'+json.id+'_'+keyc+'" onclick="'+votesel+'">'+escapeHTML(choice.title)+'<span class="vote_'+acct_id+'_'+json.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
 			});
 			poll=poll+myvote+'<span class="cbadge cbadge-hover" title="' + date(json.expires_at, 'absolute') +
-			'"><i class="fa fa-calendar-times-o"></i>' +
+			'"><i class="far fa-calendar-times"></i>' +
            date(json.expires_at, datetype) + '</span>';
            $('.vote_'+acct_id+'_'+json.id).html(poll)
 		}
--- a/app/js/tl/src.js
+++ b/app/js/tl/src.js
@@ -15,7 +15,7 @@ function src(mode) {
 	var q = $("#src").val();
 	var acct_id = $("#src-acct-sel").val();
 	if(acct_id=="tootsearch"){
-		tootsearch(q);
+		tsAdd(q)
 		return false;
 	}
 	localStorage.setItem("last-use", acct_id);
@@ -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);
 				}
@@ -73,9 +73,26 @@ function src(mode) {
 		jQuery("time.timeago").timeago();
 	});
 }
-function tootsearch(q){
+function tsAdd(q){
+		var add = {
+			domain: acct_id,
+			type: "tootsearch",
+			data: q
+		};
+		var multi = localStorage.getItem("column");
+		var obj = JSON.parse(multi);
+		localStorage.setItem("card_" + obj.length,"true");
+		obj.push(add);
+		console.log(obj);
+		var json = JSON.stringify(obj);
+		localStorage.setItem("column", json);
+		parseColumn();
+}
+function tootsearch(tlid,q){
 	var start = "https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=" + q
 	console.log(start)
+	$("#notice_" + tlid).text("tootsearch("+q+")");
+	$("#notice_icon_" + tlid).text("search");
 	fetch(start, {
 		method: 'GET',
 		headers: {
@@ -90,17 +107,68 @@ function tootsearch(q){
 			var templete="";
 			var json=raw.hits.hits;
 			console.log(json);
-			Object.keys(json).forEach(function(key5) {
-				var toot = json[key5]["_source"];
-				console.log(toot);
-				if(toot && toot.account){
-					templete = templete+parse([toot],'noauth');
+			var max_id = raw["hits"].length;
+			for(var i=0;i<json.length;i++){
+				var toot = json[i]["_source"];
+				console.log(lastid)
+				if(lastid!=toot.uri){
+					console.log(toot);
+					if(toot && toot.account){
+						templete = templete+parse([toot], "noauth", null, tlid, 0, [], "tootsearch")
+					}
 				}
-			});
+				var lastid=toot.uri;
+			}
 			if(!templete){
 				templete=lang.lang_details_nodata;
+			}else{
+				templete=templete+'<div class="hide ts-marker" data-maxid="'+max_id+'"></div>';
 			}
-			$("#src-contents").html("Tootsearch("+lang.lang_src_ts+")<br>" + templete);
+			$("#timeline_" + tlid).html(templete);
+
+		jQuery("time.timeago").timeago();
+	});
+}
+function moreTs(tlid,q){
+	var sid = $("#timeline_" + tlid + " .ts-marker").last().attr("data-maxid");
+	moreloading=true;
+	var start = "https://tootsearch.chotto.moe/api/v1/search?from="+sid+"&sort=created_at%3Adesc&q=" + q
+	console.log(start)
+	$("#notice_" + tlid).text("tootsearch("+q+")");
+	$("#notice_icon_" + tlid).text("search");
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json'
+		},
+	}).then(function(response) {
+		return response.json();
+	}).catch(function(error) {
+		todo(error);
+		console.error(error);
+	}).then(function(raw) {
+			var templete="";
+			var json=raw.hits.hits;
+			console.log(json);
+			var max_id = raw["hits"].length;
+			for(var i=0;i<json.length;i++){
+				var toot = json[i]["_source"];
+				console.log(lastid)
+				if(lastid!=toot.uri){
+					console.log(toot);
+					if(toot && toot.account){
+						templete = templete+parse([toot], "noauth", null, tlid, 0, [], "tootsearch")
+					}
+				}
+				var lastid=toot.uri;
+			}
+			if(!templete){
+				templete=lang.lang_details_nodata;
+			}else{
+				templete=templete+'<div class="hide ts-marker" data-maxid="'+max_id+'"></div>';
+			}
+			$("#timeline_" + tlid).append(templete);
+
 		jQuery("time.timeago").timeago();
 	});
 }
@@ -118,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;
--- 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");
--- a/app/js/tl/tl.js
+++ b/app/js/tl/tl.js
@@ -164,6 +164,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 	localStorage.setItem("now", type);
 	if(localStorage.getItem("mode_" + domain)=="misskey"){
 		var misskey=true;
+		console.log(type);
 		if (type == "home") {
 			var start = "wss://" + domain +
 				"/?i=" + at;
@@ -183,12 +184,13 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			var start = "wss://" + domain +
 			"/hybrid-timeline?i=" + at;
 		} else if (type == "tag") {
-			Materialize.toast(lang_misskeyparse_tagnostr[lang], 1000);
+			Materialize.toast(lang.lang_misskeyparse_tagnostr, 3000);
 		} else if (type == "noauth") {
 			var start = "wss://" + acct_id +
 			"/local-timeline?i=" + at;
 		} else if (type=="list"){
-			Materialize.toast(lang_misskeyparse_listnostr[lang], 1000);
+			var start = "wss://" + domain +
+			"/user-list?i=" + at+"&listId="+data;
 		}
 	}else{
 		var misskey=false;
@@ -335,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');
@@ -382,6 +384,10 @@ function moreload(type, tlid) {
 		}else if (type == "notf") {
 			notfmore(tlid);
 			return;
+		}else if (type == "tootsearch") {
+			var data=obj[tlid].data;
+			moreTs(tlid,data);
+			return;
 		}
 		moreloading=true;
 		localStorage.setItem("now", type);
@@ -441,8 +447,6 @@ function moreload(type, tlid) {
 				headers: hdr
 			};
 		}
-		
-		
 		fetch(start, i).then(function(response) {
 			return response.json();
 		}).catch(function(error) {
@@ -463,6 +467,119 @@ function moreload(type, tlid) {
 		});
 	}
 }
+//TL差分取得
+function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
+	console.log("sabun")
+	var multi = localStorage.getItem("column");
+	var obj = JSON.parse(multi);
+	var acct_id = obj[tlid].domain;
+	if (!type) {
+		var type = obj[tlid].type;
+	}else{
+		var data;
+	}
+	if(type=="tag"){
+		var data=obj[tlid].data;
+		var tag = localStorage.getItem("tag-range");
+		if(tag=="local"){
+			data=data+"&local=true";
+		}
+	}else if(type=="list"){
+		var data=obj[tlid].data;
+	}
+	var sid = $("#timeline_" + tlid + " .cvo").first().attr("unique-id");
+	if (sid && !moreloading) {
+		if (type == "mix" && localStorage.getItem("mode_" + localStorage.getItem("domain_" + acct_id))!="misskey") {
+			return;
+		}else if (type == "plus" && localStorage.getItem("mode_" + localStorage.getItem("domain_" + acct_id))!="misskey") {
+			return;
+		}else if (type == "notf") {
+			return;
+		}
+		moreloading=true;
+		localStorage.setItem("now", type);
+		todo(cap(type) + " TL MoreLoading");
+		if(type!="noauth"){
+			var at = localStorage.getItem("acct_"+ acct_id + "_at");
+			var hdr={
+				'content-type': 'application/json',
+				'Authorization': 'Bearer ' + at
+			};
+				var domain = localStorage.getItem("domain_" + acct_id);
+		}else{
+			var hdr={
+				'content-type': 'application/json'
+			};
+			domain=acct_id;
+		}
+		if(localStorage.getItem("mode_" + domain)=="misskey"){
+			var misskey=true;
+			hdr={
+				'content-type': 'application/json'
+			};
+			var url=misskeycom(type, data);
+			var start = "https://" + domain + "/api/notes/"+url;
+			var method="POST";
+			var req={};
+			if(type!="noauth"){
+				req.i=at;
+			}
+			if(type=="local-media"||type=="pub-media"){
+				req.mediaOnly=true;
+			}
+			if(type=="tag"){
+				req.tag=data;
+			}
+			if(type=="list"){
+				req.listId=data;
+			}
+			req.sinceId=sid;
+			req.limit=20;
+			var i={
+				method: method,
+				headers: hdr,
+				body: JSON.stringify(req),
+			}
+		}else{
+			var misskey=false;
+			var start = "https://" + domain + "/api/v1/timelines/" + com(type,data) +
+			"since_id=" + sid;
+			if(type=="dm"){
+				var start = "https://" + domain + "/api/v1/conversations?" +
+					"since_id=" + sid;
+			}
+			var method="GET";
+			var i={
+				method: method,
+				headers: hdr
+			};
+		}
+		
+		
+		fetch(start, i).then(function(response) {
+			return response.json();
+		}).catch(function(error) {
+			todo(error);
+			console.error(error);
+		}).then(function(json) {
+			console.log(json);
+			if(misskey){
+				var templete = misskeyParse(json, '', acct_id, tlid,"",mute);
+			}else{
+				var templete = parse(json, '', acct_id, tlid,"",mute, type);
+			}
+			$("#timeline_" + tlid).prepend(templete);
+			additional(acct_id, tlid);
+			jQuery("time.timeago").timeago();
+			moreloading=false;
+			todc();
+		});
+	}
+}
+//TL再取得
+function reloadTL(type, data, acct_id, key, delc,voice){
+	tl(type, data, acct_id, key, delc,voice,"");
+}

 //WebSocket切断
 function tlCloser() {
@@ -543,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 + ")"
@@ -567,6 +684,8 @@ function cap(type, data, acct_id) {
 		var response= "Local+"
 	}else if (type == "webview") {
 		var response="Twitter"
+	}else if (type == "tootsearch") {
+		var response="tootsearch(" + escapeHTML(data) + ")";
 	}
 	return response;
 }
@@ -624,7 +743,7 @@ function icon(type) {
 	} else if (type == "pub-media") {
 		var response="language";
 	} else if (type == "tag") {
-		var response="search";
+		var response="whatshot";
 	} else if (type == "list") {
 		var response="view_headline";
 	} else if (type == "notf") {
@@ -639,6 +758,8 @@ function icon(type) {
 		var response="merge_type";
 	}else if (type == "webview") {
 		var response="language";
+	}else if (type == "tootsearch") {
+		var response="search";
 	}
 	return response;
 }
@@ -667,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{
@@ -680,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();
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -28,13 +28,12 @@ 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) {
-		var obj = [];
-		var json = JSON.stringify(obj);
-		localStorage.setItem("multi", json);
-	} else {
+	if (multi) {
 		var obj = JSON.parse(multi);

 		var templete;
@@ -130,6 +129,21 @@ function parseColumn() {
 			}
 			var html =webviewParse("https://tweetdeck.twitter.com",key,insert,icnsert,css);
 			$("#timeline-container").append(html);
+		}else if(acct.type=="tootsearch"){
+			if(!acct.left_fold){
+				basekey=key;
+			}
+			var width = localStorage.getItem("width");
+			if (width) {
+				var css=" min-width:"+width+"px;"
+			}
+			var anime = localStorage.getItem("animation");
+			if (anime=="yes" || !anime) {
+				var animecss="box-anime";
+			}else{
+				var animecss="";
+			}
+			unstreamingTL(acct.type,key,basekey,insert,icnsert,acct.left_fold,css,animecss,acct.data);
 		}else{
 			var width = localStorage.getItem("width");
 		if (width) {
@@ -142,15 +156,15 @@ function parseColumn() {
 			var animecss="";
 		}
 		if(acct.type=="notf"){
-			var exclude=lang.lang_excluded+':<br><input type="checkbox" class="filled-in" id="exc-reply-'+key+'" '+excludeCk(key,"mention")+' /><label for="exc-reply-'+key+'" class="exc-chb"><i class="fa fa-share exc-icons"></i></label> '+
-			'<input type="checkbox" class="filled-in" id="exc-fav-'+key+'"  '+excludeCk(key,"favourite")+' /><label for="exc-fav-'+key+'" class="exc-chb"><i class="fa fa-star exc-icons"></i></label> '+
-			'<input type="checkbox" class="filled-in" id="exc-bt-'+key+'" '+excludeCk(key,"reblog")+' /><label for="exc-bt-'+key+'" class="exc-chb" ><i class="fa fa-retweet exc-icons"></i></label> '+
-			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"follow")+' /><label for="exc-follow-'+key+'" class="exc-chb" ><i class="fa fa-users exc-icons"></i></label> '+
-			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"poll")+' /><label for="exc-poll-'+key+'" class="exc-chb" ><i class="fa fa-tasks exc-icons"></i></label> '+
+			var exclude=lang.lang_excluded+':<br><input type="checkbox" class="filled-in" id="exc-reply-'+key+'" '+excludeCk(key,"mention")+' /><label for="exc-reply-'+key+'" class="exc-chb"><i class="fas fa-share exc-icons"></i></label> '+
+			'<input type="checkbox" class="filled-in" id="exc-fav-'+key+'"  '+excludeCk(key,"favourite")+' /><label for="exc-fav-'+key+'" class="exc-chb"><i class="fas fa-star exc-icons"></i></label> '+
+			'<input type="checkbox" class="filled-in" id="exc-bt-'+key+'" '+excludeCk(key,"reblog")+' /><label for="exc-bt-'+key+'" class="exc-chb" ><i class="fas fa-retweet exc-icons"></i></label> '+
+			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"follow")+' /><label for="exc-follow-'+key+'" class="exc-chb" ><i class="fas fa-users exc-icons"></i></label> '+
+			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"poll")+' /><label for="exc-poll-'+key+'" class="exc-chb" ><i class="fas fa-tasks exc-icons"></i></label> '+
 			'<button class="btn waves-effect" style="width:60px; padding:0;" onclick="exclude('+key+')">Filter</button><br>';
 		}else if(acct.type=="home"){
 			var exclude='<a onclick="ebtToggle(' + key +
-			')" class="setting nex"><i class="fa fa-retweet waves-effect nex" title="'+lang.lang_layout_excludingbt +'" style="font-size:24px"></i><span id="sta-bt-' +
+			')" class="setting nex"><i class="fas fa-retweet waves-effect nex" title="'+lang.lang_layout_excludingbt +'" style="font-size:24px"></i><span id="sta-bt-' +
 			key + '">Off</span></a>'+lang.lang_layout_excludingbt+'<br>';
 		}else{
 			var exclude="";
@@ -168,7 +182,7 @@ function parseColumn() {
 			}
 			var html='<div class="boxIn" id="timeline_box_' + key + '_box" tlid="' + key +
 			'" data-acct="'+acct.domain+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+' ">'+
-			'<div class="area-notice"><i class="material-icons waves-effect red-text" id="notice_icon_' + key + '"'+notf_attr+' style="font-size:40px; padding-top:25%;" onclick="goTop(' + key + ')" title="'+lang.lang_layout_gotop +'"></i></div>'+
+			'<div class="area-notice"><i class="material-icons waves-effect red-text" id="notice_icon_' + key + '"'+notf_attr+' style="font-size:40px; padding-top:25%;" onclick="checkStr(\''+acct.type+'\', \''+data+'\', \''+acct.domain+'\', \''+key+'\', \''+delc+'\',\''+voice+'\',null)" title="'+lang.lang_layout_gotop +'"></i></div>'+
 			'<div class="area-notice_name"><span id="notice_' + key + '" class="tl-title"></span></div>'+
 			'<div class="area-a1"><a onclick="notfToggle(' + acct.domain + ',' + key +
 						  ')" class="setting nex '+if_notf+'" title="'+unique_notf+'"'+icnsert+'><i class="material-icons waves-effect nex notf-icon_' +
@@ -179,7 +193,7 @@ function parseColumn() {
 		  ')" class="setting nex" title="'+lang.lang_layout_setthis +'"'+icnsert+'><i class="material-icons waves-effect nex">settings</i></a></div></div>'+
 		  '<div class="column-hide notf-indv-box z-depth-4" id="notf-box_' + key +
 		  '"><div id="notifications_' + key +
-		  '" data-notf="' + acct.domain + '" data-type="notf"></div></div><div class="column-hide notf-indv-box" id="util-box_' + key +
+		  '" data-notf="' + acct.domain + '" data-type="notf" class="notf-timeline"></div></div><div class="column-hide notf-indv-box" id="util-box_' + key +
 		  '" style="padding:5px;">'+exclude+left_hold+'<a onclick="mediaToggle(' + key +
 		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_mediafil +'">perm_media</i><span id="sta-media-' +
 		  key + '">On</span></a>'+lang.lang_layout_mediafil +'<br><a onclick="cardToggle(' + key +
@@ -187,8 +201,8 @@ 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 +
-			'" class="tl '+acct.type+'-timeline " tlid="' + key + '" data-type="' + acct.type + '" data-acct="'+acct.domain+'"><div id="landing_'+key+'" style="text-align:center">'+lang.lang_layout_nodata +'</div></div></div>'
+		  ',\''+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);
 		if (acct.data) {
@@ -240,6 +254,15 @@ function parseColumn() {
 		}
 	}
 }
+function checkStr(type, data, acct_id, key, delc,voice){
+	if($('#notice_icon_' + key).hasClass("red-text") && type!="notf" && type!="mix"){
+		console.log("sabun-get")
+		goTop(key);
+		tlDiff(type, data, acct_id, key, delc,voice,"");
+	}else{
+		goTop(key);
+	}
+}
 //セカンダリートゥートボタン
 function secvis(set){
 	if(set=="public"){
@@ -425,7 +448,7 @@ function coloradd(key,bg,txt){
 function webviewParse(url,key,insert,icnsert,css){
 	var html = '<div class="box" id="timeline_box_' + key + '_box" tlid="' + key +
 			'" style="'+css+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+'">'+
-			'<div class="area-notice"><i class="fa fa-twitter waves-effect" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;"></i></div>'+
+			'<div class="area-notice"><i class="fab fa-twitter waves-effect" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;"></i></div>'+
 			'<div class="area-notice_name tl-title">WebView('+url+')</div>'+
 			'<div class="area-sta"><input type="checkbox" id="webviewsel" value="true" class="filled-in"><label for="webviewsel">'+lang.lang_layout_webviewmode +'</label></div>'+
 			'<div class="area-a2"><a onclick="removeColumn(' + key +
@@ -439,6 +462,37 @@ function webviewParse(url,key,insert,icnsert,css){
 	
 	return html;
 }
+function unstreamingTL(type,key,basekey,insert,icnsert,left_fold,css,animecss,q){
+	if(!left_fold){
+		var basehtml = '<div style="'+css+'" class="box '+animecss+'" id="timeline_box_' + basekey + '_parentBox"></div>';
+		$("#timeline-container").append(basehtml);
+		var left_hold='<a onclick="leftFoldSet(' + key +')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_leftFold+'">view_agenda</i></a>'+lang.lang_layout_leftFold+'</span><br>';
+	}else{
+		var left_hold='<a onclick="leftFoldRemove(' + key +')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_leftUnfold+'">view_column</i></a>'+lang.lang_layout_leftUnfold+'</span><br>';
+	}
+	var html='<div class="boxIn" id="timeline_box_' + key + '_box" tlid="' + key +
+	'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+' ">'+
+	'<div class="area-notice"><i class="material-icons waves-effect" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;" onclick="tootsearch('+key+',\''+q+'\');" title="'+lang.lang_layout_gotop +'"></i></div>'+
+	'<div class="area-notice_name"><span id="notice_' + key + '" class="tl-title"></span></div>'+
+	'<div class="area-a1"></div><div class="area-sta"></div>'+
+	'<div class="area-a2"><a onclick="removeColumn(' + key +
+					')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_delthis +'"'+icnsert+'>cancel</i></a></div>'+
+	'<div class="area-a3"><a onclick="setToggle(' + key +
+	')" class="setting nex" title="'+lang.lang_layout_setthis +'"'+icnsert+'><i class="material-icons waves-effect nex">settings</i></a></div></div>'+
+	'<div class="column-hide notf-indv-box" id="util-box_' + key +
+	'" style="padding:5px;">'+left_hold+'<a onclick="mediaToggle(' + key +
+	')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_mediafil +'">perm_media</i><span id="sta-media-' +
+	key + '">On</span></a>'+lang.lang_layout_mediafil +'<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 '+type+'-timeline " tlid="' + key + '" data-type="' + type + '" data-acct="nostr"><div id="landing_'+key+'" style="text-align:center">'+lang.lang_layout_nodata +'</div></div></div>'
+	$('#timeline_box_' + basekey + '_parentBox').append(html);
+	tootsearch(key,q);
+	cardCheck(key);
+	ebtCheck(key);
+	mediaCheck(key);
+	catchCheck(key);
+	voiceCheck(key);
+	return true;
+}
 function leftFoldSet(key){
 	var multi = localStorage.getItem("column");
 	var obj = JSON.parse(multi);
--- 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");
@@ -19,6 +21,8 @@ function menu(){
        $("#menu-bar").html("TheDesk "+localStorage.getItem("ver"));
        $(".menu-content").addClass("hide");
        $("#add-box").removeClass("hide");
+        $("#left-menu div").removeClass("active");
+	    $("#addColumnMenu").addClass("active");
    }else{
        $('#menu').fadeOut()
        $("#menu").removeClass("appear")
--- a/app/js/ui/post-box.js
+++ b/app/js/ui/post-box.js
@@ -5,6 +5,10 @@ function hide() {
 	$('#post-box').fadeOut()
 	$("#post-box").removeClass("appear")
 	$("#emoji").addClass("hide")
+	$("#left-side").show();
+	$("#default-emoji").show();
+	$("#unreact").show();
+	$("#addreact").addClass("hide");
 }
 //最小化
 function mini() {
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
@@ -123,6 +123,10 @@ function load() {
 		var font = "";
 	}
 	$("#font").val(font);
+	$("#c1-file").text(localStorage.getItem("custom1"))
+	$("#c2-file").text(localStorage.getItem("custom2"));
+	$("#c3-file").text(localStorage.getItem("custom3"));
+	$("#c4-file").text(localStorage.getItem("custom4"));
 }

 function climute(){
@@ -636,6 +640,22 @@ ipc.on('theme-json-create-complete', function (event, args) {
 	$("#custom_import").val("");
 	ctLoad()
 });
+function customSound(key){
+	var electron = require("electron");
+	var remote=electron.remote;
+	var dialog=remote.dialog;
+	dialog.showOpenDialog(null, {
+		title: 'Custom sound',
+		properties: ['openFile'],
+		filters: [
+			{name: 'Audio', extensions: ['mp3','aac','wav','flac','m4a']},
+			{name: 'All', extensions: ['*']},
+		]
+	}, (fileNames) => {
+		localStorage.setItem("custom"+key,fileNames[0]);
+		$("#c1-file").text(fileNames[0])
+	});
+}
 window.onload = function() {
 	//最初に読む
 load();
--- 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);
@@ -58,6 +58,8 @@ function Scap(type, data) {
 		return "Integrated"
 	}else if (type == "webview") {
 		return "Twitter"
+	}else if (type == "tootsearch") {
+		return "tootsearch(" + data + ")"
 	}else{
 		console.log(type);
 	}
@@ -101,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()
--- a/app/js/ui/spotify.js
+++ b/app/js/ui/spotify.js
@@ -129,6 +129,10 @@ function nowplaying(mode){

 	    ipc.send('itunes', "");
 	    ipc.once('itunes-np', function (event, arg) {
+            if (arg.cmd) {
+              console.error(arg);
+              return;
+            }
            console.log(arg);
            var content=localStorage.getItem("np-temp");
            if(!content || content=="" || content=="null"){
@@ -142,8 +146,8 @@ function nowplaying(mode){
                    media(arg.path,"image/png","new");
                }
            }else if(platform=="darwin"){
-                if(flag && arg.artworks[0]){
-                    ipc.send('bmp-image', [arg.artworks[0].path,0]);
+                if(flag && arg.existsArtwork){
+                    media(arg.artworks[0].data,"image/png","new");
                }
            }
            var regExp = new RegExp("{song}", "g");
@@ -214,50 +218,4 @@ $("#npbtn").click(function() {
 $("#npbtn").bind('contextmenu', function() {
    nowplaying('itunes');
    return false;
-});
-/*cinderella NP*/
-function cgNP(q){
-    suggest = "https://cg.toot.app/api/v1/?song=" + q
-		console.log(suggest)
-		fetch(suggest, {
-			method: 'GET',
-			headers: {
-				'content-type': 'application/json'
-			},
-		}).then(function(response) {
-			return response.json();
-		}).catch(function(error) {
-			todo(error);
-			console.error(error);
-		}).then(function(json) {
-			console.log(json);
-			var electron = require("electron");
-            var ipc = electron.ipcRenderer;
-            var flag=localStorage.getItem("artwork");
-            if(flag){
-                  var img=json.album.artwork;
-                ipc.send('bmp-image', [img,0]);
-             }
-            var content=localStorage.getItem("np-temp");
-             if(!content || content==""){
-                   var content="#NowPlaying {song} / {album} / {artist}\n{url}";
-             }
-            var regExp = new RegExp("{song}", "g");
-            content = content.replace(regExp, json.name);
-            var regExp = new RegExp("{album}", "g");
-            content = content.replace(regExp, json.album.name);
-            var regExp = new RegExp("{artist}", "g");
-            content = content.replace(regExp, json.artist.text);
-            var regExp = new RegExp("{composer}", "g");
-            content = content.replace(regExp, json.composer);
-            var regExp = new RegExp("{lyricist}", "g");
-            content = content.replace(regExp, json.lyricist);
-            var regExp = new RegExp("{bpm}", "g");
-            content = content.replace(regExp, json.bpm);
-            var regExp = new RegExp("{genre}", "g");
-            content = content.replace(regExp, "");
-            var regExp = new RegExp("{url}", "g");
-            content = content.replace(regExp, "");
-            $("#textarea").val(content);
-				});
-}
+});
--- 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()
--- a/app/js/userdata/his-data.js
+++ b/app/js/userdata/his-data.js
@@ -553,6 +553,36 @@ function showFrl(more, acct_id) {

 	});
 }
+//Keybase
+function udAdd(start) {
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'Accept': 'application/json'
+		},
+		//body: JSON.stringify({})
+	}).then(function(response) {
+		return response.json();
+	}).catch(function(error) {
+		todo(error);
+		console.error(error);
+	}).then(function(json) {
+		var fields=json.attachment;
+		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}}",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}}",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)
+			}
+		}
+	});
+
+
+}
+

 //ユーザーマッチングリスト
 function showMat() {
--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@@ -105,6 +105,7 @@ function udg(user, acct_id) {
 			fer(json.id, '', acct_id);
 			var dis_name=escapeHTML(json.display_name);
 			dis_name=twemoji.parse(dis_name);
+
 			var note=json.note;
 			if(json.emojis){
 				var actemojick = json.emojis[0];
@@ -117,12 +118,18 @@ function udg(user, acct_id) {
 					var emoji = json.emojis[key5];
 					var shortcode = emoji.shortcode;
 					var emoji_url = '<img src="' + emoji.url +
-					'" class="emoji-img" data-emoji="'+shortcode+'">';
+					'" class="emoji-img" data-emoji="'+shortcode+'" draggable="false">';
 					var regExp = new RegExp(":" + shortcode + ":", "g");
 					dis_name = dis_name.replace(regExp, emoji_url);
 					note = note.replace(regExp, emoji_url);
 				});
 			}
+			//noteの解析
+			//var tags =  '<a onclick="tl(\'tag\',\'$1\',' + acct_id +',\'add\')" class="pointer parsed">#$1</a>';
+			//var mens =  '<a onclick="udgEx(\'$1\',' + acct_id +')" class="pointer parsed">@$1</a>';
+			//note=note.replace(/#(\S+)/gi, tags)
+			console.log(note)
+			//note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens)
 			$("#his-name").html(dis_name);
 			$("#his-acct").text(json.acct);
 			$("#his-acct").attr("fullname",fullname);
@@ -143,8 +150,14 @@ function udg(user, acct_id) {
 					for(var i=0;i<json.fields.length;i++){
 						var fname=json.fields[i].name;
 						var fval=json.fields[i].value;
-						fval=twemoji.parse(fval);
-						note=note+'<tr><td class="his-field-title">'+fname+'</td><td class="his-field-content">'+fval+'</td></tr>';
+						if(json.fields[i].verified_at){
+							var when=lang.lang_showontl_verified+":"+crat(json.fields[i].verified_at);
+							var color="rgba(121,189,154,.25);"
+						}else{
+							var when="";
+							var color="inherit"
+						}
+						note=note+'<tr><td class="his-field-title">'+twemoji.parse(escapeHTML(fname))+'</td><td class="his-field-content" title="'+when+'" style="background-color:'+color+'">'+twemoji.parse(fval)+'</td></tr>';
 					}
 					note=note+'</table>'
 					$("#his-des").html(twemoji.parse(note));
@@ -157,6 +170,7 @@ function udg(user, acct_id) {
 			if(json.bot){
 				$("#his-bot").html(lang.lang_showontl_botacct);
 			}
+			$("#his-des").attr("data-acct",acct_id);
 			$('#his-data').css('background-size', 'cover');
 			$("#his-data .tab-content").css("height",$("#his-float-timeline").height()-70+"px")
 			localStorage.setItem("history" , user);
@@ -193,6 +207,8 @@ function udg(user, acct_id) {
 				$(".only-his-data").show();
 			}
 		todc();
+		//外部データ取得(死かもしれないので)
+		udAdd(json.url);
 	});
 }
 function misskeyUdg(user, acct_id) {
@@ -262,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("😺"));
@@ -392,6 +408,12 @@ function relations(user, acct_id) {
 			$("#his-end-btn").removeClass("endorsed");
 			$("#his-end-btn").text(lang.lang_status_endorse)
 		}
+		//Blocked
+		if(json.blocked_by){
+			$("#his-float-timeline").hide();
+			$("#his-float-blocked").show();
+			$("#his-follow-btn").hide()
+		}

 	});
 }
@@ -453,6 +475,9 @@ function reset(){
 	$("#his-f4-name").val(""); $("#his-f4-val").val("");
 	$("#his-endorse").html("");
 	$("#his-openin").attr("data-href", "");
+	$("#his-float-timeline").show();
+	$("#his-float-blocked").hide();
+	$("#his-proof-prof").html("")
 }
 $('#my-data-nav .custom-tab').on('click',function(){
 	var target=$(this).find("a").attr("go");
--- a/app/main.js
+++ b/app/main.js
@@ -1,4 +1,4 @@
-'use strict';
+
 var dir='file://' + __dirname;
 var base=dir + '/view/';
 // Electronのモジュール
@@ -50,19 +50,14 @@ try {

 	}; // デフォルトバリュー
 }
-try {
-	var lang = fs.readFileSync(lang_path, 'utf8');
-} catch (e) {
-	var langs=app.getLocale();
-	if(~langs.indexOf("ja")){
-		lang="ja";
-	}else{
-		lang="en";
+function isFile(file){
+	try {
+		fs.statSync(file);
+		return true
+	} catch (err) {
+		if (err.code === 'ENOENT') return false
 	}
-	fs.writeFileSync(lang_path,lang);
 }
-console.log(app.getLocale());
-console.log("launch:"+lang);
 // 全てのウィンドウが閉じたら終了
 app.on('window-all-closed', function() {
 	if (process.platform != 'darwin') {
@@ -70,8 +65,31 @@ app.on('window-all-closed', function() {
 		app.quit();
 	}
 });
+// macOSでウィンドウを閉じた後に再度開けるようにする
+app.on('activate', function() {
+	if (mainWindow == null) {
+		createWindow();
+	}
+});

 function createWindow() {
+	if(isFile(lang_path)) {
+		console.log("exist");
+		var lang = fs.readFileSync(lang_path, 'utf8');
+	} else {
+		var langs=app.getLocale();
+		console.log(langs);
+		if(~langs.indexOf("ja")){
+			lang="ja";
+		}else{
+			lang="en";
+		}
+		fs.mkdir(app.getPath("userData"), function (err) {
+			fs.writeFileSync(lang_path,lang);
+		});
+	}
+	console.log(app.getLocale());
+	console.log("launch:"+lang);
 	// メイン画面の表示。ウィンドウの幅、高さを指定できる
 	var platform=process.platform;
 	var bit=process.arch;
@@ -109,6 +127,7 @@ function createWindow() {
 	}
 	// ウィンドウが閉じられたらアプリも終了
 	mainWindow.on('closed', function() {
+		electron.ipcMain.removeAllListeners();
 		mainWindow = null;
 	});
 	mainWindow.on('close', function() {
@@ -131,7 +150,7 @@ function createWindow() {
 	var platform=process.platform;
 	var bit=process.arch;
 	if(platform=="darwin"){
-		Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang,mainWindow,false)));
+		Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang,mainWindow,false,dir)));
 	}
 	//CSS
 	css.css(mainWindow);
--- a/app/main/language.js
+++ b/app/main/language.js
@@ -1,5 +1,5 @@
 // Create the Application's main menu
-function templete(lang,mainWindow,packaged){
+function templete(lang,mainWindow,packaged,dir){
    const electron = require("electron");
    const app = electron.app;
    const BrowserWindow = electron.BrowserWindow;
@@ -74,7 +74,7 @@ function templete(lang,mainWindow,packaged){
 			        "transparent": false,    // ウィンドウの背景を透過
 			        "frame": false,     // 枠の無いウィンドウ
 			        "resizable": false });
-	             window.loadURL('file://' + __dirname + '/about.html?ver='+ver);
+	             window.loadURL(dir + '/about.html?ver='+ver);
             } },
            { type: "separator" },
            { label: dict.quit[lang], accelerator: "Command+Q", click: function() { app.quit(); }}
--- a/app/main/np.js
+++ b/app/main/np.js
@@ -4,7 +4,7 @@ function np(mainWindow){
    const app = electron.app;
    const fs = require("fs");
    var ipc = electron.ipcMain;
-    ipc.on('itunes', (e, args) => {
+    ipc.on('itunes', async (e, args) => {
        //Verified on Windows
        console.log("Access");
        if(args[0]=="set"){
@@ -25,13 +25,15 @@ function np(mainWindow){
            var platform=process.platform;
            var bit=process.arch;
            if(platform=="darwin"){
-            const nowplaying = require("itunes-nowplaying-mac")
-            nowplaying.getRawData().then(function (value) {
+              try {
+                const nowplaying = require("itunes-nowplaying-mac");
+                const value = await nowplaying.getRawData();
                mainWindow.webContents.send('itunes-np', value);
-            }).catch(function (error) {
-                // 非同期処理失敗。呼ばれない
-                console.log(error);
-            });
+              } catch (error) {
+                // エラーを返す
+                console.error(error);
+                mainWindow.webContents.send('itunes-np', error);
+              }
            }else{
                var {NowPlaying,PlayerName} = require("nowplaying-node");
                var nppath=join(app.getPath("userData"), "nowplaying");
--- a/app/main/system.js
+++ b/app/main/system.js
@@ -11,7 +11,6 @@ function system(mainWindow, dir, lang) {
 	const BrowserWindow = electron.BrowserWindow;
 	const dialog = electron.dialog;
 	const os = require('os')
-    const fm = require('font-manager');
    const language=require("../main/language.js");
 	ipc.on('native-notf', function(e, args) {
        
@@ -172,6 +171,7 @@ function system(mainWindow, dir, lang) {
 		fn(data); // ソート後の配列を返す
 	}
 	ipc.on('fonts', (e, arg) => {
+		const fm = require('font-manager');
 		var fonts = fm.getAvailableFontsSync();
 		object_array_sort(fonts, 'family', 'asc', function(fonts_sorted) {
 			mainWindow.webContents.send('font-list', fonts_sorted);
--- a/app/package-lock.json
+++ b/app/package-lock.json
--- a/app/package.json
+++ b/app/package.json
@@ -1,11 +1,13 @@
 {
  "name": "thedesk",
-  "version": "18.1.0",
+  "version": "18.3.1",
  "description": "TheDesk is a Mastodon client for PC.",
+  "repository": "https://github.com/cutls/TheDesk",
  "main": "main.js",
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1",
    "dist": "build --linux snap",
+    "build": "electron-builder",
    "build:all": "electron-builder --win --linux",
    "build:win": "electron-builder --win"
  },
@@ -33,14 +35,13 @@
    },
    {
      "name": "kPherox",
-      "url": "https://www.kr-kp.com/",
+      "url": "https://pawoo.net/@kPherox",
      "email": "admin@mail.kr-kp.com"
    }
  ],
  "license": "GPL-3.0",
  "dependencies": {
    "electron-dl": "^1.11.0",
-    "font-manager": "^0.3.0",
    "jimp": "^0.2.28",
    "json5": "^2.1.0",
    "node-notifier": "^5.2.1",
@@ -49,11 +50,15 @@
  },
  "optionalDependencies": {
    "nowplaying-node": "^0.1.3",
-    "itunes-nowplaying-mac": "git+https://github.com/rinsuki/itunes-nowplaying-mac#pull/1/head"
+    "itunes-nowplaying-mac": "git+https://github.com/rinsuki/itunes-nowplaying-mac#pull/4/head",
+    "font-manager": "^0.3.0"
  },
  "build": {
    "productName": "TheDesk",
    "appId": "top.thedesk",
+    "asarUnpack": [
+      "node_modules/itunes-nowplaying-mac"
+    ],
    "directories": {
      "output": "../build"
    },
@@ -83,21 +88,21 @@
    "linux": {
      "icon": "build/icons",
      "target": [
+        "zip",
        "snap"
      ],
      "category": "Network"
    },
    "mac": {
-      "target": "dmg"
+      "target": ["dmg","zip"]
    },
    "electronDownload": {
-      "version": "4.0.6"
+      "version": "4.1.4"
    },
-    "electronVersion": "4.0.6"
+    "electronVersion": "4.1.4"
  },
  "devDependencies": {
-    "electron": "^4.0.6",
-    "electron-packager": "^13.1.1",
-    "electron-rebuild": "^1.8.4"
+    "electron": "^4.1.4",
+    "electron-builder": "^20.39.0"
  }
 }
--- a/app/source/notif.wav
+++ b/app/source/notif.wav
--- a/app/source/notif2.wav
+++ b/app/source/notif2.wav
--- a/app/source/notif3.wav
+++ b/app/source/notif3.wav
--- a/app/view/en/acct.html
+++ b/app/view/en/acct.html
@@ -18,6 +18,14 @@ body,html{overflow-y: scroll;}
 .colorsel{ display:flex; }
 .card .colorsel div:not(.exc){width:20px;height:20px;}
 .card .colorsel div.exc{width:40px;height:20px;}
+.first{
+      display:flex;
+      justify-content: center;
+      align-items:center
+}
+.first .hide-first{
+      display:none;
+}
 </style>
 <meta charset="utf-8">
 <!--
@@ -39,24 +47,27 @@ body,html{overflow-y: scroll;}
 <script type="text/javascript" src="../../js/ui/tips.js"></script>
 <script type="text/javascript" src="../../js/common/time.js"></script>
 <script type="text/javascript" src="../../js/common/modal.js"></script>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">Back</a><br>
-<h5>List of accounts</h5>
-<div id="acct-list"></div>
-<div class="divider"></div>
+<div class="hide-first">
+      <a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">Back</a><br>
+      <h5>List of accounts</h5>
+      <div id="acct-list"></div>
+      <div class="divider"></div>
+</div>
+<div>
 <h5>Add an account</h5><br>
 <div id="add">
 <div class="row">
-      <div class="col s6">
+      <div class="col s8">
            <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
            <div id="ins-suggest"></div>
-            Check if TheDesk is not working on Windows, you want to login Pleroma servers, you cannot login when it checked.<br>
+            Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)<br>
            <input type="checkbox" class="filled-in" id="linux" />
                  <label for="linux">Code setup</label><br>
            <input type="checkbox" class="filled-in" id="misskey" />
                  <label for="misskey">Login as Misskey</label><br>
            <button class="btn waves-effect" onclick="instance()">Login</button><br>
      </div>
-      <div class="col s6">
+      <div class="col s4">
            <span style="font-family:Open Sans;">Supports</span>
            <div id="support" class="collection transparent"></div>
      </div>
@@ -73,6 +84,8 @@ body,html{overflow-y: scroll;}
                  <input type="text" id="misskey-key" placeholder="Code">
                  <button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br>
            </div>
+      </div>
+<div class="hide-first">
 <h5>Main an account</h5>
 <div class="input-field" style="width:300px"><span data-trans="your_acct">Select an account</span>
      <br>
@@ -91,6 +104,7 @@ Toots:<span id="ins-toot"></span><br>
 Users:<span id="ins-user"></span>Users<br>
 Connection:<span id="ins-per"></span>%<br>
 Mastodon version:<span id="ins-ver"></span>@<span id="ins-upd"></span><br>
+</div>
 <script type="text/javascript" src="../../js/ui/theme.js"></script>
 <script type="text/javascript" src="../../js/platform/end.js"></script>
 <script type="text/javascript" src="../../js/common/sha256.js"></script>
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
@@ -4,13 +4,13 @@
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
 	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
+	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
-	<link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/post.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/tl.css" rel="stylesheet" type="text/css">
+	<link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+	<link href="../../css/post.css" rel="stylesheet" type="text/css">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/sort.css" rel="stylesheet" type="text/css">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
 	<!--
@@ -32,14 +32,13 @@
 <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.1.2)";
+var ver="Usamin (18.3.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
 //WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
 var acct_id=0;
 var tlid=0;
-  verck(ver);
 </script>
 <textarea id="copy" style="top:-100px; position:fixed;"></textarea>
 <div id="tl">
@@ -53,7 +52,7 @@ var tlid=0;
 </div>
 </div>
 <div id="post-box" class="z-depth-5">
-<div id="post-bar" class="drag-bar">Post new</div>
+<div id="post-bar" class="drag-bar"><span id="unreact">Post new</span><span id="addreact" class="hide">Reaction</span></div>
 <!--トゥートボックス-->
 <div id="left-side">
 <div class="row" style="margin-bottom:0;">
@@ -205,7 +204,6 @@ var tlid=0;
 <div id="emoji" class="hide">
 		<span class="gray sml">
 			<a onclick="emojiGet('true')" class="pointer">Refresh emojis list</a>
-			<i class="material-icons waves-effect" onclick="emojiToggle()" title="Close this box" data-trans-title="post_box_close">cancel</i>
 		<br>
 		</span>
 		<div id="emoji-list" class="" style="">
@@ -251,7 +249,7 @@ var tlid=0;
 			<i class="material-icons">flag</i>
 			</a>
 			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
-			<i class="fa fa-fort-awesome"></i>
+			<i class="fab fa-fort-awesome"></i>
 			</a>
 		</div>
 	</div>
@@ -259,12 +257,8 @@ var tlid=0;
 	<div id="poll" class="hide">
 		<select id="poll-sel"  onchange="pollProviderCk()">
 			<option value="nothing">Polls: Disabled</option>
-			<option value="votedon">votedon.</option>
 			<option value="mastodon-poll">Mastodon(2.8~)</option>
 		</select>
-		<div id="votedon" class="poll-provider hide">
-	WIP
-		</div>
 		<div id="mastodon-poll" class="poll-provider hide">
 			<input type="text" class="mastodon-choice" placeholder="Choice1">
 			<input type="text" class="mastodon-choice" placeholder="Choice2">
@@ -274,9 +268,9 @@ var tlid=0;
 			<label for="poll-multiple">Multiple select</label><br>
 			<input type="checkbox" class="filled-in" id="poll-until" value="1" />
 			<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">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">minutes
+			<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="6">minute(s)
 		</div>
 	</div>
 </div>
@@ -330,26 +324,26 @@ var tlid=0;
 	</li>
 	<li class="dm-hide">
 		<div class="collapsible-header">
-		<i class="text-darken-3 fa fa-retweet"></i>People who boosted it
+		<i class="text-darken-3 false fas fa-retweet"></i>People who boosted it
 		</div>
 		<div class="collapsible-body toot-reset" id="toot-rt">
 		</div>
 	</li>
 	</ul>
 	<div class="dm-hide">
-	Use other account(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>:unfav and unBT are disabled.)<br>
+	Use other account(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>:unfav and unBT are disabled.)<br>
 	<div class="row">
 		<div class="col s6">
 				<select id="status-acct-sel" class="acct-sel"></select>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
+			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fas fa-share"></i>/button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
+			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
+			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fas fa-star"></i></button>
 		</div>
 	</div>
 	<div id="toot-tools">
@@ -360,7 +354,6 @@ var tlid=0;
 </div>
 	<div class="modal-footer">
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="brws()">Open in browser</a>
-	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="shot()">Take a screenshot</a>
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy()">Copy URL of this toot</a>
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy('emb')">Embed</a>
 	<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
@@ -372,7 +365,7 @@ var tlid=0;
 			<div id="his-data-show">
 			<div class="his-float" id="his-float-data">
 			<div id="his-basic-prof">
-			<img src="../../img/loading.svg" id="his-prof">
+			<img src="../../img/loading.svg" id="his-prof" draggable="false">
 			<span id="his-name">Loading...</span><span class="gray" id="his-bot"></span>
 			<br>@
 			<span id="his-acct"></span><br>
@@ -390,8 +383,9 @@ var tlid=0;
 			<span class="cbadge" style="max-width:150px; width:150px; ">Since:
 			<span id="his-since"></span>
 			</span>
+			<div id="his-proof-prof"></div>
 			</div>
-			<div id="his-des"></div><br>
+			<div id="his-des" data-acct=""></div><br>
 			<div id="his-plus-action">
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">Emphasize this user</a>
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">Feature on profile</a><br>
@@ -525,6 +519,9 @@ var tlid=0;
 			</div>
 			</div>
 			</div>
+			<div class="his-float" id="his-float-blocked">
+				<div>You are blocked. Why?</div>
+			</div>
 			</div>
 			</div>
 			<div class="modal-footer">
@@ -583,20 +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-1-1" 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.1.1)</h5>
-・お知らせ機能改善<br>
-・Integrated TLで一部挙動改善(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
--以下18.1.0--<br>
-・iTunes NowPlaying(macOS)にアルバムアートワークを付ける(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
-・カラムを<b>縦に並べられる</b>ように(2つ目以降のカラム毎の設定の「左に重ねる」「右に出す」を押す)<br>
-・画像を個別に削除する(画像をクリックして)<br>
-・何個もアルバムアートワークが投稿されるバグを修正<br>
-・Misskeyでログインしたまま何もできないバグを修正(権限回り)
+					<h5>Release Note Usamin (18.3.1)</h5>
+・通知音が種別ごとに追加(すべて適当に自分で打ったやつです。)<br>
+・Integrated TLのタイムラインの再接続(kPherox)<br>
+・一部ロケーションの変更や投票に関するバグ(kPherox)<br>
+・バグと脆弱性の修正
+<br>
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -605,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>
@@ -688,11 +679,10 @@ var tlid=0;
 			<div class="input-field">
 			<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
 	</div><div class="input-field">
-	<i class="material-icons prefix">search</i>
-	<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
+	<input id="src" type="text" class="validate" style="width:60%">
 	<label for="src" data-trans="src">Search</label>
-	<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
-		<i class="material-icons left">search</i>Search
+	<button class="btn waves-effect indigo" style="width: 36%;padding: 0;padding-left: 15px;" onclick="src()" data-trans-i="src">
+		<i class="material-icons left" style="margin:0">search</i>Search
 	</button>
 	<br>
 	<br>
@@ -706,7 +696,7 @@ var tlid=0;
 	<div id="sort-box" class="hide menu-content">
 	<ul id="sort"></ul>
 	<div>
-	<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
+	<button onclick="sort()" class="btn waves-effect nex" style="width:97.5%;" data-trans-i="sort">
 		<i class="material-icons left">sort</i>Sort
 	</button>
 	</div>
@@ -759,9 +749,16 @@ var tlid=0;
 			<label for="except_filter">Drop instead of hide</label><br>
 		<span class="sml">Filtered toots will disappear irreversibly, even if filter is later removed</span><br>
 		Expire after<span class="sml">Unset or "0" means "Never"<b>This value may contain some error</b></span><br><br>
-		<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">days
-		<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">hours
-		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">minutes
+		<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">day(s)
+		<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">hour(s)
+		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">minute(s)<br>
+		Quick:<a onclick="filterTime(0,0,30)" class="pointer">30minute(s)</a>/
+		<a onclick="filterTime(0,1,0)" class="pointer">1hour(s)</a>/
+		<a onclick="filterTime(0,6,0)" class="pointer">6hour(s)</a>/
+		<a onclick="filterTime(0,12,0)" class="pointer">12hour(s)</a>/
+		<a onclick="filterTime(1,0,0)" class="pointer">1day(s)</a>/
+		<a onclick="filterTime(7,0,0)" class="pointer">7day(s)</a>/
+		<a onclick="filterTime(0,0,0)" class="pointer">Never</a><br>
 		<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">Add</button><br>
 		<span class="sml">Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.</span>
 	</div>
@@ -777,7 +774,9 @@ var tlid=0;
 <div id="main">
 <!--TLのTL-->
 <div id="timeline-container">
-	<h3>Welcome to TheDesk</h3><br><a href="acct.html">Add an account</a> or click <i class="material-icons">apps</i> to add a column.
+	<div id="something-wrong">
+		<div>Internal error: please clear all data(at setting page) <b>All data will be deleted.</b></div>
+	</div>
 </div>
 </div>
 </div>
@@ -803,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>
@@ -821,7 +821,7 @@ var tlid=0;
 						<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
 				</a>
 				<a onclick="tips('spotify')" class="nex waves-effect">
-					<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
+					<i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
 				</a>
 			</div>
 		</div>
@@ -860,6 +860,7 @@ var tlid=0;
 <script type="text/javascript" src="../../js/tl/speech.js"></script>
 <script type="text/javascript" src="../../js/ui/post-box.js"></script>
 <script type="text/javascript" src="../../js/ui/layout.js"></script>
+<script type="text/javascript" src="../../js/post/emoji.js"></script>
 <script type="text/javascript" src="../../js/login/instance.js"></script>
 <script type="text/javascript" src="../../js/login/login.js"></script>
 <script type="text/javascript" src="../../js/ui/img.js"></script>
@@ -873,7 +874,6 @@ var tlid=0;
 <script type="text/javascript" src="../../js/post/img.js"></script>
 <script type="text/javascript" src="../../js/post/status.js"></script>
 <script type="text/javascript" src="../../js/post/misskeystatus.js"></script>
-<script type="text/javascript" src="../../js/post/emoji.js"></script>
 <script type="text/javascript" src="../../js/post/suggest.js"></script>
 <script type="text/javascript" src="../../js/post/bb-md.js"></script>
 <script type="text/javascript" src="../../js/userdata/showOnTL.js"></script>
--- a/app/view/en/setting.html
+++ b/app/view/en/setting.html
@@ -1,5 +1,6 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" style="overflow:scroll">
+
 <head>
 	<title>Settings - TheDesk</title>
 	<!--
@@ -17,362 +18,426 @@
 	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
 	<meta charset="utf-8">
-	<style>input{max-height:50px!important} .pcr-result{height:1rem !important;}</style>
+	<style>
+		input {
+			max-height: 50px !important
+		}
+		.pcr-result {
+			height: 1rem !important;
+		}
+	</style>
 </head>
+
 <body id="mainView" style="overflow-y:scroll">
-<script type="text/javascript" src="../../js/common/jquery.js"></script>
-<script type="text/javascript" src="../../js/platform/first.js"></script>
-<script type="text/javascript" src="../../js/common/materialize.js"></script>
-<script type="text/javascript" src="../../js/lang/lang.en.js"></script>
-<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
-<script src="../../node_modules/vue/dist/vue.min.js"></script>
-<script type="text/javascript" src="setting.vue.js"></script>
+	<script type="text/javascript" src="../../js/common/jquery.js"></script>
+	<script type="text/javascript" src="../../js/platform/first.js"></script>
+	<script type="text/javascript" src="../../js/common/materialize.js"></script>
+	<script type="text/javascript" src="../../js/lang/lang.en.js"></script>
+	<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
+	<script src="../../node_modules/vue/dist/vue.min.js"></script>
+	<script type="text/javascript" src="setting.vue.js"></script>

-<h4>Preferences</h4>
-<ul class="collapsible" data-collapsible="accordion">
-	<li>
-	<div class="collapsible-header">
-			<i class="material-icons">desktop_windows</i>System Preferences
-	</div>
-	<div class="collapsible-body">
-		<h5>Languages</h5>
-		To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
-		<a href="../ja/setting.html" onclick="changelang('ja')">日本語(Japanese)</a>/<a href="../en/setting.html" onclick="changelang('en')">English</a>/<a href="../ps/setting.html" onclick="changelang('ps')">Crowdin web translate</a>/
-		<h5>Import and export of preferences</h5>
-		<button onclick="exportSettings()" class="btn waves-effect lime darken-3" style="width:100%; max-width:200px;">Export</button>
-		<button onclick="importSettings()" class="btn waves-effect cyan darken-3" style="width:100%; max-width:200px;">Import</button>
-		<div id="envView">
-            <template v-for="(item, i) in config">
-				<h5>{{item.text.head}}</h5>
-				<templete v-html=item.text.desc></templete><br>
-				<template v-if="item.id=='notf'"><a onclick="notftest()" class="pointer">Notification test</a><br></template>
-                <template v-if="item.checkbox">
-                        <template v-for="(check, j) in item.text.checkbox">
-                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
-                            <label v-bind:for="item.id+check.value">{{check.text}}</label>
-                        </template>
-				</template>
-				<template v-else>
-					<template v-if="item.doubleText">
-						<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-                        </template>
-					</template>
-					<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
-					</template>
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">Change</button> 
-				</template>
-			</template>
-        </div>
-        <h5>Font</h5>
-		Select your favorite font to 'Select'<br>
-		<button class="btn waves-effect" style="width:100px;" onclick="font()">Select</button><br>
-		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
-		<br>
-		<input type="text" style="width:150px" id="font">
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
-		<br>
-        <h5>Folder to save</h5>
-		TheDesk uses this value when it try to save pictures or take screenshots.<br>
-		<button class="btn waves-effect" style="width:100px;" onclick="savefolder()">Change</button>
-		<br>
-	</div>
-	</li>
-	<li>
-	<div class="collapsible-header">
-			<i class="material-icons">color_lens</i>Themes
-	</div>
-	<div class="collapsible-body">
-		<h4>Select theme</h4>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="black" value="black" />
-		<label for="black">Black</label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="white" value="white" />
-		<label for="white">White</label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="indigo" value="indigo" />
-		<label for="indigo">Indigo<span class="imas hide">(エンドレスナイト)</span></label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="brown" value="brown" />
-		<label for="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="green" value="green" />
-		<label for="green">Green<span class="imas hide">(ユースフルロマンス)</span></label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="custom" value="custom" />
-		<label for="custom">Custom</label>
-		<div style="width:300px" id="sel-selector">
-			<select id="custom-sel-sel" class="custom-sel" onchange="customSel()"></select>
-		</div>
-		<h4>Edit and add custom themes</h4>
-		<div style="width:300px" id="edit-selector" data-add="Add new">
-			<select id="custom-edit-sel" class="custom-sel" onchange="custom()">
-				<option value="add_new">Add new</option>
-			</select>
-		</div>
-		<h5>Name</h5>
-		<input type="text" style="width:300px" id="custom_name" placeholder="Name...">
-		<h5>About this theme</h5>
-		<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" />
-		<label for="dark">Dark</label>
-		<input class="with-gap" name="derection" type="radio" id="light" value="light" />
-		<label for="light">Light</label>
-		<div id="pickers">
-		<div>
-			<h5>Primary</h5>Background of components
-			<div id="color-picker0-wrap"><div class="color-picker" id="color-picker0"></div></div>
-			<input type="hidden" id="color-picker0_value">
-		</div>
-		<div>
-			<h5>Secondary</h5>Background color
-			<div id="color-picker1-wrap"><div class="color-picker" id="color-picker1"></div></div>
-			<input type="hidden" id="color-picker1_value">
-		</div>
-		<div>
-			<h5>Texts</h5>Text color
-			<div id="color-picker2-wrap"><div class="color-picker" id="color-picker2"></div></div>
-			<input type="hidden" id="color-picker2_value">
-		</div>
-		<div>
-			<h5>Accent</h5>Background of boosts
-			<div id="color-picker3-wrap"><div class="color-picker" id="color-picker3"></div></div>
-			<input type="hidden" id="color-picker3_value">
-		</div>
-		</div>
-		<button class="btn-large waves-effect" onclick="customComp()">Change</button>&nbsp;<button class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">Delete</button><br><br>
-		<input type="text" style="width:300px" id="custom_json" class="materialize-textarea" placeholder="JSON style" readonly><br>
-		Share this code with other TheDesk. Do not share this code with MiAS.
-		<h4>Import of custom themes</h4>
-		Get more themes on <a href="https://assets.msky.cafe/" target="_blank">MiAS</a><br>
-		<input type="text" style="width:300px" id="custom_import" class="materialize-textarea" placeholder="JSON/JSON5 style">
-		<button class="btn waves-effect" onclick="customImp()">Import</button><br>
-	</li>
-	<li>
-	<div class="collapsible-header">
-			<i class="material-icons">reorder</i>Timeline Preferences
-	</div>
-	<div class="collapsible-body">
-		<div id="tlView">
-            <template v-for="(item, i) in config">
-				<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
-                <template v-if="item.checkbox">
-                        <template v-for="(check, j) in item.text.checkbox">
-                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
-                            <label v-bind:for="item.id+check.value">{{check.text}}</label>
-                        </template>
-				</template>
-				<template v-else>
-					<template v-if="item.doubleText">
-						<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-                        </template>
-					</template>
-					<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
-					</template>
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">Change</button> 
-				</template>
-			</template>
-        </div>
-	</div>
-	</li>
-	<li>
-	<div class="collapsible-header">
-			<i class="material-icons">send</i>Posting Preferences
-	</div>
-	<div class="collapsible-body">
-		<div id="postView">
-            <template v-for="(item, i) in config">
-				<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
-                <template v-if="item.checkbox">
-                        <template v-for="(check, j) in item.text.checkbox">
-							<template v-if="!check.kirishima || (check.kirishima && kirishima)">
-                            	<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+	<h4>Preferences</h4>
+	<ul class="collapsible" data-collapsible="accordion">
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">desktop_windows</i>System Preferences
+			</div>
+			<div class="collapsible-body">
+				<h5>Languages</h5>
+				To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
+				<a href="../ja/setting.html" onclick="changelang('ja')">日本語(Japanese)</a>/<a href="../en/setting.html" onclick="changelang('en')">English</a>/<a href="../ps/setting.html" onclick="changelang('ps')">Crowdin web translate</a>/
+				<h5>Import and export of preferences</h5>
+				<button onclick="exportSettings()" class="btn waves-effect lime darken-3"
+					style="width:100%; max-width:200px;">Export</button>
+				<button onclick="importSettings()" class="btn waves-effect cyan darken-3"
+					style="width:100%; max-width:200px;">Import</button>
+				<div id="envView">
+					<template v-for="(item, i) in config">
+						<h5>{{item.text.head}}</h5>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
+						</template>
+						<template v-if="item.id=='notf'"><a onclick="notftest()"
+								class="pointer">Notification test</a><br></template>
+						<template v-if="item.checkbox">
+							<template v-for="(check, j) in item.text.checkbox">
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
 								<label v-bind:for="item.id+check.value">{{check.text}}</label>
-								<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
 							</template>
-                        </template>
-				</template>
-				<template v-else>
-					<template v-if="item.doubleText">
-						<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-                        </template>
+						</template>
+						<template v-else>
+							<template v-if="item.doubleText">
+								<template v-for="(textbox, j) in item.data">
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+								</template>
+							</template>
+							<template v-else>
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
+							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">Change</button>
+						</template><br>
 					</template>
-					<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+				</div>
+				<h5>Font</h5>
+				Select your favorite font to 'Select'(Windows/ macOS only)<br>
+				<button class="btn waves-effect" style="width:100px;" onclick="font()">Select</button><br>
+				<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
+				<br>
+				<input type="text" style="width:150px" id="font">
+				<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
+				<br>
+				<h5>Folder to save</h5>
+				TheDesk uses this value when it try to save pictures or take screenshots.<br>
+				<button class="btn waves-effect" style="width:100px;" onclick="savefolder()">Change</button>
+				<br>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">color_lens</i>Themes
+			</div>
+			<div class="collapsible-body">
+				<h4>Select theme</h4>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="black" value="black" />
+				<label for="black">Black</label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="white" value="white" />
+				<label for="white">White</label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="indigo" value="indigo" />
+				<label for="indigo">Indigo<span class="imas hide">(エンドレスナイト)</span></label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="brown" value="brown" />
+				<label for="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="green" value="green" />
+				<label for="green">Green<span class="imas hide">(ユースフルロマンス)</span></label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="custom" value="custom" />
+				<label for="custom">Custom</label>
+				<div style="width:300px" id="sel-selector">
+					<select id="custom-sel-sel" class="custom-sel" onchange="customSel()"></select>
+				</div>
+				<h4>Edit and add custom themes</h4>
+				<div style="width:300px" id="edit-selector" data-add="Add new">
+					<select id="custom-edit-sel" class="custom-sel" onchange="custom()">
+						<option value="add_new">Add new</option>
+					</select>
+				</div>
+				<h5>Name</h5>
+				<input type="text" style="width:300px" id="custom_name" placeholder="Name...">
+				<h5>About this theme</h5>
+				<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="direction" type="radio" id="dark" value="dark" checked="true" />
+				<label for="dark">Dark</label>
+				<input class="with-gap" name="direction" type="radio" id="light" value="light" />
+				<label for="light">Light</label>
+				<div id="pickers">
+					<div>
+						<h5>Primary</h5>Background of components
+						<div id="color-picker0-wrap">
+							<div class="color-picker" id="color-picker0"></div>
+						</div>
+						<input type="hidden" id="color-picker0_value">
+					</div>
+					<div>
+						<h5>Secondary</h5>Background color
+						<div id="color-picker1-wrap">
+							<div class="color-picker" id="color-picker1"></div>
+						</div>
+						<input type="hidden" id="color-picker1_value">
+					</div>
+					<div>
+						<h5>Texts</h5>Text color
+						<div id="color-picker2-wrap">
+							<div class="color-picker" id="color-picker2"></div>
+						</div>
+						<input type="hidden" id="color-picker2_value">
+					</div>
+					<div>
+					<h5>Accent</h5>Background of boosts
+					<div id="color-picker3-wrap">
+						<div class="color-picker" id="color-picker3"></div>
+					</div>
+					<input type="hidden" id="color-picker3_value">
+					</div>
+				</div>
+				<button class="btn-large waves-effect" onclick="customComp()">Change</button>&nbsp;<button
+					class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">Delete</button><br><br>
+				<input type="text" style="width:300px" id="custom_json" class="materialize-textarea"
+					placeholder="JSON style" readonly><br>
+				Share this code with other TheDesk. Do not share this code with MiAS.
+				<h4>Import of custom themes</h4>
+				Get more themes on <a href="https://assets.msky.cafe/" target="_blank">MiAS</a><br>
+				<input type="text" style="width:300px" id="custom_import" class="materialize-textarea"
+					placeholder="JSON/JSON5 style">
+				<button class="btn waves-effect" onclick="customImp()">Import</button><br>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">reorder</i>Timeline Preferences
+			</div>
+			<div class="collapsible-body">
+				<div id="tlView">
+					<template v-for="(item, i) in config">
+						<h5>{{item.text.head}}</h5>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
+						</template>
+						<template v-if="item.checkbox">
+							<template v-for="(check, j) in item.text.checkbox">
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+								<label v-bind:for="item.id+check.value">{{check.text}}</label>
+							</template>
+						</template>
+						<template v-else>
+							<template v-if="item.doubleText">
+								<template v-for="(textbox, j) in item.data">
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+								</template>
+							</template>
+							<template v-else>
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
+							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">Change</button>
+						</template><br>
 					</template>
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">Change</button> 
-				</template>
-			</template>
-        </div>
-	</div>
-	</li>
-	<li>
-		<div class="collapsible-header">
+				</div>
+				<h5>Custom sound</h5>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(1)">Custom 1</button><span id="c1-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(2)">Custom 2</button><span id="c2-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(3)">Custom 3</button><span id="c3-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(4)">Custom 4</button><span id="c4-file"></span><br>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">send</i>Posting Preferences
+			</div>
+			<div class="collapsible-body">
+				<div id="postView">
+					<template v-for="(item, i) in config">
+						<h5>{{item.text.head}}</h5>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
+						</template>
+						<template v-if="item.checkbox">
+							<template v-for="(check, j) in item.text.checkbox">
+								<template v-if="!check.kirishima || (check.kirishima && kirishima)">
+									<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+										type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+									<label v-bind:for="item.id+check.value">{{check.text}}</label>
+									<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
+								</template>
+							</template>
+						</template>
+						<template v-else>
+							<template v-if="item.doubleText">
+								<template v-for="(textbox, j) in item.data">
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+								</template>
+							</template>
+							<template v-else>
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
+							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">Change</button>
+						</template><br>
+					</template>
+				</div>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
 				<i class="material-icons">keyboard</i>Keyboard shortcut Preferences
-		</div>
-		<div class="collapsible-body">
-			<h5>Easy inserter</h5>
-			You can insert any letters and emojis with only 3 keys<br>
-			Ctrl+Shift+1:<input type="text" style="width:150px" id="oks-1">
-			<button onclick="oks(1)" class="btn waves-effect" style="width:100px;">Save</button><br><br>
-			Ctrl+Shift+2:<input type="text" style="width:150px" id="oks-2">
-			<button onclick="oks(2)" class="btn waves-effect" style="width:100px;">Save</button><br><br>
-			Ctrl+Shift+3:<input type="text" style="width:150px" id="oks-3">
-			<button onclick="oks(3)" class="btn waves-effect" style="width:100px;">Save</button><br><br>
+			</div>
+			<div class="collapsible-body">
+				<h5>Easy inserter</h5>
+				You can insert any letters and emojis with only 3 keys<br>
+				Ctrl+Shift+1:<input type="text" style="width:150px" id="oks-1">
+				<button onclick="oks(1)" class="btn waves-effect" style="width:100px;">Save</button><br><br>
+				Ctrl+Shift+2:<input type="text" style="width:150px" id="oks-2">
+				<button onclick="oks(2)" class="btn waves-effect" style="width:100px;">Save</button><br><br>
+				Ctrl+Shift+3:<input type="text" style="width:150px" id="oks-3">
+				<button onclick="oks(3)" class="btn waves-effect" style="width:100px;">Save</button><br><br>

-		</div>
-	</li>
-	<li>
-		<div class="collapsible-header">
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
 				<i class="material-icons">bookmark</i>Mute & Emphasis Preferences
-		</div>
-		<div class="collapsible-body">
-			<h5>Client Mute</h5>
-			<div id="mute-cli"></div>
-			<h5>Client Emphasis</h5>
-			Click client name on toots to toggle mute and emphasis.
-			<h5>Words Mute</h5>
-			Enter to set<br>
-			<div class="chips" id="wordmute" style="background-color:gray;"></div>
-			<button onclick="wordmuteSave()" class="btn waves-effect" style="width:100px;">Save</button>
-			<h5>Words Emphasis</h5>
-			Enter to set<br>
-			<div class="chips" id="wordemp" style="background-color:gray;"></div>
-			<button onclick="wordempSave()" class="btn waves-effect" style="width:100px;">Save</button>
-			<h5>Users Emphasis</h5>
-			Set on users data modals.
-			<span class="emphasized">　Use this color to emphasis　</span>
-		</div>
-	</li>
-	<li>
-		<div class="collapsible-header">
-			<i class="fa fa-spotify"></i>Spotify and NowPlaying Preferences
-		</div>
-		<div class="collapsible-body">
-			<h5>NowPlaying Provider(Windows)</h5>
-			macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a> is required. And MusicBee requires CAD.<br>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
-			<label for="aimp">AIMP</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
-			<label for="itunes">iTunes</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm" value="MEDIAMONKEY" />
-			<label for="npmm">MediaMonkey</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
-			<label for="winamp">Winamp</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
-			<label for="wmp">WMP</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
-			<label for="wlm">WLM</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
-			<label for="cad">CAD</label><br><br>
-			Click <i class="material-icons" style="font-size:24px;">music_note</i>icon to NowPlaying<br>
-			<h5>Account Connection</h5>
-			TheDesk save your data on thedesk.top server.<br>
-			<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">Save</button></div>
-			<a onclick="spotifyConnect()" class="btn waves-effect nex" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i class="fa fa-spotify left"></i>Connect</a>
-			<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i class="fa fa-spotify left"></i>Disconnect</a>
-			<h5>Edit a template</h5>
-			<br>
-			<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
+			</div>
+			<div class="collapsible-body">
+				<h5>Client Mute</h5>
+				<div id="mute-cli"></div>
+				<h5>Client Emphasis</h5>
+				Click client name on toots to toggle mute and emphasis.
+				<h5>Words Mute</h5>
+				Enter to set<br>
+				<div class="chips" id="wordmute" style="background-color:gray;"></div>
+				<button onclick="wordmuteSave()" class="btn waves-effect" style="width:100px;">Save</button>
+				<h5>Words Emphasis</h5>
+				Enter to set<br>
+				<div class="chips" id="wordemp" style="background-color:gray;"></div>
+				<button onclick="wordempSave()" class="btn waves-effect" style="width:100px;">Save</button>
+				<h5>Users Emphasis</h5>
+				Set on users data modals.
+				<span class="emphasized">　Use this color to emphasis　</span>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="fa fa-spotify"></i>Spotify and NowPlaying Preferences
+			</div>
+			<div class="collapsible-body">
+				<h5>NowPlaying Provider(Windows)</h5>
+				macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a> is required. And MusicBee requires CAD.<br>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
+				<label for="aimp">AIMP</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
+				<label for="itunes">iTunes</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm" value="MEDIAMONKEY" />
+				<label for="npmm">MediaMonkey</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
+				<label for="winamp">Winamp</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
+				<label for="wmp">WMP</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
+				<label for="wlm">WLM</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
+				<label for="cad">CAD</label><br><br>
+				Click <i class="material-icons" style="font-size:24px;">music_note</i>icon to NowPlaying<br>
+				<h5>Account Connection</h5>
+				TheDesk save your data on thedesk.top server.<br>
+				<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button
+						onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">Save</button></div>
+				<a onclick="spotifyConnect()" class="btn waves-effect nex"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i
+						class="fa fa-spotify left"></i>Connect</a>
+				<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i
+						class="fa fa-spotify left"></i>Disconnect</a>
+				<h5>Edit a template</h5>
+				<br>
+				<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
 {url}</textarea><br>
 				Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify<br>
 				macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}<br>
 				Windows:{song}:Song name/{album}:Album name/{artist}:Artist name<br>
-				<span class="imas hide">CINDERELLA NowPlaying(imastodon.net限定)では作曲家{composer}/作詞家{lyricist}/BPM{bpm}が有効です。<br>
-                    CINDERELLA NowPlayingはimastodon.netにログインしているとき、トゥート欄に「//」を入力し、その後に曲名を入れることで可能です。</span><br>
-			<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">Save</button>
-			<h5>Attach an Artwork of Spotify</h5>
-			<span class="imas hide">この設定はCINDERELLA NowPlaying(imastodon.net限定)にも適用されます。</span><br>
-			<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
-			<label for="awk_yes">Yes</label>
-			<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
-			<label for="awk_no">No</label>
-			<br>
-		</div>
-	</li>
-	<li>
-		<div class="collapsible-header">
-			<i class="material-icons">hearing</i>TTS(text to speech) Preferences
-		</div>
-		<div class="collapsible-body">
-			<h5>Speed</h5>
-			1-100(default:10)<br>
-			<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10" style="width:500px; max-width:100%"/></p>
-			<h5>Pitch</h5>
-			0-100(default:50)<br>
-			<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50" style="width:500px; max-width:100%"/></p>
-			<h5>Volume</h5>
-			0-100(default:100)<br>
-			<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100" style="width:500px; max-width:100%"/></p>
-			<h5>Test</h5>
-			<input type="text" style="width:350px" id="voicetxt" value="TheDesk is an open-source Mastodon client for PC.">
-			<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()" id="testplay">Play/Stop</button><br>
-			<br>
-			<button class="btn waves-effect" style="width:100px;" onclick="voiceSettings()">Save</button>
-		</div>
-	</li>
-</ul>
-<br>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>Back</a>
-<br>
-<br>Keyboard shortcuts
-<li>Ctrl+1-9:Jump to n(1-9)th column</li>
-<li>N:Open toot box</li>
-<li>X:Toggle toot box</li>
-<li>Ctrl+Enter:Post</li>
-<li>Ctrl+Enter+Shift:Post(secondary toot)</li>
-<li>Alt+Enter:Secondary Toot Button</li>
-<li>Ctrl+E:Make all notifications read</li>
-<li>Esc:Hide toot box</li>
-<li>F5:Super Reload</li>
-<li>Ctrl+Shift+C:Clear toot box</li>
-<li>Ctrl+Shift+S:Preferences</li>
-<li>Ctrl+Shift+M:Account Manager</li>
-<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
-<li>Ctrl+Shift+P:Show profile of selecting</li>
-<li>←/→:Show next or previous image</li>
-<li>Mousewheel:Zoom a image</li>
-<div class="hide kirishima">
-以下Markdownに対応したインスタンスのみ。
-<br>
-<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
-<li>Shift+Enter:全角スペースを入れて改行</li>
-<li>Shift+Space:ゼロ幅スペース</li>
-以下アスタルテにログインしている場合のみ 
-<br>
-<li>Ctrl+R: 
-<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
-</li><br>
-</div>
-<button class="btn waves-effect red" style="width:100%; max-width:500px;" onclick="if(confirm('Delete all data. You cannot undo. Continue?')){ localStorage.clear(); location.href='index.html'; }"><i class="material-icons left">delete</i>Reset(Danger)</button><br><br>
-<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i 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 class="material-icons left">list</i>Help/Docs(Constructing)</a>
-<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
-<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
-<br>
-Kyash<br>
-			<img src="../../img/kyash.png" width="100"><br>
-<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. 
-	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>
-	<br>Developer: Cutls P( 
-	<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
+				<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">Save</button>
+				<h5>Attach an Artwork of Spotify</h5>
+				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
+				<label for="awk_yes">Yes</label>
+				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
+				<label for="awk_no">No</label>
+				<br>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">hearing</i>TTS(text to speech) Preferences
+			</div>
+			<div class="collapsible-body">
+				<h5>Speed</h5>
+				1-100(default:10)<br>
+				<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10"
+						style="width:500px; max-width:100%" /></p>
+				<h5>Pitch</h5>
+				0-100(default:50)<br>
+				<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50"
+						style="width:500px; max-width:100%" /></p>
+				<h5>Volume</h5>
+				0-100(default:100)<br>
+				<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100"
+						style="width:500px; max-width:100%" /></p>
+				<h5>Test</h5>
+				<input type="text" style="width:350px" id="voicetxt" value="TheDesk is an open-source Mastodon client for PC.">
+				<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()"
+					id="testplay">Play/Stop</button><br>
+				<br>
+				<button class="btn waves-effect" style="width:100px;" onclick="voiceSettings()">Save</button>
+			</div>
+		</li>
+	</ul>
 	<br>
-</span><br>
-TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
-タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
-<script type="text/javascript" src="../../js/common/about.js"></script>
-<script type="text/javascript" src="../../js/platform/end.js"></script>
-<script type="text/javascript" src="../../js/login/logout.js"></script>
-<script type="text/javascript" src="../../js/ui/spotify.js"></script>
-<script type="text/javascript" src="../../js/tl/speech.js"></script>
-<script type="text/javascript" src="../../js/platform/pickr.js"></script>
-<script type="text/javascript" src="../../js/ui/settings.js"></script>
-<script type="text/javascript" src="../../js/ui/theme.js"></script>
-<script type="text/javascript" src="../../js/tl/date.js"></script>
+	<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i
+			class="material-icons left">undo</i>Back</a>
+	<br>
+	<br>Keyboard shortcuts
+	<li>Ctrl+1-9:Jump to n(1-9)th column</li>
+	<li>N:Open toot box</li>
+	<li>X:Toggle toot box</li>
+	<li>Ctrl+Enter:Post</li>
+	<li>Ctrl+Enter+Shift:Post(secondary toot)</li>
+	<li>Alt+Enter:Secondary Toot Button</li>
+	<li>Ctrl+E:Make all notifications read</li>
+	<li>Esc:Hide toot box</li>
+	<li>F5:Super Reload</li>
+	<li>Ctrl+Shift+C:Clear toot box</li>
+	<li>Ctrl+Shift+S:Preferences</li>
+	<li>Ctrl+Shift+M:Account Manager</li>
+	<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
+	<li>Ctrl+Shift+P:Show profile of selecting</li>
+	<li>←/→:Show next or previous image</li>
+	<li>Mousewheel:Zoom a image</li>
+	<div class="hide kirishima">
+		以下Markdownに対応したインスタンスのみ。
+		<br>
+		<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
+		<li>Shift+Enter:全角スペースを入れて改行</li>
+		<li>Shift+Space:ゼロ幅スペース</li>
+		以下アスタルテにログインしている場合のみ
+		<br>
+		<li>Ctrl+R:
+			<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
+		</li><br>
+	</div>
+	<button class="btn waves-effect red" style="width:100%; max-width:500px;"
+		onclick="if(confirm('Delete all data. You cannot undo. Continue?')){ localStorage.clear(); location.href='index.html'; }"><i
+			class="material-icons left">delete</i>Reset(Danger)</button><br><br>
+	<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i
+			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://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
+			class="material-icons left">list</i>Help/Docs(Constructing)</a>
+	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
+		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
+	<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2"
+		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
+			style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
+	<br>
+	Kyash<br>
+	<img src="../../img/kyash.png" width="100"><br>
+	<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; 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>
+		<br>Developer: Cutls P(
+		<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
+		<br>
+	</span><br>
+	TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
+	タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
+	<script type="text/javascript" src="../../js/common/about.js"></script>
+	<script type="text/javascript" src="../../js/platform/end.js"></script>
+	<script type="text/javascript" src="../../js/login/logout.js"></script>
+	<script type="text/javascript" src="../../js/ui/spotify.js"></script>
+	<script type="text/javascript" src="../../js/tl/speech.js"></script>
+	<script type="text/javascript" src="../../js/platform/pickr.js"></script>
+	<script type="text/javascript" src="../../js/ui/settings.js"></script>
+	<script type="text/javascript" src="../../js/ui/theme.js"></script>
+	<script type="text/javascript" src="../../js/tl/date.js"></script>
--- a/app/view/en/setting.vue.js
+++ b/app/view/en/setting.vue.js
@@ -7,6 +7,27 @@ var yesno=[
        value:"no"
    }
 ];
+var sound=[
+    {
+        text:"None",
+        value:"none"
+    },{
+        text:"Default",
+        value:"default"
+    },{
+        text:"Custom 1",
+        value:"c1"
+    },{
+        text:"Custom 2",
+        value:"c2"
+    },{
+        text:"Custom 3",
+        value:"c3"
+    },{
+        text:"Custom 4",
+        value:"c4"
+    }
+];
 var envConstruction=[
    {
        id:"popup",
@@ -286,6 +307,46 @@ var tlConstruction=[
            desc:"",
            checkbox:yesno
        }
+    },{
+        id:"replySound",
+        storage:"replySound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"Sound(Reply)",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"favSound",
+        storage:"favSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"Sound(Fav)",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"btSound",
+        storage:"btSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"Sound(Boost)",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"followSound",
+        storage:"followSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"Sound(Follow)",
+            desc:"",
+            checkbox:sound
+        }
    }
 ];
 var postConstruction=[
@@ -476,5 +537,16 @@ var postConstruction=[
                }
            ]
        }
+    },{
+        id:"zero",
+        storage:"emoji-zero-width",
+        checkbox:true,
+        setValue:"normal",
+        setValue:"no",
+        text:{
+            head:"Zero-width space when inserting emojis",
+            desc:"",
+            checkbox:yesno
+        }
    }
 ]
--- 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"));
             
    });
--- a/app/view/ja/acct.html
+++ b/app/view/ja/acct.html
@@ -18,6 +18,14 @@ body,html{overflow-y: scroll;}
 .colorsel{ display:flex; }
 .card .colorsel div:not(.exc){width:20px;height:20px;}
 .card .colorsel div.exc{width:40px;height:20px;}
+.first{
+      display:flex;
+      justify-content: center;
+      align-items:center
+}
+.first .hide-first{
+      display:none;
+}
 </style>
 <meta charset="utf-8">
 <!--
@@ -39,24 +47,27 @@ body,html{overflow-y: scroll;}
 <script type="text/javascript" src="../../js/ui/tips.js"></script>
 <script type="text/javascript" src="../../js/common/time.js"></script>
 <script type="text/javascript" src="../../js/common/modal.js"></script>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">戻る</a><br>
-<h5>アカウント一覧</h5>
-<div id="acct-list"></div>
-<div class="divider"></div>
+<div class="hide-first">
+      <a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">戻る</a><br>
+      <h5>アカウント一覧</h5>
+      <div id="acct-list"></div>
+      <div class="divider"></div>
+</div>
+<div>
 <h5>アカウントを追加</h5><br>
 <div id="add">
 <div class="row">
-      <div class="col s6">
+      <div class="col s8">
            <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
            <div id="ins-suggest"></div>
-            Windows以外でご使用の方やPleromaにログインされる方はチェックを入れて下さい。ログインできない場合、チェックを外してください。<br>
+            チェックを外すとコード貼り付けをスキップできます。(<u>Mastodon</u>にWindowsやmacOSからログインする場合)失敗する場合はチェックを入れてください。<br>
            <input type="checkbox" class="filled-in" id="linux" />
                  <label for="linux">コードセットアップ</label><br>
            <input type="checkbox" class="filled-in" id="misskey" />
                  <label for="misskey">Misskeyとしてログイン</label><br>
            <button class="btn waves-effect" onclick="instance()">Login</button><br>
      </div>
-      <div class="col s6">
+      <div class="col s4">
            <span style="font-family:Open Sans;">Supports</span>
            <div id="support" class="collection transparent"></div>
      </div>
@@ -73,6 +84,8 @@ body,html{overflow-y: scroll;}
                  <input type="text" id="misskey-key" placeholder="コードを入力">
                  <button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br>
            </div>
+      </div>
+<div class="hide-first">
 <h5>メインアカウント</h5>
 <div class="input-field" style="width:300px"><span data-trans="your_acct">アカウントを選択</span>
      <br>
@@ -91,6 +104,7 @@ Administered by:<a id="ins-admin"></a><br>
 ユーザー数:<span id="ins-user"></span>ユーザー数<br>
 コネクション:<span id="ins-per"></span>%<br>
 Mastodonバージョン:<span id="ins-ver"></span>@<span id="ins-upd"></span><br>
+</div>
 <script type="text/javascript" src="../../js/ui/theme.js"></script>
 <script type="text/javascript" src="../../js/platform/end.js"></script>
 <script type="text/javascript" src="../../js/common/sha256.js"></script>
--- a/app/view/ja/index.html
+++ b/app/view/ja/index.html
@@ -4,13 +4,13 @@
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
 	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
+	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
-	<link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/post.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/tl.css" rel="stylesheet" type="text/css">
+	<link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+	<link href="../../css/post.css" rel="stylesheet" type="text/css">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/sort.css" rel="stylesheet" type="text/css">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
 	<!--
@@ -32,14 +32,13 @@
 <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.1.2)";
+var ver="Usamin (18.3.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
 //WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
 var acct_id=0;
 var tlid=0;
-  verck(ver);
 </script>
 <textarea id="copy" style="top:-100px; position:fixed;"></textarea>
 <div id="tl">
@@ -53,7 +52,7 @@ var tlid=0;
 </div>
 </div>
 <div id="post-box" class="z-depth-5">
-<div id="post-bar" class="drag-bar">投稿</div>
+<div id="post-bar" class="drag-bar"><span id="unreact">投稿</span><span id="addreact" class="hide">Reaction</span></div>
 <!--トゥートボックス-->
 <div id="left-side">
 <div class="row" style="margin-bottom:0;">
@@ -205,7 +204,6 @@ var tlid=0;
 <div id="emoji" class="hide">
 		<span class="gray sml">サーバーによって実装が異なります。
 			<a onclick="emojiGet('true')" class="pointer">絵文字更新</a>
-			<i class="material-icons waves-effect" onclick="emojiToggle()" title="このボックスを閉じる" data-trans-title="post_box_close">cancel</i>
 		<br>
 		</span>
 		<div id="emoji-list" class="" style="">
@@ -251,7 +249,7 @@ var tlid=0;
 			<i class="material-icons">flag</i>
 			</a>
 			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
-			<i class="fa fa-fort-awesome"></i>
+			<i class="fab fa-fort-awesome"></i>
 			</a>
 		</div>
 	</div>
@@ -259,12 +257,8 @@ var tlid=0;
 	<div id="poll" class="hide">
 		<select id="poll-sel"  onchange="pollProviderCk()">
 			<option value="nothing">アンケートを使用しない</option>
-			<option value="votedon">votedon.</option>
 			<option value="mastodon-poll">Mastodon(2.8~)</option>
 		</select>
-		<div id="votedon" class="poll-provider hide">
-	WIP
-		</div>
 		<div id="mastodon-poll" class="poll-provider hide">
 			<input type="text" class="mastodon-choice" placeholder="選択肢1">
 			<input type="text" class="mastodon-choice" placeholder="選択肢2">
@@ -276,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>
@@ -330,26 +324,26 @@ var tlid=0;
 	</li>
 	<li class="dm-hide">
 		<div class="collapsible-header">
-		<i class="text-darken-3 fa fa-retweet"></i>このトゥートをブーストした人
+		<i class="text-darken-3 false fas fa-retweet"></i>このトゥートをブーストした人
 		</div>
 		<div class="collapsible-body toot-reset" id="toot-rt">
 		</div>
 	</li>
 	</ul>
 	<div class="dm-hide">
-	他のアカウントを使用(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>の解除はできません)<br>
+	他のアカウントを使用(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>の解除はできません)<br>
 	<div class="row">
 		<div class="col s6">
 				<select id="status-acct-sel" class="acct-sel"></select>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
+			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fas fa-share"></i>/button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
+			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
+			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fas fa-star"></i></button>
 		</div>
 	</div>
 	<div id="toot-tools">
@@ -360,7 +354,6 @@ var tlid=0;
 </div>
 	<div class="modal-footer">
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="brws()">ブラウザで開く</a>
-	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="shot()">スクリーンショット</a>
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy()">URLをコピー</a>
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy('emb')">埋め込む</a>
 	<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
@@ -372,7 +365,7 @@ var tlid=0;
 			<div id="his-data-show">
 			<div class="his-float" id="his-float-data">
 			<div id="his-basic-prof">
-			<img src="../../img/loading.svg" id="his-prof">
+			<img src="../../img/loading.svg" id="his-prof" draggable="false">
 			<span id="his-name">Loading...</span><span class="gray" id="his-bot"></span>
 			<br>@
 			<span id="his-acct"></span><br>
@@ -390,8 +383,9 @@ var tlid=0;
 			<span class="cbadge" style="max-width:150px; width:150px; ">Since:
 			<span id="his-since"></span>
 			</span>
+			<div id="his-proof-prof"></div>
 			</div>
-			<div id="his-des"></div><br>
+			<div id="his-des" data-acct=""></div><br>
 			<div id="his-plus-action">
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">ユーザー強調</a>
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">紹介する</a><br>
@@ -525,6 +519,9 @@ var tlid=0;
 			</div>
 			</div>
 			</div>
+			<div class="his-float" id="his-float-blocked">
+				<div>ブロックされています。なぜでしょう？</div>
+			</div>
 			</div>
 			</div>
 			<div class="modal-footer">
@@ -583,20 +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-1-1" 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.1.1)</h5>
-・お知らせ機能改善<br>
-・Integrated TLで一部挙動改善(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
--以下18.1.0--<br>
-・iTunes NowPlaying(macOS)にアルバムアートワークを付ける(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
-・カラムを<b>縦に並べられる</b>ように(2つ目以降のカラム毎の設定の「左に重ねる」「右に出す」を押す)<br>
-・画像を個別に削除する(画像をクリックして)<br>
-・何個もアルバムアートワークが投稿されるバグを修正<br>
-・Misskeyでログインしたまま何もできないバグを修正(権限回り)
+					<h5>Release Note Usamin (18.3.1)</h5>
+・通知音が種別ごとに追加(すべて適当に自分で打ったやつです。)<br>
+・Integrated TLのタイムラインの再接続(kPherox)<br>
+・一部ロケーションの変更や投票に関するバグ(kPherox)<br>
+・バグと脆弱性の修正
+<br>
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -605,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>
@@ -688,11 +679,10 @@ var tlid=0;
 			<div class="input-field">
 			<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
 	</div><div class="input-field">
-	<i class="material-icons prefix">search</i>
-	<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
+	<input id="src" type="text" class="validate" style="width:60%">
 	<label for="src" data-trans="src">検索</label>
-	<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
-		<i class="material-icons left">search</i>検索
+	<button class="btn waves-effect indigo" style="width: 36%;padding: 0;padding-left: 15px;" onclick="src()" data-trans-i="src">
+		<i class="material-icons left" style="margin:0">search</i>検索
 	</button>
 	<br>
 	<br>
@@ -706,7 +696,7 @@ var tlid=0;
 	<div id="sort-box" class="hide menu-content">
 	<ul id="sort"></ul>
 	<div>
-	<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
+	<button onclick="sort()" class="btn waves-effect nex" style="width:97.5%;" data-trans-i="sort">
 		<i class="material-icons left">sort</i>並べ替え設定
 	</button>
 	</div>
@@ -758,10 +748,17 @@ var tlid=0;
 		<input type="checkbox" class="filled-in" id="except_filter" value="1" />
 			<label for="except_filter">除外</label><br>
 		<span class="sml">「除外」時マッチしたトゥートは非可逆的に除外され、削除後も閲覧できません。</span><br>
-		有効期限(あと)<span class="sml">未指定(または0分)で「無制限」になります。<b>仕様上数値の正確性を保証できません。</b></span><br><br>
+		有効期限(あと)<span class="sml">未指定(または0分)で「無期限」になります。<b>仕様上数値の正確性を保証できません。</b></span><br><br>
 		<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">日
 		<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">時間
-		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">分
+		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">分<br>
+		Quick:<a onclick="filterTime(0,0,30)" class="pointer">30分</a>/
+		<a onclick="filterTime(0,1,0)" class="pointer">1時間</a>/
+		<a onclick="filterTime(0,6,0)" class="pointer">6時間</a>/
+		<a onclick="filterTime(0,12,0)" class="pointer">12時間</a>/
+		<a onclick="filterTime(1,0,0)" class="pointer">1日</a>/
+		<a onclick="filterTime(7,0,0)" class="pointer">7日</a>/
+		<a onclick="filterTime(0,0,0)" class="pointer">無期限</a><br>
 		<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">追加</button><br>
 		<span class="sml">Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。</span>
 	</div>
@@ -777,7 +774,9 @@ var tlid=0;
 <div id="main">
 <!--TLのTL-->
 <div id="timeline-container">
-	<h3>Welcome to TheDesk</h3><br><a href="acct.html">アカウントを追加</a>するか下の<i class="material-icons">apps</i>ボタンよりカラムを追加してください。
+	<div id="something-wrong">
+		<div>内部エラーです。再読込して治らない場合は初期化(全データ削除)をしてください。(事前に設定をエクスポートしておくことをおすすめします。)</div>
+	</div>
 </div>
 </div>
 </div>
@@ -803,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>
@@ -821,7 +821,7 @@ var tlid=0;
 						<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
 				</a>
 				<a onclick="tips('spotify')" class="nex waves-effect">
-					<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
+					<i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
 				</a>
 			</div>
 		</div>
@@ -860,6 +860,7 @@ var tlid=0;
 <script type="text/javascript" src="../../js/tl/speech.js"></script>
 <script type="text/javascript" src="../../js/ui/post-box.js"></script>
 <script type="text/javascript" src="../../js/ui/layout.js"></script>
+<script type="text/javascript" src="../../js/post/emoji.js"></script>
 <script type="text/javascript" src="../../js/login/instance.js"></script>
 <script type="text/javascript" src="../../js/login/login.js"></script>
 <script type="text/javascript" src="../../js/ui/img.js"></script>
@@ -873,7 +874,6 @@ var tlid=0;
 <script type="text/javascript" src="../../js/post/img.js"></script>
 <script type="text/javascript" src="../../js/post/status.js"></script>
 <script type="text/javascript" src="../../js/post/misskeystatus.js"></script>
-<script type="text/javascript" src="../../js/post/emoji.js"></script>
 <script type="text/javascript" src="../../js/post/suggest.js"></script>
 <script type="text/javascript" src="../../js/post/bb-md.js"></script>
 <script type="text/javascript" src="../../js/userdata/showOnTL.js"></script>
--- a/app/view/ja/setting.html
+++ b/app/view/ja/setting.html
@@ -1,5 +1,6 @@
 <!doctype html>
-<html lang="ja">
+<html lang="ja" style="overflow:scroll">
+
 <head>
 	<title>Settings - TheDesk</title>
 	<!--
@@ -17,362 +18,426 @@
 	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
 	<meta charset="utf-8">
-	<style>input{max-height:50px!important} .pcr-result{height:1rem !important;}</style>
+	<style>
+		input {
+			max-height: 50px !important
+		}
+		.pcr-result {
+			height: 1rem !important;
+		}
+	</style>
 </head>
+
 <body id="mainView" style="overflow-y:scroll">
-<script type="text/javascript" src="../../js/common/jquery.js"></script>
-<script type="text/javascript" src="../../js/platform/first.js"></script>
-<script type="text/javascript" src="../../js/common/materialize.js"></script>
-<script type="text/javascript" src="../../js/lang/lang.ja.js"></script>
-<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
-<script src="../../node_modules/vue/dist/vue.min.js"></script>
-<script type="text/javascript" src="setting.vue.js"></script>
+	<script type="text/javascript" src="../../js/common/jquery.js"></script>
+	<script type="text/javascript" src="../../js/platform/first.js"></script>
+	<script type="text/javascript" src="../../js/common/materialize.js"></script>
+	<script type="text/javascript" src="../../js/lang/lang.ja.js"></script>
+	<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
+	<script src="../../node_modules/vue/dist/vue.min.js"></script>
+	<script type="text/javascript" src="setting.vue.js"></script>

-<h4>設定</h4>
-<ul class="collapsible" data-collapsible="accordion">
-	<li>
-	<div class="collapsible-header">
-			<i class="material-icons">desktop_windows</i>環境設定
-	</div>
-	<div class="collapsible-body">
-		<h5>言語</h5>
-		To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
-		<a href="../ja/setting.html" onclick="changelang('ja')">日本語(Japanese)</a>/<a href="../en/setting.html" onclick="changelang('en')">English</a>/<a href="../ps/setting.html" onclick="changelang('ps')">Crowdin web translate</a>/
-		<h5>設定のインポートとエクスポート</h5>
-		<button onclick="exportSettings()" class="btn waves-effect lime darken-3" style="width:100%; max-width:200px;">エクスポート</button>
-		<button onclick="importSettings()" class="btn waves-effect cyan darken-3" style="width:100%; max-width:200px;">インポート</button>
-		<div id="envView">
-            <template v-for="(item, i) in config">
-				<h5>{{item.text.head}}</h5>
-				<templete v-html=item.text.desc></templete><br>
-				<template v-if="item.id=='notf'"><a onclick="notftest()" class="pointer">通知テスト</a><br></template>
-                <template v-if="item.checkbox">
-                        <template v-for="(check, j) in item.text.checkbox">
-                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
-                            <label v-bind:for="item.id+check.value">{{check.text}}</label>
-                        </template>
-				</template>
-				<template v-else>
-					<template v-if="item.doubleText">
-						<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-                        </template>
-					</template>
-					<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
-					</template>
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">変更</button> 
-				</template>
-			</template>
-        </div>
-        <h5>フォント</h5>
-		「選択」を押してフォントを選んでください。<br>
-		<button class="btn waves-effect" style="width:100px;" onclick="font()">選択</button><br>
-		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
-		<br>
-		<input type="text" style="width:150px" id="font">
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
-		<br>
-        <h5>デフォルトの保存先</h5>
-		画像ダウンロードやスクリーンショットに影響します。<br>
-		<button class="btn waves-effect" style="width:100px;" onclick="savefolder()">変更</button>
-		<br>
-	</div>
-	</li>
-	<li>
-	<div class="collapsible-header">
-			<i class="material-icons">color_lens</i>テーマの設定
-	</div>
-	<div class="collapsible-body">
-		<h4>テーマの選択</h4>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="black" value="black" />
-		<label for="black">Black</label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="white" value="white" />
-		<label for="white">White</label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="indigo" value="indigo" />
-		<label for="indigo">Indigo<span class="imas hide">(エンドレスナイト)</span></label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="brown" value="brown" />
-		<label for="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="green" value="green" />
-		<label for="green">Green<span class="imas hide">(ユースフルロマンス)</span></label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="custom" value="custom" />
-		<label for="custom">Custom</label>
-		<div style="width:300px" id="sel-selector">
-			<select id="custom-sel-sel" class="custom-sel" onchange="customSel()"></select>
-		</div>
-		<h4>カスタムテーマの作成・編集</h4>
-		<div style="width:300px" id="edit-selector" data-add="新規作成">
-			<select id="custom-edit-sel" class="custom-sel" onchange="custom()">
-				<option value="add_new">新規作成</option>
-			</select>
-		</div>
-		<h5>名前</h5>
-		<input type="text" style="width:300px" id="custom_name" placeholder="名前...">
-		<h5>説明</h5>
-		<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" />
-		<label for="dark">Dark</label>
-		<input class="with-gap" name="derection" type="radio" id="light" value="light" />
-		<label for="light">Light</label>
-		<div id="pickers">
-		<div>
-			<h5>Primary</h5>補助要素に使われる背景色
-			<div id="color-picker0-wrap"><div class="color-picker" id="color-picker0"></div></div>
-			<input type="hidden" id="color-picker0_value">
-		</div>
-		<div>
-			<h5>Secondary</h5>全体の背景色など
-			<div id="color-picker1-wrap"><div class="color-picker" id="color-picker1"></div></div>
-			<input type="hidden" id="color-picker1_value">
-		</div>
-		<div>
-			<h5>Texts</h5>テキストの色
-			<div id="color-picker2-wrap"><div class="color-picker" id="color-picker2"></div></div>
-			<input type="hidden" id="color-picker2_value">
-		</div>
-		<div>
-			<h5>Accent</h5>ブーストの背景色など
-			<div id="color-picker3-wrap"><div class="color-picker" id="color-picker3"></div></div>
-			<input type="hidden" id="color-picker3_value">
-		</div>
-		</div>
-		<button class="btn-large waves-effect" onclick="customComp()">変更</button>&nbsp;<button class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">削除</button><br><br>
-		<input type="text" style="width:300px" id="custom_json" class="materialize-textarea" placeholder="JSON style" readonly><br>
-		このコードは他のTheDeskなどとシェアできます。このコードをMiASに貼ることはご遠慮ください。詳細:<a href="https://thedesk.top/mias.html" target="_blank">テーマ互換性</a>
-		<h4>カスタムテーマのインポート</h4>
-		<a href="https://assets.msky.cafe/" target="_blank">MiAS</a>上の80を超えるテーマを張り付けることもできます。<br>
-		<input type="text" style="width:300px" id="custom_import" class="materialize-textarea" placeholder="JSON/JSON5 style">
-		<button class="btn waves-effect" onclick="customImp()">インポート</button><br>
-	</li>
-	<li>
-	<div class="collapsible-header">
-			<i class="material-icons">reorder</i>タイムラインの設定
-	</div>
-	<div class="collapsible-body">
-		<div id="tlView">
-            <template v-for="(item, i) in config">
-				<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
-                <template v-if="item.checkbox">
-                        <template v-for="(check, j) in item.text.checkbox">
-                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
-                            <label v-bind:for="item.id+check.value">{{check.text}}</label>
-                        </template>
-				</template>
-				<template v-else>
-					<template v-if="item.doubleText">
-						<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-                        </template>
-					</template>
-					<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
-					</template>
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">変更</button> 
-				</template>
-			</template>
-        </div>
-	</div>
-	</li>
-	<li>
-	<div class="collapsible-header">
-			<i class="material-icons">send</i>投稿設定
-	</div>
-	<div class="collapsible-body">
-		<div id="postView">
-            <template v-for="(item, i) in config">
-				<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
-                <template v-if="item.checkbox">
-                        <template v-for="(check, j) in item.text.checkbox">
-							<template v-if="!check.kirishima || (check.kirishima && kirishima)">
-                            	<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+	<h4>設定</h4>
+	<ul class="collapsible" data-collapsible="accordion">
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">desktop_windows</i>環境設定
+			</div>
+			<div class="collapsible-body">
+				<h5>言語</h5>
+				To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
+				<a href="../ja/setting.html" onclick="changelang('ja')">日本語(Japanese)</a>/<a href="../en/setting.html" onclick="changelang('en')">English</a>/<a href="../ps/setting.html" onclick="changelang('ps')">Crowdin web translate</a>/
+				<h5>設定のインポートとエクスポート</h5>
+				<button onclick="exportSettings()" class="btn waves-effect lime darken-3"
+					style="width:100%; max-width:200px;">エクスポート</button>
+				<button onclick="importSettings()" class="btn waves-effect cyan darken-3"
+					style="width:100%; max-width:200px;">インポート</button>
+				<div id="envView">
+					<template v-for="(item, i) in config">
+						<h5>{{item.text.head}}</h5>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
+						</template>
+						<template v-if="item.id=='notf'"><a onclick="notftest()"
+								class="pointer">通知テスト</a><br></template>
+						<template v-if="item.checkbox">
+							<template v-for="(check, j) in item.text.checkbox">
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
 								<label v-bind:for="item.id+check.value">{{check.text}}</label>
-								<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
 							</template>
-                        </template>
-				</template>
-				<template v-else>
-					<template v-if="item.doubleText">
-						<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-                        </template>
+						</template>
+						<template v-else>
+							<template v-if="item.doubleText">
+								<template v-for="(textbox, j) in item.data">
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+								</template>
+							</template>
+							<template v-else>
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
+							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">変更</button>
+						</template><br>
 					</template>
-					<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+				</div>
+				<h5>フォント</h5>
+				「選択」を押してフォントを選んでください。(Linuxでは動きません)<br>
+				<button class="btn waves-effect" style="width:100px;" onclick="font()">選択</button><br>
+				<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
+				<br>
+				<input type="text" style="width:150px" id="font">
+				<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
+				<br>
+				<h5>デフォルトの保存先</h5>
+				画像ダウンロードやスクリーンショットに影響します。<br>
+				<button class="btn waves-effect" style="width:100px;" onclick="savefolder()">変更</button>
+				<br>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">color_lens</i>テーマの設定
+			</div>
+			<div class="collapsible-body">
+				<h4>テーマの選択</h4>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="black" value="black" />
+				<label for="black">Black</label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="white" value="white" />
+				<label for="white">White</label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="indigo" value="indigo" />
+				<label for="indigo">Indigo<span class="imas hide">(エンドレスナイト)</span></label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="brown" value="brown" />
+				<label for="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="green" value="green" />
+				<label for="green">Green<span class="imas hide">(ユースフルロマンス)</span></label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="custom" value="custom" />
+				<label for="custom">Custom</label>
+				<div style="width:300px" id="sel-selector">
+					<select id="custom-sel-sel" class="custom-sel" onchange="customSel()"></select>
+				</div>
+				<h4>カスタムテーマの作成・編集</h4>
+				<div style="width:300px" id="edit-selector" data-add="新規作成">
+					<select id="custom-edit-sel" class="custom-sel" onchange="custom()">
+						<option value="add_new">新規作成</option>
+					</select>
+				</div>
+				<h5>名前</h5>
+				<input type="text" style="width:300px" id="custom_name" placeholder="名前...">
+				<h5>説明</h5>
+				<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea"
+						placeholder="説明..."></textarea></div>
+				<h5>色の系統</h5>
+				<input class="with-gap" name="direction" type="radio" id="dark" value="dark" checked="true" />
+				<label for="dark">Dark</label>
+				<input class="with-gap" name="direction" type="radio" id="light" value="light" />
+				<label for="light">Light</label>
+				<div id="pickers">
+					<div>
+						<h5>Primary</h5>補助要素に使われる背景色
+						<div id="color-picker0-wrap">
+							<div class="color-picker" id="color-picker0"></div>
+						</div>
+						<input type="hidden" id="color-picker0_value">
+					</div>
+					<div>
+						<h5>Secondary</h5>全体の背景色など
+						<div id="color-picker1-wrap">
+							<div class="color-picker" id="color-picker1"></div>
+						</div>
+						<input type="hidden" id="color-picker1_value">
+					</div>
+					<div>
+						<h5>Texts</h5>テキストの色
+						<div id="color-picker2-wrap">
+							<div class="color-picker" id="color-picker2"></div>
+						</div>
+						<input type="hidden" id="color-picker2_value">
+					</div>
+					<div>
+					<h5>Accent</h5>ブーストの背景色など
+					<div id="color-picker3-wrap">
+						<div class="color-picker" id="color-picker3"></div>
+					</div>
+					<input type="hidden" id="color-picker3_value">
+					</div>
+				</div>
+				<button class="btn-large waves-effect" onclick="customComp()">変更</button>&nbsp;<button
+					class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">削除</button><br><br>
+				<input type="text" style="width:300px" id="custom_json" class="materialize-textarea"
+					placeholder="JSON style" readonly><br>
+				このコードは他のTheDeskなどとシェアできます。このコードをMiASに貼ることはご遠慮ください。詳細:<a href="https://thedesk.top/mias.html" target="_blank">テーマ互換性</a>
+				<h4>カスタムテーマのインポート</h4>
+				<a href="https://assets.msky.cafe/" target="_blank">MiAS</a>上の80を超えるテーマを張り付けることもできます。<br>
+				<input type="text" style="width:300px" id="custom_import" class="materialize-textarea"
+					placeholder="JSON/JSON5 style">
+				<button class="btn waves-effect" onclick="customImp()">インポート</button><br>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">reorder</i>タイムラインの設定
+			</div>
+			<div class="collapsible-body">
+				<div id="tlView">
+					<template v-for="(item, i) in config">
+						<h5>{{item.text.head}}</h5>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
+						</template>
+						<template v-if="item.checkbox">
+							<template v-for="(check, j) in item.text.checkbox">
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+								<label v-bind:for="item.id+check.value">{{check.text}}</label>
+							</template>
+						</template>
+						<template v-else>
+							<template v-if="item.doubleText">
+								<template v-for="(textbox, j) in item.data">
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+								</template>
+							</template>
+							<template v-else>
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
+							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">変更</button>
+						</template><br>
 					</template>
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">変更</button> 
-				</template>
-			</template>
-        </div>
-	</div>
-	</li>
-	<li>
-		<div class="collapsible-header">
+				</div>
+				<h5>カスタム通知音</h5>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(1)">Custom 1</button><span id="c1-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(2)">Custom 2</button><span id="c2-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(3)">Custom 3</button><span id="c3-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(4)">Custom 4</button><span id="c4-file"></span><br>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">send</i>投稿設定
+			</div>
+			<div class="collapsible-body">
+				<div id="postView">
+					<template v-for="(item, i) in config">
+						<h5>{{item.text.head}}</h5>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
+						</template>
+						<template v-if="item.checkbox">
+							<template v-for="(check, j) in item.text.checkbox">
+								<template v-if="!check.kirishima || (check.kirishima && kirishima)">
+									<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+										type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+									<label v-bind:for="item.id+check.value">{{check.text}}</label>
+									<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
+								</template>
+							</template>
+						</template>
+						<template v-else>
+							<template v-if="item.doubleText">
+								<template v-for="(textbox, j) in item.data">
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+								</template>
+							</template>
+							<template v-else>
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
+							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">変更</button>
+						</template><br>
+					</template>
+				</div>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
 				<i class="material-icons">keyboard</i>キーボードショートカットの設定
-		</div>
-		<div class="collapsible-body">
-			<h5>簡単文字入力</h5>
-			絵文字やタグ、&gt;BTなどを登録しておくとすぐに入力できます。<br>
-			Ctrl+Shift+1:<input type="text" style="width:150px" id="oks-1">
-			<button onclick="oks(1)" class="btn waves-effect" style="width:100px;">設定</button><br><br>
-			Ctrl+Shift+2:<input type="text" style="width:150px" id="oks-2">
-			<button onclick="oks(2)" class="btn waves-effect" style="width:100px;">設定</button><br><br>
-			Ctrl+Shift+3:<input type="text" style="width:150px" id="oks-3">
-			<button onclick="oks(3)" class="btn waves-effect" style="width:100px;">設定</button><br><br>
+			</div>
+			<div class="collapsible-body">
+				<h5>簡単文字入力</h5>
+				絵文字やタグ、&gt;BTなどを登録しておくとすぐに入力できます。<br>
+				Ctrl+Shift+1:<input type="text" style="width:150px" id="oks-1">
+				<button onclick="oks(1)" class="btn waves-effect" style="width:100px;">設定</button><br><br>
+				Ctrl+Shift+2:<input type="text" style="width:150px" id="oks-2">
+				<button onclick="oks(2)" class="btn waves-effect" style="width:100px;">設定</button><br><br>
+				Ctrl+Shift+3:<input type="text" style="width:150px" id="oks-3">
+				<button onclick="oks(3)" class="btn waves-effect" style="width:100px;">設定</button><br><br>

-		</div>
-	</li>
-	<li>
-		<div class="collapsible-header">
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
 				<i class="material-icons">bookmark</i>ミュート・強調の設定
-		</div>
-		<div class="collapsible-body">
-			<h5>クライアントミュート</h5>
-			<div id="mute-cli"></div>
-			<h5>クライアント強調</h5>
-			各トゥートのクライアントをクリックすると設定できます。
-			<h5>ワードミュート</h5>
-			Enterで確定<br>
-			<div class="chips" id="wordmute" style="background-color:gray;"></div>
-			<button onclick="wordmuteSave()" class="btn waves-effect" style="width:100px;">設定</button>
-			<h5>ワード強調</h5>
-			Enterで確定<br>
-			<div class="chips" id="wordemp" style="background-color:gray;"></div>
-			<button onclick="wordempSave()" class="btn waves-effect" style="width:100px;">設定</button>
-			<h5>ユーザー強調</h5>
-			各ユーザーのデータ表示画面で設定できます。
-			<span class="emphasized">　強調色(テーマによって異なります。)　</span>
-		</div>
-	</li>
-	<li>
-		<div class="collapsible-header">
-			<i class="fa fa-spotify"></i>SpotifyとNowPlayingの設定
-		</div>
-		<div class="collapsible-body">
-			<h5>NowPlayingのソース(Windows)</h5>
-			macOSやLinuxでは動作しません。AIMPとiTunes以外未検証です。<br>foobar2000, MusicBee,J. River Media Center, Media JukeboxはCADを、Last.fm Client, TTPlayer, OpenPandora, ZuneはWLMを選んでください。<br>ただし、foobar2000は<a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a>が必要です。MusicBeeもCADを有効にする必要があります。<br>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
-			<label for="aimp">AIMP</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
-			<label for="itunes">iTunes</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm" value="MEDIAMONKEY" />
-			<label for="npmm">MediaMonkey</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
-			<label for="winamp">Winamp</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
-			<label for="wmp">WMP</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
-			<label for="wlm">WLM</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
-			<label for="cad">CAD</label><br><br>
-			<i class="material-icons" style="font-size:24px;">music_note</i>ボタンから簡単にNowPlayingができます。<br>
-			<h5>アカウントの連携</h5>
-			APIの性質上，thedesk.topへアクセスします。<br>
-			<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">設定</button></div>
-			<a onclick="spotifyConnect()" class="btn waves-effect nex" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i class="fa fa-spotify left"></i>接続</a>
-			<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i class="fa fa-spotify left"></i>切断</a>
-			<h5>テンプレートの編集</h5>
-			以下を編集してテンプレートを変更できます。<br>
-			<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
+			</div>
+			<div class="collapsible-body">
+				<h5>クライアントミュート</h5>
+				<div id="mute-cli"></div>
+				<h5>クライアント強調</h5>
+				各トゥートのクライアントをクリックすると設定できます。
+				<h5>ワードミュート</h5>
+				Enterで確定<br>
+				<div class="chips" id="wordmute" style="background-color:gray;"></div>
+				<button onclick="wordmuteSave()" class="btn waves-effect" style="width:100px;">設定</button>
+				<h5>ワード強調</h5>
+				Enterで確定<br>
+				<div class="chips" id="wordemp" style="background-color:gray;"></div>
+				<button onclick="wordempSave()" class="btn waves-effect" style="width:100px;">設定</button>
+				<h5>ユーザー強調</h5>
+				各ユーザーのデータ表示画面で設定できます。
+				<span class="emphasized">　強調色(テーマによって異なります。)　</span>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="fa fa-spotify"></i>SpotifyとNowPlayingの設定
+			</div>
+			<div class="collapsible-body">
+				<h5>NowPlayingのソース(Windows)</h5>
+				macOSやLinuxでは動作しません。AIMPとiTunes以外未検証です。<br>foobar2000, MusicBee,J. River Media Center, Media JukeboxはCADを、Last.fm Client, TTPlayer, OpenPandora, ZuneはWLMを選んでください。<br>ただし、foobar2000は<a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a>が必要です。MusicBeeもCADを有効にする必要があります。<br>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
+				<label for="aimp">AIMP</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
+				<label for="itunes">iTunes</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm" value="MEDIAMONKEY" />
+				<label for="npmm">MediaMonkey</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
+				<label for="winamp">Winamp</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
+				<label for="wmp">WMP</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
+				<label for="wlm">WLM</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
+				<label for="cad">CAD</label><br><br>
+				<i class="material-icons" style="font-size:24px;">music_note</i>ボタンから簡単にNowPlayingができます。<br>
+				<h5>アカウントの連携</h5>
+				APIの性質上，thedesk.topへアクセスします。<br>
+				<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button
+						onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">設定</button></div>
+				<a onclick="spotifyConnect()" class="btn waves-effect nex"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i
+						class="fa fa-spotify left"></i>接続</a>
+				<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i
+						class="fa fa-spotify left"></i>切断</a>
+				<h5>テンプレートの編集</h5>
+				以下を編集してテンプレートを変更できます。<br>
+				<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
 {url}</textarea><br>
 				Spotify:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL<br>
 				macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}<br>
 				Windows:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名<br>
-				<span class="imas hide">CINDERELLA NowPlaying(imastodon.net限定)では作曲家{composer}/作詞家{lyricist}/BPM{bpm}が有効です。<br>
-                    CINDERELLA NowPlayingはimastodon.netにログインしているとき、トゥート欄に「//」を入力し、その後に曲名を入れることで可能です。</span><br>
-			<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">設定</button>
-			<h5>アルバムアートワークを添付する(Spotify/Windows)</h5>
-			<span class="imas hide">この設定はCINDERELLA NowPlaying(imastodon.net限定)にも適用されます。</span><br>
-			<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
-			<label for="awk_yes">はい</label>
-			<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
-			<label for="awk_no">いいえ</label>
-			<br>
-		</div>
-	</li>
-	<li>
-		<div class="collapsible-header">
-			<i class="material-icons">hearing</i>読み上げの設定
-		</div>
-		<div class="collapsible-body">
-			<h5>読み上げの速さ</h5>
-			1-100まで、デフォルトは10。<br>
-			<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10" style="width:500px; max-width:100%"/></p>
-			<h5>読み上げの高さ</h5>
-			0-100まで、デフォルトは50。(大きくなるほど高い)<br>
-			<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50" style="width:500px; max-width:100%"/></p>
-			<h5>読み上げの音量</h5>
-			0-100まで、デフォルトは100。<br>
-			<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100" style="width:500px; max-width:100%"/></p>
-			<h5>テスト</h5>
-			<input type="text" style="width:350px" id="voicetxt" value="これはテスト音声です。TheDeskはオープンソースのPC向けマストドンクライアントです。マルチサーバーやマルチカラムに対応しています。">
-			<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()" id="testplay">再生/停止</button><br>
-			<br>
-			<button class="btn waves-effect" style="width:100px;" onclick="voiceSettings()">設定</button>
-		</div>
-	</li>
-</ul>
-<br>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>戻る</a>
-<br>
-<br>キーボードショートカット一覧
-<li>Ctrl+1-9:1番目～9番目のTLにスクロール</li>
-<li>N:投稿パネルを開く</li>
-<li>X:投稿パネルを開閉</li>
-<li>Ctrl+Enter:投稿</li>
-<li>Ctrl+Enter+Shift:投稿(セカンダリートゥート)</li>
-<li>Alt+Enter:セカンダリートゥートボタン</li>
-<li>Ctrl+E:全ての通知を既読にする</li>
-<li>Esc:投稿パネルを消す</li>
-<li>F5:スーパーリロード</li>
-<li>Ctrl+Shift+C:入力内容を消す</li>
-<li>Ctrl+Shift+S:設定</li>
-<li>Ctrl+Shift+M:アカウントマネージャ</li>
-<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
-<li>Ctrl+Shift+P:現在選択中のプロフィール</li>
-<li>←/→:イメージビューワー起動時に画像切り替え</li>
-<li>マウスホイール:イメージビューワー時に拡大縮小</li>
-<div class="hide kirishima">
-以下Markdownに対応したインスタンスのみ。
-<br>
-<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
-<li>Shift+Enter:全角スペースを入れて改行</li>
-<li>Shift+Space:ゼロ幅スペース</li>
-以下アスタルテにログインしている場合のみ 
-<br>
-<li>Ctrl+R: 
-<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
-</li><br>
-</div>
-<button class="btn waves-effect red" style="width:100%; max-width:500px;" onclick="if(confirm('全てのデータを削除します。この操作は取り消せません。')){ localStorage.clear(); location.href='index.html'; }"><i class="material-icons left">delete</i>初期化</button><br><br>
-<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i 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 class="material-icons left">list</i>ヘルプ/Docs(Constructing)</a>
-<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
-<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
-<br>
-Kyash<br>
-			<img src="../../img/kyash.png" width="100"><br>
-<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. 
-	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>
-	<br>Developer: Cutls P( 
-	<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
+				<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">設定</button>
+				<h5>アルバムアートワークを添付する(Spotify/Windows)</h5>
+				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
+				<label for="awk_yes">はい</label>
+				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
+				<label for="awk_no">いいえ</label>
+				<br>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">hearing</i>読み上げの設定
+			</div>
+			<div class="collapsible-body">
+				<h5>読み上げの速さ</h5>
+				1-100まで、デフォルトは10。<br>
+				<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10"
+						style="width:500px; max-width:100%" /></p>
+				<h5>読み上げの高さ</h5>
+				0-100まで、デフォルトは50。(大きくなるほど高い)<br>
+				<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50"
+						style="width:500px; max-width:100%" /></p>
+				<h5>読み上げの音量</h5>
+				0-100まで、デフォルトは100。<br>
+				<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100"
+						style="width:500px; max-width:100%" /></p>
+				<h5>テスト</h5>
+				<input type="text" style="width:350px" id="voicetxt" value="これはテスト音声です。TheDeskはオープンソースのPC向けマストドンクライアントです。マルチサーバーやマルチカラムに対応しています。">
+				<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()"
+					id="testplay">再生/停止</button><br>
+				<br>
+				<button class="btn waves-effect" style="width:100px;" onclick="voiceSettings()">設定</button>
+			</div>
+		</li>
+	</ul>
 	<br>
-</span><br>
-TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
-タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
-<script type="text/javascript" src="../../js/common/about.js"></script>
-<script type="text/javascript" src="../../js/platform/end.js"></script>
-<script type="text/javascript" src="../../js/login/logout.js"></script>
-<script type="text/javascript" src="../../js/ui/spotify.js"></script>
-<script type="text/javascript" src="../../js/tl/speech.js"></script>
-<script type="text/javascript" src="../../js/platform/pickr.js"></script>
-<script type="text/javascript" src="../../js/ui/settings.js"></script>
-<script type="text/javascript" src="../../js/ui/theme.js"></script>
-<script type="text/javascript" src="../../js/tl/date.js"></script>
+	<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i
+			class="material-icons left">undo</i>戻る</a>
+	<br>
+	<br>キーボードショートカット一覧
+	<li>Ctrl+1-9:1番目～9番目のTLにスクロール</li>
+	<li>N:投稿パネルを開く</li>
+	<li>X:投稿パネルを開閉</li>
+	<li>Ctrl+Enter:投稿</li>
+	<li>Ctrl+Enter+Shift:投稿(セカンダリートゥート)</li>
+	<li>Alt+Enter:セカンダリートゥートボタン</li>
+	<li>Ctrl+E:全ての通知を既読にする</li>
+	<li>Esc:投稿パネルを消す</li>
+	<li>F5:スーパーリロード</li>
+	<li>Ctrl+Shift+C:入力内容を消す</li>
+	<li>Ctrl+Shift+S:設定</li>
+	<li>Ctrl+Shift+M:アカウントマネージャ</li>
+	<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
+	<li>Ctrl+Shift+P:現在選択中のプロフィール</li>
+	<li>←/→:イメージビューワー起動時に画像切り替え</li>
+	<li>マウスホイール:イメージビューワー時に拡大縮小</li>
+	<div class="hide kirishima">
+		以下Markdownに対応したインスタンスのみ。
+		<br>
+		<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
+		<li>Shift+Enter:全角スペースを入れて改行</li>
+		<li>Shift+Space:ゼロ幅スペース</li>
+		以下アスタルテにログインしている場合のみ
+		<br>
+		<li>Ctrl+R:
+			<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
+		</li><br>
+	</div>
+	<button class="btn waves-effect red" style="width:100%; max-width:500px;"
+		onclick="if(confirm('全てのデータを削除します。この操作は取り消せません。')){ localStorage.clear(); location.href='index.html'; }"><i
+			class="material-icons left">delete</i>初期化</button><br><br>
+	<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i
+			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://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
+			class="material-icons left">list</i>ヘルプ/Docs(Constructing)</a>
+	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
+		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
+	<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2"
+		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
+			style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
+	<br>
+	Kyash<br>
+	<img src="../../img/kyash.png" width="100"><br>
+	<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; 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>
+		<br>Developer: Cutls P(
+		<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
+		<br>
+	</span><br>
+	TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
+	タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
+	<script type="text/javascript" src="../../js/common/about.js"></script>
+	<script type="text/javascript" src="../../js/platform/end.js"></script>
+	<script type="text/javascript" src="../../js/login/logout.js"></script>
+	<script type="text/javascript" src="../../js/ui/spotify.js"></script>
+	<script type="text/javascript" src="../../js/tl/speech.js"></script>
+	<script type="text/javascript" src="../../js/platform/pickr.js"></script>
+	<script type="text/javascript" src="../../js/ui/settings.js"></script>
+	<script type="text/javascript" src="../../js/ui/theme.js"></script>
+	<script type="text/javascript" src="../../js/tl/date.js"></script>
--- a/app/view/ja/setting.vue.js
+++ b/app/view/ja/setting.vue.js
@@ -7,6 +7,27 @@ var yesno=[
        value:"no"
    }
 ];
+var sound=[
+    {
+        text:"なし",
+        value:"none"
+    },{
+        text:"既定",
+        value:"default"
+    },{
+        text:"Custom 1",
+        value:"c1"
+    },{
+        text:"Custom 2",
+        value:"c2"
+    },{
+        text:"Custom 3",
+        value:"c3"
+    },{
+        text:"Custom 4",
+        value:"c4"
+    }
+];
 var envConstruction=[
    {
        id:"popup",
@@ -286,6 +307,46 @@ var tlConstruction=[
            desc:"",
            checkbox:yesno
        }
+    },{
+        id:"replySound",
+        storage:"replySound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"リプライの通知音",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"favSound",
+        storage:"favSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"お気に入り登録の通知音",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"btSound",
+        storage:"btSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"ブーストの通知音",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"followSound",
+        storage:"followSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"フォローの通知音",
+            desc:"",
+            checkbox:sound
+        }
    }
 ];
 var postConstruction=[
@@ -476,5 +537,16 @@ var postConstruction=[
                }
            ]
        }
+    },{
+        id:"zero",
+        storage:"emoji-zero-width",
+        checkbox:true,
+        setValue:"normal",
+        setValue:"no",
+        text:{
+            head:"絵文字にゼロ幅スペースを使う",
+            desc:"",
+            checkbox:yesno
+        }
    }
 ]
--- 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"));
             
    });
--- a/app/view/make/acct.sample.html
+++ b/app/view/make/acct.sample.html
@@ -18,6 +18,14 @@ body,html{overflow-y: scroll;}
 .colorsel{ display:flex; }
 .card .colorsel div:not(.exc){width:20px;height:20px;}
 .card .colorsel div.exc{width:40px;height:20px;}
+.first{
+      display:flex;
+      justify-content: center;
+      align-items:center
+}
+.first .hide-first{
+      display:none;
+}
 </style>
 <meta charset="utf-8">
 {{comment-start}}
@@ -39,14 +47,17 @@ body,html{overflow-y: scroll;}
 <script type="text/javascript" src="../../js/ui/tips.js"></script>
 <script type="text/javascript" src="../../js/common/time.js"></script>
 <script type="text/javascript" src="../../js/common/modal.js"></script>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">{{back}}</a><br>
-<h5>{{list}}</h5>
-<div id="acct-list"></div>
-<div class="divider"></div>
+<div class="hide-first">
+      <a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">{{back}}</a><br>
+      <h5>{{list}}</h5>
+      <div id="acct-list"></div>
+      <div class="divider"></div>
+</div>
+<div>
 <h5>{{add}}</h5><br>
 <div id="add">
 <div class="row">
-      <div class="col s6">
+      <div class="col s8">
            <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
            <div id="ins-suggest"></div>
            {{codesetupwarn}}<br>
@@ -56,7 +67,7 @@ body,html{overflow-y: scroll;}
                  <label for="misskey">{{thisismisskey}}</label><br>
            <button class="btn waves-effect" onclick="instance()">Login</button><br>
      </div>
-      <div class="col s6">
+      <div class="col s4">
            <span style="font-family:Open Sans;">Supports</span>
            <div id="support" class="collection transparent"></div>
      </div>
@@ -73,6 +84,8 @@ body,html{overflow-y: scroll;}
                  <input type="text" id="misskey-key" placeholder="{{codepaste}}">
                  <button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br>
            </div>
+      </div>
+<div class="hide-first">
 <h5>{{mainacct}}</h5>
 <div class="input-field" style="width:300px"><span data-trans="your_acct">{{selacct}}</span>
      <br>
@@ -91,6 +104,7 @@ Administered by:<a id="ins-admin"></a><br>
 {{users}}:<span id="ins-user"></span>{{users}}<br>
 {{safety}}:<span id="ins-per"></span>%<br>
 {{ver}}:<span id="ins-ver"></span>@<span id="ins-upd"></span><br>
+</div>
 <script type="text/javascript" src="../../js/ui/theme.js"></script>
 <script type="text/javascript" src="../../js/platform/end.js"></script>
 <script type="text/javascript" src="../../js/common/sha256.js"></script>
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -4,13 +4,13 @@
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
 	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
+	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
-	<link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/post.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/tl.css" rel="stylesheet" type="text/css">
+	<link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+	<link href="../../css/post.css" rel="stylesheet" type="text/css">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/sort.css" rel="stylesheet" type="text/css">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
 	{{comment-start}}
@@ -39,7 +39,6 @@ var ver="{{versionLetter}}";
 //WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
 var acct_id=0;
 var tlid=0;
-  verck(ver);
 </script>
 <textarea id="copy" style="top:-100px; position:fixed;"></textarea>
 <div id="tl">
@@ -53,7 +52,7 @@ var tlid=0;
 </div>
 </div>
 <div id="post-box" class="z-depth-5">
-<div id="post-bar" class="drag-bar">{{post-new}}</div>
+<div id="post-bar" class="drag-bar"><span id="unreact">{{post-new}}</span><span id="addreact" class="hide">Reaction</span></div>
 <!--トゥートボックス-->
 <div id="left-side">
 <div class="row" style="margin-bottom:0;">
@@ -205,7 +204,6 @@ var tlid=0;
 <div id="emoji" class="hide">
 		<span class="gray sml">{{emojiWarn}}
 			<a onclick="emojiGet('true')" class="pointer">{{refreshEmoji}}</a>
-			<i class="material-icons waves-effect" onclick="emojiToggle()" title="{{closeThisBox}}" data-trans-title="post_box_close">cancel</i>
 		<br>
 		</span>
 		<div id="emoji-list" class="" style="">
@@ -251,7 +249,7 @@ var tlid=0;
 			<i class="material-icons">flag</i>
 			</a>
 			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
-			<i class="fa fa-fort-awesome"></i>
+			<i class="fab fa-fort-awesome"></i>
 			</a>
 		</div>
 	</div>
@@ -259,12 +257,8 @@ var tlid=0;
 	<div id="poll" class="hide">
 		<select id="poll-sel"  onchange="pollProviderCk()">
 			<option value="nothing">{{pollDdisabled}}</option>
-			<option value="votedon">votedon.</option>
 			<option value="mastodon-poll">Mastodon(2.8~)</option>
 		</select>
-		<div id="votedon" class="poll-provider hide">
-	WIP
-		</div>
 		<div id="mastodon-poll" class="poll-provider hide">
 			<input type="text" class="mastodon-choice" placeholder="{{choice}}1">
 			<input type="text" class="mastodon-choice" placeholder="{{choice}}2">
@@ -276,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>
@@ -330,26 +324,26 @@ var tlid=0;
 	</li>
 	<li class="dm-hide">
 		<div class="collapsible-header">
-		<i class="text-darken-3 fa fa-retweet"></i>{{btedPeople}}
+		<i class="text-darken-3 false fas fa-retweet"></i>{{btedPeople}}
 		</div>
 		<div class="collapsible-body toot-reset" id="toot-rt">
 		</div>
 	</li>
 	</ul>
 	<div class="dm-hide">
-	{{useOtherAcct1}}(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>{{useOtherAcct2}})<br>
+	{{useOtherAcct1}}(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>{{useOtherAcct2}})<br>
 	<div class="row">
 		<div class="col s6">
 				<select id="status-acct-sel" class="acct-sel"></select>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
+			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fas fa-share"></i>/button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
+			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
+			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fas fa-star"></i></button>
 		</div>
 	</div>
 	<div id="toot-tools">
@@ -371,7 +365,7 @@ var tlid=0;
 			<div id="his-data-show">
 			<div class="his-float" id="his-float-data">
 			<div id="his-basic-prof">
-			<img src="../../img/loading.svg" id="his-prof">
+			<img src="../../img/loading.svg" id="his-prof" draggable="false">
 			<span id="his-name">Loading...</span><span class="gray" id="his-bot"></span>
 			<br>@
 			<span id="his-acct"></span><br>
@@ -389,8 +383,9 @@ var tlid=0;
 			<span class="cbadge" style="max-width:150px; width:150px; ">Since:
 			<span id="his-since"></span>
 			</span>
+			<div id="his-proof-prof"></div>
 			</div>
-			<div id="his-des"></div><br>
+			<div id="his-des" data-acct=""></div><br>
 			<div id="his-plus-action">
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">{{empUser}}</a>
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">{{endorse}}</a><br>
@@ -524,6 +519,9 @@ var tlid=0;
 			</div>
 			</div>
 			</div>
+			<div class="his-float" id="his-float-blocked">
+				<div>{{blocked}}</div>
+			</div>
 			</div>
 			</div>
 			<div class="modal-footer">
@@ -582,20 +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-1-1" 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.1.1)</h5>
-・お知らせ機能改善<br>
-・Integrated TLで一部挙動改善(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
--以下18.1.0--<br>
-・iTunes NowPlaying(macOS)にアルバムアートワークを付ける(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
-・カラムを<b>縦に並べられる</b>ように(2つ目以降のカラム毎の設定の「左に重ねる」「右に出す」を押す)<br>
-・画像を個別に削除する(画像をクリックして)<br>
-・何個もアルバムアートワークが投稿されるバグを修正<br>
-・Misskeyでログインしたまま何もできないバグを修正(権限回り)
+					<h5>Release Note Usamin (18.3.1)</h5>
+・通知音が種別ごとに追加(すべて適当に自分で打ったやつです。)<br>
+・Integrated TLのタイムラインの再接続(kPherox)<br>
+・一部ロケーションの変更や投票に関するバグ(kPherox)<br>
+・バグと脆弱性の修正
+<br>
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -604,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>
@@ -687,11 +679,10 @@ var tlid=0;
 			<div class="input-field">
 			<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
 	</div><div class="input-field">
-	<i class="material-icons prefix">search</i>
-	<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
+	<input id="src" type="text" class="validate" style="width:60%">
 	<label for="src" data-trans="src">{{search}}</label>
-	<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
-		<i class="material-icons left">search</i>{{search}}
+	<button class="btn waves-effect indigo" style="width: 36%;padding: 0;padding-left: 15px;" onclick="src()" data-trans-i="src">
+		<i class="material-icons left" style="margin:0">search</i>{{search}}
 	</button>
 	<br>
 	<br>
@@ -705,7 +696,7 @@ var tlid=0;
 	<div id="sort-box" class="hide menu-content">
 	<ul id="sort"></ul>
 	<div>
-	<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
+	<button onclick="sort()" class="btn waves-effect nex" style="width:97.5%;" data-trans-i="sort">
 		<i class="material-icons left">sort</i>{{sortSet}}
 	</button>
 	</div>
@@ -760,7 +751,14 @@ var tlid=0;
 		{{avalableBefore}}<span class="sml">{{warnAvBefore}}<b>{{warnAvBefore2}}</b></span><br><br>
 		<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">{{days}}
 		<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">{{hours}}
-		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">{{mins}}
+		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">{{mins}}<br>
+		Quick:<a onclick="filterTime(0,0,30)" class="pointer">30{{mins}}</a>/
+		<a onclick="filterTime(0,1,0)" class="pointer">1{{hours}}</a>/
+		<a onclick="filterTime(0,6,0)" class="pointer">6{{hours}}</a>/
+		<a onclick="filterTime(0,12,0)" class="pointer">12{{hours}}</a>/
+		<a onclick="filterTime(1,0,0)" class="pointer">1{{days}}</a>/
+		<a onclick="filterTime(7,0,0)" class="pointer">7{{days}}</a>/
+		<a onclick="filterTime(0,0,0)" class="pointer">{{unlimited}}</a><br>
 		<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">{{add}}</button><br>
 		<span class="sml">{{warnOnIntegratedTL}}</span>
 	</div>
@@ -776,7 +774,9 @@ var tlid=0;
 <div id="main">
 <!--TLのTL-->
 <div id="timeline-container">
-	{{helloTheDesk}}
+	<div id="something-wrong">
+		<div>{{helloTheDesk}}</div>
+	</div>
 </div>
 </div>
 </div>
@@ -802,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>
@@ -820,7 +821,7 @@ var tlid=0;
 						<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
 				</a>
 				<a onclick="tips('spotify')" class="nex waves-effect">
-					<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
+					<i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
 				</a>
 			</div>
 		</div>
@@ -859,6 +860,7 @@ var tlid=0;
 <script type="text/javascript" src="../../js/tl/speech.js"></script>
 <script type="text/javascript" src="../../js/ui/post-box.js"></script>
 <script type="text/javascript" src="../../js/ui/layout.js"></script>
+<script type="text/javascript" src="../../js/post/emoji.js"></script>
 <script type="text/javascript" src="../../js/login/instance.js"></script>
 <script type="text/javascript" src="../../js/login/login.js"></script>
 <script type="text/javascript" src="../../js/ui/img.js"></script>
@@ -872,7 +874,6 @@ var tlid=0;
 <script type="text/javascript" src="../../js/post/img.js"></script>
 <script type="text/javascript" src="../../js/post/status.js"></script>
 <script type="text/javascript" src="../../js/post/misskeystatus.js"></script>
-<script type="text/javascript" src="../../js/post/emoji.js"></script>
 <script type="text/javascript" src="../../js/post/suggest.js"></script>
 <script type="text/javascript" src="../../js/post/bb-md.js"></script>
 <script type="text/javascript" src="../../js/userdata/showOnTL.js"></script>
--- a/app/view/make/language/acct.en.json
+++ b/app/view/make/language/acct.en.json
@@ -2,7 +2,7 @@
    "list":"List of accounts",
    "back":"Back",
    "add":"Add an account",
-    "codesetupwarn":"Check if TheDesk is not working on Windows, you want to login Pleroma servers, you cannot login when it checked.",
+    "codesetupwarn":"Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
    "codesetup":"Code setup",
    "mainacct":"Main an account",
    "selacct":"Select an account",
@@ -17,5 +17,6 @@
    "ver":"Mastodon version",
    "ko":"",
    "thisismisskey":"Login as Misskey",
-    "misskeylogin":"Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey."
+    "misskeylogin":"Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
+    "nodata":"No data"
 }
--- a/app/view/make/language/acct.ja.json
+++ b/app/view/make/language/acct.ja.json
@@ -2,7 +2,7 @@
    "list":"アカウント一覧",
    "back":"戻る",
    "add":"アカウントを追加",
-    "codesetupwarn":"Windows以外でご使用の方やPleromaにログインされる方はチェックを入れて下さい。ログインできない場合、チェックを外してください。",
+    "codesetupwarn":"チェックを外すとコード貼り付けをスキップできます。(<u>Mastodon</u>にWindowsやmacOSからログインする場合)失敗する場合はチェックを入れてください。",
    "codesetup":"コードセットアップ",
    "mainacct":"メインアカウント",
    "selacct":"アカウントを選択",
@@ -17,5 +17,6 @@
    "ver":"Mastodonバージョン",
    "ko":"個",
    "thisismisskey":"Misskeyとしてログイン",
-    "misskeylogin":"<a href=\"https://thedesk.top/how-to-misskey-login.html\">ドキュメント</a>を参照して正しいコードを入れてください。"
+    "misskeylogin":"<a href=\"https://thedesk.top/how-to-misskey-login.html\">ドキュメント</a>を参照して正しいコードを入れてください。",
+    "nodata":"アカウントがありません"
 }
--- a/app/view/make/language/index.en.json
+++ b/app/view/make/language/index.en.json
@@ -98,6 +98,7 @@
    "note":"Note",
    "editProfImg":"Change avataor",
    "editHeader":"Change header image",
+    "blocked":"You are blocked. Why?",
    "likeUserDes":"Get people resembling this user.",
    "get":"Get",
    "historyBack":"Back",
@@ -137,12 +138,13 @@
    "avalableBefore":"Expire after",
    "warnAvBefore":"Unset or \"0\" means \"Never\"",
    "warnAvBefore2":"This value may contain some error",
-    "days":"days",
-    "hours":"hours",
-    "mins":"minutes",
-    "secs":"seconds",
+    "unlimited":"Never",
+    "days":"day(s)",
+    "hours":"hour(s)",
+    "mins":"minute(s)",
+    "secs":"second(s)",
    "warnOnIntegratedTL":"Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.",
-    "helloTheDesk":"<h3>Welcome to TheDesk</h3><br><a href=\"acct.html\">Add an account</a> or click <i class=\"material-icons\">apps</i> to add a column.",
+    "helloTheDesk":"Internal error: please clear all data(at setting page) <b>All data will be deleted.</b>",
    "addColumn":"Add a column",
    "sortColumns":"Sort",
    "acctMan":"Account Manager",
@@ -156,5 +158,6 @@
    "ramTips":"RAM status",
    "changeTips":"Change Tips",
    "help":"Help",
-    "about":"About TheDesk"
+    "about":"About TheDesk",
+    "hereAddColumns":"<- Add TL"
 }
--- a/app/view/make/language/index.ja.json
+++ b/app/view/make/language/index.ja.json
@@ -98,6 +98,7 @@
    "note":"自己紹介",
    "editProfImg":"アバターを変更",
    "editHeader":"ヘッダーを変更",
+    "blocked":"ブロックされています。なぜでしょう？",
    "likeUserDes":"似ているユーザーを取得できます。",
    "get":"取得",
    "historyBack":"一つ前のユーザーデータ",
@@ -135,14 +136,15 @@
    "except":"除外",
    "exceptWorn":"「除外」時マッチしたトゥートは非可逆的に除外され、削除後も閲覧できません。",
    "avalableBefore":"有効期限(あと)",
-    "warnAvBefore":"未指定(または0分)で「無制限」になります。",
+    "warnAvBefore":"未指定(または0分)で「無期限」になります。",
    "warnAvBefore2":"仕様上数値の正確性を保証できません。",
+    "unlimited":"無期限",
    "days":"日",
    "hours":"時間",
    "mins":"分",
    "secs":"秒",
    "warnOnIntegratedTL":"Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。",
-    "helloTheDesk":"<h3>Welcome to TheDesk</h3><br><a href=\"acct.html\">アカウントを追加</a>するか下の<i class=\"material-icons\">apps</i>ボタンよりカラムを追加してください。",
+    "helloTheDesk":"内部エラーです。再読込して治らない場合は初期化(全データ削除)をしてください。(事前に設定をエクスポートしておくことをおすすめします。)",
    "addColumn":"カラム追加",
    "sortColumns":"カラム一覧/並べ替え",
    "acctMan":"アカウントマネージャー",
@@ -156,5 +158,6 @@
    "ramTips":"システムメモリ容量",
    "changeTips":"Tips変更",
    "help":"ヘルプ",
-    "about":"このソフトについて"
+    "about":"このソフトについて",
+    "hereAddColumns":"←ここからTL追加"
 }
--- a/app/view/make/language/setting.en.json
+++ b/app/view/make/language/setting.en.json
@@ -3,6 +3,8 @@
    "set":"Save",
    "yes":"Yes",
    "no":"No",
+    "none":"None",
+    "default":"Default",
    "change":"Change",
    "select":"Select",
    "env":"System Preferences",
@@ -25,7 +27,7 @@
    "fixwidthwarn":"",
    "above":"above",
    "font":"Font",
-    "fontwarn":"Select your favorite font to 'Select'",
+    "fontwarn":"Select your favorite font to 'Select'(Windows/ macOS only)",
    "fontsize":"Font size",
    "savefolder":"Folder to save",
    "savefolderwarn":"TheDesk uses this value when it try to save pictures or take screenshots.",
@@ -85,6 +87,11 @@
    "ticker":"Enable #InstanceTicker",
    "tickerwarn":"Show colorful stickers about the server. <a href=\"https://cdn.weep.me/mastodon/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
    "animation":"Animation of timelines",
+    "replySound":"Sound(Reply)",
+    "favSound":"Sound(Fav)",
+    "btSound":"Sound(Boost)",
+    "followSound":"Sound(Follow)",
+    "customSound":"Custom sound",
    "post":"Posting Preferences",
    "autocw":"Alert before posting a long toot.",
    "autocwwarn":"Show dialog whether you make too-long text hidden.",
@@ -114,6 +121,7 @@
    "secwarn":"Toot with other visibility setting",
    "nothing":"Hidden",
    "localonly":"Local Only",
+    "zeroWidthEmoji":"Zero-width space when inserting emojis",
    "keysc":"Keyboard shortcut Preferences",
    "iks":"Easy inserter",
    "okswarn":"You can insert any letters and emojis with only 3 keys",
--- a/app/view/make/language/setting.ja.json
+++ b/app/view/make/language/setting.ja.json
@@ -3,6 +3,8 @@
    "set":"設定",
    "yes":"はい",
    "no":"いいえ",
+    "none":"なし",
+    "default":"既定",
    "change":"変更",
    "select":"選択",
    "env":"環境設定",
@@ -25,7 +27,7 @@
    "fixwidthwarn":"",
    "above":"以上",
    "font":"フォント",
-    "fontwarn":"「選択」を押してフォントを選んでください。",
+    "fontwarn":"「選択」を押してフォントを選んでください。(Linuxでは動きません)",
    "fontsize":"フォントサイズ",
    "savefolder":"デフォルトの保存先",
    "savefolderwarn":"画像ダウンロードやスクリーンショットに影響します。",
@@ -85,6 +87,11 @@
    "ticker":"#InstanceTickerを使う",
    "tickerwarn":"トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href=\"https://cdn.weep.me/mastodon/\">#InstanceTickerについて</a> Copyright 2018 weepjp, kyori19.",
    "animation":"タイムラインのアニメーション",
+    "replySound":"リプライの通知音",
+    "favSound":"お気に入り登録の通知音",
+    "btSound":"ブーストの通知音",
+    "followSound":"フォローの通知音",
+    "customSound":"カスタム通知音",
    "post":"投稿設定",
    "autocw":"長文投稿時に警告",
    "autocwwarn":"下で指定した以上のトゥートを投稿するときにCWするかのダイアログを表示します。",
@@ -114,6 +121,7 @@
    "secwarn":"公開範囲の変更とトゥートを一発でできます。",
    "nothing":"表示しない",
    "localonly":"ローカル限定",
+    "zeroWidthEmoji":"絵文字にゼロ幅スペースを使う",
    "keysc":"キーボードショートカットの設定",
    "iks":"簡単文字入力",
    "okswarn":"絵文字やタグ、&gt;BTなどを登録しておくとすぐに入力できます。",
--- a/app/view/make/setting.sample.html
+++ b/app/view/make/setting.sample.html
@@ -1,5 +1,6 @@
 <!doctype html>
-<html lang="@@lang@@">
+<html lang="@@lang@@" style="overflow:scroll">
+
 <head>
 	<title>Settings - TheDesk</title>
 	@@comment-start@@
@@ -17,362 +18,426 @@
 	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
 	<meta charset="utf-8">
-	<style>input{max-height:50px!important} .pcr-result{height:1rem !important;}</style>
+	<style>
+		input {
+			max-height: 50px !important
+		}
+		.pcr-result {
+			height: 1rem !important;
+		}
+	</style>
 </head>
+
 <body id="mainView" style="overflow-y:scroll">
-<script type="text/javascript" src="../../js/common/jquery.js"></script>
-<script type="text/javascript" src="../../js/platform/first.js"></script>
-<script type="text/javascript" src="../../js/common/materialize.js"></script>
-<script type="text/javascript" src="../../js/lang/lang.@@lang@@.js"></script>
-<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
-<script src="../../node_modules/vue/dist/vue.min.js"></script>
-<script type="text/javascript" src="setting.vue.js"></script>
+	<script type="text/javascript" src="../../js/common/jquery.js"></script>
+	<script type="text/javascript" src="../../js/platform/first.js"></script>
+	<script type="text/javascript" src="../../js/common/materialize.js"></script>
+	<script type="text/javascript" src="../../js/lang/lang.@@lang@@.js"></script>
+	<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
+	<script src="../../node_modules/vue/dist/vue.min.js"></script>
+	<script type="text/javascript" src="setting.vue.js"></script>

-<h4>@@setting@@</h4>
-<ul class="collapsible" data-collapsible="accordion">
-	<li>
-	<div class="collapsible-header">
-			<i class="material-icons">desktop_windows</i>@@env@@
-	</div>
-	<div class="collapsible-body">
-		<h5>@@setlang@@</h5>
-		To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
-		@@langlist@@
-		<h5>@@backup@@</h5>
-		<button onclick="exportSettings()" class="btn waves-effect lime darken-3" style="width:100%; max-width:200px;">@@export@@</button>
-		<button onclick="importSettings()" class="btn waves-effect cyan darken-3" style="width:100%; max-width:200px;">@@import@@</button>
-		<div id="envView">
-            <template v-for="(item, i) in config">
-				<h5>{{item.text.head}}</h5>
-				<templete v-html=item.text.desc></templete><br>
-				<template v-if="item.id=='notf'"><a onclick="notftest()" class="pointer">@@nntest@@</a><br></template>
-                <template v-if="item.checkbox">
-                        <template v-for="(check, j) in item.text.checkbox">
-                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
-                            <label v-bind:for="item.id+check.value">{{check.text}}</label>
-                        </template>
-				</template>
-				<template v-else>
-					<template v-if="item.doubleText">
-						<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-                        </template>
-					</template>
-					<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
-					</template>
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">@@change@@</button> 
-				</template>
-			</template>
-        </div>
-        <h5>@@font@@</h5>
-		@@fontwarn@@<br>
-		<button class="btn waves-effect" style="width:100px;" onclick="font()">@@select@@</button><br>
-		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
-		<br>
-		<input type="text" style="width:150px" id="font">
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">@@set@@</button>
-		<br>
-        <h5>@@savefolder@@</h5>
-		@@savefolderwarn@@<br>
-		<button class="btn waves-effect" style="width:100px;" onclick="savefolder()">@@change@@</button>
-		<br>
-	</div>
-	</li>
-	<li>
-	<div class="collapsible-header">
-			<i class="material-icons">color_lens</i>@@theme@@
-	</div>
-	<div class="collapsible-body">
-		<h4>@@themeSel@@</h4>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="black" value="black" />
-		<label for="black">Black</label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="white" value="white" />
-		<label for="white">White</label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="indigo" value="indigo" />
-		<label for="indigo">Indigo<span class="imas hide">(エンドレスナイト)</span></label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="brown" value="brown" />
-		<label for="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="green" value="green" />
-		<label for="green">Green<span class="imas hide">(ユースフルロマンス)</span></label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="custom" value="custom" />
-		<label for="custom">Custom</label>
-		<div style="width:300px" id="sel-selector">
-			<select id="custom-sel-sel" class="custom-sel" onchange="customSel()"></select>
-		</div>
-		<h4>@@customtheme@@</h4>
-		<div style="width:300px" id="edit-selector" data-add="@@add_new@@">
-			<select id="custom-edit-sel" class="custom-sel" onchange="custom()">
-				<option value="add_new">@@add_new@@</option>
-			</select>
-		</div>
-		<h5>@@name@@</h5>
-		<input type="text" style="width:300px" id="custom_name" placeholder="@@name@@...">
-		<h5>@@desc@@</h5>
-		<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" />
-		<label for="dark">Dark</label>
-		<input class="with-gap" name="derection" type="radio" id="light" value="light" />
-		<label for="light">Light</label>
-		<div id="pickers">
-		<div>
-			<h5>Primary</h5>@@secondarycolor@@
-			<div id="color-picker0-wrap"><div class="color-picker" id="color-picker0"></div></div>
-			<input type="hidden" id="color-picker0_value">
-		</div>
-		<div>
-			<h5>Secondary</h5>@@primary@@
-			<div id="color-picker1-wrap"><div class="color-picker" id="color-picker1"></div></div>
-			<input type="hidden" id="color-picker1_value">
-		</div>
-		<div>
-			<h5>Texts</h5>@@text@@
-			<div id="color-picker2-wrap"><div class="color-picker" id="color-picker2"></div></div>
-			<input type="hidden" id="color-picker2_value">
-		</div>
-		<div>
-			<h5>Accent</h5>@@accent@@
-			<div id="color-picker3-wrap"><div class="color-picker" id="color-picker3"></div></div>
-			<input type="hidden" id="color-picker3_value">
-		</div>
-		</div>
-		<button class="btn-large waves-effect" onclick="customComp()">@@change@@</button>&nbsp;<button class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">@@delete@@</button><br><br>
-		<input type="text" style="width:300px" id="custom_json" class="materialize-textarea" placeholder="JSON style" readonly><br>
-		@@customShare@@
-		<h4>@@customImport@@</h4>
-		@@cImpWarn@@<br>
-		<input type="text" style="width:300px" id="custom_import" class="materialize-textarea" placeholder="JSON/JSON5 style">
-		<button class="btn waves-effect" onclick="customImp()">@@import@@</button><br>
-	</li>
-	<li>
-	<div class="collapsible-header">
-			<i class="material-icons">reorder</i>@@timeline@@
-	</div>
-	<div class="collapsible-body">
-		<div id="tlView">
-            <template v-for="(item, i) in config">
-				<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
-                <template v-if="item.checkbox">
-                        <template v-for="(check, j) in item.text.checkbox">
-                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
-                            <label v-bind:for="item.id+check.value">{{check.text}}</label>
-                        </template>
-				</template>
-				<template v-else>
-					<template v-if="item.doubleText">
-						<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-                        </template>
-					</template>
-					<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
-					</template>
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">@@change@@</button> 
-				</template>
-			</template>
-        </div>
-	</div>
-	</li>
-	<li>
-	<div class="collapsible-header">
-			<i class="material-icons">send</i>@@post@@
-	</div>
-	<div class="collapsible-body">
-		<div id="postView">
-            <template v-for="(item, i) in config">
-				<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
-                <template v-if="item.checkbox">
-                        <template v-for="(check, j) in item.text.checkbox">
-							<template v-if="!check.kirishima || (check.kirishima && kirishima)">
-                            	<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+	<h4>@@setting@@</h4>
+	<ul class="collapsible" data-collapsible="accordion">
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">desktop_windows</i>@@env@@
+			</div>
+			<div class="collapsible-body">
+				<h5>@@setlang@@</h5>
+				To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
+				@@langlist@@
+				<h5>@@backup@@</h5>
+				<button onclick="exportSettings()" class="btn waves-effect lime darken-3"
+					style="width:100%; max-width:200px;">@@export@@</button>
+				<button onclick="importSettings()" class="btn waves-effect cyan darken-3"
+					style="width:100%; max-width:200px;">@@import@@</button>
+				<div id="envView">
+					<template v-for="(item, i) in config">
+						<h5>{{item.text.head}}</h5>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
+						</template>
+						<template v-if="item.id=='notf'"><a onclick="notftest()"
+								class="pointer">@@nntest@@</a><br></template>
+						<template v-if="item.checkbox">
+							<template v-for="(check, j) in item.text.checkbox">
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
 								<label v-bind:for="item.id+check.value">{{check.text}}</label>
-								<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
 							</template>
-                        </template>
-				</template>
-				<template v-else>
-					<template v-if="item.doubleText">
-						<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-                        </template>
+						</template>
+						<template v-else>
+							<template v-if="item.doubleText">
+								<template v-for="(textbox, j) in item.data">
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+								</template>
+							</template>
+							<template v-else>
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
+							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">@@change@@</button>
+						</template><br>
 					</template>
-					<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+				</div>
+				<h5>@@font@@</h5>
+				@@fontwarn@@<br>
+				<button class="btn waves-effect" style="width:100px;" onclick="font()">@@select@@</button><br>
+				<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
+				<br>
+				<input type="text" style="width:150px" id="font">
+				<button class="btn waves-effect" style="width:100px;" onclick="settings()">@@set@@</button>
+				<br>
+				<h5>@@savefolder@@</h5>
+				@@savefolderwarn@@<br>
+				<button class="btn waves-effect" style="width:100px;" onclick="savefolder()">@@change@@</button>
+				<br>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">color_lens</i>@@theme@@
+			</div>
+			<div class="collapsible-body">
+				<h4>@@themeSel@@</h4>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="black" value="black" />
+				<label for="black">Black</label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="white" value="white" />
+				<label for="white">White</label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="indigo" value="indigo" />
+				<label for="indigo">Indigo<span class="imas hide">(エンドレスナイト)</span></label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="brown" value="brown" />
+				<label for="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="green" value="green" />
+				<label for="green">Green<span class="imas hide">(ユースフルロマンス)</span></label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="custom" value="custom" />
+				<label for="custom">Custom</label>
+				<div style="width:300px" id="sel-selector">
+					<select id="custom-sel-sel" class="custom-sel" onchange="customSel()"></select>
+				</div>
+				<h4>@@customtheme@@</h4>
+				<div style="width:300px" id="edit-selector" data-add="@@add_new@@">
+					<select id="custom-edit-sel" class="custom-sel" onchange="custom()">
+						<option value="add_new">@@add_new@@</option>
+					</select>
+				</div>
+				<h5>@@name@@</h5>
+				<input type="text" style="width:300px" id="custom_name" placeholder="@@name@@...">
+				<h5>@@desc@@</h5>
+				<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="direction" type="radio" id="dark" value="dark" checked="true" />
+				<label for="dark">Dark</label>
+				<input class="with-gap" name="direction" type="radio" id="light" value="light" />
+				<label for="light">Light</label>
+				<div id="pickers">
+					<div>
+						<h5>Primary</h5>@@secondarycolor@@
+						<div id="color-picker0-wrap">
+							<div class="color-picker" id="color-picker0"></div>
+						</div>
+						<input type="hidden" id="color-picker0_value">
+					</div>
+					<div>
+						<h5>Secondary</h5>@@primary@@
+						<div id="color-picker1-wrap">
+							<div class="color-picker" id="color-picker1"></div>
+						</div>
+						<input type="hidden" id="color-picker1_value">
+					</div>
+					<div>
+						<h5>Texts</h5>@@text@@
+						<div id="color-picker2-wrap">
+							<div class="color-picker" id="color-picker2"></div>
+						</div>
+						<input type="hidden" id="color-picker2_value">
+					</div>
+					<div>
+					<h5>Accent</h5>@@accent@@
+					<div id="color-picker3-wrap">
+						<div class="color-picker" id="color-picker3"></div>
+					</div>
+					<input type="hidden" id="color-picker3_value">
+					</div>
+				</div>
+				<button class="btn-large waves-effect" onclick="customComp()">@@change@@</button>&nbsp;<button
+					class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">@@delete@@</button><br><br>
+				<input type="text" style="width:300px" id="custom_json" class="materialize-textarea"
+					placeholder="JSON style" readonly><br>
+				@@customShare@@
+				<h4>@@customImport@@</h4>
+				@@cImpWarn@@<br>
+				<input type="text" style="width:300px" id="custom_import" class="materialize-textarea"
+					placeholder="JSON/JSON5 style">
+				<button class="btn waves-effect" onclick="customImp()">@@import@@</button><br>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">reorder</i>@@timeline@@
+			</div>
+			<div class="collapsible-body">
+				<div id="tlView">
+					<template v-for="(item, i) in config">
+						<h5>{{item.text.head}}</h5>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
+						</template>
+						<template v-if="item.checkbox">
+							<template v-for="(check, j) in item.text.checkbox">
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+								<label v-bind:for="item.id+check.value">{{check.text}}</label>
+							</template>
+						</template>
+						<template v-else>
+							<template v-if="item.doubleText">
+								<template v-for="(textbox, j) in item.data">
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+								</template>
+							</template>
+							<template v-else>
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
+							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">@@change@@</button>
+						</template><br>
 					</template>
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">@@change@@</button> 
-				</template>
-			</template>
-        </div>
-	</div>
-	</li>
-	<li>
-		<div class="collapsible-header">
+				</div>
+				<h5>@@customSound@@</h5>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(1)">Custom 1</button><span id="c1-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(2)">Custom 2</button><span id="c2-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(3)">Custom 3</button><span id="c3-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(4)">Custom 4</button><span id="c4-file"></span><br>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">send</i>@@post@@
+			</div>
+			<div class="collapsible-body">
+				<div id="postView">
+					<template v-for="(item, i) in config">
+						<h5>{{item.text.head}}</h5>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
+						</template>
+						<template v-if="item.checkbox">
+							<template v-for="(check, j) in item.text.checkbox">
+								<template v-if="!check.kirishima || (check.kirishima && kirishima)">
+									<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+										type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+									<label v-bind:for="item.id+check.value">{{check.text}}</label>
+									<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
+								</template>
+							</template>
+						</template>
+						<template v-else>
+							<template v-if="item.doubleText">
+								<template v-for="(textbox, j) in item.data">
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+								</template>
+							</template>
+							<template v-else>
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
+							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">@@change@@</button>
+						</template><br>
+					</template>
+				</div>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
 				<i class="material-icons">keyboard</i>@@keysc@@
-		</div>
-		<div class="collapsible-body">
-			<h5>@@iks@@</h5>
-			@@okswarn@@<br>
-			Ctrl+Shift+1:<input type="text" style="width:150px" id="oks-1">
-			<button onclick="oks(1)" class="btn waves-effect" style="width:100px;">@@set@@</button><br><br>
-			Ctrl+Shift+2:<input type="text" style="width:150px" id="oks-2">
-			<button onclick="oks(2)" class="btn waves-effect" style="width:100px;">@@set@@</button><br><br>
-			Ctrl+Shift+3:<input type="text" style="width:150px" id="oks-3">
-			<button onclick="oks(3)" class="btn waves-effect" style="width:100px;">@@set@@</button><br><br>
+			</div>
+			<div class="collapsible-body">
+				<h5>@@iks@@</h5>
+				@@okswarn@@<br>
+				Ctrl+Shift+1:<input type="text" style="width:150px" id="oks-1">
+				<button onclick="oks(1)" class="btn waves-effect" style="width:100px;">@@set@@</button><br><br>
+				Ctrl+Shift+2:<input type="text" style="width:150px" id="oks-2">
+				<button onclick="oks(2)" class="btn waves-effect" style="width:100px;">@@set@@</button><br><br>
+				Ctrl+Shift+3:<input type="text" style="width:150px" id="oks-3">
+				<button onclick="oks(3)" class="btn waves-effect" style="width:100px;">@@set@@</button><br><br>

-		</div>
-	</li>
-	<li>
-		<div class="collapsible-header">
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
 				<i class="material-icons">bookmark</i>@@muteemp@@
-		</div>
-		<div class="collapsible-body">
-			<h5>@@climute@@</h5>
-			<div id="mute-cli"></div>
-			<h5>@@cliemp@@</h5>
-			@@cliwarn@@
-			<h5>@@wordmute@@</h5>
-			@@enter@@<br>
-			<div class="chips" id="wordmute" style="background-color:gray;"></div>
-			<button onclick="wordmuteSave()" class="btn waves-effect" style="width:100px;">@@set@@</button>
-			<h5>@@wordemp@@</h5>
-			@@enter@@<br>
-			<div class="chips" id="wordemp" style="background-color:gray;"></div>
-			<button onclick="wordempSave()" class="btn waves-effect" style="width:100px;">@@set@@</button>
-			<h5>@@useremp@@</h5>
-			@@useerempwarn@@
-			<span class="emphasized">　@@empcolorwarn@@　</span>
-		</div>
-	</li>
-	<li>
-		<div class="collapsible-header">
-			<i class="fa fa-spotify"></i>@@spotify@@
-		</div>
-		<div class="collapsible-body">
-			<h5>@@npProvider@@</h5>
-			@@npPeoviderWarn@@<br>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
-			<label for="aimp">AIMP</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
-			<label for="itunes">iTunes</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm" value="MEDIAMONKEY" />
-			<label for="npmm">MediaMonkey</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
-			<label for="winamp">Winamp</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
-			<label for="wmp">WMP</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
-			<label for="wlm">WLM</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
-			<label for="cad">CAD</label><br><br>
-			@@spotifynote1@@<i class="material-icons" style="font-size:24px;">music_note</i>@@spotifynote2@@<br>
-			<h5>@@link@@</h5>
-			@@linkwarn@@<br>
-			<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">@@set@@</button></div>
-			<a onclick="spotifyConnect()" class="btn waves-effect nex" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i class="fa fa-spotify left"></i>@@connect@@</a>
-			<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i class="fa fa-spotify left"></i>@@disconnect@@</a>
-			<h5>@@templeteedit@@</h5>
-			@@templeteeditwarn@@<br>
-			<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
+			</div>
+			<div class="collapsible-body">
+				<h5>@@climute@@</h5>
+				<div id="mute-cli"></div>
+				<h5>@@cliemp@@</h5>
+				@@cliwarn@@
+				<h5>@@wordmute@@</h5>
+				@@enter@@<br>
+				<div class="chips" id="wordmute" style="background-color:gray;"></div>
+				<button onclick="wordmuteSave()" class="btn waves-effect" style="width:100px;">@@set@@</button>
+				<h5>@@wordemp@@</h5>
+				@@enter@@<br>
+				<div class="chips" id="wordemp" style="background-color:gray;"></div>
+				<button onclick="wordempSave()" class="btn waves-effect" style="width:100px;">@@set@@</button>
+				<h5>@@useremp@@</h5>
+				@@useerempwarn@@
+				<span class="emphasized">　@@empcolorwarn@@　</span>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="fa fa-spotify"></i>@@spotify@@
+			</div>
+			<div class="collapsible-body">
+				<h5>@@npProvider@@</h5>
+				@@npPeoviderWarn@@<br>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
+				<label for="aimp">AIMP</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
+				<label for="itunes">iTunes</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm" value="MEDIAMONKEY" />
+				<label for="npmm">MediaMonkey</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
+				<label for="winamp">Winamp</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
+				<label for="wmp">WMP</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
+				<label for="wlm">WLM</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
+				<label for="cad">CAD</label><br><br>
+				@@spotifynote1@@<i class="material-icons" style="font-size:24px;">music_note</i>@@spotifynote2@@<br>
+				<h5>@@link@@</h5>
+				@@linkwarn@@<br>
+				<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button
+						onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">@@set@@</button></div>
+				<a onclick="spotifyConnect()" class="btn waves-effect nex"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i
+						class="fa fa-spotify left"></i>@@connect@@</a>
+				<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i
+						class="fa fa-spotify left"></i>@@disconnect@@</a>
+				<h5>@@templeteedit@@</h5>
+				@@templeteeditwarn@@<br>
+				<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
 {url}</textarea><br>
 				@@templete1@@<br>
 				@@templete2@@<br>
 				@@templete3@@<br>
-				<span class="imas hide">CINDERELLA NowPlaying(imastodon.net限定)では作曲家{composer}/作詞家{lyricist}/BPM{bpm}が有効です。<br>
-                    CINDERELLA NowPlayingはimastodon.netにログインしているとき、トゥート欄に「//」を入力し、その後に曲名を入れることで可能です。</span><br>
-			<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">@@set@@</button>
-			<h5>@@postartwork@@</h5>
-			<span class="imas hide">この設定はCINDERELLA NowPlaying(imastodon.net限定)にも適用されます。</span><br>
-			<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
-			<label for="awk_yes">@@yes@@</label>
-			<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
-			<label for="awk_no">@@no@@</label>
-			<br>
-		</div>
-	</li>
-	<li>
-		<div class="collapsible-header">
-			<i class="material-icons">hearing</i>@@tts@@
-		</div>
-		<div class="collapsible-body">
-			<h5>@@speed@@</h5>
-			@@speedwarn@@<br>
-			<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10" style="width:500px; max-width:100%"/></p>
-			<h5>@@pitch@@</h5>
-			@@pitchwarn@@<br>
-			<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50" style="width:500px; max-width:100%"/></p>
-			<h5>@@vol@@</h5>
-			@@volwarn@@<br>
-			<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100" style="width:500px; max-width:100%"/></p>
-			<h5>@@test@@</h5>
-			<input type="text" style="width:350px" id="voicetxt" value="@@sample@@">
-			<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()" id="testplay">@@playstop@@</button><br>
-			<br>
-			<button class="btn waves-effect" style="width:100px;" onclick="voiceSettings()">@@set@@</button>
-		</div>
-	</li>
-</ul>
-<br>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>@@back@@</a>
-<br>
-<br>@@keyscs@@
-<li>Ctrl+1-9:@@keyscr@@</li>
-<li>N:@@keynew@@</li>
-<li>X:@@keytoggle@@</li>
-<li>Ctrl+Enter:@@keypost@@</li>
-<li>Ctrl+Enter+Shift:@@keysecpost@@</li>
-<li>Alt+Enter:@@secondary@@</li>
-<li>Ctrl+E:@@keyunread@@</li>
-<li>Esc:@@keyesc@@</li>
-<li>F5:@@keyf5@@</li>
-<li>Ctrl+Shift+C:@@keyclear@@</li>
-<li>Ctrl+Shift+S:@@setting@@</li>
-<li>Ctrl+Shift+M:@@keyacctman@@</li>
-<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
-<li>Ctrl+Shift+P:@@keyshowprof@@</li>
-<li>←/→:@@keyrow@@</li>
-<li>@@keyzoom@@</li>
-<div class="hide kirishima">
-以下Markdownに対応したインスタンスのみ。
-<br>
-<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
-<li>Shift+Enter:全角スペースを入れて改行</li>
-<li>Shift+Space:ゼロ幅スペース</li>
-以下アスタルテにログインしている場合のみ 
-<br>
-<li>Ctrl+R: 
-<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
-</li><br>
-</div>
-<button class="btn waves-effect red" style="width:100%; max-width:500px;" onclick="if(confirm('@@resetconfirm@@')){ localStorage.clear(); location.href='index.html'; }"><i class="material-icons left">delete</i>@@reset@@</button><br><br>
-<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i 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 class="material-icons left">list</i>@@help@@/Docs(Constructing)</a>
-<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
-<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
-<br>
-Kyash<br>
-			<img src="../../img/kyash.png" width="100"><br>
-<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';" class="pointer">@@checkup@@</a><br>
-<a href="oss.html">OSS License@@ossJP@@</a><br>
-<span style="font-family:Open Sans;">Copyright &copy; TheDesk 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>
-	<br>Developer: Cutls P( 
-	<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
+				<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">@@set@@</button>
+				<h5>@@postartwork@@</h5>
+				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
+				<label for="awk_yes">@@yes@@</label>
+				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
+				<label for="awk_no">@@no@@</label>
+				<br>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">hearing</i>@@tts@@
+			</div>
+			<div class="collapsible-body">
+				<h5>@@speed@@</h5>
+				@@speedwarn@@<br>
+				<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10"
+						style="width:500px; max-width:100%" /></p>
+				<h5>@@pitch@@</h5>
+				@@pitchwarn@@<br>
+				<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50"
+						style="width:500px; max-width:100%" /></p>
+				<h5>@@vol@@</h5>
+				@@volwarn@@<br>
+				<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100"
+						style="width:500px; max-width:100%" /></p>
+				<h5>@@test@@</h5>
+				<input type="text" style="width:350px" id="voicetxt" value="@@sample@@">
+				<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()"
+					id="testplay">@@playstop@@</button><br>
+				<br>
+				<button class="btn waves-effect" style="width:100px;" onclick="voiceSettings()">@@set@@</button>
+			</div>
+		</li>
+	</ul>
 	<br>
-</span><br>
-TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
-タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
-<script type="text/javascript" src="../../js/common/about.js"></script>
-<script type="text/javascript" src="../../js/platform/end.js"></script>
-<script type="text/javascript" src="../../js/login/logout.js"></script>
-<script type="text/javascript" src="../../js/ui/spotify.js"></script>
-<script type="text/javascript" src="../../js/tl/speech.js"></script>
-<script type="text/javascript" src="../../js/platform/pickr.js"></script>
-<script type="text/javascript" src="../../js/ui/settings.js"></script>
-<script type="text/javascript" src="../../js/ui/theme.js"></script>
-<script type="text/javascript" src="../../js/tl/date.js"></script>
+	<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i
+			class="material-icons left">undo</i>@@back@@</a>
+	<br>
+	<br>@@keyscs@@
+	<li>Ctrl+1-9:@@keyscr@@</li>
+	<li>N:@@keynew@@</li>
+	<li>X:@@keytoggle@@</li>
+	<li>Ctrl+Enter:@@keypost@@</li>
+	<li>Ctrl+Enter+Shift:@@keysecpost@@</li>
+	<li>Alt+Enter:@@secondary@@</li>
+	<li>Ctrl+E:@@keyunread@@</li>
+	<li>Esc:@@keyesc@@</li>
+	<li>F5:@@keyf5@@</li>
+	<li>Ctrl+Shift+C:@@keyclear@@</li>
+	<li>Ctrl+Shift+S:@@setting@@</li>
+	<li>Ctrl+Shift+M:@@keyacctman@@</li>
+	<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
+	<li>Ctrl+Shift+P:@@keyshowprof@@</li>
+	<li>←/→:@@keyrow@@</li>
+	<li>@@keyzoom@@</li>
+	<div class="hide kirishima">
+		以下Markdownに対応したインスタンスのみ。
+		<br>
+		<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
+		<li>Shift+Enter:全角スペースを入れて改行</li>
+		<li>Shift+Space:ゼロ幅スペース</li>
+		以下アスタルテにログインしている場合のみ
+		<br>
+		<li>Ctrl+R:
+			<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
+		</li><br>
+	</div>
+	<button class="btn waves-effect red" style="width:100%; max-width:500px;"
+		onclick="if(confirm('@@resetconfirm@@')){ localStorage.clear(); location.href='index.html'; }"><i
+			class="material-icons left">delete</i>@@reset@@</button><br><br>
+	<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i
+			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://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
+			class="material-icons left">list</i>@@help@@/Docs(Constructing)</a>
+	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
+		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
+	<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2"
+		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
+			style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
+	<br>
+	Kyash<br>
+	<img src="../../img/kyash.png" width="100"><br>
+	<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';"
+		class="pointer">@@checkup@@</a><br>
+	<a href="oss.html">OSS License@@ossJP@@</a><br>
+	<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>
+		<br>Developer: Cutls P(
+		<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
+		<br>
+	</span><br>
+	TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
+	タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
+	<script type="text/javascript" src="../../js/common/about.js"></script>
+	<script type="text/javascript" src="../../js/platform/end.js"></script>
+	<script type="text/javascript" src="../../js/login/logout.js"></script>
+	<script type="text/javascript" src="../../js/ui/spotify.js"></script>
+	<script type="text/javascript" src="../../js/tl/speech.js"></script>
+	<script type="text/javascript" src="../../js/platform/pickr.js"></script>
+	<script type="text/javascript" src="../../js/ui/settings.js"></script>
+	<script type="text/javascript" src="../../js/ui/theme.js"></script>
+	<script type="text/javascript" src="../../js/tl/date.js"></script>
--- a/app/view/make/setting.sample.js
+++ b/app/view/make/setting.sample.js
@@ -7,6 +7,27 @@ var yesno=[
        value:"no"
    }
 ];
+var sound=[
+    {
+        text:"@@none@@",
+        value:"none"
+    },{
+        text:"@@default@@",
+        value:"default"
+    },{
+        text:"Custom 1",
+        value:"c1"
+    },{
+        text:"Custom 2",
+        value:"c2"
+    },{
+        text:"Custom 3",
+        value:"c3"
+    },{
+        text:"Custom 4",
+        value:"c4"
+    }
+];
 var envConstruction=[
    {
        id:"popup",
@@ -286,6 +307,46 @@ var tlConstruction=[
            desc:"",
            checkbox:yesno
        }
+    },{
+        id:"replySound",
+        storage:"replySound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"@@replySound@@",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"favSound",
+        storage:"favSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"@@favSound@@",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"btSound",
+        storage:"btSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"@@btSound@@",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"followSound",
+        storage:"followSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"@@followSound@@",
+            desc:"",
+            checkbox:sound
+        }
    }
 ];
 var postConstruction=[
@@ -476,5 +537,16 @@ var postConstruction=[
                }
            ]
        }
+    },{
+        id:"zero",
+        storage:"emoji-zero-width",
+        checkbox:true,
+        setValue:"normal",
+        setValue:"no",
+        text:{
+            head:"@@zeroWidthEmoji@@",
+            desc:"",
+            checkbox:yesno
+        }
    }
 ]
--- 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"));
             
    });
--- a/app/view/ps/acct.html
+++ b/app/view/ps/acct.html
@@ -18,6 +18,14 @@ body,html{overflow-y: scroll;}
 .colorsel{ display:flex; }
 .card .colorsel div:not(.exc){width:20px;height:20px;}
 .card .colorsel div.exc{width:40px;height:20px;}
+.first{
+      display:flex;
+      justify-content: center;
+      align-items:center
+}
+.first .hide-first{
+      display:none;
+}
 </style>
 <meta charset="utf-8">

@@ -39,14 +47,17 @@ body,html{overflow-y: scroll;}
 <script type="text/javascript" src="../../js/ui/tips.js"></script>
 <script type="text/javascript" src="../../js/common/time.js"></script>
 <script type="text/javascript" src="../../js/common/modal.js"></script>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">crwdns366:0crwdne366:0</a><br>
-<h5>crwdns365:0crwdne365:0</h5>
-<div id="acct-list"></div>
-<div class="divider"></div>
+<div class="hide-first">
+      <a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;">crwdns366:0crwdne366:0</a><br>
+      <h5>crwdns365:0crwdne365:0</h5>
+      <div id="acct-list"></div>
+      <div class="divider"></div>
+</div>
+<div>
 <h5>crwdns367:0crwdne367:0</h5><br>
 <div id="add">
 <div class="row">
-      <div class="col s6">
+      <div class="col s8">
            <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
            <div id="ins-suggest"></div>
            crwdns368:0crwdne368:0<br>
@@ -56,7 +67,7 @@ body,html{overflow-y: scroll;}
                  <label for="misskey">crwdns382:0crwdne382:0</label><br>
            <button class="btn waves-effect" onclick="instance()">Login</button><br>
      </div>
-      <div class="col s6">
+      <div class="col s4">
            <span style="font-family:Open Sans;">Supports</span>
            <div id="support" class="collection transparent"></div>
      </div>
@@ -73,6 +84,8 @@ body,html{overflow-y: scroll;}
                  <input type="text" id="misskey-key" placeholder="crwdns373:0crwdne373:0">
                  <button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br>
            </div>
+      </div>
+<div class="hide-first">
 <h5>crwdns370:0crwdne370:0</h5>
 <div class="input-field" style="width:300px"><span data-trans="your_acct">crwdns371:0crwdne371:0</span>
      <br>
@@ -91,6 +104,7 @@ crwdns376:0crwdne376:0:<span id="ins-toot"></span>crwdns381:0crwdne381:0<br>
 crwdns377:0crwdne377:0:<span id="ins-user"></span>crwdns377:0crwdne377:0<br>
 crwdns379:0crwdne379:0:<span id="ins-per"></span>%<br>
 crwdns380:0crwdne380:0:<span id="ins-ver"></span>@<span id="ins-upd"></span><br>
+</div>
 <script type="text/javascript" src="../../js/ui/theme.js"></script>
 <script type="text/javascript" src="../../js/platform/end.js"></script>
 <script type="text/javascript" src="../../js/common/sha256.js"></script>
--- a/app/view/ps/index.html
+++ b/app/view/ps/index.html
@@ -4,13 +4,13 @@
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
 	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
+	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
-	<link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/post.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/tl.css" rel="stylesheet" type="text/css">
+	<link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+	<link href="../../css/post.css" rel="stylesheet" type="text/css">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/sort.css" rel="stylesheet" type="text/css">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
 	
@@ -32,14 +32,13 @@
 <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.1.2)";
+var ver="Usamin (18.3.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
 //WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
 var acct_id=0;
 var tlid=0;
-  verck(ver);
 </script>
 <textarea id="copy" style="top:-100px; position:fixed;"></textarea>
 <div id="tl">
@@ -53,7 +52,7 @@ var tlid=0;
 </div>
 </div>
 <div id="post-box" class="z-depth-5">
-<div id="post-bar" class="drag-bar">crwdns2402:0crwdne2402:0</div>
+<div id="post-bar" class="drag-bar"><span id="unreact">crwdns2402:0crwdne2402:0</span><span id="addreact" class="hide">Reaction</span></div>
 <!--トゥートボックス-->
 <div id="left-side">
 <div class="row" style="margin-bottom:0;">
@@ -205,7 +204,6 @@ var tlid=0;
 <div id="emoji" class="hide">
 		<span class="gray sml">crwdns409:0crwdne409:0
 			<a onclick="emojiGet('true')" class="pointer">crwdns411:0crwdne411:0</a>
-			<i class="material-icons waves-effect" onclick="emojiToggle()" title="crwdns412:0crwdne412:0" data-trans-title="post_box_close">cancel</i>
 		<br>
 		</span>
 		<div id="emoji-list" class="" style="">
@@ -251,7 +249,7 @@ var tlid=0;
 			<i class="material-icons">flag</i>
 			</a>
 			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
-			<i class="fa fa-fort-awesome"></i>
+			<i class="fab fa-fort-awesome"></i>
 			</a>
 		</div>
 	</div>
@@ -259,12 +257,8 @@ var tlid=0;
 	<div id="poll" class="hide">
 		<select id="poll-sel"  onchange="pollProviderCk()">
 			<option value="nothing">crwdns2408:0crwdne2408:0</option>
-			<option value="votedon">votedon.</option>
 			<option value="mastodon-poll">Mastodon(2.8~)</option>
 		</select>
-		<div id="votedon" class="poll-provider hide">
-	WIP
-		</div>
 		<div id="mastodon-poll" class="poll-provider hide">
 			<input type="text" class="mastodon-choice" placeholder="crwdns2414:0crwdne2414:01">
 			<input type="text" class="mastodon-choice" placeholder="crwdns2414:0crwdne2414:02">
@@ -276,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>
@@ -330,26 +324,26 @@ var tlid=0;
 	</li>
 	<li class="dm-hide">
 		<div class="collapsible-header">
-		<i class="text-darken-3 fa fa-retweet"></i>crwdns429:0crwdne429:0
+		<i class="text-darken-3 false fas fa-retweet"></i>crwdns429:0crwdne429:0
 		</div>
 		<div class="collapsible-body toot-reset" id="toot-rt">
 		</div>
 	</li>
 	</ul>
 	<div class="dm-hide">
-	crwdns430:0crwdne430:0(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>crwdns431:0crwdne431:0)<br>
+	crwdns430:0crwdne430:0(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>crwdns431:0crwdne431:0)<br>
 	<div class="row">
 		<div class="col s6">
 				<select id="status-acct-sel" class="acct-sel"></select>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
+			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fas fa-share"></i>/button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
+			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
+			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fas fa-star"></i></button>
 		</div>
 	</div>
 	<div id="toot-tools">
@@ -360,7 +354,6 @@ var tlid=0;
 </div>
 	<div class="modal-footer">
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="brws()">crwdns435:0crwdne435:0</a>
-	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="shot()">crwdns436:0crwdne436:0</a>
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy()">crwdns437:0crwdne437:0</a>
 	<a href="#!" class="waves-effect waves-green btn-flat dm-hide" onclick="cbCopy('emb')">crwdns438:0crwdne438:0</a>
 	<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">crwdns385:0crwdne385:0</a>
@@ -372,7 +365,7 @@ var tlid=0;
 			<div id="his-data-show">
 			<div class="his-float" id="his-float-data">
 			<div id="his-basic-prof">
-			<img src="../../img/loading.svg" id="his-prof">
+			<img src="../../img/loading.svg" id="his-prof" draggable="false">
 			<span id="his-name">Loading...</span><span class="gray" id="his-bot"></span>
 			<br>@
 			<span id="his-acct"></span><br>
@@ -390,8 +383,9 @@ var tlid=0;
 			<span class="cbadge" style="max-width:150px; width:150px; ">Since:
 			<span id="his-since"></span>
 			</span>
+			<div id="his-proof-prof"></div>
 			</div>
-			<div id="his-des"></div><br>
+			<div id="his-des" data-acct=""></div><br>
 			<div id="his-plus-action">
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">crwdns472:0crwdne472:0</a>
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">crwdns454:0crwdne454:0</a><br>
@@ -525,6 +519,9 @@ var tlid=0;
 			</div>
 			</div>
 			</div>
+			<div class="his-float" id="his-float-blocked">
+				<div>{{blocked}}</div>
+			</div>
 			</div>
 			</div>
 			<div class="modal-footer">
@@ -583,20 +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-1-1" 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.1.1)</h5>
-・お知らせ機能改善<br>
-・Integrated TLで一部挙動改善(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
--以下18.1.0--<br>
-・iTunes NowPlaying(macOS)にアルバムアートワークを付ける(Thanks to <a href="https://www.kr-kp.com/">kPherox</a>)<br>
-・カラムを<b>縦に並べられる</b>ように(2つ目以降のカラム毎の設定の「左に重ねる」「右に出す」を押す)<br>
-・画像を個別に削除する(画像をクリックして)<br>
-・何個もアルバムアートワークが投稿されるバグを修正<br>
-・Misskeyでログインしたまま何もできないバグを修正(権限回り)
+					<h5>Release Note Usamin (18.3.1)</h5>
+・通知音が種別ごとに追加(すべて適当に自分で打ったやつです。)<br>
+・Integrated TLのタイムラインの再接続(kPherox)<br>
+・一部ロケーションの変更や投票に関するバグ(kPherox)<br>
+・バグと脆弱性の修正
+<br>
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -605,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>
@@ -688,11 +679,10 @@ var tlid=0;
 			<div class="input-field">
 			<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
 	</div><div class="input-field">
-	<i class="material-icons prefix">search</i>
-	<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
+	<input id="src" type="text" class="validate" style="width:60%">
 	<label for="src" data-trans="src">crwdns492:0crwdne492:0</label>
-	<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
-		<i class="material-icons left">search</i>crwdns492:0crwdne492:0
+	<button class="btn waves-effect indigo" style="width: 36%;padding: 0;padding-left: 15px;" onclick="src()" data-trans-i="src">
+		<i class="material-icons left" style="margin:0">search</i>crwdns492:0crwdne492:0
 	</button>
 	<br>
 	<br>
@@ -706,7 +696,7 @@ var tlid=0;
 	<div id="sort-box" class="hide menu-content">
 	<ul id="sort"></ul>
 	<div>
-	<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
+	<button onclick="sort()" class="btn waves-effect nex" style="width:97.5%;" data-trans-i="sort">
 		<i class="material-icons left">sort</i>crwdns493:0crwdne493:0
 	</button>
 	</div>
@@ -761,7 +751,14 @@ var tlid=0;
 		crwdns504:0crwdne504:0<span class="sml">crwdns505:0crwdne505:0<b>crwdns506:0crwdne506:0</b></span><br><br>
 		<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">crwdns507:0crwdne507:0
 		<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">crwdns508:0crwdne508:0
-		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">crwdns509:0crwdne509:0
+		<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">crwdns509:0crwdne509:0<br>
+		Quick:<a onclick="filterTime(0,0,30)" class="pointer">30crwdns509:0crwdne509:0</a>/
+		<a onclick="filterTime(0,1,0)" class="pointer">1crwdns508:0crwdne508:0</a>/
+		<a onclick="filterTime(0,6,0)" class="pointer">6crwdns508:0crwdne508:0</a>/
+		<a onclick="filterTime(0,12,0)" class="pointer">12crwdns508:0crwdne508:0</a>/
+		<a onclick="filterTime(1,0,0)" class="pointer">1crwdns507:0crwdne507:0</a>/
+		<a onclick="filterTime(7,0,0)" class="pointer">7crwdns507:0crwdne507:0</a>/
+		<a onclick="filterTime(0,0,0)" class="pointer">{{unlimited}}</a><br>
 		<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">crwdns491:0crwdne491:0</button><br>
 		<span class="sml">crwdns510:0crwdne510:0</span>
 	</div>
@@ -777,7 +774,9 @@ var tlid=0;
 <div id="main">
 <!--TLのTL-->
 <div id="timeline-container">
-	crwdns511:0crwdne511:0
+	<div id="something-wrong">
+		<div>crwdns511:0crwdne511:0</div>
+	</div>
 </div>
 </div>
 </div>
@@ -803,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>
@@ -821,7 +821,7 @@ var tlid=0;
 						<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
 				</a>
 				<a onclick="tips('spotify')" class="nex waves-effect">
-					<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
+					<i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
 				</a>
 			</div>
 		</div>
@@ -860,6 +860,7 @@ var tlid=0;
 <script type="text/javascript" src="../../js/tl/speech.js"></script>
 <script type="text/javascript" src="../../js/ui/post-box.js"></script>
 <script type="text/javascript" src="../../js/ui/layout.js"></script>
+<script type="text/javascript" src="../../js/post/emoji.js"></script>
 <script type="text/javascript" src="../../js/login/instance.js"></script>
 <script type="text/javascript" src="../../js/login/login.js"></script>
 <script type="text/javascript" src="../../js/ui/img.js"></script>
@@ -873,7 +874,6 @@ var tlid=0;
 <script type="text/javascript" src="../../js/post/img.js"></script>
 <script type="text/javascript" src="../../js/post/status.js"></script>
 <script type="text/javascript" src="../../js/post/misskeystatus.js"></script>
-<script type="text/javascript" src="../../js/post/emoji.js"></script>
 <script type="text/javascript" src="../../js/post/suggest.js"></script>
 <script type="text/javascript" src="../../js/post/bb-md.js"></script>
 <script type="text/javascript" src="../../js/userdata/showOnTL.js"></script>
--- a/app/view/ps/setting.html
+++ b/app/view/ps/setting.html
@@ -1,5 +1,6 @@
 <!doctype html>
-<html lang="ps">
+<html lang="ps" style="overflow:scroll">
+
 <head>
 	<title>Settings - TheDesk</title>
 	
@@ -17,362 +18,426 @@
 	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
 	<meta charset="utf-8">
-	<style>input{max-height:50px!important} .pcr-result{height:1rem !important;}</style>
+	<style>
+		input {
+			max-height: 50px !important
+		}
+		.pcr-result {
+			height: 1rem !important;
+		}
+	</style>
 </head>
+
 <body id="mainView" style="overflow-y:scroll">
-<script type="text/javascript" src="../../js/common/jquery.js"></script>
-<script type="text/javascript" src="../../js/platform/first.js"></script>
-<script type="text/javascript" src="../../js/common/materialize.js"></script>
-<script type="text/javascript" src="../../js/lang/lang.ps.js"></script>
-<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
-<script src="../../node_modules/vue/dist/vue.min.js"></script>
-<script type="text/javascript" src="setting.vue.js"></script>
+	<script type="text/javascript" src="../../js/common/jquery.js"></script>
+	<script type="text/javascript" src="../../js/platform/first.js"></script>
+	<script type="text/javascript" src="../../js/common/materialize.js"></script>
+	<script type="text/javascript" src="../../js/lang/lang.ps.js"></script>
+	<script src="https://unpkg.com/json5@^2.0.0/dist/index.min.js"></script>
+	<script src="../../node_modules/vue/dist/vue.min.js"></script>
+	<script type="text/javascript" src="setting.vue.js"></script>

-<h4>crwdns524:0crwdne524:0</h4>
-<ul class="collapsible" data-collapsible="accordion">
-	<li>
-	<div class="collapsible-header">
-			<i class="material-icons">desktop_windows</i>crwdns529:0crwdne529:0
-	</div>
-	<div class="collapsible-body">
-		<h5>crwdns530:0crwdne530:0</h5>
-		To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
-		<a href="../ja/setting.html" onclick="changelang('ja')">日本語(Japanese)</a>/<a href="../en/setting.html" onclick="changelang('en')">English</a>/<a href="../ps/setting.html" onclick="changelang('ps')">Crowdin web translate</a>/
-		<h5>crwdns531:0crwdne531:0</h5>
-		<button onclick="exportSettings()" class="btn waves-effect lime darken-3" style="width:100%; max-width:200px;">crwdns533:0crwdne533:0</button>
-		<button onclick="importSettings()" class="btn waves-effect cyan darken-3" style="width:100%; max-width:200px;">crwdns532:0crwdne532:0</button>
-		<div id="envView">
-            <template v-for="(item, i) in config">
-				<h5>{{item.text.head}}</h5>
-				<templete v-html=item.text.desc></templete><br>
-				<template v-if="item.id=='notf'"><a onclick="notftest()" class="pointer">crwdns540:0crwdne540:0</a><br></template>
-                <template v-if="item.checkbox">
-                        <template v-for="(check, j) in item.text.checkbox">
-                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
-                            <label v-bind:for="item.id+check.value">{{check.text}}</label>
-                        </template>
-				</template>
-				<template v-else>
-					<template v-if="item.doubleText">
-						<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-                        </template>
-					</template>
-					<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
-					</template>
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">crwdns528:0crwdne528:0</button> 
-				</template>
-			</template>
-        </div>
-        <h5>crwdns544:0crwdne544:0</h5>
-		crwdns1900:0crwdne1900:0<br>
-		<button class="btn waves-effect" style="width:100px;" onclick="font()">crwdns1896:0crwdne1896:0</button><br>
-		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
-		<br>
-		<input type="text" style="width:150px" id="font">
-		<button class="btn waves-effect" style="width:100px;" onclick="settings()">crwdns525:0crwdne525:0</button>
-		<br>
-        <h5>crwdns547:0crwdne547:0</h5>
-		crwdns548:0crwdne548:0<br>
-		<button class="btn waves-effect" style="width:100px;" onclick="savefolder()">crwdns528:0crwdne528:0</button>
-		<br>
-	</div>
-	</li>
-	<li>
-	<div class="collapsible-header">
-			<i class="material-icons">color_lens</i>crwdns534:0crwdne534:0
-	</div>
-	<div class="collapsible-body">
-		<h4>crwdns2422:0crwdne2422:0</h4>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="black" value="black" />
-		<label for="black">Black</label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="white" value="white" />
-		<label for="white">White</label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="indigo" value="indigo" />
-		<label for="indigo">Indigo<span class="imas hide">(エンドレスナイト)</span></label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="brown" value="brown" />
-		<label for="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="green" value="green" />
-		<label for="green">Green<span class="imas hide">(ユースフルロマンス)</span></label>
-		<input class="with-gap" onchange="settings()" name="theme" type="radio" id="custom" value="custom" />
-		<label for="custom">Custom</label>
-		<div style="width:300px" id="sel-selector">
-			<select id="custom-sel-sel" class="custom-sel" onchange="customSel()"></select>
-		</div>
-		<h4>crwdns2424:0crwdne2424:0</h4>
-		<div style="width:300px" id="edit-selector" data-add="crwdns2436:0crwdne2436:0">
-			<select id="custom-edit-sel" class="custom-sel" onchange="custom()">
-				<option value="add_new">crwdns2436:0crwdne2436:0</option>
-			</select>
-		</div>
-		<h5>crwdns2438:0crwdne2438:0</h5>
-		<input type="text" style="width:300px" id="custom_name" placeholder="crwdns2438:0crwdne2438:0...">
-		<h5>crwdns2440:0crwdne2440:0</h5>
-		<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" />
-		<label for="dark">Dark</label>
-		<input class="with-gap" name="derection" type="radio" id="light" value="light" />
-		<label for="light">Light</label>
-		<div id="pickers">
-		<div>
-			<h5>Primary</h5>crwdns2430:0crwdne2430:0
-			<div id="color-picker0-wrap"><div class="color-picker" id="color-picker0"></div></div>
-			<input type="hidden" id="color-picker0_value">
-		</div>
-		<div>
-			<h5>Secondary</h5>crwdns2428:0crwdne2428:0
-			<div id="color-picker1-wrap"><div class="color-picker" id="color-picker1"></div></div>
-			<input type="hidden" id="color-picker1_value">
-		</div>
-		<div>
-			<h5>Texts</h5>crwdns2432:0crwdne2432:0
-			<div id="color-picker2-wrap"><div class="color-picker" id="color-picker2"></div></div>
-			<input type="hidden" id="color-picker2_value">
-		</div>
-		<div>
-			<h5>Accent</h5>crwdns2434:0crwdne2434:0
-			<div id="color-picker3-wrap"><div class="color-picker" id="color-picker3"></div></div>
-			<input type="hidden" id="color-picker3_value">
-		</div>
-		</div>
-		<button class="btn-large waves-effect" onclick="customComp()">crwdns528:0crwdne528:0</button>&nbsp;<button class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">@@delete@@</button><br><br>
-		<input type="text" style="width:300px" id="custom_json" class="materialize-textarea" placeholder="JSON style" readonly><br>
-		crwdns2442:0crwdne2442:0
-		<h4>crwdns2444:0crwdne2444:0</h4>
-		@@cImpWarn@@<br>
-		<input type="text" style="width:300px" id="custom_import" class="materialize-textarea" placeholder="JSON/JSON5 style">
-		<button class="btn waves-effect" onclick="customImp()">crwdns532:0crwdne532:0</button><br>
-	</li>
-	<li>
-	<div class="collapsible-header">
-			<i class="material-icons">reorder</i>crwdns550:0crwdne550:0
-	</div>
-	<div class="collapsible-body">
-		<div id="tlView">
-            <template v-for="(item, i) in config">
-				<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
-                <template v-if="item.checkbox">
-                        <template v-for="(check, j) in item.text.checkbox">
-                            <input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
-                            <label v-bind:for="item.id+check.value">{{check.text}}</label>
-                        </template>
-				</template>
-				<template v-else>
-					<template v-if="item.doubleText">
-						<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-                        </template>
-					</template>
-					<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
-					</template>
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">crwdns528:0crwdne528:0</button> 
-				</template>
-			</template>
-        </div>
-	</div>
-	</li>
-	<li>
-	<div class="collapsible-header">
-			<i class="material-icons">send</i>crwdns587:0crwdne587:0
-	</div>
-	<div class="collapsible-body">
-		<div id="postView">
-            <template v-for="(item, i) in config">
-				<h5>{{item.text.head}}</h5>
-				{{item.text.desc}}<br>
-                <template v-if="item.checkbox">
-                        <template v-for="(check, j) in item.text.checkbox">
-							<template v-if="!check.kirishima || (check.kirishima && kirishima)">
-                            	<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue" type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+	<h4>crwdns524:0crwdne524:0</h4>
+	<ul class="collapsible" data-collapsible="accordion">
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">desktop_windows</i>crwdns529:0crwdne529:0
+			</div>
+			<div class="collapsible-body">
+				<h5>crwdns530:0crwdne530:0</h5>
+				To translate with Crowdin, you have to login Crowdin and restart TheDesk when login is finished.<br>
+				<a href="../ja/setting.html" onclick="changelang('ja')">日本語(Japanese)</a>/<a href="../en/setting.html" onclick="changelang('en')">English</a>/<a href="../ps/setting.html" onclick="changelang('ps')">Crowdin web translate</a>/
+				<h5>crwdns531:0crwdne531:0</h5>
+				<button onclick="exportSettings()" class="btn waves-effect lime darken-3"
+					style="width:100%; max-width:200px;">crwdns533:0crwdne533:0</button>
+				<button onclick="importSettings()" class="btn waves-effect cyan darken-3"
+					style="width:100%; max-width:200px;">crwdns532:0crwdne532:0</button>
+				<div id="envView">
+					<template v-for="(item, i) in config">
+						<h5>{{item.text.head}}</h5>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
+						</template>
+						<template v-if="item.id=='notf'"><a onclick="notftest()"
+								class="pointer">crwdns540:0crwdne540:0</a><br></template>
+						<template v-if="item.checkbox">
+							<template v-for="(check, j) in item.text.checkbox">
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
 								<label v-bind:for="item.id+check.value">{{check.text}}</label>
-								<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
 							</template>
-                        </template>
-				</template>
-				<template v-else>
-					<template v-if="item.doubleText">
-						<template v-for="(textbox, j) in item.data">
-                            <input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id" v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
-                        </template>
+						</template>
+						<template v-else>
+							<template v-if="item.doubleText">
+								<template v-for="(textbox, j) in item.data">
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+								</template>
+							</template>
+							<template v-else>
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
+							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">crwdns528:0crwdne528:0</button>
+						</template><br>
 					</template>
-					<template v-else>
-							<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id" v-bind:style="{ width: item.width+'px'}"/>{{item.text.after}}
+				</div>
+				<h5>crwdns544:0crwdne544:0</h5>
+				crwdns1900:0crwdne1900:0<br>
+				<button class="btn waves-effect" style="width:100px;" onclick="font()">crwdns1896:0crwdne1896:0</button><br>
+				<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
+				<br>
+				<input type="text" style="width:150px" id="font">
+				<button class="btn waves-effect" style="width:100px;" onclick="settings()">crwdns525:0crwdne525:0</button>
+				<br>
+				<h5>crwdns547:0crwdne547:0</h5>
+				crwdns548:0crwdne548:0<br>
+				<button class="btn waves-effect" style="width:100px;" onclick="savefolder()">crwdns528:0crwdne528:0</button>
+				<br>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">color_lens</i>crwdns534:0crwdne534:0
+			</div>
+			<div class="collapsible-body">
+				<h4>crwdns2422:0crwdne2422:0</h4>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="black" value="black" />
+				<label for="black">Black</label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="white" value="white" />
+				<label for="white">White</label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="indigo" value="indigo" />
+				<label for="indigo">Indigo<span class="imas hide">(エンドレスナイト)</span></label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="brown" value="brown" />
+				<label for="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="green" value="green" />
+				<label for="green">Green<span class="imas hide">(ユースフルロマンス)</span></label>
+				<input class="with-gap" onchange="settings()" name="theme" type="radio" id="custom" value="custom" />
+				<label for="custom">Custom</label>
+				<div style="width:300px" id="sel-selector">
+					<select id="custom-sel-sel" class="custom-sel" onchange="customSel()"></select>
+				</div>
+				<h4>crwdns2424:0crwdne2424:0</h4>
+				<div style="width:300px" id="edit-selector" data-add="crwdns2436:0crwdne2436:0">
+					<select id="custom-edit-sel" class="custom-sel" onchange="custom()">
+						<option value="add_new">crwdns2436:0crwdne2436:0</option>
+					</select>
+				</div>
+				<h5>crwdns2438:0crwdne2438:0</h5>
+				<input type="text" style="width:300px" id="custom_name" placeholder="crwdns2438:0crwdne2438:0...">
+				<h5>crwdns2440:0crwdne2440:0</h5>
+				<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="direction" type="radio" id="dark" value="dark" checked="true" />
+				<label for="dark">Dark</label>
+				<input class="with-gap" name="direction" type="radio" id="light" value="light" />
+				<label for="light">Light</label>
+				<div id="pickers">
+					<div>
+						<h5>Primary</h5>crwdns2430:0crwdne2430:0
+						<div id="color-picker0-wrap">
+							<div class="color-picker" id="color-picker0"></div>
+						</div>
+						<input type="hidden" id="color-picker0_value">
+					</div>
+					<div>
+						<h5>Secondary</h5>crwdns2428:0crwdne2428:0
+						<div id="color-picker1-wrap">
+							<div class="color-picker" id="color-picker1"></div>
+						</div>
+						<input type="hidden" id="color-picker1_value">
+					</div>
+					<div>
+						<h5>Texts</h5>crwdns2432:0crwdne2432:0
+						<div id="color-picker2-wrap">
+							<div class="color-picker" id="color-picker2"></div>
+						</div>
+						<input type="hidden" id="color-picker2_value">
+					</div>
+					<div>
+					<h5>Accent</h5>crwdns2434:0crwdne2434:0
+					<div id="color-picker3-wrap">
+						<div class="color-picker" id="color-picker3"></div>
+					</div>
+					<input type="hidden" id="color-picker3_value">
+					</div>
+				</div>
+				<button class="btn-large waves-effect" onclick="customComp()">crwdns528:0crwdne528:0</button>&nbsp;<button
+					class="btn waves-effect red disabled" id="delTheme" onclick="deleteIt()">@@delete@@</button><br><br>
+				<input type="text" style="width:300px" id="custom_json" class="materialize-textarea"
+					placeholder="JSON style" readonly><br>
+				crwdns2442:0crwdne2442:0
+				<h4>crwdns2444:0crwdne2444:0</h4>
+				@@cImpWarn@@<br>
+				<input type="text" style="width:300px" id="custom_import" class="materialize-textarea"
+					placeholder="JSON/JSON5 style">
+				<button class="btn waves-effect" onclick="customImp()">crwdns532:0crwdne532:0</button><br>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">reorder</i>crwdns550:0crwdne550:0
+			</div>
+			<div class="collapsible-body">
+				<div id="tlView">
+					<template v-for="(item, i) in config">
+						<h5>{{item.text.head}}</h5>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
+						</template>
+						<template v-if="item.checkbox">
+							<template v-for="(check, j) in item.text.checkbox">
+								<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+									type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+								<label v-bind:for="item.id+check.value">{{check.text}}</label>
+							</template>
+						</template>
+						<template v-else>
+							<template v-if="item.doubleText">
+								<template v-for="(textbox, j) in item.data">
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+								</template>
+							</template>
+							<template v-else>
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
+							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">crwdns528:0crwdne528:0</button>
+						</template><br>
 					</template>
-					<button class="btn waves-effect" style="width:100px;" v-on:click="complete(i)">crwdns528:0crwdne528:0</button> 
-				</template>
-			</template>
-        </div>
-	</div>
-	</li>
-	<li>
-		<div class="collapsible-header">
+				</div>
+				<h5>@@customSound@@</h5>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(1)">Custom 1</button><span id="c1-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(2)">Custom 2</button><span id="c2-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(3)">Custom 3</button><span id="c3-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(4)">Custom 4</button><span id="c4-file"></span><br>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">send</i>crwdns587:0crwdne587:0
+			</div>
+			<div class="collapsible-body">
+				<div id="postView">
+					<template v-for="(item, i) in config">
+						<h5>{{item.text.head}}</h5>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
+						</template>
+						<template v-if="item.checkbox">
+							<template v-for="(check, j) in item.text.checkbox">
+								<template v-if="!check.kirishima || (check.kirishima && kirishima)">
+									<input class="with-gap" v-on:click="complete(i,check.value)" v-model="item.setValue"
+										type="radio" v-bind:id="item.id+check.value" v-bind:value="check.value" />
+									<label v-bind:for="item.id+check.value">{{check.text}}</label>
+									<span v-if="check.kirishimaText">{{check.kirishimaText}}</span>
+								</template>
+							</template>
+						</template>
+						<template v-else>
+							<template v-if="item.doubleText">
+								<template v-for="(textbox, j) in item.data">
+									<input type="text" v-model="textbox.setValue" type="radio" v-bind:id="textbox.id"
+										v-bind:style="{ width: textbox.width+'px'}" />{{textbox.text.after}}
+								</template>
+							</template>
+							<template v-else>
+								<input type="text" v-model="item.setValue" type="radio" v-bind:id="item.id"
+									v-bind:style="{ width: item.width+'px'}" />{{item.text.after}}
+							</template>
+							<button class="btn waves-effect" style="width:100px;"
+								v-on:click="complete(i)">crwdns528:0crwdne528:0</button>
+						</template><br>
+					</template>
+				</div>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
 				<i class="material-icons">keyboard</i>crwdns611:0crwdne611:0
-		</div>
-		<div class="collapsible-body">
-			<h5>crwdns612:0crwdne612:0</h5>
-			crwdns613:0crwdne613:0<br>
-			Ctrl+Shift+1:<input type="text" style="width:150px" id="oks-1">
-			<button onclick="oks(1)" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button><br><br>
-			Ctrl+Shift+2:<input type="text" style="width:150px" id="oks-2">
-			<button onclick="oks(2)" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button><br><br>
-			Ctrl+Shift+3:<input type="text" style="width:150px" id="oks-3">
-			<button onclick="oks(3)" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button><br><br>
+			</div>
+			<div class="collapsible-body">
+				<h5>crwdns612:0crwdne612:0</h5>
+				crwdns613:0crwdne613:0<br>
+				Ctrl+Shift+1:<input type="text" style="width:150px" id="oks-1">
+				<button onclick="oks(1)" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button><br><br>
+				Ctrl+Shift+2:<input type="text" style="width:150px" id="oks-2">
+				<button onclick="oks(2)" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button><br><br>
+				Ctrl+Shift+3:<input type="text" style="width:150px" id="oks-3">
+				<button onclick="oks(3)" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button><br><br>

-		</div>
-	</li>
-	<li>
-		<div class="collapsible-header">
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
 				<i class="material-icons">bookmark</i>crwdns614:0crwdne614:0
-		</div>
-		<div class="collapsible-body">
-			<h5>crwdns615:0crwdne615:0</h5>
-			<div id="mute-cli"></div>
-			<h5>crwdns616:0crwdne616:0</h5>
-			crwdns617:0crwdne617:0
-			<h5>crwdns619:0crwdne619:0</h5>
-			crwdns618:0crwdne618:0<br>
-			<div class="chips" id="wordmute" style="background-color:gray;"></div>
-			<button onclick="wordmuteSave()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button>
-			<h5>crwdns620:0crwdne620:0</h5>
-			crwdns618:0crwdne618:0<br>
-			<div class="chips" id="wordemp" style="background-color:gray;"></div>
-			<button onclick="wordempSave()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button>
-			<h5>crwdns621:0crwdne621:0</h5>
-			crwdns622:0crwdne622:0
-			<span class="emphasized">　crwdns623:0crwdne623:0　</span>
-		</div>
-	</li>
-	<li>
-		<div class="collapsible-header">
-			<i class="fa fa-spotify"></i>crwdns624:0crwdne624:0
-		</div>
-		<div class="collapsible-body">
-			<h5>crwdns2354:0crwdne2354:0</h5>
-			crwdns2356:0crwdne2356:0<br>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
-			<label for="aimp">AIMP</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
-			<label for="itunes">iTunes</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm" value="MEDIAMONKEY" />
-			<label for="npmm">MediaMonkey</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
-			<label for="winamp">Winamp</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
-			<label for="wmp">WMP</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
-			<label for="wlm">WLM</label>
-			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
-			<label for="cad">CAD</label><br><br>
-			crwdns625:0crwdne625:0<i class="material-icons" style="font-size:24px;">music_note</i>crwdns626:0crwdne626:0<br>
-			<h5>crwdns627:0crwdne627:0</h5>
-			crwdns628:0crwdne628:0<br>
-			<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button></div>
-			<a onclick="spotifyConnect()" class="btn waves-effect nex" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i class="fa fa-spotify left"></i>crwdns629:0crwdne629:0</a>
-			<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled" style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i class="fa fa-spotify left"></i>crwdns630:0crwdne630:0</a>
-			<h5>crwdns631:0crwdne631:0</h5>
-			crwdns632:0crwdne632:0<br>
-			<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
+			</div>
+			<div class="collapsible-body">
+				<h5>crwdns615:0crwdne615:0</h5>
+				<div id="mute-cli"></div>
+				<h5>crwdns616:0crwdne616:0</h5>
+				crwdns617:0crwdne617:0
+				<h5>crwdns619:0crwdne619:0</h5>
+				crwdns618:0crwdne618:0<br>
+				<div class="chips" id="wordmute" style="background-color:gray;"></div>
+				<button onclick="wordmuteSave()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button>
+				<h5>crwdns620:0crwdne620:0</h5>
+				crwdns618:0crwdne618:0<br>
+				<div class="chips" id="wordemp" style="background-color:gray;"></div>
+				<button onclick="wordempSave()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button>
+				<h5>crwdns621:0crwdne621:0</h5>
+				crwdns622:0crwdne622:0
+				<span class="emphasized">　crwdns623:0crwdne623:0　</span>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="fa fa-spotify"></i>crwdns624:0crwdne624:0
+			</div>
+			<div class="collapsible-body">
+				<h5>crwdns2354:0crwdne2354:0</h5>
+				crwdns2356:0crwdne2356:0<br>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
+				<label for="aimp">AIMP</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
+				<label for="itunes">iTunes</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="npmm" value="MEDIAMONKEY" />
+				<label for="npmm">MediaMonkey</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="winamp" value="WINAMP" />
+				<label for="winamp">Winamp</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wmp" value="WMP" />
+				<label for="wmp">WMP</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="wlm" value="WLM" />
+				<label for="wlm">WLM</label>
+				<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="cad" value="CAD" />
+				<label for="cad">CAD</label><br><br>
+				crwdns625:0crwdne625:0<i class="material-icons" style="font-size:24px;">music_note</i>crwdns626:0crwdne626:0<br>
+				<h5>crwdns627:0crwdne627:0</h5>
+				crwdns628:0crwdne628:0<br>
+				<div id="spotify-code-show" class="hide"><input type="text" id="spotify-code"><button
+						onclick="spotifyAuth()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button></div>
+				<a onclick="spotifyConnect()" class="btn waves-effect nex"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-enable"><i
+						class="fa fa-spotify left"></i>crwdns629:0crwdne629:0</a>
+				<a onclick="spotifyDisconnect()" class="btn waves-effect nex disabled"
+					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i
+						class="fa fa-spotify left"></i>crwdns630:0crwdne630:0</a>
+				<h5>crwdns631:0crwdne631:0</h5>
+				crwdns632:0crwdne632:0<br>
+				<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
 {url}</textarea><br>
 				crwdns2358:0{song}crwdnd2358:0{album}crwdnd2358:0{artist}crwdnd2358:0{url}crwdne2358:0<br>
 				crwdns2360:0{song}crwdnd2360:0{album}crwdnd2360:0{artist}crwdnd2360:0{composer}crwdnd2360:0{hz}crwdnd2360:0{bitRate}crwdnd2360:0{genre}crwdne2360:0<br>
 				crwdns2362:0{song}crwdnd2362:0{album}crwdnd2362:0{artist}crwdne2362:0<br>
-				<span class="imas hide">CINDERELLA NowPlaying(imastodon.net限定)では作曲家{composer}/作詞家{lyricist}/BPM{bpm}が有効です。<br>
-                    CINDERELLA NowPlayingはimastodon.netにログインしているとき、トゥート欄に「//」を入力し、その後に曲名を入れることで可能です。</span><br>
-			<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button>
-			<h5>crwdns635:0crwdne635:0</h5>
-			<span class="imas hide">この設定はCINDERELLA NowPlaying(imastodon.net限定)にも適用されます。</span><br>
-			<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
-			<label for="awk_yes">crwdns526:0crwdne526:0</label>
-			<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
-			<label for="awk_no">crwdns527:0crwdne527:0</label>
-			<br>
-		</div>
-	</li>
-	<li>
-		<div class="collapsible-header">
-			<i class="material-icons">hearing</i>crwdns636:0crwdne636:0
-		</div>
-		<div class="collapsible-body">
-			<h5>crwdns637:0crwdne637:0</h5>
-			crwdns638:0crwdne638:0<br>
-			<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10" style="width:500px; max-width:100%"/></p>
-			<h5>crwdns639:0crwdne639:0</h5>
-			crwdns640:0crwdne640:0<br>
-			<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50" style="width:500px; max-width:100%"/></p>
-			<h5>crwdns641:0crwdne641:0</h5>
-			crwdns642:0crwdne642:0<br>
-			<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100" style="width:500px; max-width:100%"/></p>
-			<h5>crwdns643:0crwdne643:0</h5>
-			<input type="text" style="width:350px" id="voicetxt" value="crwdns644:0crwdne644:0">
-			<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()" id="testplay">crwdns645:0crwdne645:0</button><br>
-			<br>
-			<button class="btn waves-effect" style="width:100px;" onclick="voiceSettings()">crwdns525:0crwdne525:0</button>
-		</div>
-	</li>
-</ul>
-<br>
-<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i class="material-icons left">undo</i>crwdns646:0crwdne646:0</a>
-<br>
-<br>crwdns647:0crwdne647:0
-<li>Ctrl+1-9:crwdns648:0crwdne648:0</li>
-<li>N:crwdns649:0crwdne649:0</li>
-<li>X:crwdns650:0crwdne650:0</li>
-<li>Ctrl+Enter:crwdns651:0crwdne651:0</li>
-<li>Ctrl+Enter+Shift:crwdns1924:0crwdne1924:0</li>
-<li>Alt+Enter:crwdns1916:0crwdne1916:0</li>
-<li>Ctrl+E:crwdns652:0crwdne652:0</li>
-<li>Esc:crwdns653:0crwdne653:0</li>
-<li>F5:crwdns654:0crwdne654:0</li>
-<li>Ctrl+Shift+C:crwdns655:0crwdne655:0</li>
-<li>Ctrl+Shift+S:crwdns524:0crwdne524:0</li>
-<li>Ctrl+Shift+M:crwdns656:0crwdne656:0</li>
-<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
-<li>Ctrl+Shift+P:crwdns657:0crwdne657:0</li>
-<li>←/→:crwdns658:0crwdne658:0</li>
-<li>crwdns659:0crwdne659:0</li>
-<div class="hide kirishima">
-以下Markdownに対応したインスタンスのみ。
-<br>
-<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
-<li>Shift+Enter:全角スペースを入れて改行</li>
-<li>Shift+Space:ゼロ幅スペース</li>
-以下アスタルテにログインしている場合のみ 
-<br>
-<li>Ctrl+R: 
-<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
-</li><br>
-</div>
-<button class="btn waves-effect red" style="width:100%; max-width:500px;" onclick="if(confirm('crwdns661:0crwdne661:0')){ localStorage.clear(); location.href='index.html'; }"><i class="material-icons left">delete</i>crwdns660:0crwdne660:0</button><br><br>
-<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i 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 class="material-icons left">list</i>crwdns665:0crwdne665:0/Docs(Constructing)</a>
-<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2" style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
-<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2" style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25" style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
-<br>
-Kyash<br>
-			<img src="../../img/kyash.png" width="100"><br>
-<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. 
-	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>
-	<br>Developer: Cutls P( 
-	<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
+				<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button>
+				<h5>crwdns635:0crwdne635:0</h5>
+				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
+				<label for="awk_yes">crwdns526:0crwdne526:0</label>
+				<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
+				<label for="awk_no">crwdns527:0crwdne527:0</label>
+				<br>
+			</div>
+		</li>
+		<li>
+			<div class="collapsible-header">
+				<i class="material-icons">hearing</i>crwdns636:0crwdne636:0
+			</div>
+			<div class="collapsible-body">
+				<h5>crwdns637:0crwdne637:0</h5>
+				crwdns638:0crwdne638:0<br>
+				<p class="range-field"><input type="range" id="voicespeed" min="1" max="100" value="10"
+						style="width:500px; max-width:100%" /></p>
+				<h5>crwdns639:0crwdne639:0</h5>
+				crwdns640:0crwdne640:0<br>
+				<p class="range-field"><input type="range" id="voicepitch" min="0" max="100" value="50"
+						style="width:500px; max-width:100%" /></p>
+				<h5>crwdns641:0crwdne641:0</h5>
+				crwdns642:0crwdne642:0<br>
+				<p class="range-field"><input type="range" id="voicevol" min="0" max="100" value="100"
+						style="width:500px; max-width:100%" /></p>
+				<h5>crwdns643:0crwdne643:0</h5>
+				<input type="text" style="width:350px" id="voicetxt" value="crwdns644:0crwdne644:0">
+				<button class="btn waves-effect blue" style="width:150px;" onclick="voicePlay()"
+					id="testplay">crwdns645:0crwdne645:0</button><br>
+				<br>
+				<button class="btn waves-effect" style="width:100px;" onclick="voiceSettings()">crwdns525:0crwdne525:0</button>
+			</div>
+		</li>
+	</ul>
 	<br>
-</span><br>
-TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
-タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
-<script type="text/javascript" src="../../js/common/about.js"></script>
-<script type="text/javascript" src="../../js/platform/end.js"></script>
-<script type="text/javascript" src="../../js/login/logout.js"></script>
-<script type="text/javascript" src="../../js/ui/spotify.js"></script>
-<script type="text/javascript" src="../../js/tl/speech.js"></script>
-<script type="text/javascript" src="../../js/platform/pickr.js"></script>
-<script type="text/javascript" src="../../js/ui/settings.js"></script>
-<script type="text/javascript" src="../../js/ui/theme.js"></script>
-<script type="text/javascript" src="../../js/tl/date.js"></script>
+	<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"><i
+			class="material-icons left">undo</i>crwdns646:0crwdne646:0</a>
+	<br>
+	<br>crwdns647:0crwdne647:0
+	<li>Ctrl+1-9:crwdns648:0crwdne648:0</li>
+	<li>N:crwdns649:0crwdne649:0</li>
+	<li>X:crwdns650:0crwdne650:0</li>
+	<li>Ctrl+Enter:crwdns651:0crwdne651:0</li>
+	<li>Ctrl+Enter+Shift:crwdns1924:0crwdne1924:0</li>
+	<li>Alt+Enter:crwdns1916:0crwdne1916:0</li>
+	<li>Ctrl+E:crwdns652:0crwdne652:0</li>
+	<li>Esc:crwdns653:0crwdne653:0</li>
+	<li>F5:crwdns654:0crwdne654:0</li>
+	<li>Ctrl+Shift+C:crwdns655:0crwdne655:0</li>
+	<li>Ctrl+Shift+S:crwdns524:0crwdne524:0</li>
+	<li>Ctrl+Shift+M:crwdns656:0crwdne656:0</li>
+	<li>Ctrl+Shift+N:NowPlaying(Spotify)</li>
+	<li>Ctrl+Shift+P:crwdns657:0crwdne657:0</li>
+	<li>←/→:crwdns658:0crwdne658:0</li>
+	<li>crwdns659:0crwdne659:0</li>
+	<div class="hide kirishima">
+		以下Markdownに対応したインスタンスのみ。
+		<br>
+		<li>Ctrl+B/I/S/U:太字/斜字/取り消し/下線</li>
+		<li>Shift+Enter:全角スペースを入れて改行</li>
+		<li>Shift+Space:ゼロ幅スペース</li>
+		以下アスタルテにログインしている場合のみ
+		<br>
+		<li>Ctrl+R:
+			<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
+		</li><br>
+	</div>
+	<button class="btn waves-effect red" style="width:100%; max-width:500px;"
+		onclick="if(confirm('crwdns661:0crwdne661:0')){ localStorage.clear(); location.href='index.html'; }"><i
+			class="material-icons left">delete</i>crwdns660:0crwdne660:0</button><br><br>
+	<button class="btn waves-effect indigo" onclick="about()" style="width:100%; max-width:500px;"><i
+			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://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
+			class="material-icons left">list</i>crwdns665:0crwdne665:0/Docs(Constructing)</a>
+	<a href="https://github.com/cutls/TheDesk" class="btn waves-effect black lighten-2"
+		style="width:100%; max-width:500px;"><i class="fa fa-github left"></i>GitHub</a>
+	<a href="index.html?mode=user&code=Cutls@kirishima.cloud" class="btn waves-effect blue lighten-2"
+		style="width:100%; max-width:500px;"><img src="../../img/desk_full.svg" class="left" width="25"
+			style="padding-top:5px;">Developer: Cutls@kirishima.cloud</a>
+	<br>
+	Kyash<br>
+	<img src="../../img/kyash.png" width="100"><br>
+	<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; 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>
+		<br>Developer: Cutls P(
+		<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
+		<br>
+	</span><br>
+	TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のためのマストドン研究会</a>をログイン機能提供等の形で応援しています。<br>
+	タグタイムラインを開く:<a href="index.html?mode=tag&code=被災地支援のためのマストドン研究会">#被災地支援のためのマストドン研究会</a><br>
+	<script type="text/javascript" src="../../js/common/about.js"></script>
+	<script type="text/javascript" src="../../js/platform/end.js"></script>
+	<script type="text/javascript" src="../../js/login/logout.js"></script>
+	<script type="text/javascript" src="../../js/ui/spotify.js"></script>
+	<script type="text/javascript" src="../../js/tl/speech.js"></script>
+	<script type="text/javascript" src="../../js/platform/pickr.js"></script>
+	<script type="text/javascript" src="../../js/ui/settings.js"></script>
+	<script type="text/javascript" src="../../js/ui/theme.js"></script>
+	<script type="text/javascript" src="../../js/tl/date.js"></script>
--- a/app/view/ps/setting.vue.js
+++ b/app/view/ps/setting.vue.js
@@ -7,6 +7,27 @@ var yesno=[
        value:"no"
    }
 ];
+var sound=[
+    {
+        text:"@@none@@",
+        value:"none"
+    },{
+        text:"@@default@@",
+        value:"default"
+    },{
+        text:"Custom 1",
+        value:"c1"
+    },{
+        text:"Custom 2",
+        value:"c2"
+    },{
+        text:"Custom 3",
+        value:"c3"
+    },{
+        text:"Custom 4",
+        value:"c4"
+    }
+];
 var envConstruction=[
    {
        id:"popup",
@@ -286,6 +307,46 @@ var tlConstruction=[
            desc:"",
            checkbox:yesno
        }
+    },{
+        id:"replySound",
+        storage:"replySound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"@@replySound@@",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"favSound",
+        storage:"favSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"@@favSound@@",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"btSound",
+        storage:"btSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"@@btSound@@",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"followSound",
+        storage:"followSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"@@followSound@@",
+            desc:"",
+            checkbox:sound
+        }
    }
 ];
 var postConstruction=[
@@ -476,5 +537,16 @@ var postConstruction=[
                }
            ]
        }
+    },{
+        id:"zero",
+        storage:"emoji-zero-width",
+        checkbox:true,
+        setValue:"normal",
+        setValue:"no",
+        text:{
+            head:"@@zeroWidthEmoji@@",
+            desc:"",
+            checkbox:yesno
+        }
    }
 ]
--- 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"));
             
    });
--- a/trial.travis.yml
+++ b/trial.travis.yml
@@ -1,27 +1,11 @@
-language: objective-c
-cache:
-  directories:
-    - node_modules
-env:
-  - NODE_VERSION="9.9.0"
-before_install:
-  # nvm をインストールする。Travis の OS X 環境には nvm はデフォルトで入っていない
-  - git clone https://github.com/creationix/nvm.git /tmp/.nvm
-  - source /tmp/.nvm/nvm.sh
-  # 指定バージョンの Node をインストールする
-  - nvm install $NODE_VERSION
-  # 指定バージョンの Node を有効にする
-  - nvm use --delete-prefix $NODE_VERSION
-  - node --version
-script:
-  - node --version
+os: windows
+language: node_js
+node_js:
+- '10.15.2'
+script: node -v
 before_deploy:
-  - brew update
-  - brew install wine
-  - wine --version
-  - brew install makensis
-  - npm install electron-builder -g
  - cd app
+  - npm install electron-builder -g
  - npm install
  - electron-builder --win --ia32
  - mv ../build/TheDesk-setup.exe ../TheDesk-setup-ia32.exe
@@ -29,24 +13,22 @@ before_deploy:
  - electron-builder --win --x64
  - mv ../build/TheDesk-setup.exe ../TheDesk-setup.exe
  - mv ../build/TheDesk*.exe ../TheDesk.exe
-  - electron-builder --linux --x64
-  - mv ../build/thedesk*.snap ../TheDesk.snap
-  - electron-builder --mac --x64
-  - mv ../build/TheDesk*.dmg ../TheDesk.dmg
  - cd ../
+  - ls
+after_deploy: ls
 deploy:
+  skip_cleanup: true
  provider: releases
-  # GitHub にリリースするための API KEY を暗号化した値
  api_key:
    secure: jndR02p5KRTtcJk18b3YsXL2cC+yzEf1AOqXdpWciF8f3lO5oY01jlxd17xdHIcK7VywSsLVZpLToSdqAoIEhJ5OxEQ/FmA3FlmbwwD6ou13gLa4VGIvsBHveCmKGjVu0Z++atIy76tZYU1SOWFWv4B0ZhnVz2ca2VZynvLgw3YNsPJH7rHO966GXgRkGYJAJ4UvLg3sj/iztVh2FSfbUj5IGO1e/JHJO63wAo1MSQtRjkutVgl/djnBLC6vbL4YHkM3Ynpkx/YQEcxwrmeY0Ra8D5yYDq4MNIDMmZahWC+k4u2eA2Cj2ifBFNxbZvTN75vLwRBp6DsTNHsiqkXrSPDBdNeet31RbwTQ6LtsK8jqmL4S/59dmLcj7uCU2WxyBLPbJdbdZWlqW2ZQvfQY8QVAYy7S3MiHQWQN0oP5wqXk89jcgR42ig/zsqFNPpXHM4mExR7l/gDLPg0j9c3XEF6sWtk3FmJN1i4+B+9kn09b6UKlV7EFPKp8XcFNrz4ZcE9/I8lKwsqLVG2jAXIk7Z9LwDRcAmK5eG348X5zwFtOY6raKIvRw2cn92bPnEI+55v8A4WANS2647GFTgxHj30D0d/sOZmJ5BS34zpdWTgE0AlKg7sOqkncjqoW5J5zCh5Ow7b3KXvEvlAts44mAag8tZTectxMP4iguXvTnv4=
-  # Releases ページにアップロードするファイル
-  file:
+  file: 
    - TheDesk.exe
    - TheDesk-setup.exe
    - TheDesk-ia32.exe
    - TheDesk-setup-ia32.exe
-    - TheDesk.snap
-    - TheDesk.dmg
-  skip_cleanup: true
  on:
-    repo: cutls/TheDesk
+    repo: cutls/TheDesk
+branches:
+  only:
+  - master
+
Author	SHA1	Message	Date
Cutls	1f597a9d4a	Merge pull request #63 from cutls/WIP-(before-CI) Wip (before ci)	2019-04-22 23:20:07 +09:00
Cutls	5cd72a538c	add note	2019-04-22 23:19:34 +09:00
Cutls	d439169c63	Merge pull request #61 from kPherox/fix-integrated-tl-reconnect-streaming Fix integrated tl reconnect streaming	2019-04-22 23:18:12 +09:00
Cutls	da39e0ded6	package	2019-04-22 23:17:46 +09:00
Cutls	823fae5eac	TheDesk Usamin (18.3.1)	2019-04-22 23:16:57 +09:00
kPherox	4f3a7c47e3	Change console log level	2019-04-22 03:33:56 +09:00
kPherox	bd8d480e07	Check error count on integrated tl	2019-04-22 03:31:14 +09:00
kPherox	a09c031dbe	Add type integrated to reconnector	2019-04-22 03:26:57 +09:00
kPherox	1fee94846d	Fix typo	2019-04-22 02:02:23 +09:00
Cutls	4fb37525d5	Merge branch 'WIP-(before-CI)' of https://github.com/cutls/TheDesk into WIP-(before-CI)	2019-04-22 01:51:42 +09:00
Cutls	8f25557f20	wip	2019-04-22 01:51:32 +09:00
Cutls	cb47eabed9	Merge pull request #60 from kPherox/fix-poll-vote-button Fix poll vote button	2019-04-22 01:50:29 +09:00
kPherox	f8823a4c5a	Fix bug that deleting the vote button	2019-04-22 01:34:50 +09:00
kPherox	7fdd5964cc	Fix lang_parse_vote for en	2019-04-22 01:00:20 +09:00
Cutls	3aadcaef0f	add some notifications sound	2019-04-20 23:40:12 +09:00
Cutls	edf1a6ec29	Merge pull request #59 from cutls/WIP-(before-CI) Wip (before ci)	2019-04-20 13:52:35 +09:00
Cutls	f58d4f349b	TheDesk Usamin (18.3.0)	2019-04-20 00:59:31 +09:00
Cutls	9bb8ec0b66	some security update	2019-04-19 23:02:30 +09:00
Cutls	ec9a14d63b	custom emojis when poll	2019-04-16 01:38:29 +09:00
Cutls	82a00f4d1e	security	2019-04-16 01:29:44 +09:00
Cutls	af97f88d0a	sound	2019-04-15 00:45:04 +09:00
Cutls	e27351481b	Merge pull request #58 from cutls/WIP-(before-CI) Wip (before ci)	2019-04-14 18:58:33 +09:00
Cutls	4c375e2d0a	travis	2019-04-14 18:58:12 +09:00
Cutls	53cd49d4e8	travis	2019-04-14 18:55:30 +09:00
Cutls	e36942180e	restart	2019-04-14 03:48:44 +09:00
Cutls	6b58c88118	travis	2019-04-14 03:46:15 +09:00
Cutls	d20777ed18	travis	2019-04-14 03:45:30 +09:00
Cutls	202e389c20	travis	2019-04-14 03:38:07 +09:00
Cutls	707a5b2033	change travis	2019-04-14 03:31:19 +09:00
Cutls	0967c93dde	Merge pull request #57 from cutls/WIP-(before-CI) Wip (before ci)	2019-04-14 03:26:44 +09:00
Cutls	b13849a427	readme	2019-04-14 03:26:19 +09:00
Cutls	d0322c7bda	TheDesk Usamin (18.2.3)	2019-04-14 03:22:16 +09:00
Cutls	494a4e90d6	fix some undif	2019-04-14 03:06:59 +09:00
Cutls	d1968a2e69	Merge pull request #56 from cutls/mac miss	2019-04-14 01:43:57 +09:00
Cutls	51e6909f77	#64 fix	2019-04-14 01:42:49 +09:00
Cutls	cec46faf19	keybase	2019-04-14 01:42:18 +09:00
Cutls	53f880ab97	Merge pull request #55 from kPherox/fix-nowplaying-for-asar-packed Fix nowplaying for asar packed	2019-04-14 01:41:30 +09:00
kPherox	cc20b0a7c0	Replace promise to async/await	2019-04-14 01:33:00 +09:00
kPherox	efac88db4c	Change to pass error on itunes-np	2019-04-14 01:32:16 +09:00
Cutls	2e1c076b5f	Merge pull request #53 from kPherox/update-package Update package	2019-04-14 00:36:19 +09:00
kPherox	5a03df6ee9	Change itunes-nowplaying-mac pull request number	2019-04-14 00:13:57 +09:00
kPherox	ade5893183	Unpack asar for itunes-nowplaying-mac	2019-04-14 00:12:35 +09:00
kPherox	8a17e737f9	Add npm scripts for build Update README.md#buildビルド初回のcloneするときの流れを修正してからnpm scriptsを利用するように書き換え	2019-04-14 00:09:35 +09:00
kPherox	94c1ff3731	Replace dev dependency electron-packager to electron-builder Some package update	2019-04-13 23:34:10 +09:00
Cutls	4e5fe2fc91	proof lang	2019-04-13 12:51:54 +09:00
Cutls	f88ed31e38	Add keybase	2019-04-13 12:41:58 +09:00
Cutls	7df51c161b	mac 18.2.2	2019-04-13 03:55:05 +09:00
Cutls	b5d1686c12	update package	2019-04-13 02:32:42 +09:00
Cutls	a1048b3243	to linux	2019-04-13 02:31:07 +09:00
Cutls	f9090e261d	travis	2019-04-13 02:21:21 +09:00
Cutls	4029f168df	readme	2019-04-13 01:55:01 +09:00
Cutls	7965e7c742	pavkage	2019-04-13 01:54:33 +09:00
Cutls	932e6731c9	readme package	2019-04-13 01:49:22 +09:00
Cutls	3c3eb5209b	readme	2019-04-13 01:48:26 +09:00
Cutls	a07d6b3172	Merge pull request #52 from cutls/WIP-(before-CI) travis	2019-04-12 23:39:54 +09:00
Cutls	253f742332	travis	2019-04-12 23:39:28 +09:00
Cutls	35e262293d	Merge pull request #51 from cutls/WIP-(before-CI) Wip (before ci)	2019-04-12 23:37:14 +09:00
Cutls	972ea9f5ed	travjs	2019-04-12 23:36:16 +09:00
Cutls	0c1191e362	travis	2019-04-12 23:35:48 +09:00
Cutls	426e48325c	osx	2019-04-12 23:35:22 +09:00
Cutls	6c86825732	update travis	2019-04-12 23:33:36 +09:00
Cutls	e0cae78827	Merge pull request #50 from cutls/WIP-(before-CI) Wip (before ci)	2019-04-12 23:32:37 +09:00
Cutls	09d3643b19	travis	2019-04-12 23:32:14 +09:00
Cutls	ed93d5b4f2	ul	2019-04-12 23:30:59 +09:00
Cutls	f0d7d84f8e	travis update	2019-04-12 23:29:30 +09:00
Cutls	05fab4c45c	Change	2019-04-12 23:26:38 +09:00
Cutls	3059ec9941	Merge pull request #49 from cutls/WIP-(before-CI) Wip (before ci)	2019-04-12 23:20:26 +09:00
Cutls	892872869b	TheDesk Usamin (18.2.1)	2019-04-12 23:19:27 +09:00
Cutls	0db7ed4a33	TheDesk Usamin (18.2.1)	2019-04-12 23:14:38 +09:00
Cutls	54e12db08b	Fix XSS	2019-04-12 23:12:57 +09:00
Cutls	6fb90f0c8e	Merge pull request #48 from cutls/WIP-(before-CI) TheDesk Usamin (18.2.0)	2019-04-11 17:13:20 +09:00
Cutls	5f3257a83b	TheDesk Usamin (18.2.0)	2019-04-11 17:11:26 +09:00
Cutls	f333595817	WIP: done some ToDo	2019-04-11 12:52:38 +09:00
Cutls	cc1018c65d	next ver	2019-04-11 03:11:03 +09:00
Cutls	1c16a5f4a0	WIP done some ToDO	2019-04-11 02:59:13 +09:00
Cutls	0ad7bf9036	WIP some ToDo	2019-04-11 01:52:01 +09:00
Cutls	1670c0bc08	ToDo: done: ts column/menu .active/ about	2019-04-09 23:12:11 +09:00
Cutls	f1c4276d06	Add list on misskey	2019-04-08 00:14:06 +09:00
Cutls	50bfbbd755	Merge pull request #47 from kPherox/fix-reopen-macos Fix cannot reopen in macOS	2019-04-05 21:48:24 +09:00
kPherox	f5afafe26a	Remove all listener when closed main window	2019-04-05 20:43:37 +09:00
kPherox	c524777505	Fix cannot repoen in macOS	2019-04-05 19:55:13 +09:00
Cutls	8155baa07d	fix about window	2019-04-04 01:09:57 +09:00
Cutls	32c56dcf6a	Fix link to quesdon	2019-04-04 01:07:07 +09:00