TheDesk 22.3.0

Merge branch 'master' of https://github.com/cutls/TheDesk
Update README.md
2021-06-18 17:06:45 +09:00 · 2021-06-18 16:29:07 +09:00 · 2021-06-18 16:29:01 +09:00 · 2021-06-18 16:22:32 +09:00 · 2021-06-18 16:21:51 +09:00 · 2021-06-18 16:21:25 +09:00
153 changed files with 11381 additions and 9649 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,49 @@
 version: 2
 updates:
 - package-ecosystem: npm
  directory: "/app"
  schedule:
    interval: daily
    time: "20:00"
  open-pull-requests-limit: 10
  ignore:
  - dependency-name: font-manager
    versions:
    - "> 0.3.0, < 0.4"
  - dependency-name: sweetalert2
    versions:
    - 10.14.1
    - 10.15.0
    - 10.15.1
    - 10.15.2
    - 10.15.3
    - 10.15.5
    - 10.15.6
    - 10.16.0
    - 10.16.2
    - 10.16.5
  - dependency-name: electron
    versions:
    - 11.2.1
    - 12.0.2
    - 12.0.3
    - 12.0.4
  - dependency-name: eslint
    versions:
    - 7.18.0
    - 7.19.0
    - 7.20.0
    - 7.21.0
    - 7.22.0
    - 7.24.0
  - dependency-name: itunes-nowplaying-mac
    versions:
    - 0.4.0
  - dependency-name: electron-dl
    versions:
    - 3.0.3
    - 3.1.0
    - 3.2.0
  - dependency-name: electron-rebuild
    versions:
    - 2.3.4
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ app/view/cs
 app/view/ps
 app/view/es-AR
 app/view/it-IT
 app/view/pl-PL
 app/git
 *.code-workspace
 releasenote.md
--- a/.prettierrc
+++ b/.prettierrc
@@ -0,0 +1,8 @@
 {
    "tabWidth": 4,
    "useTabs": true,
    "semi": false,
    "singleQuote": true,
    "printWidth": 200,
    "jsxBracketSameLine": true
 }
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
 オープンソースSNSマストドン/MisskeyのPC向けクライアント[日本語はこちら](README_ja.md)  
-Download:[TheDesk](https://thedesk.top)
+[![Download from TheDesk Official Website](https://thedesk.top/img/dlfrom-thedesk.svg?7)](https://thedesk.top)
 </div>
@@ -44,9 +44,7 @@ Please write issues to improve TheDesk affinity with Pleroma.
 ## Contributors
-* <img src="https://user-images.githubusercontent.com/17561618/66582029-162df380-ebbc-11e9-8a6f-1832b3a35d89.png" width="20">[toneji](https://minohdon.jp/@toneji) Build for macOS(Now: Travis CI)  
+[![](https://opencollective.com/TheDesk/contributors.svg?width=400&button=false)](https://github.com/cutls/TheDesk/graphs/contributors)
 * <img src="https://avatars3.githubusercontent.com/u/24523508?s=88&v=4" width="20">[popn_ja](https://popon.pptdn.jp/@popn_ja) Build for Linux(Now: Travis CI)  
 * <img src="https://user-images.githubusercontent.com/17561618/66582379-a3714800-ebbc-11e9-8402-d81a35a3be9f.png" width="20">[kPherox](https://pl.kpherox.dev/kPherox) Fellow coder
 ## Support
--- a/README_ja.md
+++ b/README_ja.md
@@ -15,7 +15,8 @@
 ![Contributors](https://flat.badgen.net/github/contributors/cutls/TheDesk)  
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
 オープンソースSNSマストドン/MisskeyのPC向けクライアント  
-Download:[TheDesk](https://thedesk.top)
+
 [![Download from TheDesk Official Website](https://thedesk.top/img/dlfrom-thedesk.svg?7)](https://thedesk.top)
 </div>
--- a/app/about.html
+++ b/app/about.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="ja">
 <head>
    <title>TheDesk</title>
    <meta content="width=device-width,initial-scale=1.0" name="viewport" />
@@ -87,7 +88,7 @@
    <script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
    <script type="text/javascript" src="./js/platform/first-not-view.js"></script>
    <script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
-		<img src="./img/desk.svg" style="max-width: 62%;" />
+    <img src="./img/desk.svg" style="max-width: 58%;" />
    <h5>TheDesk</h5>
    <div class="container">
        <div class="area-name1">Display version</div>
@@ -104,15 +105,8 @@
        <div class="area-data6" id="node"></div>
    </div>
    <div class="cp">
-			Copyright &copy; TheDesk 2018<br />
+        Copyright &copy; TheDesk 2018<br /> Main developer(author): <a href="https://1m.cutls.com/@Cutls" target="_blank">Cutls P</a><br />
-			Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br />
+        <a href="https://github.com/cutls/TheDesk/graphs/contributors" style="text-align: center; user-select: none;"><img src="https://opencollective.com/TheDesk/contributors.svg?width=700&button=false" style="width: 100%"></a>
 			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://pl.kpherox.dev/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>
@@ -136,4 +130,5 @@
        })
    </script>
 </body>
 </html>
--- a/app/aiscript.js
+++ b/app/aiscript.js
@@ -1,4 +1,6 @@
 const { AiScript, parse, values, utils } = require('@syuilo/aiscript')
 const gcc = require('textarea-caret')
 global.getCaretCoordinates = gcc
 global.sanitizeHtml = require('sanitize-html')
 global.asValue = values
 global.AiScript = AiScript
--- a/app/build.js
+++ b/app/build.js
@@ -139,6 +139,7 @@ async function cmd(options) {
                )
            }
            if ((isTrue(options, 'withArm64') && arch == 'x64') || arch == 'arm64') {
                config.nsis.artifactName = artifactName.replace('${arch}', 'arm64')
                await build(Platform.WINDOWS, Arch.arm64, config)
                fs.renameSync(
                    `../build/TheDesk ${version}.exe`,
--- a/app/css/acct.css
+++ b/app/css/acct.css
@@ -92,3 +92,18 @@ i.left {
 .text-line-icon {
 	font-size: 1rem;
 }
 .loginBtnWrap {
 	padding-top: 10px !important;
 }
 #add {
 	max-width: 1000px;
 }
 .autocomplete-content {
 	min-width: 450px;
 }
 .autocomplete-content li {
    white-space: nowrap;
    text-overflow: ellipsis;
    word-break: break-word;
    overflow: hidden;
 }
--- a/app/css/master.css
+++ b/app/css/master.css
@@ -28,7 +28,9 @@ html {
 	text-transform: none;
 	height: 2.76rem;
 	line-height: 2.76rem;
 	border-radius: 0.5rem;
 }
 .markdown {
 	display: none;
 }
@@ -88,16 +90,16 @@ option {
 #imagewrap {
 	width: 100%;
-	height: 100%;
+	height: calc(100% - 4px);
 }
 #imagewrap img.rotate-90 {
-	transform: rotate(-90deg)
+	transform: rotate(-90deg);
 }
 #imagewrap img.rotate-180 {
-	transform: rotate(-180deg)
+	transform: rotate(-180deg);
 }
 #imagewrap img.rotate-270 {
-	transform: rotate(-270deg)
+	transform: rotate(-270deg);
 }
 .pointer {
 	cursor: pointer;
@@ -234,6 +236,12 @@ blockquote:before,
 	right: 0;
 	top: 0;
 }
 .menu-icon {
 	font-size: 1.4rem !important;
 	top: 0.3rem;
 	line-height: 1rem !important;
 	position: relative;
 }
 #start {
 	display: none;
 	position: fixed;
@@ -329,8 +337,26 @@ blockquote:before,
 .collapsible-header:focus {
 	background-color: var(--thirdColor) !important;
 }
-.modal-footer {
+.modal .modal-footer {
 	background-color: var(--modalfooter) !important;
 	border-radius: 0;
 	padding: 0;
 }
 .modal {
 	border-radius: 1.5rem;
 }
 .progress .determinate,
 .progress .indeterminate {
 	background-color: var(--active);
 }
 .nomargin {
 	margin: 0;
 }
 #imginfo {
 	float: left;
 	padding-top: 0.23rem;
 	line-height: normal;
 	padding-left: 1rem;
 }
 .font {
 	font-size: 1.5rem;
@@ -342,7 +368,8 @@ blockquote:before,
 .release-do {
 	border: solid 2px;
 	border-color: var(--text);
-	padding: 5px;
+	padding: 1.5rem;
 	border-radius: 0.5rem;
 }
 #pickers {
 	display: flex;
@@ -392,7 +419,8 @@ input[type='color']::-webkit-color-swatch {
 	color: var(--text);
 }
 #left-menu a:hover {
-	background-color: var(--beforehover);
+	background-color: var(--emphasized);
    filter: brightness(80%);
 }
 #left-menu span {
 	margin-left: 0.4rem;
@@ -401,7 +429,9 @@ input[type='color']::-webkit-color-swatch {
 	background-color: var(--emphasized);
 }
 #left-menu a.active span {
-	text-decoration: underline;
+	text-decoration: none;
 	border-bottom: 1px solid;
 	padding-bottom: 0.5px;
 }
 #right-menu {
 	width: 100%;
@@ -417,16 +447,27 @@ input[type='color']::-webkit-color-swatch {
 	display: flex;
 	flex-wrap: wrap;
 	align-items: center;
-	width: 13rem;
+	min-width: 150px;
-	height: 3.1rem;
+	width: 50%;
 	height: 2.5rem;
 	cursor: pointer;
 	color: var(--text);
 }
 #tltype .type div {
 	margin-left: 5px;
 	margin-right: 5px;
 	margin-top: 3px;
 }
 #tltype .type span {
-	width: calc(100% - 2.3rem);
+	width: calc(100% - 4rem);
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	word-break: break-word;
 	overflow: hidden;
 }
 #tltype .type:hover {
-	background-color: var(--beforehover);
+	background-color: var(--emphasized);
    filter: brightness(80%);
 }
 #tltype .active {
 	background-color: var(--emphasized);
@@ -498,7 +539,8 @@ textarea {
 	font-size: 1rem !important;
 	font-family: inherit;
 }
-.swal2-popup, .swal2-header {
+.swal2-popup,
 .swal2-header {
 	background-color: var(--subcolor) !important;
 }
 .swal2-title,
@@ -558,6 +600,7 @@ h2.swal2-title {
 	background-color: var(--emphasized);
 }
 #pageSrc {
 	border-radius: 10px;
 	position: absolute;
 	top: 0;
 	left: calc(50vw - 11.53rem);
@@ -565,10 +608,22 @@ h2.swal2-title {
 	max-width: 100%;
 	background-color: var(--subcolor);
 	z-index: 501;
 	padding: 0.4rem;
 }
-#pageSrcInput {
+.pageSrcBtn:hover {
-	width: 12.3rem;
+	background-color: var(--selected);
 }
 .srcQ {
 	margin-top: 0.4rem;
 	padding-left: 0.5rem;
 	padding-right: 0.5rem;
 	border-bottom: 1px solid;
 }
 .lastPSB {
 	margin-bottom: 0.4rem;
 }
 .pageSrcBtn {
 	padding-left: 0.5rem;
 	padding-right: 0.5rem;
 }
 .voice {
 	clip: rect(1px, 1px, 1px, 1px);
@@ -696,3 +751,12 @@ button {
 	position: relative;
 	top: -4px;
 }
 #fonts {
 	overflow-y: scroll;
 	width: 22rem;
 	height: 40rem;
 	position: absolute;
 	background-color: var(--bg);
 	z-index: 2;
 	padding: 5px;
 }
--- a/app/css/post.css
+++ b/app/css/post.css
@@ -69,6 +69,20 @@ textarea {
 	overflow-y: scroll;
 	overflow-x: hidden;
 }
 #suggest {
 	position: absolute;
 	top: 0;
 	left: 0;
 	background-color: var(--bg);
 	z-index: 2;
 	border-radius: 0.5rem;
 	display: none;
 	max-height: 10rem;
 }
 #suggest a {
 	margin-left: 0.5rem;
 	margin-right: 0.5rem;
 }
 #emoji-list {
 	width: 100%;
 	height: 15.4rem;
--- a/app/css/sweetalert2-material.css
+++ b/app/css/sweetalert2-material.css
--- a/app/css/sweetalert2-material.min.css
+++ b/app/css/sweetalert2-material.min.css
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -359,8 +359,8 @@ iframe,
 	grid-area: actions;
 }
 .area-actions .btn-flat {
-	height: 1rem;
+	height: 1.3rem;
-	line-height: 1rem;
+	line-height: 1.3rem;
 }
 .area-actions .btn-flat,
 .area-vis i,
@@ -384,7 +384,16 @@ iframe,
 	margin: 0.15rem;
 	grid-area: side;
 }
-
+.notf-udg-text {
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	word-break: break-word;
 	overflow: hidden;
 	max-width: calc(100% - 150px);
 	display: inline-block;
 	position: relative;
 	top: 0.2rem;
 }
 .cusr {
 	user-select: text;
 	padding-left: 0.4rem;
@@ -409,6 +418,12 @@ iframe,
 	margin-top: 0.46rem;
 	margin-left: 0.46rem;
 }
 .landing {
 	text-align: center;
 	display: flex;
 	flex-direction: column;
 	align-items: center;
 }
 .quote-inline {
 	display: none;
@@ -442,6 +457,12 @@ iframe,
 .btn-flat {
 	color: var(--text);
 }
 .sublink {
 	font-size: 1.4rem !important;
 	position: relative;
 	top: 0.4rem;
 	cursor: pointer;
 }
 .area-side i {
 	margin-left: 0.75rem;
 }
@@ -452,6 +473,9 @@ iframe,
 	font-size: 1.2rem;
 	margin-right: 0.15rem;
 }
 .action li i {
 	margin-right: 0.5rem;
 }
 .action .fa-quote-right {
 	margin-top: 0.15rem;
 }
@@ -561,7 +585,9 @@ p:not(:last-child) {
 	font-weight: bold;
 	text-decoration: underline;
 }
-
+.rotate-90 {
 	transform: rotate(90deg);
 }
 .area-notice {
 	grid-area: notice;
 }
@@ -578,13 +604,32 @@ p:not(:last-child) {
 	width: 8rem;
 	display: flex;
 }
 .area-sta .hide {
 	display: inline-block !important;
 }
 .small-header .area-sta::-webkit-scrollbar {
 	height: 5px;
 }
-
+#tagContextMenu {
 	position: absolute;
 	top: 0;
 	left: 0;
 	background-color: var(--subcolor);
 	z-index: 2;
 	border-radius: 0.4rem;
 }
 #tagContextMenu a {
 	display: block;
 	color: var(--text);
 	padding-left: 0.5rem;
 	padding-right: 0.5rem;
 }
 #tagContextMenu a:hover {
 	background-color: var(--selected);
 }
 .firstTCM {
 	margin-top: 0.4rem;
 }
 .lastTCM {
 	margin-bottom: 0.4rem;
 }
 .area-notice_name {
 	grid-area: notice_name;
 	overflow: hidden;
@@ -676,13 +721,24 @@ p:not(:last-child) {
 	padding-left: 23px !important;
 	margin-right: 5px;
 }
 .columnSettings {
 	display: flex;
 	flex-wrap: wrap;
 }
 .notf-indv-box .setting {
 	font-size: 1rem;
-	width: calc(25% - 3px);
+	width: calc(25% - 6px);
-	text-align: left;
+	margin: 3px;
-	padding: 5px;
+	height: 100px;
 	height: 70px;
 	text-align: center;
 	display: flex;
 	flex-direction: column;
 	padding-top: 17px;
 	border: 1px solid;
 	border-radius: 5px;
 }
 .notf-indv-box .setting:hover {
 	color: var(--text);
 }
 .notf-exclude-btn {
 	border: 1px solid;
@@ -721,6 +777,9 @@ p:not(:last-child) {
 	overflow: hidden;
 	position: relative;
 }
 .dropdown-content li {
 	padding-top: 0.4rem;
 }
 .fa-2x > .emoji-img {
 	width: 2.3rem !important;
 	height: 2.3rem !important;
--- a/app/css/userdata.css
+++ b/app/css/userdata.css
@@ -25,7 +25,6 @@
 #his-float-data {
 	height: 100%;
 	overflow-y: hidden;
 }
 #his-leftside {
 	width: 28.4rem;
@@ -33,7 +32,7 @@
 }
 #his-float-timeline {
 	max-width: 47.5rem;
-  min-width: calc(100% - 29.4rem);
+	width: calc(100% - 28.4rem);
 	height: 100%;
 	overflow-y: hidden;
 }
@@ -150,13 +149,24 @@
 	background-color: var(--bg);
 }
 #hisdropdown li a {
-	color: white;
+	color: var(--text);
 }
 #hisdropdown li:hover {
 	background-color: var(--active);
 }
-#his-data-title {
+#his-data-title-wrap {
 	width: 100%;
 	text-align: center;
 	font-size: 1.5rem;
 	display: flex;
 	justify-content: center;
 	align-items: center;
 }
 #his-data-title .material-icons {
 	position: relative;
 	top: 5px;
 	margin-right: 3px;
 }
 #his-data-title a {
 	color: white;
 }
--- a/app/js/common/version.js
+++ b/app/js/common/version.js
@@ -5,20 +5,6 @@ function verck(ver, jp) {
 	$('body').addClass(localStorage.getItem('platform'))
 	var date = new Date()
 	var showVer = false
 	//Spotify
 	if (localStorage.getItem('spotify')) {
 		localStorage.removeItem('spotify')
 		localStorage.removeItem('spotify-refresh')
 		var spDc = 'Spotify NowPlaying sysytem was changed, please re-login to Spotify'
 		if(lang.language == 'ja') {
 			spDc = 'Spotify NowPlayingの機能が変更されたため、もう一度ログインしてください'
 		}
 		Swal.fire({
 			type: 'info',
 			title: spDc,
 		})
 	}
 	//Spotify(e)
 	if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
 		showVer = true
 		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
@@ -44,9 +30,18 @@ function verck(ver, jp) {
 	localStorage.setItem('ver', ver)
 	if (!showVer) {
 		console.log(showVer)
 		if (!localStorage.getItem('showSupportMe')) {
 			if (date.getMonth() == 11) {
 				var yrs = date.getFullYear() + 1
 				var nextmonth = yrs * 100 + 1
 			} else {
 				var yrs = date.getFullYear() 
 				var nextmonth = yrs * 100 + date.getMonth() + 2
 			}
 			localStorage.setItem('showSupportMe', nextmonth)
 		} else {
 			if (
-			date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe') ||
+				date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe')
 			!localStorage.getItem('showSupportMe')
 			) {
 				if (date.getMonth() == 11) {
 					var yrs = date.getFullYear() + 1
@@ -55,11 +50,11 @@ function verck(ver, jp) {
 					var yrs = date.getFullYear() 
 					var nextmonth = yrs * 100 + date.getMonth() + 2
 				}
 				localStorage.setItem('showSupportMe', nextmonth)
 				if (lang.language != 'ja') {
 					$('#support-btm-ja').addClass('hide')
 					$('#support-btm-en').removeClass('hide')
 				}
 			localStorage.setItem('showSupportMe', nextmonth)
 				$('#support-btm').removeClass('hide')
 				$('#support-btm').animate(
 					{
@@ -71,6 +66,8 @@ function verck(ver, jp) {
 				)
 			}
 		}
 	}
 	var platform = localStorage.getItem('platform')
 	console.log('Your platform:' + platform)
 	//if (!localStorage.getItem('winstore') && !pwa) {
@@ -114,11 +111,6 @@ function verck(ver, jp) {
 		.then(function(mess) {
 			console.table(mess)
 			if (mess) {
 				//askjp_jp_ua: 2019年10月24日、mstdn.jpによるユーザーエージェントアクセス制限
 				if (jp && mess.jp_ua && !localStorage.getItem('askjp_jp_ua')) {
 					localStorage.setItem('askjp_jp_ua', true)
 					$('#askjp_jp_ua').removeClass('hide')
 				}
 				var platform = localStorage.getItem('platform')
 				if (platform == 'darwin') {
 					var newest = mess.desk_mac
--- a/app/js/login/manager.js
+++ b/app/js/login/manager.js
@@ -423,10 +423,6 @@ function login(url) {
 			versionChecker(url)
 			$('#add').hide()
 			postMessage(['openUrl', auth], '*')
 			if ($('#linux:checked').val() == 'on') {
 			} else {
 				postMessage(['sendSinmpleIpc', 'quit'], '*')
 			}
 		}
 	}
 }
@@ -625,7 +621,7 @@ function misskeyAuth(url, mkc) {
 //テキストボックスにURL入れた
 function instance() {
-	var url = $('#url').val()
+	var url = $('#autocomplete-input').val()
 	if (url.indexOf('@') != -1 || url.indexOf('https') != -1) {
 		alert('入力形式が違います。(Cutls@mstdn.jpにログインする場合、入力するのは"mstdn.jp"です。)')
 		return false
@@ -634,6 +630,7 @@ function instance() {
 }
 //コード入れてAccessTokenゲット
 function code(code) {
 	var red = localStorage.getItem('redirect')
 	localStorage.removeItem('redirect')
 	if (!code) {
 		var code = $('#code').val()
@@ -696,7 +693,7 @@ function code(code) {
 		}
 		return
 	} else {
-		var red = 'urn:ietf:wg:oauth:2.0:oob'
+		if (!red) red = 'urn:ietf:wg:oauth:2.0:oob'
 		if (~url.indexOf('pixelfed')) {
 			red = 'https://thedesk.top/hello.html'
 		}
@@ -720,6 +717,7 @@ function code(code) {
 			if (httpreq.readyState === 4) {
 				var json = httpreq.response
 				if (this.status !== 200) {
 					M.toast({ html: lang.lang_fatalerroroccured + 'Error: cannot complete', displayLength: 5000 })
 					setLog(start, this.status, json)
 				}
 				if (json['access_token']) {
@@ -1089,15 +1087,14 @@ function coloradd(key, bg, txt) {
 //入力時にハッシュタグと@をサジェスト
 var timer = null
-var input = document.getElementById('url')
+var input = document.getElementById('autocomplete-input')
 var prev_val = input.value
 var oldSuggest
 var suggest
 input.addEventListener(
 	'focus',
 	function () {
-		$('#ins-suggest').html('')
+		const instance = M.Autocomplete.getInstance(input)
 		window.clearInterval(timer)
 		timer = window.setInterval(function () {
 			var new_val = input.value
@@ -1125,21 +1122,20 @@ input.addEventListener(
 						})
 						.then(function (json) {
 							if (!json.error) {
-								var urls = 'Suggest:'
+								let data = {}
 								Object.keys(json.data).forEach(function (key) {
 									var url = json.data[key]
-									urls =
+									data[url.uri] = escapeHTML(url.title ? url.title : url.uri)
 										urls +
 										`<a onclick="login('${url.uri}')" class="pointer" title="${url.uri}">${escapeHTML(url.title ? url.title : url.uri)}</a>, `
 								})
-								$('#ins-suggest').html(urls)
+								instance.updateData(data)
 								instance.open()
 							} else {
 								console.error(json.error)
 							}
 						})
 				}
 				oldSuggest = suggest
-				prev_value = new_val
+				prev_val = new_val
 			}
 		}, 1000)
 	},
@@ -1157,3 +1153,12 @@ input.addEventListener(
 function asReadEnd() {
 	postMessage(['asReadComp', ''], '*')
 }
 // Or with jQuery
 $(document).ready(function(){
    $('input.autocomplete').autocomplete({
      data: {},
    });
  });
--- a/app/js/platform/end.js
+++ b/app/js/platform/end.js
@@ -29,7 +29,7 @@ $(document).on('click', 'a', e => {
 					acct_id = 0
 				}
 				$a.parent().addClass('loadp')
-				$a.parent().text('Loading...')
+				
 				detEx(url, acct_id)
 			}
 		} else if (tags) {
@@ -186,7 +186,7 @@ onmessage = function (e) {
 	} else if (e.data[0] == 'asReadEnd') {
 		asReadEnd()
 	} else if (e.data[0] == 'accessibility') {
-		console.log('atrue')
+		console.log('accessibility mode')
 		$('body').addClass('accessibility')
 		$('.window-title').before('<div class="accessMark">Screen Reader Optimized</div>')
 	} else if (e.data[0] == 'logData') {
@@ -200,6 +200,22 @@ onmessage = function (e) {
 		})
 	} else if (e.data[0] == 'twitterLoginComplete') {
 		location.reload()
 	} else if (e.data[0] == 'customUrl') {
 		const mode = e.data[1][0]
 		const codex = e.data[1][1]
 		if (mode === 'share') {
 			$('textarea').focus()
 			$('#textarea').val(decodeURI(codex))
 			show()
 			$('body').removeClass('mini-post')
 			$('.mini-btn').text('expand_less')
 		} else if (mode === 'manager' || mode === 'login') {
 			code(codex)
 		} else if (mode === 'spotify') {
 			var coder = codex.split(':')
 			localStorage.setItem('spotify', coder[0])
 			localStorage.setItem('spotify-refresh', coder[1])
 		}
 	}
 }
 /* PWA */
@@ -236,3 +252,34 @@ const connection = function (event) {
 }
 window.onoffline = connection
 window.ononline = connection
 let lastSelection = null
 let isSame = true
 $(document).on('keyup mouseup', function (e) {
 	lastSelection = (window.getSelection().toString() !== '') ? window.getSelection().getRangeAt(0) : null
 	if (!isSame) $('#pageSrc').addClass('hide')
 })
 // カスタム右クリックメニュー
 $(document).on('contextmenu', function (e) {
 	// テキスト選択中であれば何もしない
 	if (lastSelection !== null) {
 		const currentSelection = window.getSelection().getRangeAt(0)
 		for (let key in currentSelection) {
 			if (currentSelection[key] != lastSelection[key]) {
 				isSame = false
 				break
 			}
 		}
 		if (isSame && currentSelection != '') {
 			$('#pageSrc').removeClass('hide')
 			$('#pageSrc').css('left', e.pageX)
 			$('#pageSrc').css('top', e.pageY)
 			$('.srcQ').text(currentSelection)
 		}
 	}
 })
 $('textarea, input').on('contextmenu', function (e) {
 	postMessage(['textareaContextMenu', { x: e.pageX, y: e.pageY }], '*')
 })
--- a/app/js/platform/preload.js
+++ b/app/js/platform/preload.js
@@ -83,6 +83,8 @@ onmessage = function(e) {
 		ipc.send('log', e.data[1])
 	} else if (e.data[0] == 'twitterLogin') {
 		ipc.send('twitterLogin', e.data[1])
 	} else if (e.data[0] == 'textareaContextMenu') {
 		ipc.send('textareaContextMenu', e.data[1])
 	}
 }
 //version.js
@@ -236,3 +238,9 @@ ipc.on('accessibility', function(event, arg) {
 ipc.on('twitterLoginComplete', function(event, arg) {
 	postMessage(['twitterLoginComplete', ''], '*')
 })
 ipc.on('alert', function(event, arg) {
 	postMessage(['alert', arg], '*')
 })
 ipc.on('customUrl', function(event, args) {
 	postMessage(['customUrl', args], '*')
 })
--- a/app/js/post/emoji.js
+++ b/app/js/post/emoji.js
@@ -19,7 +19,7 @@ function emojiToggle(reaction) {
 		if (width) {
 			width = width.replace('px', '') * 1 + 300
 		} else {
-			width = 600
+			width = reaction ? 300 : 600
 		}
 		$('#post-box').css('width', width + 'px')
 		$('#suggest').html('')
@@ -126,8 +126,10 @@ function emojiGet(parse, started) {
 					md['if_categorized'] = if_categorized
 					localStorage.setItem('emojis_' + acct_id, JSON.stringify(md))
 					localStorage.setItem(`emojis_raw_${acct_id}`, JSON.stringify(json))
 				} else {
 					localStorage.setItem('emojis_' + acct_id, JSON.stringify(md))
 					localStorage.setItem(`emojis_raw_${acct_id}`, JSON.stringify(json))
 				}
 				localStorage.setItem('emojiseek', 0)
 				if (!started) {
--- a/app/js/post/status.js
+++ b/app/js/post/status.js
@@ -110,6 +110,7 @@ function rt(id, acct_id, remote, vis) {
        }
    }
 }
 function boostWith(vis) {
    var id = $('#tootmodal').attr('data-id')
    var acct_id = $('#tootmodal').attr('data-acct')
@@ -167,7 +168,6 @@ async function follow(acct_id, resolve) {
    }
    if (!acct_id && acct_id != 'selector') {
        var acct_id = $('#his-data').attr('use-acct')
    } else if (acct_id == 'selector') {
        var acct_id = $('#user-acct-sel').val()
    }
@@ -182,7 +182,8 @@ async function follow(acct_id, resolve) {
    var id = $('#his-data').attr('user-id')
    if (resolve == 'selector') {
        var fullacct = $('#his-acct').attr('fullname')
-		var id = await acctResolve(acct_id, fullacct)
+        var data = await acctResolve(acct_id, fullacct)
        var { id } = data
        console.log(id)
    }
    var domain = localStorage.getItem('domain_' + acct_id)
@@ -223,28 +224,47 @@ async function follow(acct_id, resolve) {
 }
 async function acctResolve(acct_id, user) {
    console.log('Get user data of ' + user)
-	var domain = localStorage.getItem('domain_' + acct_id)
+    const domain = localStorage.getItem('domain_' + acct_id)
    if (localStorage.getItem('mode_' + domain) == 'misskey') {
        return false
    }
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
+    const at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + user
+    const options = {
 	let promise = await fetch(start, {
        method: 'GET',
        headers: {
            'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+            Authorization: 'Bearer ' + at,
        },
    }
-	})
+    try {
-	var idJson = await promise.json()
+        const start = `https://${domain}/api/v1/accounts/lookup?acct=${user}`
        const promise = fetch(start, options)
        const idJson = await promise.json()
        if (idJson) {
            return idJson
        } else {
            return await acctResolveLegacy(domain, user, options)
        }
    } catch {
        return await acctResolveLegacy(domain, user, options)
    }
 }
 async function acctResolveLegacy(domain, user, options) {
    console.log(`Get user data of ${user} with legacy method`)
    try {
        const start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + user
        const promise = fetch(start, options)
        const idJson = await promise.json()
        if (idJson.accounts[0]) {
-		var id = idJson.accounts[0].id
+            return idJson.accounts[0]
        } else {
            M.toast({ html: lang.lang_fatalerroroccured, displayLength: 2000 })
        }
-	return id
+    } catch {
        console.log('Error occured on searching and fetching with resolve')
    }
 }
 //ブロック
 function block(acct_id) {
    if ($('#his-data').hasClass('blocking')) {
@@ -260,8 +280,8 @@ function block(acct_id) {
        type: 'warning',
        showCancelButton: true,
        confirmButtonText: lang.lang_yesno,
-		cancelButtonText: lang.lang_no
+        cancelButtonText: lang.lang_no,
-	}).then(result => {
+    }).then((result) => {
        if (result.value) {
            if (!acct_id) {
                var acct_id = $('#his-data').attr('use-acct')
@@ -311,8 +331,8 @@ function muteDo(acct_id) {
        type: 'warning',
        showCancelButton: true,
        confirmButtonText: lang.lang_yesno,
-		cancelButtonText: lang.lang_no
+        cancelButtonText: lang.lang_no,
-	}).then(result => {
+    }).then((result) => {
        if (result.value) {
            if (!acct_id) {
                var acct_id = $('#his-data').attr('use-acct')
@@ -390,8 +410,8 @@ function redraft(id, acct_id) {
        type: 'warning',
        showCancelButton: true,
        confirmButtonText: lang.lang_yesno,
-		cancelButtonText: lang.lang_no
+        cancelButtonText: lang.lang_no,
-	}).then(result => {
+    }).then((result) => {
        if (result.value) {
            show()
            var domain = localStorage.getItem('domain_' + acct_id)
@@ -426,6 +446,7 @@ function redraft(id, acct_id) {
        }
    })
 }
 function draftToPost(json, acct_id, id) {
    $('#post-acct-sel').prop('disabled', true)
    $('#post-acct-sel').val(acct_id)
@@ -439,11 +460,7 @@ function draftToPost(json, acct_id, id) {
        for (var i = 0; i <= 4; i++) {
            if (json.media_attachments[i]) {
                media_ids.push(json.media_attachments[i].id)
-				$('#preview').append(
+                $('#preview').append('<img src="' + json.media_attachments[i].preview_url + '" style="width:50px; max-height:100px;">')
 					'<img src="' +
 					json.media_attachments[i].preview_url +
 					'" style="width:50px; max-height:100px;">'
 				)
            } else {
                break
            }
@@ -645,8 +662,8 @@ function staEx(mode) {
            method: 'GET',
            headers: {
                'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+                Authorization: 'Bearer ' + at,
-		}
+            },
        })
        .then(function(response) {
            if (!response.ok) {
@@ -677,6 +694,7 @@ function staEx(mode) {
        })
    return
 }
 function toggleAction(elm) {
    console.log(elm)
    const instance = M.Dropdown.init(elm)
--- a/app/js/post/suggest.js
+++ b/app/js/post/suggest.js
@@ -13,51 +13,57 @@ input.addEventListener(
 		localStorage.removeItem('cursor')
 		var acct_id = $('#post-acct-sel').val()
 		$('#suggest').html('')
 		$('#suggest').hide()
 		window.clearInterval(timer)
 		timer = window.setInterval(function () {
 			var new_val = input.value
 			if (new_val == '') {
 				$('#suggest').html('')
-				if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
+				$('#suggest').hide()
 					$('#right-side').hide()
 					$('#right-side').css('width', '300px')
 					$('#left-side').css('width', '100%')
 					var width = localStorage.getItem('postbox-width')
 					if (width) {
 						width = width.replace('px', '') * 1
 					} else {
 						width = 300
 					}
 					$('#post-box').css('width', width + 'px')
 				}
 				return
 			}
 			if (prev_val != new_val) {
-				var tag = new_val.match(/#(\S{3,})/)
+				const pos = input.selectionStart
-				var acct = new_val.match(/@(\S{3,})/)
+				let startI = pos - 1
-				if (tag && tag[1]) {
+				let hasDomain = false
-					var q = tag[1]
+				let hasDomainOnce = false
-				} else if (acct && acct[1]) {
+				for (startI = pos - 1; startI >= 0; startI--) {
-					var q = acct[1]
+					if (new_val[startI].match(/\./)) hasDomain = true
 					if (new_val[startI].match(/#|@|:/) && !hasDomain) break
 					if (new_val[startI].match(/@/) && hasDomainOnce) break
 					if (new_val[startI].match(/@/) && !hasDomainOnce) hasDomainOnce = true
 				}
 				const target = new_val.substr(startI, pos - startI)
 				var tag = target.match(/#(\S{3,})/g)
 				var acct = target.match(/@(\S{3,})(@(\S{3,}))?/g)
 				var emoji = target.match(/:(\S{1,})/g)
 				if (emoji && emoji[0]) {
 					const l = emoji[0]
 					const emojis = localStorage.getItem('emojis_raw_' + acct_id)
 					const json = emojis ? JSON.parse(emojis) : []
 					const reg = new RegExp(`${emoji[0]}`)
 					let listHtml = ''
 					for (const emoji of json) {
 						const { shortcode, url } = emoji
 						if (`:${shortcode}`.match(reg)) {
 							listHtml = listHtml + `${listHtml ? `<br>` : ``}<a onclick="tagInsert(':${shortcode}:','${l}')" class="pointer"><img src="${url}" width="15">:${shortcode}:</a>`
 						}
 					}
 					$('#suggest').html(listHtml)
 					$('#suggest').show()
 				} else if (tag && tag[0]) {
 					var q = tag[0]
 				} else if (acct && acct[0]) {
 					var q = acct[0]
 				} else {
 					$('#suggest').html('')
-					if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
+					$('#suggest').hide()
 						$('#right-side').hide()
 						$('#right-side').css('width', '300px')
 						$('#left-side').css('width', '100%')
 						var width = localStorage.getItem('postbox-width')
 						if (width) {
 							width = width.replace('px', '') * 1
 						} else {
 							width = 300
 						}
 						$('#post-box').css('width', width + 'px')
 					}
 					return
 				}
 				if (q) {
 					var domain = localStorage.getItem('domain_' + acct_id)
 					var at = localStorage.getItem('acct_' + acct_id + '_at')
-				suggest = 'https://' + domain + '/api/v2/search?q=' + q
+					suggest = 'https://' + domain + '/api/v2/search?q=' + encodeURIComponent(q)
 					if (suggest != oldSuggest) {
 						console.log('Try to get suggest at ' + suggest)
 						fetch(suggest, {
@@ -84,7 +90,7 @@ input.addEventListener(
 								console.log(['Search', json])
 								//ハッシュタグ
 								if (json.hashtags[0] && tag) {
-								if (tag[1]) {
+									if (tag[0]) {
 										var tags = []
 										Object.keys(json.hashtags).forEach(function (key4) {
 											var tag = json.hashtags[key4]
@@ -99,7 +105,7 @@ input.addEventListener(
 												his[6].uses * 1
 											tagHTML = `<br><a onclick="tagInsert('#${escapeHTML(
 												tag.name
-										)}','#${q}')" class="pointer">#${escapeHTML(tag.name)}</a>&nbsp;${uses}toot(s)`
+											)}','${q}')" class="pointer">#${escapeHTML(tag.name)}</a>&nbsp;${uses}toot(s)`
 											var item = {
 												uses: uses,
@@ -121,26 +127,14 @@ input.addEventListener(
 										Object.keys(tags).forEach(function (key7) {
 											ins = ins + tags[key7].html
 											if (key7 <= 0 && !nev) {
-											ins = ins + '<br>'
+												//ins = ins + '<br>'
 												nev = true
 											}
 										})
 										$('#suggest').html(ins)
-									$('#right-side').show()
+										$('#suggest').show()
 									$('#right-side').css('width', '200px')
 									$('#left-side').css('width', 'calc(100% - 200px)')
 									var width = localStorage.getItem('postbox-width')
 									if (width) {
 										width = width.replace('px', '') * 1 + 200
 									} else {
 										width = 500
 									}
-									$('#post-box').css('width', width + 'px')
+								} else if (json.accounts[0] && acct[0]) {
 									$('#poll').addClass('hide')
 									$('#emoji').addClass('hide')
 									$('#draft').addClass('hide')
 								}
 							} else if (json.accounts[0] && acct[1]) {
 									var accts = ''
 									Object.keys(json.accounts).forEach(function (key3) {
 										var acct = json.accounts[key3]
@@ -149,43 +143,28 @@ input.addEventListener(
 											if (acct.username.indexOf('.') < 0) {
 												accts =
 													accts +
-												`<a onclick="tagInsert('@${acct.acct}','@${q}')" class="pointer">@${acct.acct}</a><br>`
+													`<a onclick="tagInsert('@${acct.acct}','${q}')" class="pointer">@${acct.acct}</a><br>`
 											}
 										}
 									})
 								$('#right-side').show()
 								$('#right-side').css('width', '200px')
 								$('#left-side').css('width', 'calc(100% - 200px)')
 								var width = localStorage.getItem('postbox-width')
 								if (width) {
 									width = width.replace('px', '') * 1 + 200
 								} else {
 									width = 500
 								}
 								$('#post-box').css('width', width + 'px')
 									$('#suggest').html(accts)
-								$('#poll').addClass('hide')
+									$('#suggest').show()
 								$('#emoji').addClass('hide')
 								$('#draft').addClass('hide')
 								} else {
-								if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
+
 									$('#right-side').hide()
 									$('#right-side').css('width', '300px')
 									$('#left-side').css('width', '100%')
 									var width = localStorage.getItem('postbox-width')
 									if (width) {
 										width = width.replace('px', '') * 1
 									} else {
 										width = 300
 									}
 									$('#post-box').css('width', width + 'px')
 								}
 								}
 							})
 					}
 				}
 			}
 			oldSuggest = suggest
-			prev_value = new_val
+			prev_val = new_val
 			const rectTextarea = document.querySelector('#textarea')
 			const rect = rectTextarea.getBoundingClientRect()
 			const caret = getCaretCoordinates(rectTextarea, rectTextarea.selectionEnd)
 			$('#suggest').css('top', `calc(${caret.top}px + 1rem)`)
 			const left = rect.width / 2 < caret.left ? rect.width / 2 : caret.left
 			$('#suggest').css('left', left)
 		}, 1000)
 	},
 	false
@@ -199,9 +178,14 @@ input.addEventListener(
 	},
 	false
 )
-function tagInsert(code, del) {
+function tagInsert(code, del, emoji) {
 	if (localStorage.getItem('emoji-zero-width') == 'yes' && emoji) {
 		var blankBefore = ''
 		var blankAfter = ''
 	} else {
 		var blankBefore = ' '
 		var blankAfter = ' '
 	}
 	var textarea = document.querySelector('#textarea')
 	var sentence = textarea.value
 	var len = sentence.length
@@ -217,10 +201,10 @@ function tagInsert(code, del) {
 	var after = sentence.substr(pos, len)
 	var start = after.substr(0, 1)
 	if (start == ' ') blankAfter = ''
-	if (len == 0) {
+	if (len === delLen) {
-		var word = code
+		var word = code + blankAfter
 	} else if (len == pos) {
-		var word = blankBefore + code
+		var word = blankBefore + code + blankAfter
 	} else if (pos == 0) {
 		var word = code + blankAfter
 	} else {
@@ -228,17 +212,9 @@ function tagInsert(code, del) {
 	}
 	sentence = before + word + after
 	textarea.value = sentence
 	if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
 		$('#right-side').hide()
 		$('#right-side').css('width', '300px')
 		$('#left-side').css('width', '50%')
 		var width = localStorage.getItem('postbox-width').replace('px', '') * 1
 		if (!width) {
 			width = 300
 		}
 		$('#post-box').css('width', width + 'px')
 	}
 	$('#suggest').html('')
 	$('#suggest').hide()
 	$('#textarea').focus()
 }
 function cgNPs(q) {
 	suggest = 'https://cg.toot.app/api/v1/search/light?q=' + q
--- a/app/js/tl/card.js
+++ b/app/js/tl/card.js
@@ -17,7 +17,8 @@ function additional(acct_id, tlid) {
 		}
 		if (tagThis) {
-			$(this).attr('href', "javascript:tagShow('" + tagThis + "')")
+			$(this).attr('href', "#")
 			$(this).attr('onclick', "tagShow('" + tagThis + "', this)")
 		}
 	})
--- a/app/js/tl/datails.js
+++ b/app/js/tl/datails.js
@@ -637,34 +637,22 @@ function brws() {
 	postMessage(['openUrl', url], '*')
 }
 //外部からトゥート開く
-function detEx(url, acct_id) {
+async function detEx(url, acct_id) {
 	if (acct_id == 'main') {
 		acct_id = localStorage.getItem('main')
 	}
-	var domain = localStorage.getItem('domain_' + acct_id)
+	Swal.fire({
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
+		title: 'Loading...',
-	var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + encodeURIComponent(url)
+		html: lang.lang_details_fetch,
-	fetch(start, {
+		showConfirmButton: false,
-		method: 'GET',
+		showCloseButton: true,
-		headers: {
+		onBeforeOpen: () => {
-			'content-type': 'application/json',
+			Swal.showLoading()
-			Authorization: 'Bearer ' + at
+		},
-		}
+		onClose: () => { },
-	})
+	}).then((result) => { })
-		.then(function(response) {
+	const json = await detExCore(url, acct_id)
-			if (!response.ok) {
+	Swal.close()
 				response.text().then(function(text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
 		.catch(function(error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
 		.then(function(json) {
 	if (!json.statuses) {
 		postMessage(['openUrl', url], '*')
 	} else {
@@ -673,6 +661,24 @@ function detEx(url, acct_id) {
 		$('.loadp').removeClass('loadp')
 		details(id, acct_id, 0)
 	}
 		})
 	return
 }
 async function detExCore(url, acct_id) {
 	const domain = localStorage.getItem('domain_' + acct_id)
 	const start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + encodeURIComponent(url)
 	const at = localStorage.getItem('acct_' + acct_id + '_at')
 	let promise = await fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
 			Authorization: 'Bearer ' + at
 		}
 	})
 	const json = await promise.json()
 	if (json) {
 		return json
 	} else {
 		return false
 	}
 }
--- a/app/js/tl/directory.js
+++ b/app/js/tl/directory.js
@@ -1,58 +1,71 @@
 //ディレクトリ
 //ディレクトリトグル
 function dirMenu() {
-	$("#dir-contents").html("")
+    $('#dir-contents').html('')
-	directory()
+    directory('directory')
-	$("#left-menu a").removeClass("active")
+    $('#left-menu a').removeClass('active')
-	$("#dirMenu").addClass("active")
+    $('#dirMenu').addClass('active')
-	$(".menu-content").addClass("hide")
+    $('.menu-content').addClass('hide')
-	$("#dir-box").removeClass("hide")
+    $('#dir-box').removeClass('hide')
 }
 function dirselCk() {
-	var acct = $("#dir-acct-sel").val()
+    var acct = $('#dir-acct-sel').val()
-	if (acct == "noauth") {
+    if (acct == 'noauth') {
-		$("#dirNoAuth").removeClass("hide")
+        $('#dirNoAuth').removeClass('hide')
    } else {
-		$("#dirNoAuth").addClass("hide")
+        $('#dirNoAuth').addClass('hide')
-		directory()
+        directory('check')
    }
 }
-function directory(isMore) {
+
-	var order = $("[name=sort]:checked").val()
+function dirChange(mode) {
    if (mode === 'directory') $('#directoryConfig').removeClass('hide')
    if (mode === 'suggest') $('#directoryConfig').addClass('hide')
    directory(mode)
 }
 function directory(modeRaw, isMore) {
    const mode = modeRaw === 'check' ? $('[name=dirsug]:checked').val() : modeRaw
    var order = $('[name=sort]:checked').val()
    if (!order) {
-		order = "active"
+        order = 'active'
    }
-	var local_only = $("#local_only:checked").val()
+    var local_only = $('#local_only:checked').val()
    if (local_only) {
-		local_only = "true"
+        local_only = 'true'
    } else {
-		local_only = "false"
+        local_only = 'false'
    }
-	var acct_id = $("#dir-acct-sel").val()
+    var acct_id = $('#dir-acct-sel').val()
-	if (acct_id == "noauth") {
+    if (acct_id == 'noauth') {
-		var domain = $("#dirNoAuth-url").val()
+        var domain = $('#dirNoAuth-url').val()
-		var at = ""
+        var at = ''
    } else {
-		var domain = localStorage.getItem("domain_" + 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 (isMore) {
-		var addOffset = $("#dir-contents .cvo").length
+        var addOffset = $('#dir-contents .cvo').length
        $('#dir-contents').append(`<div class="progress transparent"><div class="indeterminate"></div></div>`)
    } else {
        var addOffset = 0
-		$("#dir-contents").html("")
+        $('#dir-contents').html(`<div class="progress transparent"><div class="indeterminate"></div></div>`)
    }
-	var start = "https://" + domain + "/api/v1/directory?order=" + order + "&local=" + local_only + "&offset=" + addOffset
+    let start = `https://${domain}/api/v1/directory?order=${order}&local=${local_only}&offset=${addOffset}`
    if (mode === 'suggest') start = `https://${domain}/api/v2/suggestions`
    console.log(start)
    fetch(start, {
-		method: "GET",
+            method: 'GET',
            headers: {
-			"content-type": "application/json",
+                'content-type': 'application/json',
-			Authorization: "Bearer " + at
+                Authorization: 'Bearer ' + at,
-		}
+            },
        })
        .then(function(response) {
            $('#dir-contents .progress').remove()
            if (!response.ok) {
                $('#dir-contents').html(`v2 follow suggestion is supported by Mastodon 3.4.0 or above.`)
                response.text().then(function(text) {
                    setLog(response.url, response.status, text)
                })
@@ -60,17 +73,24 @@ function directory(isMore) {
            return response.json()
        })
        .catch(function(error) {
-			setLog(start, "JSON", error)
+            setLog(start, 'JSON', error)
            console.error(error)
        })
        .then(function(json) {
            if (json) {
-				$("#moreDir").removeClass("disabled")
+                $('#moreDir').removeClass('disabled')
-				var html = userparse(json, null, acct_id, "dir", null)
+                let obj = []
-				$("#dir-contents").append(html)
+                if (mode === 'suggest') {
-				jQuery("time.timeago").timeago()
+                    $('#moreDir').addClass('disabled')
                    for (const suggest of json) obj.push(suggest.account)
                } else {
-				$("#moreDir").addClass("disabled")
+                    obj = json
                }
                var html = userparse(obj, null, acct_id, 'dir', null)
                $('#dir-contents').append(html)
                jQuery('time.timeago').timeago()
            } else {
                $('#moreDir').addClass('disabled')
            }
        })
 }
--- a/app/js/tl/filter.js
+++ b/app/js/tl/filter.js
@@ -42,6 +42,7 @@ function remoteOnly(tlid, type) {
    }
    columnReload(tlid, type)
 }
 function remoteOnlyCk(tlid) {
    var multi = localStorage.getItem('column')
    var obj = JSON.parse(multi)
@@ -125,6 +126,7 @@ function catchToggle(tlid) {
        parseColumn(tlid)
    }
 }
 function catchCheck(tlid) {
    var catchck = localStorage.getItem('catch_' + tlid)
    if (catchck) {
@@ -135,6 +137,7 @@ function catchCheck(tlid) {
        $('#sta-del-' + tlid).css('color', 'red')
    }
 }
 function delreset(tlid) {
    $('[tlid=' + tlid + '] .by_delcatch').hide()
    $('[tlid=' + tlid + '] .by_delcatch').remove()
@@ -146,6 +149,7 @@ function filterMenu() {
    $('.menu-content').addClass('hide')
    $('#filter-box').removeClass('hide')
 }
 function filter() {
    $('#filtered-words').html('')
    $('#filter-edit-id').val('')
@@ -199,11 +203,13 @@ 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()
@@ -280,6 +286,7 @@ function makeNewFilter() {
        }
    }
 }
 function filterEdit(id, acct_id) {
    $('#filter-add-word').val('')
    $('#home_filter').prop('checked', false)
@@ -342,6 +349,7 @@ function filterEdit(id, acct_id) {
            }
        })
 }
 function filterDel(id, acct_id) {
    var domain = localStorage.getItem('domain_' + acct_id)
    var at = localStorage.getItem('acct_' + acct_id + '_at')
@@ -363,6 +371,7 @@ function filterDel(id, acct_id) {
        }
    }
 }
 function getFilter(acct_id) {
    var domain = localStorage.getItem('domain_' + acct_id)
    var at = localStorage.getItem('acct_' + acct_id + '_at')
@@ -395,6 +404,7 @@ function getFilter(acct_id) {
        localStorage.setItem('filter_' + acct_id, JSON.stringify({}))
    }
 }
 function getFilterType(json, type) {
    if (!json) {
        return []
@@ -421,6 +431,7 @@ function getFilterType(json, type) {
    })
    return mutedfilters
 }
 function getFilterTypeByAcct(acct_id, type) {
    if (localStorage.getItem('filter_' + acct_id) != 'undefined') {
        var mute = getFilterType(JSON.parse(localStorage.getItem('filter_' + acct_id)), type)
@@ -429,6 +440,7 @@ function getFilterTypeByAcct(acct_id, type) {
    }
    return mute
 }
 function filterUpdate(acct_id) {
    var domain = localStorage.getItem('domain_' + acct_id)
    var at = localStorage.getItem('acct_' + acct_id + '_at')
@@ -461,6 +473,7 @@ function filterUpdate(acct_id) {
            filterUpdateInternal(json, 'pub')
        })
 }
 function filterUpdateInternal(json, type) {
    var home = getFilterType(json, type)
    var wordmute = localStorage.getItem('word_mute')
@@ -523,11 +536,11 @@ function exclude(key) {
        } else {
            excludetxt = '?exclude_types[]=poll'
        }
-	} else {
+    } else {}
 	}
    localStorage.setItem('exclude-' + key, excludetxt)
    parseColumn(key)
 }
 function excludeCk(key, target) {
    var exc = localStorage.getItem('exclude-' + key)
    if (!exc) {
@@ -539,6 +552,7 @@ function excludeCk(key, target) {
        return ''
    }
 }
 function checkNotfFilter(tlid) {
    var excludetxt = localStorage.getItem('exclude-' + tlid)
    if (!excludetxt || excludetxt != '') {
@@ -547,10 +561,12 @@ function checkNotfFilter(tlid) {
        return false
    }
 }
 function resetNotfFilter(tlid) {
    localStorage.setItem('exclude-' + tlid, '')
    parseColumn(tlid)
 }
 function notfFilter(id, tlid, acct_id) {
    var excludetxt = localStorage.getItem('exclude-' + tlid)
    if (excludetxt || excludetxt != '') {
--- a/app/js/tl/list.js
+++ b/app/js/tl/list.js
@@ -89,7 +89,7 @@ function list() {
 							</a>/
 							<a onclick="listUser('${list.id}','${acct_id}')" class="pointer">
 								${lang.lang_list_users}
-							'</a><br>`
+							</a><br>`
 					})
 					$('#lists').html(lists)
 				} else {
--- a/app/js/tl/misskeyparse.js
+++ b/app/js/tl/misskeyparse.js
@@ -518,7 +518,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		if (tagck) {
 			Object.keys(toot.tags).forEach(function (key4) {
 				var tag = toot.tags[key4]
-				var tags = '<a onclick="tagShow(\'' + tag + '\')" class="pointer parsed">#' + tag + '</a><span class="hide" data-tag="' + tag + '" data-regTag="'+tag.toLowerCase()+'">#' + tag + ':<a onclick="tl(\'tag\',\'' + tag + '\',' + acct_id +
+				var tags = '<a onclick="tagShow(\'' + tag + '\', this)" class="pointer parsed">#' + tag + '</a><span class="hide" data-tag="' + tag + '" data-regTag="'+tag.toLowerCase()+'">#' + tag + ':<a onclick="tl(\'tag\',\'' + tag + '\',' + acct_id +
 					',\'add\')" class="pointer parsed" title="' + lang.lang_parse_tagTL.replace("{{tag}}", '#' + tag) + '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer parsed" title="' + lang.lang_parse_tagtoot.replace("{{tag}}", '#' + tag) + '">Toot</a>　' +
 					'<a onclick="tagPin(\'' + tag + '\')" class="pointer parsed" title="' + lang.lang_parse_tagpin.replace("{{tag}}", '#' + tag) + '">Pin</a></span> '
 				content = content.replace("#" + tag, tags)
--- a/app/js/tl/notification.js
+++ b/app/js/tl/notification.js
@@ -7,6 +7,7 @@ function notf(acct_id, tlid, sys) {
        notfCommon(acct_id, tlid, sys)
    }
 }
 function notfColumn(acct_id, tlid, sys) {
    todo('Notifications Loading...')
    var native = localStorage.getItem('nativenotf')
@@ -22,7 +23,7 @@ function notfColumn(acct_id, tlid, sys) {
        httpreq.open('POST', start, true)
        httpreq.setRequestHeader('Content-Type', 'application/json')
        var body = JSON.stringify({
-			i: at
+            i: at,
        })
    } else {
        var misskey = false
@@ -44,6 +45,7 @@ function notfColumn(acct_id, tlid, sys) {
        if (httpreq.readyState === 4) {
            var json = httpreq.response
            if (this.status !== 200) {
                $('#landing_' + tlid).append(`<div>${this.status}</div><div>${escapeHTML(this.response)}`)
                setLog(start, this.status, this.response)
            }
            var max_id = httpreq.getResponseHeader('link')
@@ -64,7 +66,7 @@ function notfColumn(acct_id, tlid, sys) {
                        var os = localStorage.getItem('platform')
                        var options = {
                            body: ct + lang.lang_notf_new,
-							icon: localStorage.getItem('prof_' + acct_id)
+                            icon: localStorage.getItem('prof_' + acct_id),
                        }
                        var n = new Notification('TheDesk:' + domain, options)
                    }
@@ -88,7 +90,7 @@ function notfColumn(acct_id, tlid, sys) {
                })
                templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
                $('#timeline_' + tlid).html(templete)
-				$('#landing_' + tlid).hide()
+                    // $('#landing_' + tlid).hide()
                jQuery('time.timeago').timeago()
            }
            $('#notf-box').addClass('fetched')
@@ -116,6 +118,7 @@ function notfColumn(acct_id, tlid, sys) {
        var start = 'wss://' + domain + '/?i=' + at
    }
 }
 function notfCommon(acct_id, tlid, sys, stream) {
    todo('Notifications Loading...')
    var native = localStorage.getItem('nativenotf')
@@ -130,11 +133,11 @@ function notfCommon(acct_id, tlid, sys, stream) {
        var i = {
            method: 'POST',
            headers: {
-				'content-type': 'application/json'
+                'content-type': 'application/json',
            },
            body: JSON.stringify({
-				i: at
+                i: at,
-			})
+            }),
        }
    } else {
        var misskey = false
@@ -143,8 +146,8 @@ function notfCommon(acct_id, tlid, sys, stream) {
            method: 'GET',
            headers: {
                'content-type': 'application/json',
-				Authorization: 'Bearer ' + at
+                Authorization: 'Bearer ' + at,
-			}
+            },
        }
    }
    if (stream == 'only') {
@@ -156,6 +159,8 @@ function notfCommon(acct_id, tlid, sys, stream) {
            console.log('header to get param:' + response.headers.get('link'))
            if (!response.ok) {
                response.text().then(function(text) {
                    console.log('notf error', 'div[data-notf=' + acct_id + '] .landing')
                    $('div[data-notf=' + acct_id + '] .landing').append(`<div>${response.status}</div><div>${escapeHTML(text)}`)
                    setLog(response.url, response.status, text)
                })
            }
@@ -181,7 +186,7 @@ function notfCommon(acct_id, tlid, sys, stream) {
                        var os = localStorage.getItem('platform')
                        var options = {
                            body: ct + lang.lang_notf_new,
-							icon: localStorage.getItem('prof_' + acct_id)
+                            icon: localStorage.getItem('prof_' + acct_id),
                        }
                        var n = new Notification('TheDesk:' + domain, options)
                    }
@@ -202,7 +207,7 @@ function notfCommon(acct_id, tlid, sys, stream) {
                    }
                })
                $('div[data-notf=' + acct_id + ']').html(templete)
-				$('#landing_' + tlid).hide()
+                    // $('#landing_' + tlid).hide()
                jQuery('time.timeago').timeago()
            }
            $('#notf-box').addClass('fetched')
@@ -210,6 +215,7 @@ function notfCommon(acct_id, tlid, sys, stream) {
            if (stream != 'no') notfWS(misskey, acct_id, tlid, domain, at)
        })
 }
 function notfWS(misskey, acct_id, tlid, domain, at) {
    if (mastodonBaseWsStatus[domain] == 'available') return false
    if (!misskey) {
@@ -227,11 +233,12 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
                acct_id: acct_id,
                type: 'Connect Streaming API(Notf)',
                domain: domain,
-				message: [mess]
+                message: [mess],
            })
            $('i[data-notf=' + acct_id + ']').removeClass('red-text')
        }
        websocketNotf[acct_id].onmessage = function(mess) {
            $('#landing_' + tlid).hide()
                //console.log(["Receive Streaming API(Notf):" + acct_id + "(" + domain + ")", JSON.parse(JSON.parse(mess.data).payload)]);
            var popup = localStorage.getItem('popup')
            if (!popup) {
@@ -306,7 +313,7 @@ function notfmore(tlid) {
            httpreq.setRequestHeader('Content-Type', 'application/json')
            var body = JSON.stringify({
                i: at,
-				untilID: sid
+                untilID: sid,
            })
        } else {
            var misskey = false
@@ -356,7 +363,7 @@ function notfmore(tlid) {
                    moreloading = false
                    templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
                    $('#timeline_' + tlid).append(templete)
-					$('#landing_' + tlid).hide()
+                        // $('#landing_' + tlid).hide()
                    jQuery('time.timeago').timeago()
                }
                $('#notf-box').addClass('fetched')
@@ -370,35 +377,30 @@ function notfmore(tlid) {
 function notfToggle(acct, tlid) {
    if ($('#notf-box_' + tlid).hasClass('column-hide')) {
        $('#notf-box_' + tlid).css('display', 'block')
-		$('#notf-box_' + tlid).animate(
+        $('#notf-box_' + tlid).animate({
-			{
+            height: '400px',
-				height: '400px'
+        }, {
 			},
 			{
            duration: 300,
            complete: function() {
                $('#notf-box_' + tlid).css('overflow-y', 'scroll')
                $('#notf-box_' + tlid).removeClass('column-hide')
-				}
+            },
-			}
+        })
 		)
    } else {
        $('#notf-box_' + tlid).css('overflow-y', 'hidden')
-		$('#notf-box_' + tlid).animate(
+        $('#notf-box_' + tlid).animate({
-			{
+            height: '0',
-				height: '0'
+        }, {
 			},
 			{
            duration: 300,
            complete: function() {
                $('#notf-box_' + tlid).addClass('column-hide')
                $('#notf-box_' + tlid).css('display', 'none')
-				}
+            },
-			}
+        })
 		)
    }
    notfCanceler(acct)
 }
 function notfCanceler(acct) {
    $('.notf-reply_' + acct).text(0)
    localStorage.removeItem('notf-reply_' + acct)
@@ -413,13 +415,16 @@ function notfCanceler(acct) {
    localStorage.removeItem('notf-follow_' + acct)
    $('.notf-follow_' + acct).addClass('hide')
    $('.notf-icon_' + acct).removeClass('red-text')
-	var id = $('#announce_' + acct + ' .announcement').first().attr('data-id')
+    var id = $('#announce_' + acct + ' .announcement')
-	$('.notf-announ_' + acct + '_ct').text("")
+        .first()
        .attr('data-id')
    $('.notf-announ_' + acct + '_ct').text('')
    $(`.boxIn[data-acct=${acct}] .notice-box`).removeClass('has-notf')
    if (id) {
        localStorage.setItem('announ_' + acct, id)
    }
 }
 function allNotfRead() {
    var multi = localStorage.getItem('multi')
    if (multi) {
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -278,7 +278,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
 				</span>
 				<span class="voice">${date(toot.created_at, 'absolute')}(${lang.lang_parse_notftime})</span>
 				<i class="big-text fas ${icon}"></i>
-				<a onclick="udg('${toot.account.id}','${acct_id}')" class="pointer grey-text">
+				<a onclick="udg('${toot.account.id}','${acct_id}')" class="pointer grey-text notf-udg-text">
 					${dis_name}(@${toot.account.acct})
 				</a>`
 			var notice = noticetext
@@ -631,7 +631,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
 							var mty = media.remote_url.match(/.+(\..+)$/)[1]
 							viewer =
 								viewer +
-								`<a href="${media.url ? media.url : media.remote_url}" title="${media.remote_url} from ${media.url}">[${lang.lang_parse_unknown}(${mty})]</a> `
+								`<a href="${media.url ? media.url : media.remote_url}" title="${media.url ? media.url : media.remote_url}">[${lang.lang_parse_unknown}(${mty})]</a>${media.url ? `<a href="${media.remote_url}"><i class="material-icons sublink" title="${media.remote_url}">open_in_new</i></a>` : ''} `
 						} else if (media.type == 'audio') {
 							viewer =
 								viewer +
@@ -703,31 +703,6 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
 							${lang.lang_parse_thread}
 						</a></div>`
 			}
 			var tagck = toot.tags[0]
 			var tags = ''
 			//タグであれば
 			if (tagck) {
 				Object.keys(toot.tags).forEach(function (key4) {
 					var tag = toot.tags[key4]
 					var featured = `　<a onclick="tagFeature('${tag.name}','${acct_id}')" class="pointer" title="add it to Featured tags">Feature</a>　`
 					tags =
 						tags +
 						`<span class="hide" data-tag="${tag.name}" data-regTag="${tag.name.toLowerCase()}">#${tag.name
 						}:
 							<a onclick="tl('tag','${tag.name}','${acct_id}','add')" class="pointer"
 							 title="${lang.lang_parse_tagTL.replace(
 							'{{tag}}',
 							'#' + tag.name
 						)}">TL</a>　<a onclick="brInsert('#${tag.name}')" 
 							 class="pointer" title="${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag.name)}">Toot</a>　
 						<a onclick="tagPin('${tag.name}')" class="pointer" title="${lang.lang_parse_tagpin.replace(
 							'{{tag}}',
 							'#' + tag.name
 						)}
 						">Pin</a>${featured}</span> `
 				})
 				tags = '<div style="float:right" aria-hidden="true">' + tags + '</div>'
 			}
 			//リプ数
 			if (toot.replies_count || toot.replies_count === 0) {
 				var replyct = toot.replies_count
@@ -904,7 +879,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
 			//日本語じゃない
 			if (toot.language != lang.language && toot.language) {
 				var trans = `<li onclick="trans('${toot.language}','${lang.language}', $(this))" 
-							 style="padding:0">
+							 style="padding:0; padding-top: 5px;">
 								<i class="material-icons" aria-hidden="true">g_translate</i>${lang.lang_parse_trans}
 					</li>`
 			} else {
@@ -1077,7 +1052,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
 				</div>
 				<div class="area-additional grid">
 					<span class="additional">${analyze}</span>
-					${mentions}${tags}
+					${mentions}
 				</div>
 				<div class="area-vis grid">${vis}</div>
 				<div class="area-actions grid">
@@ -1157,23 +1132,23 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
 					</li>
 					<div>
 					<li onclick="bkm('${uniqueid}','${acct_id}','${tlid}')"
-						class="bkm-btn bkmStr_${uniqueid}" style="padding:0">
+						class="bkm-btn bkmStr_${uniqueid}" style="padding:0; padding-top: 5px;">
 						<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>${bkmStr}
 					</li>
 					<li class="${if_mine}" onclick="del('${uniqueid}','${acct_id}')"
-							style="padding:0">
+							style="padding:0; padding-top: 5px;">
 							<i class="fas fa-trash"></i>${lang.lang_parse_del}
 					</li>
-					<li class="${if_mine}" onclick="pin('${uniqueid}','${acct_id}')" style="padding:0" class="pinStr_${uniqueid}">
+					<li class="${if_mine}" onclick="pin('${uniqueid}','${acct_id}')" style="padding:0; padding-top: 5px;" class="pinStr_${uniqueid}">
 							<i class="fas fa-map-pin pin_${uniqueid} ${if_pin}"></i>${pinStr}
 					</li>
 					<li class="${if_mine}"  onclick="redraft('${uniqueid}','${acct_id}')"
-							style="padding:0">
+							style="padding:0; padding-top: 5px;">
 							<i class="material-icons" aria-hidden="true">redo</i>${lang.lang_parse_redraft}
 					</li>
 					${trans}
 					<li onclick="postMessage(['openUrl', '${toot.url}'], '*')"
-						 style="padding:0">
+						 style="padding:0; padding-top: 5px;">
 						<i class="fas text-darken-3 fa-globe"></i>${lang.lang_parse_link}
 					</li>
 					${pluginHtml}
@@ -1577,6 +1552,7 @@ function mastodonBaseStreaming(acct_id) {
 		$('.notice_icon_acct_' + acct_id).removeClass('red-text')
 	}
 	mastodonBaseWs[domain].onmessage = function (mess) {
 		$(`div[data-acct=${acct_id}] .landing`).hide()
 		const typeA = JSON.parse(mess.data).event
 		if (typeA == 'delete') {
 			$(`[unique-id=${JSON.parse(mess.data).payload}]`).hide()
--- a/app/js/tl/src.js
+++ b/app/js/tl/src.js
@@ -13,7 +13,21 @@ function searchMenu() {
 //検索取得
 function src(mode, offset) {
 	if (!offset) {
-		$('#src-contents').html('')
+		$('#src-contents').html(`
 		<div class="preloader-wrapper small active" style="margin-left: calc(50% - 36px);">
 			<div class="spinner-layer spinner-blue-only">
 				<div class="circle-clipper left">
 					<div class="circle"></div>
 				</div>
 				<div class="gap-patch">
 					<div class="circle"></div>
 				</div>
 				<div class="circle-clipper right">
 					<div class="circle"></div>
 				</div>
 			</div>
 		</div>
 		`)
 		var add = ''
 	} else {
 		var add = '&type=accounts&offset=' + $('#src-accts .cvo').length
@@ -49,6 +63,9 @@ function src(mode, offset) {
 		}
 	})
 		.then(function (response) {
 			if (!offset) {
 				$('#src-contents').html(``)
 			}
 			if (!response.ok) {
 				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
@@ -314,39 +331,19 @@ function trend() {
 		})
 }
 function srcBox(mode) {
 	var selectedText = window.getSelection().toString()
 	if (mode == 'open') {
 		$('#pageSrc').removeClass('hide')
 	} else if (mode == 'close') {
 		if(!selectedText) {
 		$('#pageSrc').addClass('hide')
 		$('#pageSrc').removeClass('keep')
 		}
 	} else {
 		$('#pageSrc').toggleClass('hide')
 	}
 	if(!$('#pageSrc').hasClass('keep')) {
 		$('#pageSrcInput').val(selectedText)
 }
 }
 $('#pageSrcInput').click(function() {
 	$('#pageSrc').addClass('keep')
 })
 $('#pageSrcInput').on('input', function(evt) {
 	if(!$('#pageSrcInput').val()) {
 		$('#pageSrc').removeClass('keep')
 	}
 })
 document.addEventListener('selectionchange', function() {
 	var selectedText = window.getSelection().toString()
 	if (selectedText && !$('input').is(':focus') && !$('textarea').is(':focus')) {
 		srcBox('open')
 	}
 })
 function doSrc(type) {
 	$('#pageSrc').addClass('hide')
 	$('#pageSrc').removeClass('keep')
-	var q = $('#pageSrcInput').val()
+	var q = $('.srcQ').text()
 	if (type == 'web') {
 		var start = localStorage.getItem('srcUrl')
 		if (!start) {
@@ -356,5 +353,9 @@ function doSrc(type) {
 		postMessage(["openUrl", start], "*")
 	} else if (type == 'ts') {
 		tsAdd(q)
 	} else if (type == 'copy') {
 		execCopy(q)
 	} else if (type == 'toot') {
 		brInsert(q)
 	}
 }
--- a/app/js/tl/tag.js
+++ b/app/js/tl/tag.js
@@ -9,9 +9,47 @@ if (location.search) {
 	}
 }
 //よく使うタグ
-function tagShow(tag) {
+function tagShow(tag, elm) {
-	console.log('[data-regTag=' + decodeURI(tag).toLowerCase() + ']')
+	tag = decodeURIComponent(tag)
-	$('[data-regTag=' + decodeURI(tag).toLowerCase() + ']').toggleClass('hide')
+	const tagTL = lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag)
 	const tagPin = lang.lang_parse_tagpin.replace('{{tag}}', '#' + tag)
 	const tagToot = lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)
 	$('#tagCMTL').text(tagTL)
 	$('#tagCMPin').text(tagPin)
 	$('#tagCMToot').text(tagToot)
 	const acct_id = $(elm).parents('.tl').attr('data-acct')
 	const rect = elm.getBoundingClientRect()
 	$('#tagContextMenu').css('top', `calc(${rect.top}px + 1rem)`)
 	$('#tagContextMenu').css('left', `${rect.left}px`)
 	$('#tagContextMenu').attr('data-tag', tag)
 	$('#tagContextMenu').attr('data-acct', acct_id)
 	$('#tagContextMenu').removeClass('hide')
 	setTimeout(() => tShowBox('open'), 500)
 }
 function tShowBox(mode) {
 	if (mode == 'open') {
 		$('#tagContextMenu').removeClass('hide')
 	} else if (mode == 'close') {
 		if (!$('#tagContextMenu').hasClass('hide')) $('#tagContextMenu').addClass('hide')
 		$('#tagContextMenu').removeClass('keep')
 	} else {
 		$('#tagContextMenu').toggleClass('hide')
 	}
 }
 function doTShowBox(type) {
 	$('#tagContextMenu').addClass('hide')
 	$('#tagContextMenu').removeClass('keep')
 	const q = $('#tagContextMenu').attr('data-tag')
 	const acct_id = $('#tagContextMenu').attr('data-acct')
 	if (type == 'tl') {
 		tl('tag', q, acct_id, 'add')
 	} else if (type == 'toot') {
 		brInsert(`#${q}`)
 	} else if (type == 'pin') {
 		tagPin(q)
 	} else if (type == 'f') {
 		tagFeature(q, acct_id)
 	}
 }
 //タグ追加
 function tagPin(tag) {
@@ -69,17 +107,17 @@ function favTag() {
 		tag = escapeHTML(tag)
 		tags =
 			tags +
-			`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a>
+			`<a onclick="tagShowHorizon('${tag}')" class="pointer">#${tag}</a>
 			${nowon}<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
 			<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="${lang.lang_parse_tagTL.replace('{{tag}}', '#' + tag)}">
 				TL
-			</a>　
+			</a>
 			<a onclick="brInsert('#${tag}')" class="pointer" title="${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)}">
 				Toot
-			</a>　
+			</a>
 			<a onclick="autoToot('${tag}');" class="pointer" title="${lang.lang_tags_always}${lang.lang_parse_tagtoot.replace('{{tag}}', '#' + tag)}">
 				${ptt}
-			</a>　
+			</a>
 			<a onclick="tagRemove('${key}')" class="pointer" title="${lang.lang_tags_tagunpin.replace('{{tag}}', '#' + tag)}">
 				${lang.lang_del}
 			</a>
@@ -91,6 +129,9 @@ function favTag() {
 		$('#taglist').append('')
 	}
 }
 function tagShowHorizon(tag) {
 	$('[data-regTag=' + decodeURI(tag).toLowerCase() + ']').toggleClass('hide')
 }
 function trendTag() {
 	$('.trendtag').remove()
 	var domain = 'imastodon.net'
@@ -124,7 +165,7 @@ function trendTag() {
 					tag = escapeHTML(tag)
 					tags =
 						tags +
-						`<a onclick="tagShow('${tag}')" class="pointer">#${tag}</a>
+						`<a onclick="tagShow('${tag}', this)" class="pointer">#${tag}</a>
 						<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
 						<a onclick=\"tagTL('tag','${tag}',false,'add')" class="pointer" title="#${tag}のタイムライン">TL</a>　
 						<a onclick="show();brInsert('#${tag}')" class="pointer" title="#${tag}でトゥート">
--- a/app/js/tl/tl.js
+++ b/app/js/tl/tl.js
@@ -1,6 +1,7 @@
 //TL取得
 moreloading = false
 var errorct = 0
 function tl(type, data, acct_id, tlid, delc, voice, mode) {
    scrollevent()
    $('#unread_' + tlid + ' .material-icons').removeClass('teal-text')
@@ -182,6 +183,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
        .then(function(response) {
            if (!response.ok) {
                response.text().then(function(text) {
                    $('#landing_' + tlid).append(`<div>${response.status}</div><div>${$.strip_tags(text)}`)
                    setLog(response.url, response.status, text)
                })
            }
@@ -193,6 +195,7 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
            console.error(error)
        })
        .then(function(json) {
            if (!json) return true
            console.log(['Result of getting timeline of ' + tlid, json])
            $('#landing_' + tlid).hide()
            var mute = getFilterTypeByAcct(acct_id, type)
@@ -267,17 +270,14 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
        }
    }
 }
 function stremaingSubscribe(type, acct_id, data, unsubscribe) {
    let command = 'subscribe'
    if (unsubscribe) command = 'unsubscribe'
    let stream
    const domain = localStorage.getItem('domain_' + acct_id)
    if (type == 'home') return false
-	if (type === 'local' || type === 'mix') { stream = 'public:local' }
+    if (type === 'local' || type === 'mix') { stream = 'public:local' } else if (type === 'local-media') { stream = 'public:local:media' } else if (type === 'pub') { stream = 'public' } else if (type === 'pub-media') { stream = 'public:media' } else if (type === 'list') {
 	else if (type === 'local-media') { stream = 'public:local:media' }
 	else if (type === 'pub') { stream = 'public' }
 	else if (type === 'pub-media') { stream = 'public:media' }
 	else if (type === 'list') {
        mastodonBaseWs[domain].send(JSON.stringify({ type: command, stream: 'list', list: data }))
        return true
    } else if (type === 'tag') {
@@ -294,6 +294,7 @@ function stremaingSubscribe(type, acct_id, data, unsubscribe) {
    }
    mastodonBaseWs[domain].send(JSON.stringify({ type: command, stream: stream }))
 }
 function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
    var misskey = false
    const domain = localStorage.getItem(`domain_${acct_id}`)
@@ -315,7 +316,8 @@ function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
        var add = ''
        if (remoteOnlyCk(tlid)) {
            add = '&remote=true'
-		} var start =
+        }
        var start =
            wss + '/api/v1/streaming/?stream=public:media&access_token=' + at + add
    } else if (type == 'local') {
        var start =
@@ -413,9 +415,7 @@ function oldStreaming(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
                    $('[unique-id=' + JSON.parse(mess.data).payload + ']').remove()
                }
            } else if (typeA == 'update' || typeA == 'conversation') {
-				if (
+                if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
 					!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')
 				) {
                    //markers show中はダメ
                    var obj = JSON.parse(JSON.parse(mess.data).payload)
                    if (
@@ -967,6 +967,7 @@ function typePs(type) {
        return 'userList'
    }
 }
 function misskeycom(type, data) {
    if (type == 'home') {
        return 'timeline'
@@ -1022,6 +1023,7 @@ function icon(type) {
    }
    return response
 }
 function reconnector(tlid, type, acct_id, data, mode) {
    console.log('%c Reconnector:' + mode + '(timeline' + tlid + ')', 'color:pink')
    if (type == 'mix' || type == 'integrated' || type == 'plus') {
@@ -1051,6 +1053,7 @@ function reconnector(tlid, type, acct_id, data, mode) {
    }
    M.toast({ html: lang.lang_tl_reconnect, displayLength: 2000 })
 }
 function columnReload(tlid, type) {
    $('#notice_icon_' + tlid).addClass('red-text')
    $('#unread_' + tlid + ' .material-icons').removeClass('teal-text')
@@ -1150,6 +1153,7 @@ function getMarker(tlid, type, acct_id) {
            }
        })
 }
 function showUnread(tlid, type, acct_id) {
    if ($('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
        goTop(tlid)
@@ -1203,6 +1207,7 @@ function showUnread(tlid, type, acct_id) {
        })
 }
 var ueloadlock = false
 function ueload(tlid) {
    if (ueloadlock) {
        return false
@@ -1259,6 +1264,7 @@ function ueload(tlid) {
            ueloadlock = false
        })
 }
 function asRead(callback) {
    //Markers
    var markers = localStorage.getItem('markers')
@@ -1318,6 +1324,7 @@ function asRead(callback) {
        }
    }
 }
 function asReadEnd() {
    //Markers
    var markers = localStorage.getItem('markers')
@@ -1395,6 +1402,7 @@ function getBookmark(acct_id, tlid, more) {
        }
    }
 }
 function getUtl(acct_id, tlid, data, more) {
    moreloading = true
--- a/app/js/ui/img.js
+++ b/app/js/ui/img.js
@@ -77,6 +77,9 @@ function imgCont(type) {
 }
 function imageXhr(id, key, murl) {
 	var startTime = new Date()
 	$('#imgmodal-progress div').removeClass('determinate')
 	$('#imgmodal-progress div').addClass('indeterminate')
 	$('#imgmodal-progress').removeClass('hide')
 	xhr = new XMLHttpRequest()
 	xhr.open('GET', murl, true)
 	xhr.responseType = 'arraybuffer'
@@ -87,6 +90,9 @@ function imageXhr(id, key, murl) {
 				var total = event.total
 				var now = event.loaded
 				var per = (now / total) * 100
 				$('#imgmodal-progress div').removeClass('indeterminate')
 				$('#imgmodal-progress div').addClass('determinate')
 				$('#imgmodal-progress div').css('width', `${per}%`)
 				$('#imgprog').text(Math.floor(per))
 			}
 		},
@@ -100,6 +106,10 @@ function imageXhr(id, key, murl) {
 			var now = event.loaded
 			var per = (now / total) * 100
 			$('#imgprog').text(Math.floor(per))
 			$('#imgmodal-progress').addClass('hide')
 			$('#imgmodal-progress div').css('width', '0%')
 			$('#imgmodal-progress div').removeClass('determinate')
 			$('#imgmodal-progress div').addClass('indeterminate')
 		},
 		false
 	)
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -231,14 +231,14 @@ function parseColumn(target, dontclose) {
 			}
 			var unread = `<a id="unread_${key}" onclick="showUnread('${key}','${acct.type}','${acct.domain}')"
 					 class="setting nex waves-effect" title="${lang.lang_layout_unread}">
-					<i class="material-icons waves-effect nex">more</i><br />${lang.lang_layout_unread}
+					<i class="material-icons waves-effect nex">more</i><span>${lang.lang_layout_unread}</span>
 				</a>`
 			var notfDomain = acct.domain
 			var notfKey = key
 			var if_tag = ''
 			var if_tag_btn = ''
 			if (acct.type == 'notf') {
-				var exclude =
+				var excludeNotf =
 					`<div style="border: 1px solid; padding: 5px; margin-top: 5px; margin-bottom: 5px;">${lang.lang_layout_excluded}:<br>
 					<label>
 						<input type="checkbox" class="filled-in" id="exc-reply-${key}" ${excludeCk(key, 'mention')} />
@@ -272,20 +272,21 @@ function parseColumn(target, dontclose) {
 					</label> <br />
 					<button class="btn btn-flat waves-effect notf-exclude-btn waves-light" style="width:calc(50% - 11px); padding:0;" onclick="exclude('${key}')">Filter</button>`
 				if (checkNotfFilter(key)) {
-					exclude =
+					excludeNotf =
-						exclude +
+						excludeNotf +
 						`<button class="btn btn-flat red-text waves-effect notf-exclude-btn waves-light" style="width:calc(50% - 11px); padding:0;" onclick="resetNotfFilter('${key}')">
 							Clear all
 						</button>`
 				}
-				exclude = exclude + '</div>'
+				excludeNotf = excludeNotf + '</div>'
 				notfDomain = 'dummy'
 				notfKey = 'dummy'
 				var excludeHome = ''
 			} else if (acct.type == 'home') {
-				var exclude = `<a onclick="ebtToggle('${key}')" class="setting nex waves-effect">
+				var excludeNotf = ''
 				var excludeHome = `<a onclick="ebtToggle('${key}')" class="setting nex waves-effect">
 						<i class="fas fa-retweet nex" title="${lang.lang_layout_excludingbt}" style="font-size: 24px"></i>
-						<span id="sta-bt-${key}">Off</span><br />
+						<span>${lang.lang_layout_excludingbt}</span><span id="sta-bt-${key}">Off</span>
 					${lang.lang_layout_excludingbt}
 					</a>`
 			} else if (acct.type == 'tag') {
 				if (acct.data.name) {
@@ -313,10 +314,12 @@ function parseColumn(target, dontclose) {
 				<i class="material-icons waves-effect nex">note_add</i>
 				</a>`
 				unread = ''
-				var exclude = ''
+				var excludeNotf = ''
 				var excludeHome = ''
 				var if_notf = 'hide'
 			} else {
-				var exclude = ''
+				var excludeNotf = ''
 				var excludeHome = ''
 				unread = ''
 			}
@@ -337,12 +340,12 @@ function parseColumn(target, dontclose) {
 					$('#timeline-container').append(basehtml)
 				}
 				var left_hold = `<a onclick="leftFoldSet('${key}')" class="setting nex waves-effect">
-						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i><br />
+						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftFold}">view_agenda</i>
-					${lang.lang_layout_leftFold}</a>`
+					<span>${lang.lang_layout_leftFold}</span></a>`
 			} else {
 				var left_hold = `<a onclick="leftFoldRemove('${key}')" class="setting nex waves-effect">
-						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i><br />
+						<i class="material-icons waves-effect nex" title="${lang.lang_layout_leftUnfold}">view_column</i>
-					${lang.lang_layout_leftUnfold}</a>`
+					<span>${lang.lang_layout_leftUnfold}</span></a>`
 			}
 			if (key === 0) {
 				left_hold = ''
@@ -363,8 +366,7 @@ function parseColumn(target, dontclose) {
 			if (acct.type != 'pub' && acct.type != 'pub-media') {
 				var mediaFil = `<a onclick="mediaToggle('${key}')" class="setting nex waves-effect">
 					<i class="material-icons nex" title="${lang.lang_layout_mediafil}">perm_media</i>
-					<span id="sta-media-${key}">On</span><br />
+				<span>${lang.lang_layout_mediafil}</span/><span id="sta-media-${key}">On</span></a>`
 				${lang.lang_layout_mediafil}</a>`
 			} else {
 				var mediaFil = `<a onclick="remoteOnly('${key}','${acct.type}')" class="setting nex waves-effect">
 					<i class="material-icons nex" title="${lang.lang_layout_remoteOnly}">perm_media</i><br />
@@ -422,39 +424,48 @@ function parseColumn(target, dontclose) {
 					</div>
 				</div>
 				<div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;">
-					${exclude}
+					${excludeNotf}
 					<div class="columnSettings">
 					${excludeHome}
 					${unread}
 					${left_hold}
 					${mediaFil}
 					<a onclick="cardToggle('${key}')" class="setting nex waves-effect">
 						<i class="material-icons nex" title="${lang.lang_layout_linkanades}">link</i>
-						<span id="sta-card-${key}">On</span><br />
+					<span>${lang.lang_layout_linkana}</span><span id="sta-card-${key}">On</span>
 					${lang.lang_layout_linkana}
 					</a>
 					<a onclick="voiceToggle('${key}')" class="setting nex waves-effect">
 						<i class="material-icons nex" title="${lang.lang_layout_tts}">hearing</i>
-						<span id="sta-voice-${key}">On</span><br />
+					<span>${lang.lang_layout_tts}TL</span/><span id="sta-voice-${key}">On</span>
-					${lang.lang_layout_tts}
+					</a>
 					TL</a>
 					<a onclick="columnReload('${key}','${acct.type}')" class="setting nex ${if_misskey_hide} waves-effect">
 						<i class="material-icons nex" title="${lang.lang_layout_reconnect}">refresh</i>
-					<br />
+						<span>${lang.lang_layout_reconnect}</span>
 						${lang.lang_layout_reconnect}
 					</a>
 					<a onclick="resetWidth('${key}')" class="setting nex waves-effect">
-						<i class="material-icons nex" title="${lang.lang_layout_resetWidth}">refresh</i>
+						<i class="material-icons nex rotate-90" title="${lang.lang_layout_resetWidth}">height</i>
-					<br />
+						<span>${lang.lang_layout_resetWidth}</span>
-						${lang.lang_layout_resetWidth}
+					</a></div>
-					</a><br />
+					<p>${lang.lang_layout_headercolor}</p>
 					${lang.lang_layout_headercolor}
 					<br>
 					<div id="picker_${key}" class="color-picker"></div>
 				</div>${if_tag}
 				<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">
+						<div id="landing_${key}" class="landing">
-						${lang.lang_layout_nodata}
+						<div class="preloader-wrapper small active " style="margin-top: calc(50vh - 15px)">
 							<div class="spinner-layer spinner-blue-only">
 								<div class="circle-clipper left">
 									<div class="circle"></div>
 								</div>
 								<div class="gap-patch">
 									<div class="circle"></div>
 								</div>
 								<div class="circle-clipper right">
 									<div class="circle"></div>
 								</div>
 							</div>
 					  </div>
 					</div>
 				</div>
 			</div>`
@@ -660,8 +671,6 @@ function removeColumn(tlid) {
 				$('#timeline_box_' + tlid + '_parentBox').remove()
 			}
 		}
 		$('#sort-box').removeClass('hide')
 		$('#sort-box').addClass('show')
 	})
 }
--- a/app/js/ui/post-box.js
+++ b/app/js/ui/post-box.js
@@ -101,6 +101,7 @@ if (location.search) {
 		$('.mini-btn').text('expand_less')
 	}
 }
 function initPostbox() {
 	$('#posttgl').click(function (e) {
 		if (!$('#post-box').hasClass('appear')) {
@@ -124,6 +125,7 @@ function initPostbox() {
 		selectedToot = 0
 		localStorage.removeItem('nohide')
 		srcBox('close')
 		tShowBox('close')
 	})
 	$('#textarea,#cw-text').focusout(function (e) {
 		localStorage.setItem('nohide', true)
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
@@ -11,9 +11,11 @@ var envView = new Vue({
            } else {
                ls = ls.data
            }
            console.log(ls)
            for (var j = 0; j < ls.length; j++) {
-				var id = ls[j].id
+                var lsi = ls[j]
-				localStorage.setItem(ls[j].storage, val)
+                if (!val || j > 0) val = lsi.setValue
                localStorage.setItem(lsi.storage, val)
            }
            if (ls[0].id == 'ha') {
                hardwareAcceleration(val)
@@ -185,6 +187,7 @@ function load() {
    //$("#log").val(localStorage.getItem("errors"))
    $('#lastFmUser').val(localStorage.getItem('lastFmUser'))
 }
 function customVol() {
    var cvol = $('#soundvol').val()
    $('#soundVolVal').text(cvol)
@@ -241,6 +244,7 @@ function climute() {
        })
    }
 }
 function cliMuteDel(key) {
    var cli = localStorage.getItem('client_mute')
    var obj = JSON.parse(cli)
@@ -260,6 +264,7 @@ function wordmute() {
        data: obj,
    })
 }
 function wordmuteSave() {
    var word = M.Chips.getInstance($('#wordmute')).chipsData
    var json = JSON.stringify(word)
@@ -276,11 +281,13 @@ function wordemp() {
        data: obj,
    })
 }
 function wordempSave() {
    var word = M.Chips.getInstance($('#wordemp')).chipsData
    var json = JSON.stringify(word)
    localStorage.setItem('word_emp', json)
 }
 function notftest() {
    var os = localStorage.getItem('platform')
    var options = {
@@ -289,11 +296,13 @@ function notftest() {
    }
    var n = new Notification('TheDesk' + lang.lang_setting_notftest, options)
 }
 function oks(no) {
    var txt = $('#oks-' + no).val()
    localStorage.setItem('oks-' + no, txt)
    M.toast({ html: lang.lang_setting_ksref, displayLength: 3000 })
 }
 function oksload() {
    if (localStorage.getItem('oks-1')) {
        $('#oks-1').val(localStorage.getItem('oks-1'))
@@ -305,11 +314,13 @@ function oksload() {
        $('#oks-3').val(localStorage.getItem('oks-3'))
    }
 }
 function changeLang() {
    const lang = $('#langsel-sel').val()
    console.log(lang)
    if (lang) postMessage(['lang', lang], '*')
 }
 function exportSettings() {
    var exp = exportSettingsCore()
    $('#imp-exp').val(JSON5.stringify(exp))
@@ -326,6 +337,7 @@ function exportSettings() {
        }
    })
 }
 function exportSettingsCore() {
    var exp = {}
        //Accounts
@@ -391,6 +403,7 @@ function exportSettingsCore() {
    exp.meta.platform = localStorage.getItem('platform')
    return exp
 }
 function importSettings() {
    Swal.fire({
        title: 'Warning',
@@ -409,6 +422,7 @@ function importSettings() {
        }
    })
 }
 function importSettingsCore(obj) {
    if (obj) {
        localStorage.clear()
@@ -502,13 +516,20 @@ function importSettingsCore(obj) {
        })
    }
 }
 function savefolder() {
    postMessage(['sendSinmpleIpc', 'savefolder'], '*')
 }
 function font() {
    if ($('#fonts').hasClass('hide')) {
        postMessage(['sendSinmpleIpc', 'fonts'], '*')
        $('#fonts').removeClass('hide')
    } else {
        $('#fonts').addClass('hide')
    }
 }
 function fontList(arg) {
    $('#fonts').removeClass('hide')
    for (var i = 0; i < arg.length; i++) {
@@ -516,16 +537,14 @@ function fontList(arg) {
        $('#fonts').append('<div class="font pointer" style="font-family:' + font + '" onclick="insertFont(\'' + font + '\')">' + font + '</div>')
    }
 }
 function insertFont(name) {
    $('#fonts').addClass('hide')
    $('#font').val(name)
 }
 function copyColor(from, to) {
-	let props = [
+    let props = ['background', 'subcolor', 'text', 'accent', 'modal', 'modalFooter', 'third', 'forth', 'bottom', 'emphasized', 'postbox', 'active', 'selected', 'selectedWithShared']
 		'background', 'subcolor', 'text', 'accent',
 		'modal', 'modalFooter', 'third', 'forth',
 		'bottom', 'emphasized', 'postbox', 'active',
 		'selected', 'selectedWithShared'
 	]
    let i = 0
    let color
    for (tag of props) {
@@ -553,6 +572,7 @@ function copyColor(from, to) {
        i++
    }
 }
 function customComp(preview) {
    var nameC = $('#custom_name').val()
    if (!nameC && !preview) {
@@ -564,11 +584,7 @@ function customComp(preview) {
    var textC = $('#color-picker1_value').val()
    var accentC = $('#color-picker3_value').val()
    var multi = localStorage.getItem('multi')
-	let advanced = [
+    let advanced = ['modal', 'modalFooter', 'third', 'forth', 'bottom', 'emphasized', 'postbox', 'active', 'selected', 'selectedWithShared']
 		'modal', 'modalFooter', 'third', 'forth',
 		'bottom', 'emphasized', 'postbox', 'active',
 		'selected', 'selectedWithShared'
 	]
    var advanceTheme = {}
    let i = 4
    for (tag of advanced) {
@@ -581,9 +597,7 @@ function customComp(preview) {
    var my = JSON.parse(multi)[0].name
    var id = $('#custom-edit-sel').val()
-	const defaults = [
+    const defaults = ['black', 'blue', 'brown', 'green', 'indigo', 'polar', 'snow', 'white']
 		'black', 'blue', 'brown', 'green', 'indigo', 'polar', 'snow', 'white'
 	]
    if (id == 'add_new' || defaults.includes(id)) {
        id = makeCID()
    }
@@ -597,11 +611,11 @@ function customComp(preview) {
            background: bgC,
            subcolor: subcolorC,
            text: textC,
-			accent: accentC
+            accent: accentC,
        },
        advanced: advanceTheme,
        id: id,
-		version: '2'
+        version: '2',
    }
    $('#custom_json').val(JSON.stringify(json))
    if (preview) {
@@ -615,8 +629,8 @@ function customComp(preview) {
        })
        postMessage(['themeJsonCreate', JSON.stringify(json)], '*')
    }
 }
 function deleteIt() {
    var id = $('#custom-sel-sel').val()
    $('#custom_name').val('')
@@ -629,9 +643,11 @@ function deleteIt() {
    }
    postMessage(['themeJsonDelete', id + '.thedesktheme'], '*')
 }
 function ctLoad() {
    postMessage(['sendSinmpleIpc', 'theme-json-list'], '*')
 }
 function ctLoadCore(args) {
    var template = ''
    var editTemplate = ''
@@ -682,16 +698,11 @@ function customConnect(raw) {
 	$('#color-picker2_value').val(args.primary.subcolor)
 	//Accent
 	$('#color-picker3_value').val(args.primary.accent)
-	let advanced = [
+	let advanced = ['modal', 'modalFooter', 'third', 'forth', 'bottom', 'emphasized', 'postbox', 'active', 'selected', 'selectedWithShared']
 		'modal', 'modalFooter', 'third', 'forth',
 		'bottom', 'emphasized', 'postbox', 'active',
 		'selected', 'selectedWithShared'
 	]
 	let i = 4
 	for (tag of advanced) {
 		if (args.advanced[tag]) {
 			$(`#color-picker${i}_value`).val(args.advanced[tag])
 		}
 		$(`#use-color_${i}`).prop('checked', true)
 		i++
@@ -737,7 +748,7 @@ function customSoundSave(key, file) {
 }
 function pluginLoad() {
 	$('#plugin-edit-sel').val('add_new')
-	$(".plugin_delete").addClass('disabled')
+	$('.plugin_delete').addClass('disabled')
 	var template = ''
 	var pgns = localStorage.getItem('plugins')
 	var args = JSON.parse(pgns ? pgns : '[]')
@@ -755,9 +766,9 @@ function pluginEdit() {
 	$('#plugin').attr('data-id', id)
 	if (id == 'add_new') {
 		editor.setValue('', -1)
-		$(".plugin_delete").addClass('disabled')
+		$('.plugin_delete').addClass('disabled')
 	} else {
-		$(".plugin_delete").removeClass('disabled')
+		$('.plugin_delete').removeClass('disabled')
 		var pgns = localStorage.getItem('plugins')
 		var args = JSON.parse(pgns ? pgns : '[]')
 		Object.keys(args).forEach(function (key) {
@@ -795,7 +806,7 @@ function completePlugin(comp) {
 		id = makeCID()
 		args.push({
 			id: id,
-			content: inputPlugin
+			content: inputPlugin,
 		})
 	} else {
 		Object.keys(args).forEach(function (key) {
@@ -829,7 +840,7 @@ async function deletePlugin() {
 	const alert = await Swal.fire({
 		title: 'delete',
 		icon: 'warning',
-		showCancelButton: true
+		showCancelButton: true,
 	})
 	if (!alert) return false
 	editor.setValue('', -1)
@@ -931,4 +942,6 @@ function lastFmSet() {
 	M.toast({ html: 'Complete: last.fm', displayLength: 3000 })
 }
-function stopVideo() { return false }
+function stopVideo() {
 	return false
 }
--- a/app/js/ui/tips.js
+++ b/app/js/ui/tips.js
@@ -117,7 +117,7 @@ function trendTagonTip() {
 				Object.keys(json).forEach(function(tag) {
 					tags =
 						tags +
-						`<a onclick="tagShow('${tag}')" class="pointer">
+						`<a onclick="tagShow('${tag}', this)" class="pointer">
 							#${escapeHTML(tag)}
 						</a>
 						<span class="hide" data-tag="${tag}" data-regTag="${tag.toLowerCase()}">　
--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@@ -1,40 +1,62 @@
 //ユーザーデータ表示
-localStorage.removeItem("history")
+localStorage.removeItem('history')
    //コード受信
 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 == "user") {
+    if (mode == 'user') {
-		udgEx(codex, "main")
+        udgEx(codex, 'main')
    }
 }
-function udgEx(user, acct_id) {
+
-	if (user == "selector") {
+async function udgEx(user, acct_id) {
-		user = $("#his-acct").attr("fullname")
+    if (user == 'selector') {
        user = $('#his-acct').attr('fullname')
    }
-	if (acct_id == "selector") {
+    if (acct_id == 'selector') {
-		acct_id = $("#user-acct-sel").val()
+        acct_id = $('#user-acct-sel').val()
    }
-	if (acct_id == "main") {
+    if (acct_id == 'main') {
-		acct_id = localStorage.getItem("main")
+        acct_id = localStorage.getItem('main')
    }
-	console.log("Get user data of " + user)
+    console.log('Get user data of ' + user)
-	var domain = localStorage.getItem("domain_" + acct_id)
+    var domain = localStorage.getItem('domain_' + acct_id)
-	if (localStorage.getItem("mode_" + domain) == "misskey") {
+    if (localStorage.getItem('mode_' + domain) == 'misskey') {
        return false
    }
-	var at = localStorage.getItem("acct_" + acct_id + "_at")
+    var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = "https://" + domain + "/api/v2/search?resolve=true&q=" + encodeURIComponent(user)
+    var data = await acctResolve(acct_id, user)
-	fetch(start, {
+    if (data.id) {
-		method: "GET",
+        var { id } = data
-		headers: {
+        udg(id, acct_id, true)
-			"content-type": "application/json",
+    } else {
-			Authorization: "Bearer " + at
+        Swal.close()
        postMessage(['openUrl', user], '*')
    }
    return true
    var start = 'https://' + domain + '/api/v2/search?resolve=true&q=' + encodeURIComponent(user)
    Swal.fire({
        title: 'Loading...',
        html: lang.lang_details_fetch,
        showConfirmButton: false,
        showCloseButton: true,
        onBeforeOpen: () => {
            Swal.showLoading()
        },
        onClose: () => {},
    }).then((result) => {})
    fetch(start, {
            method: 'GET',
            headers: {
                'content-type': 'application/json',
                Authorization: 'Bearer ' + at,
            },
        })
        .then(function(response) {
            if (!response.ok) {
                Swal.close()
                response.text().then(function(text) {
                    setLog(response.url, response.status, text)
                })
@@ -43,40 +65,43 @@ function udgEx(user, acct_id) {
        })
        .catch(function(error) {
            todo(error)
-			setLog(start, "JSON", error)
+            setLog(start, 'JSON', error)
            console.error(error)
        })
        .then(function(json) {
            if (json.accounts[0]) {
                var id = json.accounts[0].id
-				udg(id, acct_id)
+                udg(id, acct_id, true)
            } else {
-				postMessage(["openUrl", user], "*")
+                Swal.close()
                postMessage(['openUrl', user], '*')
            }
        })
    return true
 }
-function udg(user, acct_id) {
+
 function udg(user, acct_id, isSwal) {
    reset()
    if (!user) {
-		user = localStorage.getItem("user-id_" + acct_id)
+        user = localStorage.getItem('user-id_' + acct_id)
    }
-	todo("User Data Loading...")
+    todo('User Data Loading...')
-	var domain = localStorage.getItem("domain_" + acct_id)
+    var domain = localStorage.getItem('domain_' + acct_id)
-	if (localStorage.getItem("mode_" + domain) == "misskey") {
+    if (localStorage.getItem('mode_' + domain) == 'misskey') {
        misskeyUdg(user, acct_id)
        return
    }
-	var at = localStorage.getItem("acct_" + acct_id + "_at")
+    var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = "https://" + domain + "/api/v1/accounts/" + user
+    var start = 'https://' + domain + '/api/v1/accounts/' + user
    fetch(start, {
-		method: "GET",
+            method: 'GET',
            headers: {
-			"content-type": "application/json",
+                'content-type': 'application/json',
-			Authorization: "Bearer " + at
+                Authorization: 'Bearer ' + at,
-		}
+            },
        })
        .then(function(response) {
            if (isSwal) Swal.close()
            if (!response.ok) {
                response.text().then(function(text) {
                    setLog(response.url, response.status, text)
@@ -86,38 +111,38 @@ function udg(user, acct_id) {
        })
        .catch(function(error) {
            todo(error)
-			setLog(start, "JSON", error)
+            setLog(start, 'JSON', error)
            console.error(error)
        })
        .then(function(json) {
            //一つ前のユーザーデータ
-			if (!localStorage.getItem("history")) {
+            if (!localStorage.getItem('history')) {
-				$("#his-history-btn").prop("disabled", true)
+                $('#his-history-btn').prop('disabled', true)
            } else {
-				$("#his-history-btn").prop("disabled", false)
+                $('#his-history-btn').prop('disabled', false)
-				$("#his-data").attr("history", localStorage.getItem("history"))
+                $('#his-data').attr('history', localStorage.getItem('history'))
            }
            //moved設定時
            if (json.moved) {
                M.toast({
-					html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' + json.moved.id + "','" + acct_id + "')\">" + lang.lang_showontl_movebtn + "</button>",
+                    html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' + json.moved.id + "','" + acct_id + '\')">' + lang.lang_showontl_movebtn + '</button>',
-					displayLength: 4000
+                    displayLength: 4000,
                })
            }
-			$("#his-data").modal("open")
+            $('#his-data').modal('open')
-			$("#his-data").attr("user-id", user)
+            $('#his-data').attr('user-id', user)
-			$("#his-data").attr("use-acct", acct_id)
+            $('#his-data').attr('use-acct', acct_id)
            if (json.username != json.acct) {
                //Remote
-				$("#his-data").attr("remote", "true")
+                $('#his-data').attr('remote', 'true')
                var fullname = json.acct
            } else {
-				$("#his-data").attr("remote", "false")
+                $('#his-data').attr('remote', 'false')
-				var fullname = json.acct + "@" + domain
+                var fullname = json.acct + '@' + domain
            }
-			utlShow(json.id, "", acct_id)
+            utlShow(json.id, '', acct_id)
-			flw(json.id, "", acct_id)
+            flw(json.id, '', acct_id)
-			fer(json.id, "", acct_id)
+            fer(json.id, '', acct_id)
            var dis_name = escapeHTML(json.display_name)
            dis_name = twemoji.parse(dis_name)
@@ -133,7 +158,7 @@ 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 + '" draggable="false">'
-					var regExp = new RegExp(":" + shortcode + ":", "g")
+                    var regExp = new RegExp(':' + shortcode + ':', 'g')
                    dis_name = dis_name.replace(regExp, emoji_url)
                    note = note.replace(regExp, emoji_url)
                })
@@ -143,100 +168,116 @@ function udg(user, acct_id) {
            //var mens =  '<a onclick="udgEx(\'$1\',' + acct_id +')" class="pointer parsed">@$1</a>';
            //note=note.replace(/#(\S+)/gi, tags)
            //note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens)
-			$("#his-name").html(dis_name)
+            $('#his-name').html(dis_name)
-			$("#his-acct").text(json.acct)
+            $('#his-acct').text(json.acct)
-			$("#his-acct").attr("fullname", fullname)
+            $('#his-acct').attr('fullname', fullname)
-			$("#his-prof").attr("src", json.avatar)
+            $('#his-prof').attr('src', json.avatar)
-			$("#his-data").css("background-image", "url(" + json.header + ")")
+            $('#util-add').removeClass('hide')
-			$("#his-sta").text(json.statuses_count)
+            const title = $('.column-first').html()
-			$("#his-follow").text(json.following_count)
+            $('#my-data-nav .anc-link').removeClass('active-back')
            $('.column-first').addClass('active-back')
            $('#his-data-title').html(title)
            $('#his-data').css('background-image', 'url(' + json.header + ')')
            $('#his-sta').text(json.statuses_count)
            $('#his-follow').text(json.following_count)
            var flerc = json.followers_count
            if (flerc < 0) {
-				flerc = "-"
+                flerc = '-'
            }
-			$("#his-follower").text(flerc)
+            $('#his-follower').text(flerc)
-			$("#his-since").text(crat(json.created_at))
+            $('#his-since').text(crat(json.created_at))
-			$("#his-openin").attr("data-href", json.url)
+            $('#his-openin').attr('data-href', json.url)
            if (json.fields) {
-				var table = ""
+                var table = ''
                if (json.fields.length > 0) {
-					$("#his-des").css("max-height", "250px")
+                    $('#his-des').css('max-height', '250px')
                    table = '<table id="his-field">'
                    for (var i = 0; i < json.fields.length; i++) {
                        var fname = json.fields[i].name
                        var fval = json.fields[i].value
                        if (json.fields[i].verified_at) {
-							var when = lang.lang_showontl_verified + ":" + crat(json.fields[i].verified_at)
+                            var when = lang.lang_showontl_verified + ':' + crat(json.fields[i].verified_at)
-							var color = "rgba(121,189,154,.25);"
+                            var color = 'rgba(121,189,154,.25);'
                        } else {
-							var when = ""
+                            var when = ''
-							var color = "inherit"
+                            var color = 'inherit'
                        }
-						table = table + '<tr><td class="his-field-title">' + escapeHTML(fname) + '</td><td class="his-field-content" title="' + when + '" style="background-color:' + color + '">' + fval + "</td></tr>"
+                        table =
                            table +
                            '<tr><td class="his-field-title">' +
                            escapeHTML(fname) +
                            '</td><td class="his-field-content" title="' +
                            when +
                            '" style="background-color:' +
                            color +
                            '">' +
                            fval +
                            '</td></tr>'
                    }
-					table = table + "</table>"
+                    table = table + '</table>'
-					$("#his-des").html(twemoji.parse(note))
+                    $('#his-des').html(twemoji.parse(note))
                } else {
-					$("#his-des").css("max-height", "400px")
+                    $('#his-des').css('max-height', '400px')
                }
-				$("#his-table").html(twemoji.parse(table))
+                $('#his-table').html(twemoji.parse(table))
            } else {
-				$("#his-des").css("max-height", "400px")
+                $('#his-des').css('max-height', '400px')
            }
-			$("#his-des").html(twemoji.parse(note))
+            $('#his-des').html(twemoji.parse(note))
            if (json.bot) {
-				$("#his-bot").html(lang.lang_showontl_botacct)
+                $('#his-bot').html(lang.lang_showontl_botacct)
                $('#his-bot').removeClass('hide')
            }
-			$("#his-des").attr("data-acct", acct_id)
+            $('#his-des').attr('data-acct', acct_id)
-			$("#his-data").css("background-size", "cover")
+            $('#his-data').css('background-size', 'cover')
-			$("#his-float-timeline").css("height", $("#his-data-show").height() + "px")
+            $('#his-float-timeline').css('height', $('#his-data-show').height() + 'px')
-			localStorage.setItem("history", user)
+            localStorage.setItem('history', user)
                //自分の時
-			if (json.acct == localStorage.getItem("user_" + acct_id)) {
+            if (json.acct == localStorage.getItem('user_' + acct_id)) {
-				showFav("", acct_id)
+                showFav('', acct_id)
-				showBlo("", acct_id)
+                showBlo('', acct_id)
-				showMut("", acct_id)
+                showMut('', acct_id)
-				showDom("", acct_id)
+                showDom('', acct_id)
-				showReq("", acct_id)
+                showReq('', acct_id)
-				showFrl("", acct_id)
+                showFrl('', acct_id)
-				$("#his-name-val").val(json.display_name)
+                $('#his-name-val').val(json.display_name)
                if (json.fields.length > 0) {
                    if (json.fields[0]) {
-						$("#his-f1-name").val(json.fields[0].name)
+                        $('#his-f1-name').val(json.fields[0].name)
-						$("#his-f1-val").val($.strip_tags(json.fields[0].value))
+                        $('#his-f1-val').val($.strip_tags(json.fields[0].value))
                    }
                    if (json.fields[1]) {
-						$("#his-f2-name").val(json.fields[1].name)
+                        $('#his-f2-name').val(json.fields[1].name)
-						$("#his-f2-val").val($.strip_tags(json.fields[1].value))
+                        $('#his-f2-val').val($.strip_tags(json.fields[1].value))
                    }
                    if (json.fields[2]) {
-						$("#his-f3-name").val(json.fields[2].name)
+                        $('#his-f3-name').val(json.fields[2].name)
-						$("#his-f3-val").val($.strip_tags(json.fields[2].value))
+                        $('#his-f3-val').val($.strip_tags(json.fields[2].value))
                    }
                    if (json.fields[3]) {
-						$("#his-f4-name").val(json.fields[3].name)
+                        $('#his-f4-name').val(json.fields[3].name)
-						$("#his-f4-val").val($.strip_tags(json.fields[3].value))
+                        $('#his-f4-val').val($.strip_tags(json.fields[3].value))
                    }
                }
                var des = json.note
-				des = des.replace(/<br \/>/g, "\n")
+                des = des.replace(/<br \/>/g, '\n')
                des = $.strip_tags(des)
-				$("#his-des-val").val(des)
+                $('#his-des-val').val(des)
-				$("#his-follow-btn").hide()
+                $('#his-follow-btn').hide()
-				$("#his-block-btn").hide()
+                $('#his-block-btn').hide()
-				$("#his-mute-btn").hide()
+                $('#his-mute-btn').hide()
-				$("#his-notf-btn").hide()
+                $('#his-notf-btn').hide()
-				$("#his-domain-btn").hide()
+                $('#his-domain-btn').hide()
-				$("#his-emp-btn").hide()
+                $('#his-emp-btn').hide()
-				$(".only-my-data").show()
+                $('.only-my-data').show()
-				$(".only-his-data").hide()
+                $('.only-his-data').hide()
-				if (localStorage.getItem("main") == acct_id) {
+                if (localStorage.getItem('main') == acct_id) {
-					$("#his-main-acct").hide()
+                    $('#his-main-acct').hide()
                }
            } else {
                relations(user, acct_id)
-				$(".only-my-data").hide()
+                $('.only-my-data').hide()
-				$(".only-his-data").show()
+                $('.only-his-data').show()
            }
            todc()
            if (json.locked) {
@@ -248,28 +289,29 @@ function udg(user, acct_id) {
            udAdd(acct_id, user, json.url)
        })
 }
 function misskeyUdg(user, acct_id) {
    reset()
    if (!user) {
-		user = localStorage.getItem("user-id_" + acct_id)
+        user = localStorage.getItem('user-id_' + acct_id)
    }
-	todo("User Data Loading...")
+    todo('User Data Loading...')
-	var domain = localStorage.getItem("domain_" + acct_id)
+    var domain = localStorage.getItem('domain_' + acct_id)
-	if (localStorage.getItem("mode_" + domain) != "misskey") {
+    if (localStorage.getItem('mode_' + domain) != 'misskey') {
        udg(user, acct_id)
        return
    }
-	var at = localStorage.getItem("acct_" + acct_id + "_at")
+    var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = "https://" + domain + "/api/users/show"
+    var start = 'https://' + domain + '/api/users/show'
    fetch(start, {
-		method: "POST",
+            method: 'POST',
            headers: {
-			"content-type": "application/json"
+                'content-type': 'application/json',
            },
            body: JSON.stringify({
                i: at,
-			userId: user
+                userId: user,
-		})
+            }),
        })
        .then(function(response) {
            if (!response.ok) {
@@ -281,126 +323,126 @@ function misskeyUdg(user, acct_id) {
        })
        .catch(function(error) {
            todo(error)
-			setLog(start, "JSON", error)
+            setLog(start, 'JSON', error)
            console.error(error)
        })
        .then(function(json) {
            //一つ前のユーザーデータ
-			if (!localStorage.getItem("history")) {
+            if (!localStorage.getItem('history')) {
-				$("#his-history-btn").prop("disabled", true)
+                $('#his-history-btn').prop('disabled', true)
            } else {
-				$("#his-history-btn").prop("disabled", false)
+                $('#his-history-btn').prop('disabled', false)
-				$("#his-data").attr("history", localStorage.getItem("history"))
+                $('#his-data').attr('history', localStorage.getItem('history'))
            }
-			$("#his-data").modal("open")
+            $('#his-data').modal('open')
-			$("#his-data").attr("user-id", user)
+            $('#his-data').attr('user-id', user)
-			$("#his-data").attr("use-acct", acct_id)
+            $('#his-data').attr('use-acct', acct_id)
            if (json.host) {
                //Remote
-				$("#his-data").attr("remote", "false")
+                $('#his-data').attr('remote', 'false')
-				var fullname = json.username + "@" + json.host
+                var fullname = json.username + '@' + json.host
            } else {
-				$("#his-data").attr("remote", "false")
+                $('#his-data').attr('remote', 'false')
-				var fullname = json.acct + "@" + domain
+                var fullname = json.acct + '@' + domain
            }
-			utlShow(json.id, "", acct_id)
+            utlShow(json.id, '', acct_id)
-			flw(json.id, "", acct_id)
+            flw(json.id, '', acct_id)
-			fer(json.id, "", acct_id)
+            fer(json.id, '', acct_id)
            if (json.name) {
                var dis_name = escapeHTML(json.name)
                dis_name = twemoji.parse(dis_name)
            } else {
                var dis_name = json.name
            }
-			$("#his-name").html(dis_name)
+            $('#his-name').html(dis_name)
-			$("#his-acct").text(json.username)
+            $('#his-acct').text(json.username)
-			$("#his-acct").attr("fullname", fullname)
+            $('#his-acct').attr('fullname', fullname)
-			$("#his-prof").attr("src", json.avatarUrl)
+            $('#his-prof').attr('src', json.avatarUrl)
-			$("#his-data").css("background-image", "url(" + json.bannerUrl + ")")
+            $('#his-data').css('background-image', 'url(' + json.bannerUrl + ')')
-			$("#his-sta").text(json.notesCount)
+            $('#his-sta').text(json.notesCount)
-			$("#his-follow").text(json.followingCount)
+            $('#his-follow').text(json.followingCount)
-			$("#his-follower").text(json.followersCount)
+            $('#his-follower').text(json.followersCount)
-			$("#his-since").text(crat(json.createdAt))
+            $('#his-since').text(crat(json.createdAt))
            var note = escapeHTML(json.description)
-			$("#his-des").html(twemoji.parse(note))
+            $('#his-des').html(twemoji.parse(note))
            if (json.isCat) {
-				$("#his-bot").html("Cat" + twemoji.parse("😺"))
+                $('#his-bot').html('Cat' + twemoji.parse('😺'))
            }
-			$("#his-data").css("background-size", "cover")
+            $('#his-data').css('background-size', 'cover')
-			localStorage.setItem("history", user)
+            localStorage.setItem('history', user)
                //自分の時
-			if (json.username == localStorage.getItem("user_" + acct_id) && !json.host) {
+            if (json.username == localStorage.getItem('user_' + acct_id) && !json.host) {
                //showFav('', acct_id);
                //showMut('', acct_id);
                //showReq('', acct_id);
-				showFrl("", acct_id)
+                showFrl('', acct_id)
-				$("#his-name-val").val(json.name)
+                $('#his-name-val').val(json.name)
                var des = json.note
                des = nl2br(des)
                des = $.strip_tags(des)
-				$("#his-des-val").val(des)
+                $('#his-des-val').val(des)
-				$("#his-follow-btn").hide()
+                $('#his-follow-btn').hide()
-				$("#his-block-btn").hide()
+                $('#his-block-btn').hide()
-				$("#his-mute-btn").hide()
+                $('#his-mute-btn').hide()
-				$("#his-notf-btn").hide()
+                $('#his-notf-btn').hide()
-				$("#his-domain-btn").hide()
+                $('#his-domain-btn').hide()
-				$("#his-emp-btn").hide()
+                $('#his-emp-btn').hide()
-				$(".only-my-data").show()
+                $('.only-my-data').show()
-				$(".only-his-data").hide()
+                $('.only-his-data').hide()
-				if (localStorage.getItem("main") == acct_id) {
+                if (localStorage.getItem('main') == acct_id) {
-					$("#his-main-acct").hide()
+                    $('#his-main-acct').hide()
                }
            } else {
                if (json.isFollowing) {
                    //自分がフォローしている
-					$("#his-data").addClass("following")
+                    $('#his-data').addClass('following')
-					$("#his-follow-btn-text").text(lang.lang_status_unfollow)
+                    $('#his-follow-btn-text').text(lang.lang_status_unfollow)
                    hisList(user, acct_id)
                } else {
-					$("#his-follow-btn-text").text(lang.lang_status_follow)
+                    $('#his-follow-btn-text').text(lang.lang_status_follow)
                }
                if (json.isFollowed) {
                    //フォローされてる
-					$("#his-relation").text(lang.lang_showontl_followed)
+                    $('#his-relation').text(lang.lang_showontl_followed)
                }
-				$("#his-block-btn").hide()
+                $('#his-block-btn').hide()
                if (json.isMuted) {
-					$("#his-data").addClass("muting")
+                    $('#his-data').addClass('muting')
-					$("#his-mute-btn-text").text(lang.lang_status_unmute)
+                    $('#his-mute-btn-text').text(lang.lang_status_unmute)
                } else {
-					$("#his-mute-btn-text").text(lang.lang_status_mute)
+                    $('#his-mute-btn-text').text(lang.lang_status_mute)
                }
-				$(".only-my-data").hide()
+                $('.only-my-data').hide()
-				$(".only-his-data").show()
+                $('.only-his-data').show()
            }
            todc()
        })
 }
 //一つ前のユーザーデータ表示
 function historyShow() {
-	var acct_id = $("#his-data").attr("use-acct")
+    var acct_id = $('#his-data').attr('use-acct')
-	var user = $("#his-data").attr("history")
+    var user = $('#his-data').attr('history')
-	udg(user, acct_id, "true")
+    udg(user, acct_id, 'true')
 }
 //選択アカウントのプロフ
 function profShow() {
-	var acct_id = $("#post-acct-sel").val()
+    var acct_id = $('#post-acct-sel').val()
-	var user = localStorage.getItem("user-id_" + acct_id)
+    var user = localStorage.getItem('user-id_' + acct_id)
    udg(user, acct_id)
    hide()
 }
 //FF関係取得
 function relations(user, acct_id) {
-	var domain = localStorage.getItem("domain_" + 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')
-	var start = "https://" + domain + "/api/v1/accounts/relationships?id=" + user
+    var start = 'https://' + domain + '/api/v1/accounts/relationships?id=' + user
    fetch(start, {
-		method: "GET",
+            method: 'GET',
            headers: {
-			"content-type": "application/json",
+                'content-type': 'application/json',
-			Authorization: "Bearer " + at
+                Authorization: 'Bearer ' + at,
-		}
+            },
        })
        .then(function(response) {
            if (!response.ok) {
@@ -412,7 +454,7 @@ function relations(user, acct_id) {
        })
        .catch(function(error) {
            todo(error)
-			setLog(start, "JSON", error)
+            setLog(start, 'JSON', error)
            console.error(error)
        })
        .then(function(json) {
@@ -420,145 +462,151 @@ function relations(user, acct_id) {
            if (json.requested) {
                //フォロリク中
                $('#his-data').addClass('following')
-				$("#his-follow-btn-text").text(lang.lang_status_requesting)
+                $('#his-follow-btn-text').text(lang.lang_status_requesting)
            }
            if (json.following) {
                //自分がフォローしている
-				$("#his-data").addClass("following")
+                $('#his-data').addClass('following')
-				$("#his-follow-btn-text").text(lang.lang_status_unfollow)
+                $('#his-follow-btn-text').text(lang.lang_status_unfollow)
                hisList(user, acct_id)
            } else {
-				$("#his-follow-btn-text").text(lang.lang_status_follow)
+                $('#his-follow-btn-text').text(lang.lang_status_follow)
            }
            if (json.followed_by) {
                //フォローされてる
-				$("#his-relation").text(lang.lang_showontl_followed)
+                $('#his-relation').text(lang.lang_showontl_followed)
            }
            if (json.blocking) {
-				$("#his-data").addClass("blocking")
+                $('#his-data').addClass('blocking')
-				$("#his-block-btn-text").text(lang.lang_status_unblock)
+                $('#his-block-btn-text').text(lang.lang_status_unblock)
            } else {
-				$("#his-block-btn-text").text(lang.lang_status_block)
+                $('#his-block-btn-text').text(lang.lang_status_block)
            }
            if (json.muting) {
-				$("#his-data").addClass("muting")
+                $('#his-data').addClass('muting')
-				$("#his-mute-btn-text").text(lang.lang_status_unmute)
+                $('#his-mute-btn-text').text(lang.lang_status_unmute)
            } else {
-				$("#his-mute-btn-text").text(lang.lang_status_mute)
+                $('#his-mute-btn-text').text(lang.lang_status_mute)
            }
            if (json.muting_notifications) {
-				$("#his-data").addClass("mutingNotf")
+                $('#his-data').addClass('mutingNotf')
-				$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_unmute)
+                $('#his-notf-btn-text').text(lang.lang_showontl_notf + lang.lang_status_unmute)
            } else {
-				$("#his-notf-btn-text").text(lang.lang_showontl_notf + lang.lang_status_mute)
+                $('#his-notf-btn-text').text(lang.lang_showontl_notf + lang.lang_status_mute)
            }
            if (json.domain_blocking) {
-				$("#his-data").addClass("blockingDom")
+                $('#his-data').addClass('blockingDom')
-				$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_unblock)
+                $('#his-domain-btn-text').text(lang.lang_showontl_domain + lang.lang_status_unblock)
            } else {
-				$("#his-domain-btn-text").text(lang.lang_showontl_domain + lang.lang_status_block)
+                $('#his-domain-btn-text').text(lang.lang_showontl_domain + lang.lang_status_block)
            }
            //Endorsed
            if (json.endorsed) {
-				$("#his-end-btn").addClass("endorsed")
+                $('#his-end-btn').addClass('endorsed')
-				$("#his-end-btn-text").text(lang.lang_status_unendorse)
+                $('#his-end-btn-text').text(lang.lang_status_unendorse)
            } else {
-				$("#his-end-btn").removeClass("endorsed")
+                $('#his-end-btn').removeClass('endorsed')
-				$("#his-end-btn-text").text(lang.lang_status_endorse)
+                $('#his-end-btn-text').text(lang.lang_status_endorse)
            }
            //Blocked
            if (json.blocked_by) {
-				$("#my-data-nav .btn").addClass("disabled")
+                $('#my-data-nav .btn').addClass('disabled')
-				$(".his-var-content").hide()
+                $('.his-var-content').hide()
-				$("#his-float-blocked").show()
+                $('#his-float-blocked').show()
-				$("#his-follow-btn").hide()
+                $('#his-follow-btn').hide()
            }
        })
 }
 function profbrws() {
-	var url = $("#his-openin").attr("data-href")
+    var url = $('#his-openin').attr('data-href')
-	postMessage(["openUrl", url], "*")
+    postMessage(['openUrl', url], '*')
 }
 function setMain() {
-	var acct_id = $("#his-data").attr("use-acct")
+    var acct_id = $('#his-data').attr('use-acct')
-	localStorage.setItem("main", acct_id)
+    localStorage.setItem('main', acct_id)
    multiSelector(true)
    M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 })
 }
 //オールリセット
 function hisclose() {
-	$("#his-data").modal("close")
+    $('#his-data').modal('close')
    reset()
-	$("#his-data").attr("history", "")
+    $('#his-data').attr('history', '')
-	localStorage.removeItem("history")
+    localStorage.removeItem('history')
 }
 function reset() {
-	$(".his-var-content:eq(0)").show()
+    $('.his-var-content:eq(0)').show()
-	$(".his-var-content:gt(0)").hide()
+    $('.his-var-content:gt(0)').hide()
-	$("#my-data-nav .btn").removeClass("disabled")
+    $('#my-data-nav .btn').removeClass('disabled')
-	$(".active-back").removeClass("active-back")
+    $('.active-back').removeClass('active-back')
-	$(".column-first").addClass("active-back")
+    $('.column-first').addClass('active-back')
-	$("#his-name").text("Loading")
+    $('#his-name').text('Loading')
-	$("#his-acct").text("")
+    $('#his-acct').text('')
-	$("#his-prof").attr("src", "../../img/loading.svg")
+    $('#his-prof').attr('src', '../../img/loading.svg')
-	$("#his-data").css("background-image", "url(../../img/loading.svg)")
+    $('#his-data').css('background-image', 'url(../../img/loading.svg)')
-	$("#his-sta").text("")
+    $('#his-sta').text('')
-	$("#his-follow").text("")
+    $('#his-follow').text('')
-	$("#his-follower").text("")
+    $('#his-follower').text('')
-	$("#his-des").html("")
+    $('#his-des').html('')
-	$("#his-data").css("background-size", "cover")
+    $('#his-data').css('background-size', 'cover')
-	$("#his-since").text("")
+    $('#his-since').text('')
-	$("#his-data").removeClass("following")
+    $('#his-data').removeClass('following')
-	$("#his-data").removeClass("muting")
+    $('#his-data').removeClass('muting')
-	$("#his-data").removeClass("blocking")
+    $('#his-data').removeClass('blocking')
-	$("#his-data").removeClass("mutingNotf")
+    $('#his-data').removeClass('mutingNotf')
-	$("#his-data").removeClass("blockingDom")
+    $('#his-data').removeClass('blockingDom')
-	$("#his-end-btn").removeClass("endorsed")
+    $('#his-end-btn').removeClass('endorsed')
-	$("#his-des").css("max-height", "250px")
+    $('#his-des').css('max-height', '250px')
-	$("#his-bot").html("")
+    $('#his-bot').html('')
-	$("#his-follow-btn").show()
+    $('#his-bot').addClass('hide')
-	$("#his-block-btn").show()
+    $('#his-follow-btn').show()
-	$("#his-mute-btn").show()
+    $('#his-block-btn').show()
-	$("#his-notf-btn").show()
+    $('#his-mute-btn').show()
-	$("#his-domain-btn").show()
+    $('#his-notf-btn').show()
-	$("#his-emp-btn").show()
+    $('#his-domain-btn').show()
-	$("#his-follow-btn-text").text(lang.lang_status_follow)
+    $('#his-emp-btn').show()
-	$("#his-mute-btn-text").text(lang.lang_status_mute)
+    $('#his-follow-btn-text').text(lang.lang_status_follow)
-	$("#his-block-btn-text").text(lang.lang_status_block)
+    $('#his-mute-btn-text').text(lang.lang_status_mute)
-	$("#his-notf-btn").text(lang.lang_showontl_notf + lang.lang_status_mute)
+    $('#his-block-btn-text').text(lang.lang_status_block)
-	$("#his-domain-btn").text(lang.lang_showontl_domain + lang.lang_status_block)
+    $('#his-notf-btn').text(lang.lang_showontl_notf + lang.lang_status_mute)
-	$("#his-relation").text("")
+    $('#his-domain-btn').text(lang.lang_showontl_domain + lang.lang_status_block)
-	$(".cont-series").html("")
+    $('#his-relation').text('')
-	$("#domainblock").val("")
+    $('.cont-series').html('')
-	$("#his-lists-a").html(lang.lang_showontl_listwarn)
+    $('#domainblock').val('')
-	$("#his-lists-b").html("")
+    $('#his-lists-a').html(lang.lang_showontl_listwarn)
-	$("#his-name-val").val("")
+    $('#his-lists-b').html('')
-	$("#his-des-val").val("")
+    $('#his-name-val').val('')
-	$("#his-f1-name").val("")
+    $('#his-des-val').val('')
-	$("#his-f1-val").val("")
+    $('#his-f1-name').val('')
-	$("#his-f2-name").val("")
+    $('#his-f1-val').val('')
-	$("#his-f2-val").val("")
+    $('#his-f2-name').val('')
-	$("#his-f3-name").val("")
+    $('#his-f2-val').val('')
-	$("#his-f3-val").val("")
+    $('#his-f3-name').val('')
-	$("#his-f4-name").val("")
+    $('#his-f3-val').val('')
-	$("#his-f4-val").val("")
+    $('#his-f4-name').val('')
-	$("#his-endorse").html("")
+    $('#his-f4-val').val('')
-	$("#his-openin").attr("data-href", "")
+    $('#his-endorse').html('')
-	$("#his-float-timeline").show()
+    $('#his-openin').attr('data-href', '')
-	$("#his-float-blocked").hide()
+    $('#his-float-timeline').show()
-	$("#his-main-acct").show()
+    $('#his-float-blocked').hide()
-	$("#his-proof-prof").html("")
+    $('#his-main-acct').show()
    $('#his-proof-prof').html('')
    $('#his-data').removeClass('locked')
    $('#his-data').removeClass('requesting')
 }
-$("#my-data-nav .anc-link").on("click", function() {
+$('#my-data-nav .anc-link').on('click', function() {
-	var target = $(this).attr("go")
+    var target = $(this).attr('go')
    if (target) {
-		const title = $(this).html()
+        let title = $(this).html()
        if (target === '#his-tl') $('#util-add').removeClass('hide')
        if (target != '#his-tl') $('#util-add').addClass('hide')
        $('#his-data-title').html(title)
-		$("#my-data-nav .anc-link").removeClass("active-back")
+        $('#my-data-nav .anc-link').removeClass('active-back')
-		$(this).addClass("active-back")
+        $(this).addClass('active-back')
        $(target).show()
-		$(".his-var-content:not(" + target + ")").hide()
+        $('.his-var-content:not(' + target + ')').hide()
    }
 })
--- a/app/main.js
+++ b/app/main.js
@@ -14,12 +14,12 @@ const dl = require('./main/dl.js')
 const img = require('./main/img.js')
 const np = require('./main/np.js')
 const systemFunc = require('./main/system.js')
-const Menu = electron.Menu
+const { Menu, MenuItem, BrowserWindow, ipcMain } = electron
 const join = require('path').join
 // ウィンドウを作成するモジュール
 const BrowserWindow = electron.BrowserWindow
 // メインウィンドウはGCされないようにグローバル宣言
 let mainWindow
 let opening = true
 // アプリが多重起動しないようにする
 const gotTheLock = app.requestSingleInstanceLock()
@@ -27,9 +27,12 @@ const gotTheLock = app.requestSingleInstanceLock()
 if (!gotTheLock) {
 	app.quit()
 } else {
-	app.on('second-instance', () => {
+	app.on('second-instance', (event, commandLine, workingDirector) => {
-		// 多重起動を試みた場合、既に存在するウィンドウにフォーカスを移す
+		opening = false
-		// Someone tried to run a second instance, we should focus our window.
+		const m = commandLine[2].match(/([a-zA-Z0-9]+)\/\?[a-zA-Z-0-9]+=(.+)/)
 		if (m) {
 			mainWindow.send('customUrl', [m[1], m[2]])
 		}
 		if (mainWindow) {
 			if (mainWindow.isMinimized()) mainWindow.restore()
 			mainWindow.focus()
@@ -89,12 +92,13 @@ function createWindow() {
 	const data = JSON.parse(package)
 	const version = data.version
 	const codename = data.codename
-	var openingWindow = new BrowserWindow({
+	const openingWindow = new BrowserWindow({
 		width: 300,
 		height: 400,
 		transparent: false,
 		frame: false,
 		resizable: false,
 		show: opening
 	})
 	openingWindow.loadURL(`${__dirname}/opening.html?ver=${version}&codename=${codename}&maxim=${encodeURI(show)}`)
@@ -229,7 +233,7 @@ function createWindow() {
 	}
 	// ウィンドウが閉じられたらアプリも終了
 	mainWindow.on('closed', function () {
-		electron.ipcMain.removeAllListeners()
+		ipcMain.removeAllListeners()
 		mainWindow = null
 	})
 	closeArg = false
@@ -252,7 +256,7 @@ function createWindow() {
 			mainWindow.close()
 		})
 	})
-	electron.ipcMain.on('sendMarkersComplete', function (e, arg) {
+	ipcMain.on('sendMarkersComplete', function (e, arg) {
 		closeArg = true
 		mainWindow.close()
 	})
--- a/app/main/language.js
+++ b/app/main/language.js
@@ -4,10 +4,8 @@ function templete(lang, mainWindow, packaged, dir, dirname) {
    if (lang != "ja" && lang != "en") {
        lang = "en"
    }
-    const electron = require("electron");
+    const electron = require("electron")
-    const ipc = electron.ipcMain;
+    const { Menu, MenuItem, ipcMain, BrowserWindow, app } = electron
    const app = electron.app;
    const BrowserWindow = electron.BrowserWindow;
    const join = require('path').join;
    const dict = {
        "application": {
@@ -84,7 +82,7 @@ function templete(lang, mainWindow, packaged, dir, dirname) {
            {
                label: 'Toggle Developer Tools',
                accelerator: 'Alt+Command+I',
-                click: function () { if (!packaged) { mainWindow.toggleDevTools(); } }
+                click: function () { mainWindow.toggleDevTools(); }
            },
            {
                label: dict.reload[lang],
@@ -150,6 +148,28 @@ function templete(lang, mainWindow, packaged, dir, dirname) {
        ]
    }
    ];
    // コピペメニュー
    const ctxMenu = new Menu()
    ctxMenu.append(new MenuItem({
        label: dict.cut[lang],
        role: 'cut',
        click: () => { console.log('Cut clicked!') }
    }))
    ctxMenu.append(new MenuItem({
        label: dict.copy[lang],
        role: 'copy',
        click: () => { console.log('Copy clicked!') }
    }))
    ctxMenu.append(new MenuItem({
        label: dict.paste[lang],
        role: 'paste',
        click: () => { console.log('Paste clicked!') }
    }))
    ipcMain.on('textareaContextMenu', function (e, params) {
        ctxMenu.popup(mainWindow, params.x, params.y)
    })
    return menu;
 }
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
    "name": "thedesk",
-    "version": "22.2.0",
+    "version": "22.3.0",
    "codename": "Koume",
    "description": "TheDesk is a Mastodon client for PC.",
    "repository": "https://github.com/cutls/TheDesk",
@@ -38,8 +38,7 @@
        "url": "https://cutls.dev",
        "email": "p@cutls.com"
    },
-    "contributor": [
+    "contributor": [{
        {
            "name": "とねぢ",
            "url": "https://minohdon.jp/@toneji",
            "email": "solfa.tono@gmail.com"
@@ -57,7 +56,7 @@
    ],
    "license": "GPL-3.0",
    "dependencies": {
-        "@fortawesome/fontawesome-free": "^5.15.2",
+        "@fortawesome/fontawesome-free": "^5.15.3",
        "@syuilo/aiscript": "^0.11.1",
        "electron-dl": "^3.2.1",
        "itunes-nowplaying-mac": "https://github.com/cutls/itunes-nowplaying-mac/releases/download/v0.4.0/itunes-nowplaying-mac-0.4.0.tgz",
@@ -67,25 +66,27 @@
        "json5": "^2.2.0",
        "lodash": "^4.17.21",
        "materialize-css": "git://github.com/cutls/materialize#v1-dev",
-        "sanitize-html": "^2.3.2",
+        "sanitize-html": "^2.4.0",
        "sumchecker": "^3.0.1",
-        "sweetalert2": "^10.15.7",
+        "sweetalert2": "^11.0.17",
        "system-font-families": "^0.4.1",
-        "vue": "^2.6.12"
+        "textarea-caret": "^3.1.0",
        "vue": "^2.6.14"
    },
    "devDependencies": {
        "browserify": "^17.0.0",
-        "chokidar": "^3.5.1",
+        "chokidar": "^3.5.2",
-        "dotenv": "^8.2.0",
+        "dotenv": "^10.0.0",
-        "electron": "^12.0.2",
+        "electron": "^13.1.2",
-        "electron-builder": "^22.10.5",
+        "electron-builder": "^22.11.7",
        "electron-notarize": "^1.0.0",
        "electron-rebuild": "^2.3.5",
-        "eslint": "^7.23.0",
+        "eslint": "^7.28.0",
        "npm-run-all": "^4.1.5",
        "readline-sync": "1.4.10"
    },
    "resolutions": {
-        "@types/fs-extra": "9.0.11"
+        "@types/fs-extra": "9.0.11",
        "plist": "3.0.2"
    }
 }
--- a/app/source/themes/white.thedesktheme
+++ b/app/source/themes/white.thedesktheme
@@ -17,7 +17,7 @@
 		bottom: '#eeeeee',
 		emphasized: '#81c784',
 		postbox: '#fff',
-		active: '#009688',
+		active: '#66dacf',
 		selected: '#c0c0c0',
 		selectedWithShared: '#b2babd',
 	},
--- a/app/view/make/acct.sample.html
+++ b/app/view/make/acct.sample.html
@@ -11,17 +11,15 @@
    <link href="../../css/userdata.css" rel="stylesheet" type="text/css" />
    <link href="../../@@node_base@@/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet" />
    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-	<link href="../../css/sweetalert2-material.min.css" type="text/css" rel="stylesheet">
+    <link href="../../css/sweetalert2-material.css" type="text/css" rel="stylesheet">
    <link href="../../css/acct.css" rel="stylesheet" type="text/css" />
-	<meta charset="utf-8" />
+    <meta charset="utf-8" /> @@comment-start@@
 	@@comment-start@@
    <script type="text/javascript">
        var _jipt = []
        _jipt.push(['project', 'thedesk'])
    </script>
    <script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
-	@@comment-end@@
+    @@comment-end@@ @@pwa@@ @@store@@
 	@@pwa@@ @@store@@
 </head>
 <body id="mainView" class="@@pwaClass@@">
@@ -40,19 +38,28 @@
        <div id="acct-list"></div>
        <div class="divider"></div>
    </div>
    <div>
        <h5>@@add@@</h5>
        <div class="hide-second">
            <a href="setting.html">@@haveExported@@</a>
        </div>
 	<div>
 		<h5>@@add@@</h5>
        <br />
        <div id="add">
            <div class="row">
                <div class="col s8">
-					@@addAcct@@<br />
+                    @@addAcct@@
-					<input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp" />
+                    <div class="row">
-					<div id="ins-suggest"></div>
+                        <div class="input-field col s6">
-					<button class="btn waves-effect" onclick="instance()">Login</button><br />
+                            <input type="text" id="autocomplete-input" class="autocomplete" placeholder="eg) mstdn.jp">
                            <label for="autocomplete-input">URL</label>
                        </div>
                        <div class="col s4 loginBtnWrap">
                            <button class="btn waves-effect" onclick="instance()"><i
 									class="material-icons left">login</i>Login</button>
                        </div>
                    </div>
                    <div class="pwa">
                        @@codesetupwarn@@<br />
                        <label>
@@ -80,8 +87,7 @@
            <div id="compt" style="display:none" class="scr">
                <h5>ログイン前に必ずご確認ください</h5>
                <span id="compt-instance"></span>はバージョンが<span id="compt-ver"></span>のため以下の機能がご利用いただけません。
-				<span id="compt-warn"
+                <span id="compt-warn" style="display:none">また、このインスタンスはMastodonではなくそのAPI上の互換実装であり、TheDeskでは利用を想定していないため非保証となります。</span>
 					style="display:none">また、このインスタンスはMastodonではなくそのAPI上の互換実装であり、TheDeskでは利用を想定していないため非保証となります。</span>
                <ul id="compt-list"></ul>
            </div>
        </div>
@@ -108,16 +114,17 @@
            Some instance data by
            <a href="https://instances.social" target="_blank">instances.social API</a><br />
            <h5 id="ins-title"></h5>
-			Administered by:<a id="ins-admin"></a><br />
+            Administered by:
            <a id="ins-admin"></a><br />
            <span id="ins-desc"></span><br />
            <img src="../../img/loading.svg" id="ins-prof" width="200" /><br />
-			<br />
+            <br /> @@domain@@:
-			@@domain@@:<span id="ins-name"></span><br />
+            <span id="ins-name"></span><br /> @@connect@@:
-			@@connect@@:<span id="ins-connect"></span>@@ko@@<br />
+            <span id="ins-connect"></span>@@ko@@<br /> @@toots@@:
-			@@toots@@:<span id="ins-toot"></span>@@ko@@<br />
+            <span id="ins-toot"></span>@@ko@@<br /> @@users@@:
-			@@users@@:<span id="ins-user"></span>@@users@@<br />
+            <span id="ins-user"></span>@@users@@<br /> @@safety@@:
-			@@safety@@:<span id="ins-per"></span>%<br />
+            <span id="ins-per"></span>%<br /> @@ver@@:
-			@@ver@@:<span id="ins-ver"></span>@<span id="ins-upd"></span><br />
+            <span id="ins-ver"></span>@<span id="ins-upd"></span><br />
        </div>
    </div>
    <script type="text/javascript" src="../../js/ui/theme.js"></script>
@@ -128,7 +135,10 @@
    <script type="text/javascript" src="../../js/login/instance.js"></script>
    <script type="text/javascript" src="../../js/login/manager.js"></script>
    <script type="text/javascript" src="../../js/tl/date.js"></script>
-	<script>$('body').addClass(localStorage.getItem('platform'))</script>
+    <script>
        $('body').addClass(localStorage.getItem('platform'))
    </script>
 </body>
 </html>
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
--- a/app/view/make/language/af-ZA/index.json
+++ b/app/view/make/language/af-ZA/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
    "copyURL": "Copy the URL",
    "copy": "Copy",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
@@ -178,6 +179,7 @@
    "foundBug": "I found a bug",
    "show": "Show",
    "directory": "Directory",
    "discover": "Discover",
    "active": "Recently active",
    "newcomer": "New arrivals",
    "local_only": "Local only",
--- a/app/view/make/language/af-ZA/main.json
+++ b/app/view/make/language/af-ZA/main.json
@@ -103,6 +103,7 @@
    "lang_details_embed": "Embed HTML is cliped.",
    "lang_details_url": "URL of this toot is cliped.",
    "lang_details_txt": "Content of this toot is cliped.",
    "lang_details_fetch": "Fetcging toot data...",
    "lang_filter_nodata": "No data",
    "lang_filter_errordegree": "Please check a context",
    "lang_list_nodata": "No data",
--- a/app/view/make/language/af-ZA/setting.json
+++ b/app/view/make/language/af-ZA/setting.json
@@ -72,6 +72,7 @@
  "desc": "About this theme",
  "customImport": "Import of custom themes",
  "delete": "Delete",
  "preview": "Preview",
  "timeline": "Timeline Preferences",
  "timemode": "Time format",
  "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
  "remote_imgWarn": "All previews are got from your loginned cache server.",
  "moreContextMode": "Context Tool",
  "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
  "smallHeader": "Minimize column headers",
  "replySound": "Sound(Reply)",
  "favSound": "Sound(Fav)",
  "btSound": "Sound(Boost)",
--- a/app/view/make/language/ar-SA/index.json
+++ b/app/view/make/language/ar-SA/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
    "copyURL": "Copy the URL",
    "copy": "Copy",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
@@ -178,6 +179,7 @@
    "foundBug": "I found a bug",
    "show": "Show",
    "directory": "Directory",
    "discover": "Discover",
    "active": "Recently active",
    "newcomer": "New arrivals",
    "local_only": "Local only",
--- a/app/view/make/language/ar-SA/main.json
+++ b/app/view/make/language/ar-SA/main.json
@@ -103,6 +103,7 @@
    "lang_details_embed": "Embed HTML is cliped.",
    "lang_details_url": "URL of this toot is cliped.",
    "lang_details_txt": "Content of this toot is cliped.",
    "lang_details_fetch": "Fetcging toot data...",
    "lang_filter_nodata": "No data",
    "lang_filter_errordegree": "Please check a context",
    "lang_list_nodata": "No data",
--- a/app/view/make/language/ar-SA/setting.json
+++ b/app/view/make/language/ar-SA/setting.json
@@ -72,6 +72,7 @@
  "desc": "About this theme",
  "customImport": "Import of custom themes",
  "delete": "Delete",
  "preview": "Preview",
  "timeline": "Timeline Preferences",
  "timemode": "Time format",
  "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
  "remote_imgWarn": "All previews are got from your loginned cache server.",
  "moreContextMode": "Context Tool",
  "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
  "smallHeader": "Minimize column headers",
  "replySound": "Sound(Reply)",
  "favSound": "Sound(Fav)",
  "btSound": "Sound(Boost)",
--- a/app/view/make/language/bg-BG/index.json
+++ b/app/view/make/language/bg-BG/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "Отваряне в браузъра",
    "screenshot": "Направете снимка на екрана",
    "copyURL": "Копирай URL адреса на този тоот",
    "copy": "Copy",
    "embed": "Закрепи",
    "toots": "Тоот",
    "follow": "Следвам",
@@ -178,6 +179,7 @@
    "foundBug": "Намерена е грешка",
    "show": "Покажи",
    "directory": "Директория",
    "discover": "Discover",
    "active": "Наскоро активен",
    "newcomer": "Новодошли",
    "local_only": "Само местно",
--- a/app/view/make/language/bg-BG/main.json
+++ b/app/view/make/language/bg-BG/main.json
@@ -103,6 +103,7 @@
    "lang_details_embed": "Вграденият HTML е изрязан.",
    "lang_details_url": "URL адресът на този toot е изрязан.",
    "lang_details_txt": "Съдържанието на този toot е изрязано.",
    "lang_details_fetch": "Fetcging toot data...",
    "lang_filter_nodata": "Няма данни",
    "lang_filter_errordegree": "Моля, проверете контекстта",
    "lang_list_nodata": "Няма данни",
--- a/app/view/make/language/bg-BG/setting.json
+++ b/app/view/make/language/bg-BG/setting.json
@@ -72,6 +72,7 @@
  "desc": "Относно тази тема",
  "customImport": "Импортиране на персонализирани теми",
  "delete": "Изтрий",
  "preview": "Preview",
  "timeline": "Предпочитания за времевата линия",
  "timemode": "Времеви формат",
  "relativetime": "Относителен формат: „преди 1 минута“, „преди 3 дни“",
@@ -119,6 +120,7 @@
  "remote_imgWarn": "All previews are got from your loginned cache server.",
  "moreContextMode": "Context Tool",
  "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
  "smallHeader": "Minimize column headers",
  "replySound": "Звук (Отговор)",
  "favSound": "Звук(Фаворит)",
  "btSound": "Звук(Подсилване)",
--- a/app/view/make/language/ca-ES/index.json
+++ b/app/view/make/language/ca-ES/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
    "copyURL": "Copy the URL",
    "copy": "Copy",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
@@ -178,6 +179,7 @@
    "foundBug": "I found a bug",
    "show": "Show",
    "directory": "Directory",
    "discover": "Discover",
    "active": "Recently active",
    "newcomer": "New arrivals",
    "local_only": "Local only",
--- a/app/view/make/language/ca-ES/main.json
+++ b/app/view/make/language/ca-ES/main.json
@@ -103,6 +103,7 @@
    "lang_details_embed": "Embed HTML is cliped.",
    "lang_details_url": "URL of this toot is cliped.",
    "lang_details_txt": "Content of this toot is cliped.",
    "lang_details_fetch": "Fetcging toot data...",
    "lang_filter_nodata": "No data",
    "lang_filter_errordegree": "Please check a context",
    "lang_list_nodata": "No data",
--- a/app/view/make/language/ca-ES/setting.json
+++ b/app/view/make/language/ca-ES/setting.json
@@ -72,6 +72,7 @@
  "desc": "About this theme",
  "customImport": "Import of custom themes",
  "delete": "Delete",
  "preview": "Preview",
  "timeline": "Timeline Preferences",
  "timemode": "Time format",
  "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
  "remote_imgWarn": "All previews are got from your loginned cache server.",
  "moreContextMode": "Context Tool",
  "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
  "smallHeader": "Minimize column headers",
  "replySound": "Sound(Reply)",
  "favSound": "Sound(Fav)",
  "btSound": "Sound(Boost)",
--- a/app/view/make/language/cs-CZ/index.json
+++ b/app/view/make/language/cs-CZ/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "Otevřít v prohlížeči",
    "screenshot": "Vytvořit snímek obrazovky",
    "copyURL": "Kopírovat URL tohoto tootu",
    "copy": "Copy",
    "embed": "Vložit",
    "toots": "Tooty",
    "follow": "Sledovat",
@@ -178,6 +179,7 @@
    "foundBug": "I found a bug",
    "show": "Show",
    "directory": "Directory",
    "discover": "Discover",
    "active": "Recently active",
    "newcomer": "New arrivals",
    "local_only": "Local only",
--- a/app/view/make/language/cs-CZ/main.json
+++ b/app/view/make/language/cs-CZ/main.json
@@ -103,6 +103,7 @@
    "lang_details_embed": "HTML pro vložení je zkopírován.",
    "lang_details_url": "URL adresa tohoto tootu je zkopírována.",
    "lang_details_txt": "Obsah tohoto tootu je zkopírován.",
    "lang_details_fetch": "Fetcging toot data...",
    "lang_filter_nodata": "Žádná data",
    "lang_filter_errordegree": "Prosím zkontrolujte kontext",
    "lang_list_nodata": "Žádná data",
--- a/app/view/make/language/cs-CZ/setting.json
+++ b/app/view/make/language/cs-CZ/setting.json
@@ -72,6 +72,7 @@
  "desc": "About this theme",
  "customImport": "Import of custom themes",
  "delete": "Delete",
  "preview": "Preview",
  "timeline": "Timeline Preferences",
  "timemode": "Časový formát",
  "relativetime": "Relativní formát: „před 1 minutou“, „před 3 dny“",
@@ -119,6 +120,7 @@
  "remote_imgWarn": "All previews are got from your loginned cache server.",
  "moreContextMode": "Context Tool",
  "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
  "smallHeader": "Minimize column headers",
  "replySound": "Sound(Reply)",
  "favSound": "Sound(Fav)",
  "btSound": "Sound(Boost)",
--- a/app/view/make/language/da-DK/index.json
+++ b/app/view/make/language/da-DK/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
    "copyURL": "Copy the URL",
    "copy": "Copy",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
@@ -178,6 +179,7 @@
    "foundBug": "I found a bug",
    "show": "Show",
    "directory": "Directory",
    "discover": "Discover",
    "active": "Recently active",
    "newcomer": "New arrivals",
    "local_only": "Local only",
--- a/app/view/make/language/da-DK/main.json
+++ b/app/view/make/language/da-DK/main.json
@@ -103,6 +103,7 @@
    "lang_details_embed": "Embed HTML is cliped.",
    "lang_details_url": "URL of this toot is cliped.",
    "lang_details_txt": "Content of this toot is cliped.",
    "lang_details_fetch": "Fetcging toot data...",
    "lang_filter_nodata": "No data",
    "lang_filter_errordegree": "Please check a context",
    "lang_list_nodata": "No data",
--- a/app/view/make/language/da-DK/setting.json
+++ b/app/view/make/language/da-DK/setting.json
@@ -72,6 +72,7 @@
  "desc": "About this theme",
  "customImport": "Import of custom themes",
  "delete": "Delete",
  "preview": "Preview",
  "timeline": "Timeline Preferences",
  "timemode": "Time format",
  "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
  "remote_imgWarn": "All previews are got from your loginned cache server.",
  "moreContextMode": "Context Tool",
  "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
  "smallHeader": "Minimize column headers",
  "replySound": "Sound(Reply)",
  "favSound": "Sound(Fav)",
  "btSound": "Sound(Boost)",
--- a/app/view/make/language/de-DE/index.json
+++ b/app/view/make/language/de-DE/index.json
@@ -1,7 +1,7 @@
 {
    "draghere": "Zum Hochladen hier her ziehen",
    "nowOffline": "OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
-    "reOnline": "Now we are in the Internet, you should reload...",
+    "reOnline": "Jetzt haben wir wieder Internet. Du solltest neuladen...",
    "close": "Schließen",
    "webSrc": "Suche im Internet",
    "tsSrc": "Bei Tootsearch suchen",
@@ -74,6 +74,7 @@
    "openBrowser": "Im Browser öffnen",
    "screenshot": "Bildschirmfoto aufnehmen",
    "copyURL": "URL dieses Tröts kopieren",
    "copy": "Copy",
    "embed": "Einbinden",
    "toots": "Tröts",
    "follow": "Folgen",
@@ -178,6 +179,7 @@
    "foundBug": "Ich habe einen Fehler gefunden",
    "show": "Zeige",
    "directory": "Verzeichnis",
    "discover": "Discover",
    "active": "Kürzlich aktiv",
    "newcomer": "Neu eingetroffen",
    "local_only": "Nur lokal",
--- a/app/view/make/language/de-DE/main.json
+++ b/app/view/make/language/de-DE/main.json
@@ -103,6 +103,7 @@
    "lang_details_embed": "Eingefügtes HTML wurde entfernt.",
    "lang_details_url": "URL dieses Tröts wurde entfernt.",
    "lang_details_txt": "Inhalt dieses Tröts wurde entfernt.",
    "lang_details_fetch": "Fetcging toot data...",
    "lang_filter_nodata": "Keine Daten",
    "lang_filter_errordegree": "Bitte überprüfen Sie den Kontext",
    "lang_list_nodata": "Keine Daten",
--- a/app/view/make/language/de-DE/setting.json
+++ b/app/view/make/language/de-DE/setting.json
@@ -72,6 +72,7 @@
  "desc": "Über dieses Design",
  "customImport": "Import von eigenen Designs",
  "delete": "Löschen",
  "preview": "Preview",
  "timeline": "Verlaufseinstellungen",
  "timemode": "Zeitformat",
  "relativetime": "Relatives Format:\"vor 1 Minuten\",\"vor 3 Tagen\"",
@@ -119,6 +120,7 @@
  "remote_imgWarn": "All previews are got from your loginned cache server.",
  "moreContextMode": "Context Tool",
  "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
  "smallHeader": "Minimize column headers",
  "replySound": "Ton bei Antwort",
  "favSound": "Ton bei Favorit",
  "btSound": "Ton bei Verstärkung",
--- a/app/view/make/language/el-GR/index.json
+++ b/app/view/make/language/el-GR/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
    "copyURL": "Copy the URL",
    "copy": "Copy",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
@@ -178,6 +179,7 @@
    "foundBug": "I found a bug",
    "show": "Show",
    "directory": "Directory",
    "discover": "Discover",
    "active": "Recently active",
    "newcomer": "New arrivals",
    "local_only": "Local only",
--- a/app/view/make/language/el-GR/main.json
+++ b/app/view/make/language/el-GR/main.json
@@ -103,6 +103,7 @@
    "lang_details_embed": "Embed HTML is cliped.",
    "lang_details_url": "URL of this toot is cliped.",
    "lang_details_txt": "Content of this toot is cliped.",
    "lang_details_fetch": "Fetcging toot data...",
    "lang_filter_nodata": "No data",
    "lang_filter_errordegree": "Please check a context",
    "lang_list_nodata": "No data",
--- a/app/view/make/language/el-GR/setting.json
+++ b/app/view/make/language/el-GR/setting.json
@@ -72,6 +72,7 @@
  "desc": "About this theme",
  "customImport": "Import of custom themes",
  "delete": "Delete",
  "preview": "Preview",
  "timeline": "Timeline Preferences",
  "timemode": "Time format",
  "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
  "remote_imgWarn": "All previews are got from your loginned cache server.",
  "moreContextMode": "Context Tool",
  "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
  "smallHeader": "Minimize column headers",
  "replySound": "Sound(Reply)",
  "favSound": "Sound(Fav)",
  "btSound": "Sound(Boost)",
--- a/app/view/make/language/en-US/index.json
+++ b/app/view/make/language/en-US/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "crwdns3190:0crwdne3190:0",
    "screenshot": "crwdns3192:0crwdne3192:0",
    "copyURL": "crwdns3194:0crwdne3194:0",
    "copy": "crwdns4586:0crwdne4586:0",
    "embed": "crwdns3196:0crwdne3196:0",
    "toots": "crwdns3198:0crwdne3198:0",
    "follow": "crwdns3200:0crwdne3200:0",
@@ -178,6 +179,7 @@
    "foundBug": "crwdns4431:0crwdne4431:0",
    "show": "crwdns3388:0crwdne3388:0",
    "directory": "crwdns3390:0crwdne3390:0",
    "discover": "crwdns4590:0crwdne4590:0",
    "active": "crwdns3392:0crwdne3392:0",
    "newcomer": "crwdns3394:0crwdne3394:0",
    "local_only": "crwdns3396:0crwdne3396:0",
--- a/app/view/make/language/en-US/main.json
+++ b/app/view/make/language/en-US/main.json
@@ -103,6 +103,7 @@
    "lang_details_embed": "crwdns3584:0crwdne3584:0",
    "lang_details_url": "crwdns3586:0crwdne3586:0",
    "lang_details_txt": "crwdns3588:0crwdne3588:0",
    "lang_details_fetch": "crwdns4588:0crwdne4588:0",
    "lang_filter_nodata": "crwdns3590:0crwdne3590:0",
    "lang_filter_errordegree": "crwdns3592:0crwdne3592:0",
    "lang_list_nodata": "crwdns3594:0crwdne3594:0",
--- a/app/view/make/language/en-US/setting.json
+++ b/app/view/make/language/en-US/setting.json
@@ -72,6 +72,7 @@
  "desc": "crwdns3992:0crwdne3992:0",
  "customImport": "crwdns3996:0crwdne3996:0",
  "delete": "crwdns3998:0crwdne3998:0",
  "preview": "crwdns4584:0crwdne4584:0",
  "timeline": "crwdns4002:0crwdne4002:0",
  "timemode": "crwdns4004:0crwdne4004:0",
  "relativetime": "crwdns4006:0crwdne4006:0",
@@ -119,6 +120,7 @@
  "remote_imgWarn": "crwdns4384:0crwdne4384:0",
  "moreContextMode": "crwdns4572:0crwdne4572:0",
  "moreContextModeWarn": "crwdns4574:0crwdne4574:0",
  "smallHeader": "crwdns4582:0crwdne4582:0",
  "replySound": "crwdns4088:0crwdne4088:0",
  "favSound": "crwdns4090:0crwdne4090:0",
  "btSound": "crwdns4092:0crwdne4092:0",
--- a/app/view/make/language/en/index.json
+++ b/app/view/make/language/en/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
    "copyURL": "Copy the URL",
    "copy": "Copy",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
@@ -178,6 +179,7 @@
    "foundBug": "I found a bug",
    "show": "Show",
    "directory": "Directory",
    "discover": "Discover",
    "active": "Recently active",
    "newcomer": "New arrivals",
    "local_only": "Local only",
--- a/app/view/make/language/en/main.json
+++ b/app/view/make/language/en/main.json
@@ -103,6 +103,7 @@
    "lang_details_embed": "Embed HTML is cliped.",
    "lang_details_url": "URL of this toot is cliped.",
    "lang_details_txt": "Content of this toot is cliped.",
    "lang_details_fetch": "Fetcging toot data...",
    "lang_filter_nodata": "No data",
    "lang_filter_errordegree": "Please check a context",
    "lang_list_nodata": "No data",
--- a/app/view/make/language/es-AR/index.json
+++ b/app/view/make/language/es-AR/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "Abrir en navegador web",
    "screenshot": "Tomar captura de pantalla",
    "copyURL": "Copiar dirección web de este toot",
    "copy": "Copiar",
    "embed": "Insertar",
    "toots": "Toots",
    "follow": "Seguir",
@@ -178,6 +179,7 @@
    "foundBug": "Encontré un error",
    "show": "Mostrar",
    "directory": "Directorio",
    "discover": "Discover",
    "active": "Recientemente activo",
    "newcomer": "Recién llegados",
    "local_only": "Sólo local",
--- a/app/view/make/language/es-AR/main.json
+++ b/app/view/make/language/es-AR/main.json
@@ -103,6 +103,7 @@
    "lang_details_embed": "El código HTML de inserción se copió al portapapeles.",
    "lang_details_url": "La dirección web de este toot se copió al portapapeles.",
    "lang_details_txt": "El contenido de este toot se copió al portapapeles.",
    "lang_details_fetch": "Fetcging toot data...",
    "lang_filter_nodata": "Sin datos",
    "lang_filter_errordegree": "Por favor, comprobá un contexto",
    "lang_list_nodata": "Sin datos",
--- a/app/view/make/language/es-AR/setting.json
+++ b/app/view/make/language/es-AR/setting.json
@@ -9,7 +9,7 @@
  "default": "Predeterminado",
  "change": "Cambiar",
  "select": "Seleccionar",
-  "exec": "Exec",
+  "exec": "Ejec",
  "env": "Configuración del sistema",
  "setlang": "Idiomas",
  "backup": "Importación y exportación de la configuración",
@@ -18,8 +18,8 @@
  "export": "Exportar",
  "hardwareAcceleration": "Deshabilitar la aceleración por hardware",
  "hardwareAccelerationWarn": "Inicio automático",
-  "webview": "Webview Integration",
+  "webview": "Integración de Webview",
-  "webviewWarn": "To use TweetDeck Integration, please turn on. You should understand it may lessen security level.",
+  "webviewWarn": "Para usar Integración de TweetDeck, por favor activalo. Tené en cuenta que puede reducir el nivel de seguridad.",
  "theme": "Temas",
  "popup": "Ventana emergente de notificaciones (en Windows)",
  "popupwarn": "Establecer \"0\" para ocultar",
@@ -72,6 +72,7 @@
  "desc": "Acerca de este tema",
  "customImport": "Importación de temas personalizados",
  "delete": "Eliminar",
  "preview": "Previsualización",
  "timeline": "Configuración de la línea temporal",
  "timemode": "Formato del tiempo",
  "relativetime": "Formato relativo: \"hace 1 minuto\", \"hace 3 días\"",
@@ -117,8 +118,9 @@
  "markerswarn": "Mastodon 3.0~. Compartido en interface web y clientes de terceros soportados.",
  "remote_img": "Obtener imágenes del servidor remoto",
  "remote_imgWarn": "Todas las previsualizaciones se obtienen de tu servidor de caché conectado.",
-  "moreContextMode": "Context Tool",
+  "moreContextMode": "Herramienta de contexto",
-  "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
+  "moreContextModeWarn": "En detalle de la modal de toot, mostrar toots antes / después del toot en LTL, FTL, UTL",
  "smallHeader": "Minimizar cabeceras de columna",
  "replySound": "Sonido (respuesta)",
  "favSound": "Sonido (marcado como favorito)",
  "btSound": "Sonido (retoot)",
--- a/app/view/make/language/es-ES/index.json
+++ b/app/view/make/language/es-ES/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
    "copyURL": "Copy the URL",
    "copy": "Copy",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
@@ -178,6 +179,7 @@
    "foundBug": "I found a bug",
    "show": "Show",
    "directory": "Directory",
    "discover": "Discover",
    "active": "Recently active",
    "newcomer": "New arrivals",
    "local_only": "Local only",
--- a/app/view/make/language/es-ES/main.json
+++ b/app/view/make/language/es-ES/main.json
@@ -103,6 +103,7 @@
    "lang_details_embed": "Embed HTML is cliped.",
    "lang_details_url": "URL of this toot is cliped.",
    "lang_details_txt": "Content of this toot is cliped.",
    "lang_details_fetch": "Fetcging toot data...",
    "lang_filter_nodata": "Sin datos",
    "lang_filter_errordegree": "Please check a context",
    "lang_list_nodata": "Sin datos",
--- a/app/view/make/language/es-ES/setting.json
+++ b/app/view/make/language/es-ES/setting.json
@@ -72,6 +72,7 @@
  "desc": "About this theme",
  "customImport": "Import of custom themes",
  "delete": "Delete",
  "preview": "Preview",
  "timeline": "Timeline Preferences",
  "timemode": "Time format",
  "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
  "remote_imgWarn": "All previews are got from your loginned cache server.",
  "moreContextMode": "Context Tool",
  "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
  "smallHeader": "Minimize column headers",
  "replySound": "Sound(Reply)",
  "favSound": "Sound(Fav)",
  "btSound": "Sound(Boost)",
--- a/app/view/make/language/fi-FI/index.json
+++ b/app/view/make/language/fi-FI/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
    "copyURL": "Copy the URL",
    "copy": "Copy",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
@@ -178,6 +179,7 @@
    "foundBug": "I found a bug",
    "show": "Show",
    "directory": "Directory",
    "discover": "Discover",
    "active": "Recently active",
    "newcomer": "New arrivals",
    "local_only": "Local only",
--- a/app/view/make/language/fi-FI/main.json
+++ b/app/view/make/language/fi-FI/main.json
@@ -103,6 +103,7 @@
    "lang_details_embed": "Embed HTML is cliped.",
    "lang_details_url": "URL of this toot is cliped.",
    "lang_details_txt": "Content of this toot is cliped.",
    "lang_details_fetch": "Fetcging toot data...",
    "lang_filter_nodata": "No data",
    "lang_filter_errordegree": "Please check a context",
    "lang_list_nodata": "No data",
--- a/app/view/make/language/fi-FI/setting.json
+++ b/app/view/make/language/fi-FI/setting.json
@@ -72,6 +72,7 @@
  "desc": "About this theme",
  "customImport": "Import of custom themes",
  "delete": "Delete",
  "preview": "Preview",
  "timeline": "Timeline Preferences",
  "timemode": "Time format",
  "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
  "remote_imgWarn": "All previews are got from your loginned cache server.",
  "moreContextMode": "Context Tool",
  "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
  "smallHeader": "Minimize column headers",
  "replySound": "Sound(Reply)",
  "favSound": "Sound(Fav)",
  "btSound": "Sound(Boost)",
--- a/app/view/make/language/fr-FR/index.json
+++ b/app/view/make/language/fr-FR/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "Ouvrir dans un navigateur",
    "screenshot": "Prendre une capture d'écran",
    "copyURL": "Copier l'URL",
    "copy": "Copy",
    "embed": "Embarquer",
    "toots": "Pouets",
    "follow": "Suivre",
@@ -178,6 +179,7 @@
    "foundBug": "J'ai trouvé un bug",
    "show": "Afficher",
    "directory": "Répertoire",
    "discover": "Discover",
    "active": "Actif récemment",
    "newcomer": "Nouveautés",
    "local_only": "Local uniquement",
--- a/app/view/make/language/fr-FR/main.json
+++ b/app/view/make/language/fr-FR/main.json
@@ -103,6 +103,7 @@
    "lang_details_embed": "Le code HTML intégré est tronqué.",
    "lang_details_url": "L'URL de ce pouet est tronqué.",
    "lang_details_txt": "Le contenu de ce pouet est tronqué.",
    "lang_details_fetch": "Fetcging toot data...",
    "lang_filter_nodata": "Aucune donnée",
    "lang_filter_errordegree": "Veuillez vérifier le contexte",
    "lang_list_nodata": "Aucune donnée",
--- a/app/view/make/language/fr-FR/setting.json
+++ b/app/view/make/language/fr-FR/setting.json
@@ -72,6 +72,7 @@
  "desc": "À propos de ce thème",
  "customImport": "Importer des thèmes personnalisés",
  "delete": "Supprimer",
  "preview": "Preview",
  "timeline": "Préférence de la TimeLine",
  "timemode": "Format de l’heure",
  "relativetime": "Format relatif:\"Il y a 1 minutes\",\"3 jours\"",
@@ -119,6 +120,7 @@
  "remote_imgWarn": "Toutes les prévisualisations sont obtenues depuis le serveur où vous êtes connecté.",
  "moreContextMode": "Context Tool",
  "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
  "smallHeader": "Minimize column headers",
  "replySound": "Son (Réponse)",
  "favSound": "Son (Fav)",
  "btSound": "Son (Boost)",
--- a/app/view/make/language/he-IL/index.json
+++ b/app/view/make/language/he-IL/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
    "copyURL": "Copy the URL",
    "copy": "Copy",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
@@ -178,6 +179,7 @@
    "foundBug": "I found a bug",
    "show": "Show",
    "directory": "Directory",
    "discover": "Discover",
    "active": "Recently active",
    "newcomer": "New arrivals",
    "local_only": "Local only",
--- a/app/view/make/language/he-IL/main.json
+++ b/app/view/make/language/he-IL/main.json
@@ -103,6 +103,7 @@
    "lang_details_embed": "Embed HTML is cliped.",
    "lang_details_url": "URL of this toot is cliped.",
    "lang_details_txt": "Content of this toot is cliped.",
    "lang_details_fetch": "Fetcging toot data...",
    "lang_filter_nodata": "No data",
    "lang_filter_errordegree": "Please check a context",
    "lang_list_nodata": "No data",
--- a/app/view/make/language/he-IL/setting.json
+++ b/app/view/make/language/he-IL/setting.json
@@ -72,6 +72,7 @@
  "desc": "About this theme",
  "customImport": "Import of custom themes",
  "delete": "Delete",
  "preview": "Preview",
  "timeline": "Timeline Preferences",
  "timemode": "Time format",
  "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
  "remote_imgWarn": "All previews are got from your loginned cache server.",
  "moreContextMode": "Context Tool",
  "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
  "smallHeader": "Minimize column headers",
  "replySound": "Sound(Reply)",
  "favSound": "Sound(Fav)",
  "btSound": "Sound(Boost)",
--- a/app/view/make/language/hu-HU/index.json
+++ b/app/view/make/language/hu-HU/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
    "copyURL": "Copy the URL",
    "copy": "Copy",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
@@ -178,6 +179,7 @@
    "foundBug": "I found a bug",
    "show": "Show",
    "directory": "Directory",
    "discover": "Discover",
    "active": "Recently active",
    "newcomer": "New arrivals",
    "local_only": "Local only",
--- a/app/view/make/language/hu-HU/main.json
+++ b/app/view/make/language/hu-HU/main.json
@@ -103,6 +103,7 @@
    "lang_details_embed": "Embed HTML is cliped.",
    "lang_details_url": "URL of this toot is cliped.",
    "lang_details_txt": "Content of this toot is cliped.",
    "lang_details_fetch": "Fetcging toot data...",
    "lang_filter_nodata": "No data",
    "lang_filter_errordegree": "Please check a context",
    "lang_list_nodata": "No data",
--- a/app/view/make/language/hu-HU/setting.json
+++ b/app/view/make/language/hu-HU/setting.json
@@ -72,6 +72,7 @@
  "desc": "About this theme",
  "customImport": "Import of custom themes",
  "delete": "Delete",
  "preview": "Preview",
  "timeline": "Timeline Preferences",
  "timemode": "Time format",
  "relativetime": "Relative format:\"1 minutes ago\",\"3 days ago\"",
@@ -119,6 +120,7 @@
  "remote_imgWarn": "All previews are got from your loginned cache server.",
  "moreContextMode": "Context Tool",
  "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
  "smallHeader": "Minimize column headers",
  "replySound": "Sound(Reply)",
  "favSound": "Sound(Fav)",
  "btSound": "Sound(Boost)",
--- a/app/view/make/language/it-IT/index.json
+++ b/app/view/make/language/it-IT/index.json
@@ -47,7 +47,7 @@
    "thingsEmoji": "Emoji di strumenti",
    "symbolEmoji": "Emoji di simboli",
    "flagsEmoji": "Emoji delle bandiere",
-    "draft": "Draft",
+    "draft": "Bozza",
    "poll": "Sondaggio",
    "pollDdisabled": "Sondaggi: Disabilitato",
    "pollProvider": "Fornitore del sondaggio",
@@ -74,6 +74,7 @@
    "openBrowser": "Apri nel browser",
    "screenshot": "Cattura una schermata",
    "copyURL": "Copia l'URL",
    "copy": "Copia",
    "embed": "Incorpora",
    "toots": "Toots",
    "follow": "Segui",
@@ -178,6 +179,7 @@
    "foundBug": "Ho trovato un bug",
    "show": "Mostra",
    "directory": "Directory",
    "discover": "Discover",
    "active": "Recentemente attivo",
    "newcomer": "Nuovi arrivi",
    "local_only": "Solo locale",
--- a/app/view/make/language/it-IT/main.json
+++ b/app/view/make/language/it-IT/main.json
@@ -49,7 +49,7 @@
    "lang_manager_godev": "Apri DevCenter di Misskey. Mostriamo anche un documento ufficiale da riferire.",
    "lang_manager_logout": "Esci",
    "lang_manager_maxChars": "Max caratteri dei toot",
-    "lang_manager_refreshAt": "Login with this domain",
+    "lang_manager_refreshAt": "Accedi con questo dominio",
    "lang_bbmd_misskey": "TheDesk considera \"@\" come risposta, ma mettere altri parametri. Non elencato su Mastodon significa Home su Misskey.",
    "lang_emoji_get": "Ottieni emoji",
    "lang_emoji_custom": "Emoji personalizzate",
@@ -89,7 +89,7 @@
    "lang_status_endorse": "Caratteristica sul profilo",
    "lang_status_followers": "Follower",
    "lang_status_active": "Ultimo stato",
-    "lang_secure_draft": "Add to draft",
+    "lang_secure_draft": "Aggiungi alla bozza",
    "lang_secure_useThis": "Usa questo",
    "lang_secure_deleteThis": "Elimina questo",
    "lang_suggest_nodata": "Si prega di ottenere l'elenco delle emoji per mostrare il suggerimento.",
@@ -103,6 +103,7 @@
    "lang_details_embed": "HTML incorporato è sotto la lente.",
    "lang_details_url": "L'URL di questo toot è sotto la lente.",
    "lang_details_txt": "Il contenuto di questo toot è ritagliato.",
    "lang_details_fetch": "Fetcging toot data...",
    "lang_filter_nodata": "Nessun dato",
    "lang_filter_errordegree": "Si prega di controllare un contesto",
    "lang_list_nodata": "Nessun dato",
@@ -154,7 +155,7 @@
    "lang_layout_unread": "Non Letta",
    "lang_layout_tagManager": "Gestore timeline tag",
    "lang_layout_announ": "Annuncio: il contatore è il numero dei tuoi annunci non letti. Se non mostrato, significa che gli annunci sono tutti contrassegnati come letti.",
-    "lang_layout_resetWidth": "Stretch this column",
+    "lang_layout_resetWidth": "Allunga questa colonna",
    "lang_sort_gothis": "Vai a questa colonna",
    "lang_sort_remthis": "Elimina questa colonna",
    "lang_spotify_img": "Allega una copertina album",
--- a/app/view/make/language/it-IT/setting.json
+++ b/app/view/make/language/it-IT/setting.json
@@ -72,6 +72,7 @@
  "desc": "Informazioni su questo tema",
  "customImport": "Importa temi personalizzati",
  "delete": "Elimina",
  "preview": "Preview",
  "timeline": "Preferenze Della Timeline",
  "timemode": "Formato orario",
  "relativetime": "Formato relativo:\"1 minuti fa\",\"3 giorni fa\"",
@@ -119,6 +120,7 @@
  "remote_imgWarn": "Tutte le anteprime sono ottenute dal server cache loginato.",
  "moreContextMode": "Context Tool",
  "moreContextModeWarn": "On detail of the toot modal, show toots before / after the toot on LTL, FTL, UTL",
  "smallHeader": "Minimize column headers",
  "replySound": "Suono(Rispondi)",
  "favSound": "Suono (Fav)",
  "btSound": "Suono (Boost)",
--- a/app/view/make/language/ja-KS/index.json
+++ b/app/view/make/language/ja-KS/index.json
@@ -72,6 +72,7 @@
    "openBrowser": "ブラウザで開く",
    "screenshot": "スクリーンショット",
    "copyURL": "URLをコピー",
    "copy": "コピー",
    "embed": "埋め込む",
    "toots": "トゥート",
    "follow": "フォロー",
@@ -176,6 +177,7 @@
    "foundBug": "バグあるんやけど",
    "show": "表示",
    "directory": "ディレクトリ",
    "discover": "見つける",
    "active": "最新活動順",
    "newcomer": "新規順",
    "local_only": "ローカルだけ",
--- a/app/view/make/language/ja-KS/main.json
+++ b/app/view/make/language/ja-KS/main.json
@@ -102,6 +102,7 @@
    "lang_details_embed": "埋め込みHTMLがコピーされたで。",
    "lang_details_url": "トゥートURLがコピーされたで。",
    "lang_details_txt": "トゥート本文がコピーされたで。",
    "lang_details_fetch": "トゥートの情報を引っ張って来とるで…",
    "lang_filter_nodata": "フィルターは無いで",
    "lang_filter_errordegree": "適応範囲は一つ以上チェックせなあかんで。",
    "lang_list_nodata": "リストは無いで",
--- a/app/view/make/language/ja/index.json
+++ b/app/view/make/language/ja/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "ブラウザで開く",
    "screenshot": "スクリーンショット",
    "copyURL": "URLをコピー",
    "copy": "コピー",
    "embed": "埋め込む",
    "toots": "トゥート",
    "follow": "フォロー",
@@ -92,7 +93,7 @@
    "change": "変更",
    "followReq": "フォローリクエスト",
    "likeHimOrHer": "似てる",
-    "frc":"おすすめ",
+    "frc": "おすすめフォロー",
    "more": "もっと",
    "endorse": "紹介する",
    "openinbrowser": "ブラウザで開く",
@@ -178,6 +179,7 @@
    "foundBug": "バグを見つけた",
    "show": "表示",
    "directory": "ディレクトリ",
    "discover": "見つける",
    "active": "最新活動順",
    "newcomer": "新規順",
    "local_only": "ローカルのみ",
--- a/app/view/make/language/ja/main.json
+++ b/app/view/make/language/ja/main.json
@@ -104,6 +104,7 @@
    "lang_details_embed": "埋め込みHTMLがコピーされました。",
    "lang_details_url": "トゥートURLがコピーされました。",
    "lang_details_txt": "トゥート本文がコピーされました。",
    "lang_details_fetch": "トゥートの情報を読み込んでいます",
    "lang_filter_nodata": "フィルターはありません",
    "lang_filter_errordegree": "適応範囲を最低一つ以上チェックしてください。",
    "lang_list_nodata": "リストはありません",
--- a/app/view/make/language/kw-GB/index.json
+++ b/app/view/make/language/kw-GB/index.json
@@ -74,6 +74,7 @@
    "openBrowser": "Open in browser",
    "screenshot": "Take a screenshot",
    "copyURL": "Copy the URL",
    "copy": "Copy",
    "embed": "Embed",
    "toots": "Toots",
    "follow": "Follow",
@@ -178,6 +179,7 @@
    "foundBug": "I found a bug",
    "show": "Show",
    "directory": "Directory",
    "discover": "Discover",
    "active": "Recently active",
    "newcomer": "New arrivals",
    "local_only": "Local only",
--- a/Show More
+++ b/Show More