TheDesk 21.0.1 (Mayu)

delete user matching
Fix: cannot show when dled imga
2020-05-11 19:03:55 +09:00 · 2020-05-11 18:59:28 +09:00 · 2020-05-11 18:42:52 +09:00 · 2020-05-11 18:42:43 +09:00 · 2020-05-10 22:02:51 +09:00 · 2020-05-10 21:59:25 +09:00
195 changed files with 2892 additions and 1912 deletions
--- a/README.md
+++ b/README.md
@@ -28,7 +28,6 @@ The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.o
 * [SVG 4095x4096](https://d2upiril6ywqp9.cloudfront.net/press/thedesk-fullcolor.svg)
 * [ico 256x256](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ico)
 * [icns old](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.icns)
 * [Illustrator .ai](https://d2upiril6ywqp9.cloudfront.net/press/thedesk.ai)
 The default sounds of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/)
--- a/app/about.html
+++ b/app/about.html
@@ -1,135 +1,139 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="ja">
 	<head>
 		<title>TheDesk</title>
 		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
 		<link href="./node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet" />
 		<link href="./css/font-awesome.css" rel="stylesheet" type="text/css" />
 		<link href="./css/themes.css" type="text/css" rel="stylesheet" />
 		<link href="./css/master.css" type="text/css" rel="stylesheet" />
 		<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet" />
 		<meta charset="utf-8" />
 		<style>
 			body {
 				font-family: 'Open Sans';
 				-webkit-app-region: drag;
 				cursor: move;
 				padding: 5px;
 				padding-top: 15px;
 			}
-<head>
+			a,
-    <title>TheDesk</title>
+			button {
-    <meta content="width=device-width,initial-scale=1.0" name="viewport">
+				-webkit-app-region: no-drag;
-    <link href="./node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
+			}
    <link href='./css/font-awesome.css' rel='stylesheet' type='text/css'>
    <link href="./css/themes.css" type="text/css" rel="stylesheet">
    <link href="./css/master.css" type="text/css" rel="stylesheet">
    <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
    <meta charset="utf-8">
    <style>
        body {
            font-family: 'Open Sans';
            -webkit-app-region: drag;
            cursor: move;
            padding: 5px;
            padding-top: 15px;
        }
-        a,
+			.container {
-        button {
+				width: 100%;
-            -webkit-app-region: no-drag;
+				display: grid;
-        }
+				grid-template-columns: 1fr 1fr;
 				grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
 				grid-template-areas: 'name1 data1' 'name2 data2' 'name3 data3' 'name4 data4' 'name5 data5' 'name6 data6';
 				text-align: left;
 				margin: 5px;
 			}
-        .container {
+			.area-name1 {
-            width: 100%;
+				grid-area: name1;
-            display: grid;
+			}
            grid-template-columns: 1fr 1fr;
            grid-template-rows: 1fr 1fr 1fr 1fr 1fr;
            grid-template-areas: 'name1 data1''name2 data2''name3 data3''name4 data4''name5 data5''name6 data6';
            text-align: left;
            margin: 5px;
        }
-        .area-name1 {
+			.area-data1 {
-            grid-area: name1;
+				grid-area: data1;
-        }
+			}
-        .area-data1 {
+			.area-name2 {
-            grid-area: data1;
+				grid-area: name2;
-        }
+			}
-        .area-name2 {
+			.area-data2 {
-            grid-area: name2;
+				grid-area: data2;
-        }
+			}
-        .area-data2 {
+			.area-name3 {
-            grid-area: data2;
+				grid-area: name3;
-        }
+			}
-        .area-name3 {
+			.area-data3 {
-            grid-area: name3;
+				grid-area: data3;
-        }
+			}
-        .area-data3 {
+			.area-name4 {
-            grid-area: data3;
+				grid-area: name4;
-        }
+			}
-        .area-name4 {
+			.area-data4 {
-            grid-area: name4;
+				grid-area: data4;
-        }
+			}
-        .area-data4 {
+			.area-name5 {
-            grid-area: data4;
+				grid-area: name5;
-        }
+			}
-        .area-name5 {
+			.area-data5 {
-            grid-area: name5;
+				grid-area: data5;
-        }
+			}
-        .area-data5 {
+			.area-name6 {
-            grid-area: data5;
+				grid-area: name6;
-        }
+			}
-        .area-name6 {
+			.area-data6 {
-            grid-area: name6;
+				grid-area: data6;
-        }
+			}
 		</style>
 	</head>
-        .area-data6 {
+	<body class="center" style="overflow: hidden;">
-            grid-area: data6;
+		<script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
-        }
+		<script type="text/javascript" src="./js/platform/first-not-view.js"></script>
-    </style>
+		<script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
-</head>
+		<img src="./img/desk.svg" style="max-width: 62%;" />
-
+		<h5>TheDesk</h5>
-<body class="center " style="overflow:hidden">
+		<div class="container">
-    <script type="text/javascript" src="./node_modules/jquery/dist/jquery.js"></script>
+			<div class="area-name1">Display version</div>
-    <script type="text/javascript" src="./js/platform/first-not-view.js"></script>
+			<div class="area-data1" id="now"></div>
-    <script type="text/javascript" src="./node_modules/materialize-css/dist/js/materialize.js"></script>
+			<div class="area-name2">Internal version</div>
-    <img src="./img/desk.svg" style="max-width:62%;">
+			<div class="area-data2" id="ver"></div>
-    <h5>TheDesk</h5>
+			<div class="area-name3">Commit(7chars)</div>
-    <div class="container">
+			<div class="area-data3" id="hash"></div>
-        <div class="area-name1">Display version</div>
+			<div class="area-name4">Chromium</div>
-        <div class="area-data1" id="now"></div>
+			<div class="area-data4" id="chrome"></div>
-        <div class="area-name2">Internal version</div>
+			<div class="area-name5">Electron</div>
-        <div class="area-data2" id="ver"></div>
+			<div class="area-data5" id="electron"></div>
-        <div class="area-name3">Commit(7chars)</div>
+			<div class="area-name6">Node.js</div>
-        <div class="area-data3" id="hash"></div>
+			<div class="area-data6" id="node"></div>
-        <div class="area-name4">Chromium</div>
+		</div>
-        <div class="area-data4" id="chrome"></div>
+		<div class="cp">
-        <div class="area-name5">Electron</div>
+			Copyright &copy; TheDesk 2018<br />
-        <div class="area-data5" id="electron"></div>
+			Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br />
-        <div class="area-name6">Node.js</div>
+			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
-        <div class="area-data6" id="node"></div>
+				href="https://pl.kpherox.dev/kPherox"
-    </div>
+				target="_blank"
-    <div class="cp">Copyright &copy; TheDesk 2018<br>
+				>kPherox</a
-        Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br>
+			>
-        Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a
+			and all users
-            href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a href="https://pl.kpherox.dev/kPherox"
+			<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" />
-            target="_blank">kPherox</a> and all users
+			<br /><a href="https://thedesk.top" target="_blank">Web site</a>
-        <img draggable="false" style="width:0.8rem;top: 1px;margin-left: 1px;position: relative;" alt="❤️"
+		</div>
-            title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png">
+		<button onclick="window.close()" class="btn waves-effect indigo" style="width: calc(100% - 10px);"><i class="material-icons left">close</i>Close</button>
-        <br><a href="https://thedesk.top" target="_blank">Web site</a></div>
+		<script type="text/javascript" src="./js/ui/theme.js"></script>
-    <button onclick="window.close()" class="btn waves-effect indigo" style="width:calc(100% - 10px);"><i
+		<script>
-            class="material-icons left">close</i>Close</button>
+			var about = JSON.parse(localStorage.getItem('about'))
-    <script type="text/javascript" src="./js/ui/theme.js"></script>
+			$('#now').text(localStorage.getItem('ver'))
-    <script>
+			$('#node').text(about[0])
-        var about = JSON.parse(localStorage.getItem("about"));
+			$('#chrome').text(about[1])
-        $("#now").text(localStorage.getItem("ver"));
+			$('#electron').text(about[2])
-        $("#node").text(about[0]);
+			if (location.search) {
-        $("#chrome").text(about[1]);
+				var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/)
-        $("#electron").text(about[2]);
+				var ver = m[1]
-        if (location.search) {
+				$('#ver').text(ver)
-            var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/);
+			}
-            var ver = m[1];
+			$('#hash').html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>')
-            $("#ver").text(ver);
+			$(document).on('click', 'a', (e) => {
-        }
+				var url = $(e.target).attr('href')
-        $("#hash").html('<a href="https://github.com/cutls/TheDesk/commits/' + about[3] + '" target="_blank">' + about[3].slice(0, 7) + '</a>');
+				postMessage(['openUrl', url], '*')
-        $(document).on('click', 'a', e => {
+				return false
-            var url = $(e.target).attr('href');
+			})
-            postMessage(["openUrl", url], "*")
+		</script>
-            return false;
+	</body>
-        });
+</html>
    </script>
--- a/app/build/appx/Square150x150Logo.png
+++ b/app/build/appx/Square150x150Logo.png
--- a/app/build/appx/Square44x44Logo.png
+++ b/app/build/appx/Square44x44Logo.png
--- a/app/build/appx/StoreLogo.png
+++ b/app/build/appx/StoreLogo.png
--- a/app/build/thedesk.ico
+++ b/app/build/thedesk.ico
--- a/app/css/master.css
+++ b/app/css/master.css
@@ -9,7 +9,9 @@ body {
 	height: 100vh;
 	color: var(--color);
 }
-.titlebar, .menubar-menu-container, .action-menu-item {
+.titlebar,
 .menubar-menu-container,
 .action-menu-item {
 	background-color: var(--notfbox) !important;
 	filter: brightness(110%) !important;
 	color: var(--color) !important;
@@ -24,8 +26,17 @@ body {
 .markdown {
 	display: none;
 }
-help {
+.accessMark {
-	display: none;
+	font-size: 12px;
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	background-color: var(--emphasized);
 	padding-left: 5px;
 	padding-right: 5px;
 }
 .accessibility .scr {
 	display: none !important;
 }
 .show-help {
 	display: inline;
@@ -342,21 +353,22 @@ blockquote:before,
 #left-menu {
 	width: 230px;
 }
-#left-menu div {
+#left-menu a {
 	padding-left: 5px;
 	width: 100%;
 	height: 50px;
 	display: flex;
 	align-items: center;
 	cursor: pointer;
 	color: var(--color);
 }
-#left-menu div:hover {
+#left-menu a:hover {
 	background-color: var(--beforehover);
 }
 #left-menu span {
 	margin-left: 5px;
 }
-#left-menu div.active {
+#left-menu a.active {
 	background-color: var(--emphasized);
 }
 #right-menu {
@@ -376,6 +388,7 @@ blockquote:before,
 	width: 170px;
 	height: 40px;
 	cursor: pointer;
 	color: var(--color);
 }
 #tltype .type span {
 	width: calc(100% - 30px);
@@ -508,11 +521,18 @@ textarea {
 	width: 300px;
 	max-width: 100%;
 	background-color: var(--box);
-  z-index: 501;
+	z-index: 501;
-  padding: 5px;
+	padding: 5px;
 }
 #pageSrcInput {
-  width: 160px;
+	width: 160px;
 }
 .voice {
 	clip: rect(1px, 1px, 1px, 1px);
 	position: absolute !important;
 	height: 1px;
 	width: 1px;
 	overflow: hidden;
 }
@media (max-width: 500px) {
@@ -543,17 +563,14 @@ textarea {
 	font-family: 'Open Sans';
 	font-style: normal;
 	font-weight: 300;
-	src: local('Open Sans Light'), local('OpenSans-Light'),
+	src: local('Open Sans Light'), local('OpenSans-Light'), url('../fonts/OpenSans-Light.ttf') format('truetype');
-		url(https://fonts.gstatic.com/s/opensans/v17/mem5YaGs126MiZpBA-UN_r8OUuhp.woff2) format('woff2');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F,
 		U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
@font-face {
 	font-family: 'Material Icons';
 	font-style: normal;
 	font-weight: 400;
-	src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2)
+	src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2');
 		format('woff2');
 }
 .material-icons {
 	font-family: 'Material Icons';
@@ -570,3 +587,16 @@ textarea {
 	-webkit-font-feature-settings: 'liga';
 	-webkit-font-smoothing: antialiased;
 }
 .pwaView .pwa,
 .pwaView .mac,
 .pwaView .win {
 	display: none;
 }
 .win32 .mac,
 .linux .mac {
 	display: none;
 }
 .linux .win,
 .darwin .win {
 	display: none;
 }
--- a/app/css/post.css
+++ b/app/css/post.css
@@ -124,6 +124,7 @@ textarea {
 }
 #posttgl,#toot-post-btn {
  background-color: var(--accentbtn);
  color: var(--color);
 }
 /*mini*/
 .mini-post .mize {
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -559,7 +559,7 @@ p:not(:last-child) {
 	z-index: 500;
 	padding: 5px;
 	display: grid;
-	grid-template-columns: 40px 60px 1fr 24px;
+	grid-template-columns: 40px 65px 1fr 24px;
 	grid-template-rows: 30px 30px;
 	grid-template-areas: 'notice notice_name notice_name a2' 'notice a1 sta a3' 'notf-box notf-box notf-box notf-box';
 }
--- a/app/css/userdata.css
+++ b/app/css/userdata.css
@@ -1,7 +1,7 @@
 /*アイコンをクリックした時とかにでてくるユーザーデータ*/
 #his-data {
  background-repeat: no-repeat;
-  background-image: url("../../loading.svg");
+  background-image: url("../img/loading.svg");
  overflow-y: hidden;
 }
 #his-data .btn .material-icons{
@@ -38,10 +38,6 @@
 #his-basic-prof {
  min-height: 130px;
 }
 #his-matching-list {
  overflow-y: scroll;
  overflow-x: hidden;
 }
 #his-field {
  vertical-align: baseline;
  text-align: center;
--- a/app/fonts/OpenSans-Light.ttf
+++ b/app/fonts/OpenSans-Light.ttf
--- a/app/img/desk-animation.svg
+++ b/app/img/desk-animation.svg
@@ -0,0 +1,37 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg width="100%" height="100%" viewBox="0 0 4096 4096" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
    <g id="TheDesk">
        <g id="back">
            <g transform="matrix(1,0,0,1.53232,-11.8871,-1144.65)">
                <rect x="1044.02" y="1686.36" width="2335.77" height="782.558" style="fill:rgba(255,255,255,0);">
                    <animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
                </rect>
            </g>
            <rect x="1058.89" y="609.971" width="711.146" height="2885.69" style="fill:rgba(255,255,255,0);">
                <animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
            </rect>
            <g transform="matrix(1.08582,0,0,1,-142.973,0)">
                <rect x="1665.9" y="1021.89" width="776.607" height="2050.26" style="fill:rgba(255,255,255,0);">
                    <animate attributeName="fill" begin="0.5s" dur="0.1s" fill="freeze" values="rgba(255,255,255,0);rgba(255,255,255,1)" />
                </rect>
            </g>
        </g>
        <g transform="matrix(1,0,0,0.998821,0,4.65666)" id="gray">
            <rect x="678.5" y="128.48" width="450" height="3821.5" style="fill:rgb(84,82,81);"/>
        </g>
        <g transform="matrix(0.999978,-5.55112e-17,-2.20005e-08,0.996112,-1237.17,972.039)" id="orange">
            <rect x="1915.71" y="-583.55" width="450" height="3117.62" style="fill:rgb(240,132,46);" r="3117.62">
                <animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0,1915.71,-583.55" to="-60,1915.71,-583.55" dur="0.5s" repeatCount="1" fill="freeze" />
            </rect>
        </g>
        <g transform="matrix(0.999978,5.55112e-17,-5.55112e-17,0.999978,-1236.96,-1164.58)" id="blue">
            <rect x="1915.5" y="1775.41" width="450" height="3105.58" style="fill:rgb(54,76,159);" r="3117.62">
                <animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0,1915.71,4881" to="60,1915.71,4881" dur="0.5s" repeatCount="1" fill="freeze" />
            </rect>
        </g>
        <path id="cat" d="M1592.47,2584L2048.94,2584C2048.94,2519.11 2044.31,2506.24 1936.84,2506.24C1954.01,2454.74 2023.79,2330.13 2062.57,2330.13C2096.88,2330.13 2137.81,2332.02 2137.81,2410.3C2137.81,2499.17 2287.37,2642.46 2323.63,2584C2377.67,2496.88 2230.72,2523.45 2230.72,2313.35C2230.72,2025.92 2398.46,2066.84 2398.46,1905.36C2398.46,1824.57 2376.14,1813.66 2376.14,1755.9C2376.14,1679.56 2443.39,1683.99 2430.31,1620.7C2421.27,1576.98 2414.2,1541.92 2408.93,1489.05C2405.19,1451.54 2404,1411.55 2365.03,1413.16C2319.25,1415.05 2301.88,1495.63 2230.72,1501.41C2159.7,1507.18 2099.15,1440.95 2071.66,1450.41C2044.41,1459.79 2052.98,1533.73 2069.14,1586.24C2094.54,1668.78 2149.93,1776.1 2048.94,1792.26C1947.95,1808.42 1774.25,1824.58 1649.02,1990.2C1523.79,2155.82 1528.42,2350.19 1479.36,2410.31C1314.72,2612.08 1146,2529.23 1146,2697.11C1146,2772.27 1273.35,2826.38 1293.55,2802.14C1313.75,2777.9 1121.93,2705.68 1336.56,2620.36C1519.91,2547.46 1536.28,2532.58 1592.47,2584Z" style="fill:rgba(0,0,0,0);">
            <animate attributeName="fill" begin="0.6s" dur="0.5s" fill="freeze" values="rgba(0,0,0,0);rgba(0,0,0,1)" repeatCount="1" />
        </path>
    </g>
 </svg>
--- a/app/img/desk.png
+++ b/app/img/desk.png
--- a/app/img/desk.svg
+++ b/app/img/desk.svg
@@ -1,35 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+<svg width="100%" height="100%" viewBox="0 0 4096 4096" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
+    <g id="TheDesk">
-<style type="text/css">
+        <g>
-	.st0{display:none;}
+            <g transform="matrix(1,0,0,1.53232,-11.8871,-1144.65)">
-	.st1{fill:#FFFFFF;}
+                <rect x="1044.02" y="1686.36" width="2335.77" height="782.558" style="fill:white;"/>
-	.st2{fill:#545251;stroke:#040000;stroke-miterlimit:10;}
+            </g>
-	.st3{fill:#F0842E;}
+            <rect x="1058.89" y="609.971" width="711.146" height="2885.69" style="fill:white;"/>
-	.st4{fill:#364C9F;}
+            <g transform="matrix(1.08582,0,0,1,-142.973,0)">
-	.st5{fill:#FFFFFF;stroke:#040000;stroke-miterlimit:10;}
+                <rect x="1665.9" y="1021.89" width="776.607" height="2050.26" style="fill:white;"/>
-	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#040000;}
+            </g>
-	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:none;}
+        </g>
-</style>
+        <g transform="matrix(1,0,0,0.998821,0,4.65666)">
-<g id="レイヤー_1" class="st0">
+            <rect x="678.5" y="128.48" width="450" height="3821.5" style="fill:rgb(84,82,81);"/>
-</g>
+        </g>
-<g id="レイヤー_2">
+        <g transform="matrix(0.5,-0.866,0.862652,0.498067,224.046,2340.41)">
-	<polyline class="st1" points="1128.5,650.67 3378,1950 3378,2137 1128.5,3432.67 	"/>
+            <rect x="1915.71" y="-583.55" width="450" height="3117.62" style="fill:rgb(240,132,46);"/>
-	<rect x="678.5" y="128.48" class="st2" width="450" height="3821.5"/>
+        </g>
-	
+        <g transform="matrix(0.5,0.866,-0.866,0.5,3757.17,-299.625)">
-		<rect x="1915.71" y="-583.55" transform="matrix(0.5 -0.866 0.866 0.5 225.753 2341.5386)" class="st3" width="450" height="3117.62"/>
+            <rect x="1915.5" y="1555.41" width="450" height="3105.58" style="fill:rgb(54,76,159);"/>
-	
+        </g>
-		<rect x="1915.5" y="1555.41" transform="matrix(0.5 0.866 -0.866 0.5 3762.031 -299.6245)" class="st4" width="450" height="3105.58"/>
+        <path id="cat" d="M1592.47,2584L2048.94,2584C2048.94,2519.11 2044.31,2506.24 1936.84,2506.24C1954.01,2454.74 2023.79,2330.13 2062.57,2330.13C2096.88,2330.13 2137.81,2332.02 2137.81,2410.3C2137.81,2499.17 2287.37,2642.46 2323.63,2584C2377.67,2496.88 2230.72,2523.45 2230.72,2313.35C2230.72,2025.92 2398.46,2066.84 2398.46,1905.36C2398.46,1824.57 2376.14,1813.66 2376.14,1755.9C2376.14,1679.56 2443.39,1683.99 2430.31,1620.7C2421.27,1576.98 2414.2,1541.92 2408.93,1489.05C2405.19,1451.54 2404,1411.55 2365.03,1413.16C2319.25,1415.05 2301.88,1495.63 2230.72,1501.41C2159.7,1507.18 2099.15,1440.95 2071.66,1450.41C2044.41,1459.79 2052.98,1533.73 2069.14,1586.24C2094.54,1668.78 2149.93,1776.1 2048.94,1792.26C1947.95,1808.42 1774.25,1824.58 1649.02,1990.2C1523.79,2155.82 1528.42,2350.19 1479.36,2410.31C1314.72,2612.08 1146,2529.23 1146,2697.11C1146,2772.27 1273.35,2826.38 1293.55,2802.14C1313.75,2777.9 1121.93,2705.68 1336.56,2620.36C1519.91,2547.46 1536.28,2532.58 1592.47,2584Z" style="fill:rgb(4,0,0);"/>
-	<path class="st5" d="M714.5,2953.5"/>
+        <rect x="0" y="0" width="4096" height="4096" style="fill:none;"/>
-	<path id="path1891" class="st6" d="M1592.47,2584h456.47c0-64.89-4.63-77.76-112.1-77.76c17.17-51.5,86.95-176.11,125.73-176.11
+    </g>
 		c34.31,0,75.24,1.89,75.24,80.17c0,88.87,149.56,232.16,185.82,173.7c54.04-87.12-92.91-60.55-92.91-270.65
 		c0-287.43,167.74-246.51,167.74-407.99c0-80.79-22.32-91.7-22.32-149.46c0-76.34,67.25-71.91,54.17-135.2
 		c-9.04-43.72-16.11-78.78-21.38-131.65c-3.74-37.51-4.93-77.5-43.9-75.89c-45.78,1.89-63.15,82.47-134.31,88.25
 		c-71.02,5.77-131.57-60.46-159.06-51c-27.25,9.38-18.68,83.32-2.52,135.83c25.4,82.54,80.79,189.86-20.2,206.02
 		c-100.99,16.16-274.69,32.32-399.92,197.94s-120.6,359.99-169.66,420.11C1314.72,2612.08,1146,2529.23,1146,2697.11
 		c0,75.16,127.35,129.27,147.55,105.03c20.2-24.24-171.62-96.46,43.01-181.78C1519.91,2547.46,1536.28,2532.58,1592.47,2584z"/>
 	<rect class="st7" width="4096" height="4096"/>
 	<path class="st1" d="M-58,1122"/>
 </g>
 </svg>
--- a/app/img/desk_full.svg
+++ b/app/img/desk_full.svg
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!--
 	TheDesk icon, Cutls P.
 	This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
 -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
 <style type="text/css">
--- a/app/img/icons/icon-128x128.png
+++ b/app/img/icons/icon-128x128.png
--- a/app/img/icons/icon-144x144.png
+++ b/app/img/icons/icon-144x144.png
--- a/app/img/icons/icon-152x152.png
+++ b/app/img/icons/icon-152x152.png
--- a/app/img/icons/icon-192x192.png
+++ b/app/img/icons/icon-192x192.png
--- a/app/img/icons/icon-384x384.png
+++ b/app/img/icons/icon-384x384.png
--- a/app/img/icons/icon-512x512.png
+++ b/app/img/icons/icon-512x512.png
--- a/app/img/icons/icon-72x72.png
+++ b/app/img/icons/icon-72x72.png
--- a/app/img/icons/icon-96x96.png
+++ b/app/img/icons/icon-96x96.png
--- a/app/img/thinking.svg
+++ b/app/img/thinking.svg
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 	ThinkingDesk: Cutls P's icon, Cutls P.
 	This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
 -->
 <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 4096 4096" style="enable-background:new 0 0 4096 4096;" xml:space="preserve">
--- a/app/js/common/keyshortcut.js
+++ b/app/js/common/keyshortcut.js
@@ -115,6 +115,13 @@ $(function($) {
 					return false
 				}
 			}
 			//Ctrl+K:メニュー開閉
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode === 75) {
 					menu()
 					return false
 				}
 			}
 			//Ctrl+Space:読み込み
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode === 32) {
--- a/app/js/common/version.js
+++ b/app/js/common/version.js
@@ -1,8 +1,9 @@
 //バージョンチェッカー
 function verck(ver, jp) {
-	console.log('%c Welcome😊', 'color: red;font-size:200%;')
+	console.log('%c Welcome😊 ' + ver, 'color: red;font-size:200%;')
 	$('body').addClass(localStorage.getItem('platform'))
 	var date = new Date()
-	var show = false
+	var showVer = false
 	if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
 		//ちょっと削除とリンク解析の都合上アレ(s)
 		//対象外のアプデ:storageが20の最初まで"Usamin (18.6.5)"
@@ -15,10 +16,10 @@ function verck(ver, jp) {
 			}
 		}
 		//ちょっと削除とリンク解析の都合上アレ(e)
-		show = true
+		showVer = true
 		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
 		$(document).ready(function() {
-			if (localStorage.getItem('winstore')) {
+			if (localStorage.getItem('winstore') && !pwa) {
 				$('#releasenote').modal('open')
 			}
 			verp = ver.replace('(', '')
@@ -37,8 +38,8 @@ function verck(ver, jp) {
 		})
 	}
 	localStorage.setItem('ver', ver)
-	if (!show) {
+	if (!showVer) {
-		console.log(show)
+		console.log(showVer)
 		if (
 			date.getFullYear() * 100 + date.getMonth() + 1 >= localStorage.getItem('showSupportMe') ||
 			!localStorage.getItem('showSupportMe')
@@ -68,7 +69,7 @@ function verck(ver, jp) {
 	}
 	var platform = localStorage.getItem('platform')
 	console.log('Your platform:' + platform)
-	if (!localStorage.getItem('winstore')) {
+	if (!localStorage.getItem('winstore') && !pwa) {
 		$('#start').css('display', 'flex')
 	}
 	if (
@@ -142,9 +143,10 @@ function verck(ver, jp) {
 	if (!localStorage.getItem('last-notice-id')) {
 		localStorage.setItem('last-notice-id', 0)
 	}
-	var start = 'https://thedesk.top/notice?since_id=' + localStorage.getItem('last-notice-id')
+	var start = 'https://thedesk.top/notice/index.php?since_id=' + localStorage.getItem('last-notice-id')
 	fetch(start, {
-		method: 'GET'
+		method: 'GET',
 		cors: true
 	})
 		.then(function(response) {
 			if (!response.ok) {
@@ -172,7 +174,7 @@ function verck(ver, jp) {
 					} else {
 						if (obj.type == 'textv2') {
 							if (~obj.languages.indexOf(lang.language)) {
-								var show = true
+								var showVer = true
 								if (obj.toot != '') {
 									var toot =
 										'<button class="btn-flat toast-action" onclick="detEx(\'' +
@@ -183,25 +185,25 @@ function verck(ver, jp) {
 								}
 								if (obj.ver != '') {
 									if (obj.ver == ver) {
-										show = true
+										showVer = true
 									} else {
-										show = false
+										showVer = false
 									}
 								}
 								if (obj.domain != '') {
 									var multi = localStorage.getItem('multi')
 									if (multi) {
-										show = false
+										showVer = false
 										var accts = JSON.parse(multi)
 										Object.keys(accts).forEach(function(key) {
 											var acct = accts[key]
 											if (acct.domain == obj.domain) {
-												show = true
+												showVer = true
 											}
 										})
 									}
 								}
-								if (show) {
+								if (showVer) {
 									M.toast({
 										html:
 											escapeHTML(obj.text) +
@@ -231,7 +233,7 @@ function infowebsocket() {
 			if (obj.type == 'textv2') {
 				if (~obj.languages.indexOf(lang.language)) {
 					localStorage.setItem('last-notice-id', obj.id)
-					var show = true
+					var showVer = true
 					if (obj.toot != '') {
 						var toot =
 							'<button class="btn-flat toast-action" onclick="detEx(\'' +
@@ -242,25 +244,25 @@ function infowebsocket() {
 					}
 					if (obj.ver != '') {
 						if (obj.ver == ver) {
-							show = true
+							showVer = true
 						} else {
-							show = false
+							showVer = false
 						}
 					}
 					if (obj.domain != '') {
 						var multi = localStorage.getItem('multi')
 						if (multi) {
-							show = false
+							showVer = false
 							var accts = JSON.parse(multi)
 							Object.keys(accts).forEach(function(key) {
 								var acct = accts[key]
 								if (acct.domain == obj.domain) {
-									show = true
+									showVer = true
 								}
 							})
 						}
 					}
-					if (show) {
+					if (showVer) {
 						console.log(obj.text)
 						console.log(escapeHTML(obj.text))
 						M.toast({
@@ -323,6 +325,7 @@ function closeSupport() {
 	)
 }
 function storeDialog(platform, ver) {
 	if($('body').hasClass('accessibility')) return false
 	if (platform == 'win32') {
 		var mes = lang.lang_version_platform
 	} else if (platform == 'linux') {
@@ -350,7 +353,8 @@ function storeDialog(platform, ver) {
 				localStorage.setItem('winstore', 'localinstall')
 			}
 			localStorage.setItem('ver', ver)
-			show = true
+			showVer = true
 			if(pwa) return false
 			console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
 			$(document).ready(function() {
 				$('#releasenote').modal('open')
@@ -371,9 +375,10 @@ function storeDialog(platform, ver) {
 		})
 	} else {
 		localStorage.setItem('ver', ver)
-			show = true
+			showVer = true
 			console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
 			$(document).ready(function() {
 				if(pwa) return false
 				$('#releasenote').modal('open')
 				verp = ver.replace('(', '')
 				verp = verp.replace('.', '-')
--- a/app/js/login/login.js
+++ b/app/js/login/login.js
@@ -47,6 +47,9 @@ function ck() {
 			multiSelector(false)
 			verck(ver, jp)
 			$('.stw').show()
 			if (localStorage.getItem('tips')) {
 				tips(localStorage.getItem('tips'))
 			}
 			$('#something-wrong img').attr('src', '../../img/thinking.svg')
 		}
 	}
@@ -587,9 +590,10 @@ function enc(ver) {
 }
 //インスタンスティッカー
 function ticker() {
-	var start = 'https://toot.app/toot/'
+	var start = 'https://toot.app/toot/index.php'
 	fetch(start, {
 		method: 'GET',
 		cors: true,
 		headers: {
 			'content-type': 'application/json'
 		}
--- a/app/js/login/manager.js
+++ b/app/js/login/manager.js
@@ -506,7 +506,7 @@ function misskeyLogin(url) {
 	if (!url) {
 		var url = $('#misskey-url').val()
 	}
-	var start = 'http://' + url + '/api/app/create'
+	var start = 'https://' + url + '/api/app/create'
 	var httpreq = new XMLHttpRequest()
 	httpreq.open('POST', start, true)
 	httpreq.setRequestHeader('Content-Type', 'application/json')
--- a/app/js/platform/end.js
+++ b/app/js/platform/end.js
@@ -140,6 +140,7 @@ function nano() {
 	postMessage(['nano', null], '*')
 }
 onmessage = function(e) {
 	console.log(e)
 	if (e.data[0] == 'details') {
 		details(e.data[1][0], e.data[1][1])
 	} else if (e.data[0] == 'udg') {
@@ -149,10 +150,10 @@ onmessage = function(e) {
 	} else if (e.data[0] == 'post') {
 		post('pass')
 	} else if (e.data[0] == 'toastSaved') {
-		var show = `${lang.lang_img_DLDone}${
+		var showTxt = `${lang.lang_img_DLDone}${
 			e.data[1][0]
 		}<button class="btn-flat toast-action" onclick="openFinder('${e.data[1][1]}')">Show</button>`
-		M.toast({ html: show, displayLength: 5000 })
+		M.toast({ html: showTxt, displayLength: 5000 })
 	} else if (e.data[0] == 'parseColumn') {
 		parseColumn(e.data[1])
 	} else if (e.data[0] == 'exportSettingsCore') {
@@ -186,6 +187,10 @@ onmessage = function(e) {
 		asRead()
 	} else if (e.data[0] == 'asReadEnd') {
 		asReadEnd()
 	} else if (e.data[0] == 'accessibility') {
 		console.log('atrue')
 		$('body').addClass('accessibility')
 		$('.window-title').before('<div class="accessMark">Screen Reader Optimized</div>')
 	} else if (e.data[0] == 'logData') {
 		$('#logs').val(e.data[1])
 		var obj = document.getElementById('logs')
--- a/app/js/platform/first.js
+++ b/app/js/platform/first.js
@@ -1,4 +1,3 @@
 document.title = 'TheDesk'
 $.strip_tags = function(str, allowed) {
 	if (!str) {
 		return ''
--- a/app/js/platform/preload.js
+++ b/app/js/platform/preload.js
@@ -4,6 +4,8 @@ var ipc = electron.ipcRenderer
 //title bar
 const customTitlebar = require('custom-electron-titlebar')
 window.addEventListener('DOMContentLoaded', () => {
 	document.title = 'TheDesk'
 	ipc.send('acsCheck', '')
 	ipc.send('frameCheck', '')
 	ipc.on('frame', function(event, args) {
 		const file = location.href.substr(-10)
@@ -47,7 +49,7 @@ onmessage = function(e) {
 	} else if (e.data[0] == 'generalDL') {
 		ipc.send('general-dl', e.data[1])
 	} else if (e.data[0] == 'openFinder') {
-		ipc.send('open-finder', e.data[1])
+		ipc.send('openFinder', e.data[1])
 	} else if (e.data[0] == 'columnDel') {
 		ipc.send('column-del', e.data[1])
 	} else if (e.data[0] == 'lang') {
@@ -154,12 +156,12 @@ ipc.on('resizeJudgement', function(event, b64) {
 			var width = element.naturalWidth
 			var height = element.naturalHeight
 			if (width > resize || height > resize) {
-				ipc.send('resize-image', [b64, resize])
+				ipc.send('resize-image', [b64[0], resize])
 			} else {
 				postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
 			}
 		}
-		element.src = b64
+		element.src = 'data:image/png;base64,' + b64[0]
 	} else {
 		postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
 	}
@@ -169,7 +171,7 @@ ipc.on('general-dl-prog', function(event, arg) {
 	console.log('Progress: ' + arg)
 })
 ipc.on('general-dl-message', function(event, arg) {
-	var argC = arg.replace(/\\/g, '\\\\') + '\\\\.'
+	var argC = arg.replace(/\\/g, '\\\\')
 	console.log('saved')
 	postMessage(['toastSaved', [arg, argC]], '*')
 })
@@ -230,12 +232,16 @@ ipc.on('prog', function(event, arg) {
 ipc.on('mess', function(event, arg) {
 	postMessage(['updateMess', arg], '*')
 })
 //misc
 ipc.on('asRead', function(event, arg) {
 	postMessage(['asRead', ''], '*')
 })
 ipc.on('asReadEnd', function(event, arg) {
 	postMessage(['asReadEnd', ''], '*')
 })
 ipc.on('accessibility', function(event, arg) {
 	postMessage(['accessibility', 'true'], '*')
 })
 var webviewDom = document.getElementById('webview')
 if (webviewDom) {
 	webviewDom.addEventListener('new-window', function(e) {
--- a/app/js/post/img.js
+++ b/app/js/post/img.js
@@ -133,25 +133,34 @@ async function media(b64, type, no, stamped) {
 		//v2/media
 		try {
 			var id = await v2MediaUpload(domain, at, fd)
-			var mediav = $('#media').val()
+			if(!id) {
-			var regExp = new RegExp('tmp_' + r, 'g')
+				var start = 'https://' + domain + '/api/v1/media'
-			mediav = mediav.replace(regExp, id)
+				httpreq.open('POST', start, true)
-			$('#media').val(mediav)
+				httpreq.upload.addEventListener('progress', progshow, false)
-			var html = `<img src="../../img/picture.svg" class="preview-img pointer unknown" data-media="${id}" oncontextmenu="deleteImage('${id}')" onclick="altImage('${acct_id}','${id}')" title="${lang.lang_postimg_delete}">`
+				httpreq.responseType = 'json'
-			$('#preview').append(html)
+				httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-			todc()
+				httpreq.send(fd)
-			if (localStorage.getItem('nsfw_' + acct_id)) {
+			} else {
-				$('#nsfw').addClass('yellow-text')
+				var mediav = $('#media').val()
-				$('#nsfw').html('visibility')
+				var regExp = new RegExp('tmp_' + r, 'g')
-				$('#nsfw').addClass('nsfw-avail')
+				mediav = mediav.replace(regExp, id)
-			}
+				$('#media').val(mediav)
-			$('.toot-btn-group').prop('disabled', false)
+				var html = `<img src="../../img/picture.svg" class="preview-img pointer unknown" data-media="${id}" oncontextmenu="deleteImage('${id}')" onclick="altImage('${acct_id}','${id}')" title="${lang.lang_postimg_delete}">`
-			$('select').formSelect()
+				$('#preview').append(html)
-			$('#mec').text(lang.lang_there)
+				todc()
-			M.toast({ html: '<span>' + lang.lang_postimg_sync + '</span><button class="btn-flat toast-action" onclick="syncDetail()">Click</button>', displayLength: 3000 })
+				if (localStorage.getItem('nsfw_' + acct_id)) {
-			$('#imgup').text('')
+					$('#nsfw').addClass('yellow-text')
-			$('#imgsel').show()
+					$('#nsfw').html('visibility')
-			localStorage.removeItem('image')
+					$('#nsfw').addClass('nsfw-avail')
 				}
 				$('.toot-btn-group').prop('disabled', false)
 				$('select').formSelect()
 				$('#mec').text(lang.lang_there)
 				M.toast({ html: '<span>' + lang.lang_postimg_sync + '</span><button class="btn-flat toast-action" onclick="syncDetail()">Click</button>', displayLength: 3000 })
 				$('#imgup').text('')
 				$('#imgsel').show()
 				localStorage.removeItem('image')
 			} 
 		} catch {
 			var start = 'https://' + domain + '/api/v1/media'
 			httpreq.open('POST', start, true)
@@ -183,6 +192,10 @@ async function media(b64, type, no, stamped) {
 				M.toast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
 				return false
 			}
 			$('#imgup').text('')
 			$('.toot-btn-group').prop('disabled', false)
 			$('select').formSelect()
 			$('#imgsel').show()
 			var img = localStorage.getItem('img')
 			if (json.type.indexOf('image') != -1) {
 				var html = `<img src="${json[previewer]}" class="preview-img pointer" data-media="${json['id']}" oncontextmenu="deleteImage('${json['id']}')" onclick="altImage('${acct_id}','${json['id']}')" title="${lang.lang_postimg_delete}">`
--- a/app/js/tl/directory.js
+++ b/app/js/tl/directory.js
@@ -3,7 +3,7 @@
 function dirMenu() {
 	$("#dir-contents").html("");
 	directory();
-	$("#left-menu div").removeClass("active");
+	$("#left-menu a").removeClass("active");
 	$("#dirMenu").addClass("active");
 	$(".menu-content").addClass("hide");
 	$("#dir-box").removeClass("hide");
--- a/app/js/tl/filter.js
+++ b/app/js/tl/filter.js
@@ -14,6 +14,46 @@ function mediaToggle(tlid) {
 		$('#timeline_' + tlid).addClass('media-filter')
 	}
 }
 /* Remote only */
 function remoteOnly(tlid, type) {
 	var multi = localStorage.getItem('column')
 	var obj = JSON.parse(multi)
 	if (obj[tlid].data) {
 		if (obj[tlid].data.remote) {
 			obj[tlid].data.remote = false
 			var json = JSON.stringify(obj)
 			localStorage.setItem('column', json)
 			$('#sta-remote-' + tlid).text('Off')
 			$('#sta-remote-' + tlid).css('color', '#009688')
 		} else {
 			obj[tlid].data.remote = true
 			var json = JSON.stringify(obj)
 			localStorage.setItem('column', json)
 			$('#sta-remote-' + tlid).text('On')
 			$('#sta-remote-' + tlid).css('color', 'red')
 		}
 	} else {
 		obj[tlid].data = {}
 		obj[tlid].data.remote = true
 		var json = JSON.stringify(obj)
 		localStorage.setItem('column', json)
 		$('#sta-remote-' + tlid).text('On')
 		$('#sta-remote-' + tlid).css('color', 'red')
 	}
 	columnReload(tlid, type)
 }
 function remoteOnlyCk(tlid) {
 	var multi = localStorage.getItem('column')
 	var obj = JSON.parse(multi)
 	if (obj[tlid].data) {
 		if (obj[tlid].data.remote) {
 			$('#sta-remote-' + tlid).text('On')
 			$('#sta-remote-' + tlid).css('color', 'red')
 			return true
 		}
 	}
 	return false
 }
 //各TL上方のBT[BTOnly/BTExc/Off]
 function ebtToggle(tlid) {
 	var ebt = localStorage.getItem('ebt_' + tlid)
@@ -101,7 +141,7 @@ function delreset(tlid) {
 }
 /*ワードフィルター機能*/
 function filterMenu() {
-	$('#left-menu div').removeClass('active')
+	$('#left-menu a').removeClass('active')
 	$('#filterMenu').addClass('active')
 	$('.menu-content').addClass('hide')
 	$('#filter-box').removeClass('hide')
@@ -117,26 +157,26 @@ function filter() {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			Authorization: 'Bearer ' + at,
-		}
+		},
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			if (json) {
 				var filters = ''
-				Object.keys(json).forEach(function(key) {
+				Object.keys(json).forEach(function (key) {
 					var filterword = json[key]
 					var context = filterword.context.join(',')
 					filters =
@@ -180,6 +220,9 @@ function makeNewFilter() {
 	if ($('#conv_filter:checked').val()) {
 		cont.push('thread')
 	}
 	if ($('#prof_filter:checked').val()) {
 		cont.push('profiles')
 	}
 	if (!cont.length) {
 		$('#filtered-words').html('Error:' + lang.lang_filter_errordegree)
 	}
@@ -188,10 +231,7 @@ function makeNewFilter() {
 	if (!who) {
 		who = false
 	}
-	var time =
+	var time = $('#days_filter').val() * 24 * 60 * 60 + $('#hours_filter').val() * 60 * 60 + $('#mins_filter').val() * 60
 		$('#days_filter').val() * 24 * 60 * 60 +
 		$('#hours_filter').val() * 60 * 60 +
 		$('#mins_filter').val() * 60
 	var domain = localStorage.getItem('domain_' + acct_id)
 	var at = localStorage.getItem('acct_' + acct_id + '_at')
 	if ($('#filter-edit-id').val()) {
@@ -213,10 +253,10 @@ function makeNewFilter() {
 			context: cont,
 			irreversible: exc,
 			whole_word: who,
-			expires_in: time
+			expires_in: time,
 		})
 	)
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -229,6 +269,7 @@ function makeNewFilter() {
 			$('#local_filter').prop('checked', false)
 			$('#notf_filter').prop('checked', false)
 			$('#conv_filter').prop('checked', false)
 			$('#prof_filter').prop('checked', false)
 			$('#except_filter').prop('checked', false)
 			$('#wholeword_filter').prop('checked', false)
 			$('#days_filter').val('0')
@@ -259,29 +300,29 @@ function filterEdit(id, acct_id) {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			Authorization: 'Bearer ' + at,
-		}
+		},
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			if (json) {
 				var now = new Date()
 				now = now.getTime()
 				var now = Math.floor(now / 1000)
 				$('#filter-add-word').val(json.phrase)
-				Object.keys(json.context).forEach(function(key) {
+				Object.keys(json.context).forEach(function (key) {
 					var context = json.context[key]
 					$('[value=' + context + ']').prop('checked', true)
 				})
@@ -311,7 +352,7 @@ function filterDel(id, acct_id) {
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 	httpreq.responseType = 'json'
 	httpreq.send()
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -331,23 +372,23 @@ function getFilter(acct_id) {
 			method: 'GET',
 			headers: {
 				'content-type': 'application/json',
-				Authorization: 'Bearer ' + at
+				Authorization: 'Bearer ' + at,
-			}
+			},
 		})
-			.then(function(response) {
+			.then(function (response) {
 				if (!response.ok) {
-					response.text().then(function(text) {
+					response.text().then(function (text) {
 						setLog(response.url, response.status, text)
 					})
 				}
 				return response.json()
 			})
-			.catch(function(error) {
+			.catch(function (error) {
 				todo(error)
 				setLog(start, 'JSON', error)
 				console.error(error)
 			})
-			.then(function(json) {
+			.then(function (json) {
 				localStorage.setItem('filter_' + acct_id, JSON.stringify(json))
 			})
 	} else {
@@ -366,13 +407,13 @@ function getFilterType(json, type) {
 		type = 'notifi'
 	}
 	var mutedfilters = []
-	Object.keys(json).forEach(function(key) {
+	Object.keys(json).forEach(function (key) {
 		var filterword = json[key]
 		var phrases = filterword.phrase
 		var arr = filterword.context
 		if (arr.join(',').indexOf(type) !== -1) {
 			mutedfilters.push(phrases)
-		} else if (type == 'mix'){
+		} else if (type == 'mix') {
 			if (arr.indexOf('home') !== -1 || arr.indexOf('public') !== -1) {
 				mutedfilters.push(phrases)
 			}
@@ -396,23 +437,23 @@ function filterUpdate(acct_id) {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			Authorization: 'Bearer ' + at,
-		}
+		},
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			localStorage.setItem('filter_' + acct_id, JSON.stringify(json))
 			filterUpdateInternal(json, 'home')
 			filterUpdateInternal(json, 'local')
@@ -428,13 +469,11 @@ function filterUpdateInternal(json, type) {
 		home = home.concat(wordmute)
 	}
 	if (home) {
-		$('[data-acct=' + acct_id + '] [data-type=' + type + '] .cvo').each(function(i, elem) {
+		$('[data-acct=' + acct_id + '] [data-type=' + type + '] .cvo').each(function (i, elem) {
 			var id = $(elem).attr('toot-id')
 			$('[toot-id=' + id + ']').removeClass('hide')
-			var text = $(elem)
+			var text = $(elem).find('.toot').html()
-				.find('.toot')
+			Object.keys(home).forEach(function (key8) {
 				.html()
 			Object.keys(home).forEach(function(key8) {
 				var word = home[key8]
 				var regExp = new RegExp(word.replace(/[.*+?^=!:${}()|[\]\/\\]/g, '\\$&'), 'g')
 				if ($.strip_tags(text).match(regExp)) {
--- a/app/js/tl/list.js
+++ b/app/js/tl/list.js
@@ -1,5 +1,5 @@
 function listMenu() {
-	$('#left-menu div').removeClass('active')
+	$('#left-menu a').removeClass('active')
 	$('#listMenu').addClass('active')
 	$('.menu-content').addClass('hide')
 	$('#list-box').removeClass('hide')
--- a/app/js/tl/notification.js
+++ b/app/js/tl/notification.js
@@ -239,8 +239,10 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
 				localStorage.setItem('lastnotf_' + acct_id, obj.id)
 				if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
 					//markers show中はダメ
-					if (obj.type != 'follow') {
+					if (obj.type != 'follow' && obj.type != 'follow_request') {
 						templete = parse([obj], 'notf', acct_id, 'notf', popup)
 					} else if (obj.type == 'follow_request') {
 						templete = userparse([obj.account], 'request', acct_id, 'notf', -1)
 					} else {
 						templete = userparse([obj], obj.type, acct_id, 'notf', popup)
 					}
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -241,7 +241,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				noticeavatar = toot.account.avatar_static
 			}
 			noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg">
-					<img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img" user="${toot.account.acct}">
+					<img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img" user="${toot.account.acct}" alt="">
 				</a>`
 			if (toot.type == 'mention') {
 				var what = lang.lang_parse_mentioned
@@ -268,15 +268,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			} else {
 				var notfFilHide = ''
 			}
-			var noticetext = `<i class="fas fa-filter pointer big-text ${notfFilHide}" 
+			var noticetext = `<span onclick="notfFilter('${toot.account.id}','${tlid}');" class=" pointer big-text ${notfFilHide}"><i class="fas fa-filter" 
-					onclick="notfFilter('${toot.account.id}','${tlid}');" title="${lang.lang_parse_notffilter}">
+					 title="${lang.lang_parse_notffilter}">
-				</i>
+				</i><span class="voice">${lang.lang_parse_notffilter}</span></span>
 				<span class="cbadge cbadge-hover" title="${date(toot.created_at, 'absolute')}(${
 				lang.lang_parse_notftime
-			})">
+			})" aria-hidden="true"><i class="far fa-clock"></i>
 					<i class="far fa-clock"></i>
 					${date(toot.created_at, datetype)}
 				</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">
 					${dis_name}(@${toot.account.acct})
@@ -393,7 +393,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				} else {
 					noticeavatar = toot.account.avatar_static
 				}
-				noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="notf-icon udg">
+				noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="notf-icon udg" aria-hidden="true">
 						<img draggable="false" src="${noticeavatar}" width="20" class="prof-img" 
 							user="${toot.account.acct}" onerror="this.src=\'../../img/loading.svg\'">
 					</a>`
@@ -518,7 +518,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var spoil = escapeHTML(toot.spoiler_text)
 				var spoiler = 'cw cw_hide'
 				var api_spoil = 'gray'
-				var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">${lang.lang_parse_cwshow}</a><br>`
+				var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">${lang.lang_parse_cwshow}<span class="voice">${lang.lang_parse_cwshow_acc}</span></a><br>`
 			} else {
 				if (content) {
 					var ct1 = content.split('</p>').length + content.split('<br />').length - 2
@@ -576,7 +576,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			if (urls) {
-				var analyze = `<a onclick="additionalIndv('${tlid}','${acct_id}','${id}')" class="add-show pointer">
+				var analyze = `<a onclick="additionalIndv('${tlid}','${acct_id}','${id}')" class="add-show pointer" aria-hidden="true">
 						${lang.lang_parse_url}
 					</a><br>`
 			} else {
@@ -621,7 +621,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							viewer +
 							`<a onclick="imgv('${id}','${key2}','${acct_id}')" id="${id}'-image-${key2}" 
 								data-url="${url}" data-type="video" class="img-parsed">
-									<video src="${purl}" class="${sense} toot-img pointer" style="max-width:100%;" loop="true">
+									<video src="${purl}" class="${sense} toot-img pointer" style="max-width:100%;" loop="true" alt="attached media">
 							</a></span>`
 					} else {
 						if (media.type == 'unknown') {
@@ -634,7 +634,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 								viewer +
 								'<audio src="' +
 								url +
-								'" class="pointer" style="width:100%;" controls></span>'
+								'" class="pointer" style="width:100%;" controls alt="attached media"></span>'
 						} else {
 							if (media.description) {
 								var desc = media.description
@@ -652,7 +652,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 										id="${id}-image-${key2}" data-url="${url}" data-original="${remote_url}" data-type="${media.type}" 
 										class="img-parsed img-link" style="width:calc(${cwdt}% - 1px); height:${imh};">
 									<img draggable="false" src="${purl}" class="${sense} toot-img pointer" 
-										onerror="this.src=\'../../img/loading.svg\'" title="${escapeHTML(desc)}">
+										onerror="this.src=\'../../img/loading.svg\'" title="${escapeHTML(desc)}" alt="${escapeHTML(desc)}">
 									${nsfwmes}
 								</a>`
 						}
@@ -683,7 +683,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						if (toot.account.acct != mention.acct) {
 							mentions =
 								mentions +
-								`<a onclick="udg('${mention.id}',' ${acct_id}')" class="pointer">@${mention.acct}</a> `
+								`<a onclick="udg('${mention.id}',' ${acct_id}')" class="pointer" aria-hidden="true">@${mention.acct}</a> `
 							to_mention.push(mention.acct)
 						}
 					}
@@ -724,7 +724,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						)}
 						">Pin</a>${featured}</span> `
 				})
-				tags = '<div style="float:right">' + tags + '</div>'
+				tags = '<div style="float:right" aria-hidden="true">' + tags + '</div>'
 			}
 			//リプ数
 			if (toot.replies_count || toot.replies_count === 0) {
@@ -739,29 +739,29 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			var vis = ''
 			var visen = toot.visibility
 			if (visen == 'public') {
-				var vis = `<i class="text-darken-3 material-icons gray sml vis-data pointer" 
+				var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons gray sml vis-data pointer" 
-						title="${lang.lang_parse_public}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')">
+						title="${lang.lang_parse_public}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
 						public
-					</i>`
+					</i><span class="voice">${lang.lang_parse_public} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
 				var can_rt = ''
 			} else if (visen == 'unlisted') {
-				var vis = `<i class="text-darken-3 material-icons blue-text sml vis-data pointer" 
+				var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons blue-text sml vis-data pointer" 
-						title="${lang.lang_parse_unlisted}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')">
+						title="${lang.lang_parse_unlisted}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
 						lock_open
-					</i>`
+					</i><span class="voice">${lang.lang_parse_unlisted} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
 				var can_rt = ''
 			} else if (visen == 'private') {
-				var vis = `<i class="text-darken-3 material-icons orange-text sml vis-data pointer" 
+				var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons orange-text sml vis-data pointer" 
-						title="${lang.lang_parse_private}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')">
+						title="${lang.lang_parse_private}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
 						lock
-					</i>`
+					</i><span class="voice">${lang.lang_parse_private} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
 				var can_rt = 'unvisible'
 			} else if (visen == 'direct') {
-				var vis = `<i class="text-darken-3 material-icons red-text sml vis-data pointer" 
+				var vis = `<span onclick="staCopy('${id}')"><i class="text-darken-3 material-icons red-text sml vis-data pointer" 
-						title="${lang.lang_parse_direct}(${lang.lang_parse_clickcopy})" data-vis="public" onclick="staCopy('${id}')">
+						title="${lang.lang_parse_direct}(${lang.lang_parse_clickcopy})" data-vis="public" aria-hidden="true">
 						mail
-					</i>`
+					</i><span class="voice">${lang.lang_parse_direct} ${lang.lang_toot}(${lang.lang_parse_clickcopy})</span></span>`
 				var can_rt = 'unvisible'
 			}
 			if (toot.account.acct == localStorage.getItem('user_' + acct_id)) {
@@ -904,7 +904,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var trans = `<div class="">
 						<a onclick="trans('${toot.language}','${lang.language}', $(this))" 
 							class="waves-effect waves-dark btn-flat actct" style="padding:0">
-								<i class="material-icons">g_translate</i>${lang.lang_parse_trans}
+								<i class="material-icons" aria-hidden="true">g_translate</i>${lang.lang_parse_trans}
 						</a>
 					</div>`
 			} else {
@@ -929,7 +929,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					for (var i = 0; i < tickerdata.length; i++) {
 						var value = tickerdata[i]
 						if (value.domain == thisdomain) {
-							var tickerdom = `<div style="user-select:none;cursor:default;background:linear-gradient(90deg, ${
+							var tickerdom = `<div aria-hidden="true" style="user-select:none;cursor:default;background:linear-gradient(90deg, ${
 								value.bg
 							}, transparent 96%) !important; color:${
 								value.text
@@ -1007,7 +1007,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				<div class="area-icon grid">
 					<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg">
 						<img draggable="false" src="${avatar}" width="40" class="prof-img"
-							user="${toot.account.acct}" onerror="this.src='../../img/loading.svg'"/>
+							user="${toot.account.acct}" onerror="this.src='../../img/loading.svg'" alt="" />
 					</a>
 					${noticeavatar}
 				</div>
@@ -1021,7 +1021,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					<div class="flex-time">
 						<span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy('${toot.url}');"
 							title="${date(toot.created_at, 'absolute')}(${lang.lang_parse_clickcopyurl})">
-							<i class="far fa-clock"></i>${date(toot.created_at, datetype)}
+							<i class="far fa-clock"></i><span class="voice">posted at </span>${date(toot.created_at, datetype)}
 						</span>
 					</div>
 				</div>
@@ -1056,6 +1056,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							class="waves-effect waves-dark btn-flat actct rep-btn"
 							data-men="${to_mention}" data-visen="${visen}" style="padding:0" title="${lang.lang_parse_replyto}">
 								<i class="fas fa-share"></i>
 								<span class="voice">${lang.lang_parse_replyto} </span>
 								<span class="rep_ct">${replyct}</span>
 						</a>
 					</div>
@@ -1065,6 +1066,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
 							style="padding:0" title="${lang.lang_parse_bt}">
 							<i class="fas fa-retweet ${if_rt} rt_${toot.id}"></i>
 							<span class="voice">${lang.lang_parse_bt} </span>
 							<span class="rt_ct">${toot.reblogs_count}</span>
 						</a>
 					</div>
@@ -1072,6 +1074,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						<a onclick="qt('${toot.id}','${acct_id}','${toot.account.acct}','${toot.url}')" 
 							class="waves-effect waves-dark btn-flat actct" style="padding:0" title="${lang.lang_parse_quote}">
 							<i class="text-darken-3 fas fa-quote-right"></i>
 							<span class="voice">${lang.lang_parse_quote} </span>
 						</a>
 					</div>
 					<div class="action ${disp['bkm']} ${noauth} ${bkmClass}">
@@ -1079,6 +1082,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0"
 							title="${lang.lang_parse_bookmark}">
 							<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>
 							<span class="voice">${lang.lang_parse_bookmark} </span>
 					</a>
 					</div>
 					<div class="action ${disp['fav']} ${noauth}">
@@ -1087,6 +1091,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							title="${lang.lang_parse_fav}">
 							<i class="fas text-darken-3 fa-star${if_fav} fav_${uniqueid}"></i>
 							<span class="fav_ct">${toot.favourites_count}</span>
 							<span class="voice">${lang.lang_parse_fav} </span>
 						</a>
 					</div>
 				</div>
@@ -1094,14 +1099,16 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					<div class="action ${noauth}">
 						<a onclick="toggleAction($(this), ${menuct * 39 + 6})" 
 							class="ctxMenu waves-effect waves-dark btn-flat" style="padding:0">
-							<i class="text-darken-3 material-icons act-icon">expand_more</i>
+							<i class="text-darken-3 material-icons act-icon" aria-hidden="true">expand_more</i>
 							<span class="voice">Other actions</span>
 						</a>
 					</div>
 					<div class="action ${noauth}">
 						<a onclick="details('${toot.id}','${acct_id}','${tlid}','normal')"
 							class="waves-effect waves-dark btn-flat details ${dmHide}" style="padding:0"
 							title="${lang.lang_parse_detail}">
-						<i class="text-darken-3 material-icons">menu_open</i></a>
+						<i class="text-darken-3 material-icons" aria-hidden="true">menu_open</i></a>
 						<span class="voice">${lang.lang_parse_detail}</span>
 					</div>
 				</div>
 				<div class="contextMenu hide z-depth-4">
@@ -1131,7 +1138,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					<div class="${if_mine}">
 						<button onclick="redraft('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
 							style="padding:0">
-							<i class="material-icons">redo</i>${lang.lang_parse_redraft}
+							<i class="material-icons" aria-hidden="true">redo</i>${lang.lang_parse_redraft}
 						</button>
 					</div>
 					${trans}
@@ -1185,10 +1192,10 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					var locked = ''
 				}
 				if (auth == 'request') {
-					var authhtml = `<i class="material-icons gray pointer" onclick="request('${toot.id}','authorize','${acct_id}')" title="Accept">
+					var authhtml = `<i class="material-icons gray pointer" onclick="request('${toot.id}','authorize','${acct_id}')" title="Accept" aria-hidden="true">
 							person_add
-						</i>　
+						</i>
-						<i class="material-icons gray pointer" onclick="request('${toot.id}','reject','${acct_id}')" title="Reject">
+						<i class="material-icons gray pointer" onclick="request('${toot.id}','reject','${acct_id}')" title="Reject" aria-hidden="true">
 							person_add_disabled
 						</i>`
 				} else {
@@ -1279,7 +1286,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				}
 				var latest = date(toot.last_status_at, 'relative')
 				if (toot.last_status_at) {
-					var latesthtml = `<div class="cbadge" style="width:100px;">Last:${latest}</div>`
+					var latesthtml = `<div class="cbadge" style="width:100px;">Last <span class="voice">toot</span>: ${latest}</div>`
 				} else {
 					var latesthtml = ''
 				}
@@ -1296,6 +1303,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 							class="prof-img"
 							user="${toot.acct}"
 							onerror="this.src='../../img/loading.svg'"
 							alt=""
 						/>
 					</a></div>
 					<div class="area-display_name">
--- a/app/js/tl/src.js
+++ b/app/js/tl/src.js
@@ -3,7 +3,7 @@
 function searchMenu() {
 	$('#src-contents').html('')
 	trend()
-	$('#left-menu div').removeClass('active')
+	$('#left-menu a').removeClass('active')
 	$('#searchMenu').addClass('active')
 	$('.menu-content').addClass('hide')
 	$('#src-box').removeClass('hide')
@@ -116,8 +116,11 @@ function tsAdd(q) {
 	parseColumn('add')
 }
 function tootsearch(tlid, q) {
 	if(!q || q=='undefined') {
 		return false
 	}
 	var start = 'https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=' + q
-	console.log('Toot srrach at ' + start)
+	console.log('Toot search at ' + start)
 	$('#notice_' + tlid).text('tootsearch(' + q + ')')
 	$('#notice_icon_' + tlid).text('search')
 	fetch(start, {
--- a/app/js/tl/tag.js
+++ b/app/js/tl/tag.js
@@ -198,3 +198,28 @@ function tagFeature(name, acct_id) {
 			M.toast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 })
 		})
 }
 //タグのフィルタ
 function addTag(id) {
 	var columns = JSON.parse(localStorage.getItem('column'))
 	var column = columns[id]
 	if(!column.data.name) {
 		var name = column.data
 	} else {
 		var name = column.data.name
 	}
 	var col = localStorage.getItem('column')
 	var o = JSON.parse(col)
 	var obj = o[id]
 	obj.data = {
 		'name': name,
 		'all': $(`#all_tm-${id}`).val(),
 		'any': $(`#any_tm-${id}`).val(),
 		'none': $(`#none_tm-${id}`).val(),
 	}
 	o[id] = obj
 	var json = JSON.stringify(o)
 	console.log(json)
 	localStorage.setItem('column',json)
 	columnReload(id, 'tag')
 }
--- a/app/js/tl/tl.js
+++ b/app/js/tl/tl.js
@@ -10,10 +10,18 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	if (tlid == 'add') {
 		console.log('add new column')
 		var newtab = $('.box').length
 		if (type == 'tag') {
 			data = {
 				name: data,
 				any: [],
 				all: [],
 				none: [],
 			}
 		}
 		var add = {
 			domain: acct_id,
 			type: type,
-			data: data
+			data: data,
 		}
 		var multi = localStorage.getItem('column')
 		var obj = JSON.parse(multi)
@@ -35,7 +43,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	if (type == 'mix' && localStorage.getItem('mode_' + domain) != 'misskey') {
 		//Integratedなら飛ばす
 		$('#notice_' + tlid).text(
-			'Integrated TL(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+			'Integrated TL(' +
 				localStorage.getItem('user_' + acct_id) +
 				'@' +
 				domain +
 				')'
 		)
 		$('#notice_icon_' + tlid).text('merge_type')
 		mixtl(acct_id, tlid, 'integrated', delc, voice)
@@ -43,7 +55,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	} else if (type == 'plus') {
 		//Local+なら飛ばす
 		$('#notice_' + tlid).text(
-			'Local+ TL(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+			'Local+ TL(' +
 				localStorage.getItem('user_' + acct_id) +
 				'@' +
 				domain +
 				')'
 		)
 		$('#notice_icon_' + tlid).text('people_outline')
 		mixtl(acct_id, tlid, 'plus', delc, voice)
@@ -52,7 +68,12 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		//通知なら飛ばす
 		notf(acct_id, tlid, 'direct')
 		$('#notice_' + tlid).text(
-			cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+			cap(type, data, acct_id) +
 				'(' +
 				localStorage.getItem('user_' + acct_id) +
 				'@' +
 				domain +
 				')'
 		)
 		$('#notice_icon_' + tlid).text('notifications')
 		return
@@ -60,13 +81,31 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		//ブックマークなら飛ばす
 		getBookmark(acct_id, tlid)
 		$('#notice_' + tlid).text(
-			cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+			cap(type, data, acct_id) +
 				'(' +
 				localStorage.getItem('user_' + acct_id) +
 				'@' +
 				domain +
 				')'
 		)
 		$('#notice_icon_' + tlid).text('bookmark')
 		return
 	} else if (type == 'utl') {
 		//UTLなら飛ばす
 		getUtl(acct_id, tlid, data, false)
 		$('#notice_' + tlid).text(
 			cap(type, data, acct_id) +
 				'(' +
 				localStorage.getItem('user_' + acct_id) +
 				'@' +
 				domain +
 				')'
 		)
 		$('#notice_icon_' + tlid).text('person')
 		return
 	} else if (type == 'home') {
 		//ホームならお知らせ「も」取りに行く
-		announ(acct_id, tlid);
+		announ(acct_id, tlid)
 	}
 	localStorage.setItem('now', type)
 	todo(cap(type) + ' TL Loading...')
@@ -74,14 +113,19 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	if (type != 'noauth') {
 		var hdr = {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			Authorization: 'Bearer ' + at,
 		}
 		$('#notice_' + tlid).text(
-			cap(type, data, acct_id) + '(' + localStorage.getItem('user_' + acct_id) + '@' + domain + ')'
+			cap(type, data, acct_id) +
 				'(' +
 				localStorage.getItem('user_' + acct_id) +
 				'@' +
 				domain +
 				')'
 		)
 	} else {
 		var hdr = {
-			'content-type': 'application/json'
+			'content-type': 'application/json',
 		}
 		domain = acct_id
 		$('#notice_' + tlid).text('Glance TL(' + domain + ')')
@@ -110,11 +154,11 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		var i = {
 			method: method,
 			headers: hdr,
-			body: JSON.stringify(req)
+			body: JSON.stringify(req),
 		}
 	} else {
 		var misskey = false
-		var url = com(type, data)
+		var url = com(type, data, tlid)
 		if (type == 'tag') {
 			var tag = localStorage.getItem('tag-range')
 			if (tag == 'local') {
@@ -129,26 +173,26 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		var method = 'GET'
 		var i = {
 			method: method,
-			headers: hdr
+			headers: hdr,
 		}
 	}
 	console.log(['Try to get timeline of ' + tlid, start])
 	fetch(start, i)
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			console.log(['Result of getting timeline of ' + tlid, json])
 			$('#landing_' + tlid).hide()
 			var mute = getFilterTypeByAcct(acct_id, type)
@@ -190,8 +234,13 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 	if (localStorage.getItem('mode_' + domain) == 'misskey') {
 		var misskey = true
 		var key = localStorage.getItem('misskey_wss_' + acct_id)
-		var send = '{"type":"connect","body":{"channel":"' + typePs(type) + '","id":"' + tlid + '"}}'
+		var send =
-		var mskyset = setInterval(function() {
+			'{"type":"connect","body":{"channel":"' +
 			typePs(type) +
 			'","id":"' +
 			tlid +
 			'"}}'
 		var mskyset = setInterval(function () {
 			if (misskeywsstate[key]) {
 				misskeyws[key].send(send)
 				clearInterval(mskyset)
@@ -207,14 +256,25 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 		if (type == 'home') {
 			var start = wss + '/api/v1/streaming/?stream=user&access_token=' + at
 		} else if (type == 'pub') {
-			var start = wss + '/api/v1/streaming/?stream=public&access_token=' + at
+			var add = ''
 			if(remoteOnlyCk(tlid)){
 				add = '&remote=true'
 			}
 			var start = wss + '/api/v1/streaming/?stream=public&access_token=' + at + add
 		} else if (type == 'pub-media') {
-			var start = wss + '/api/v1/streaming/?stream=public:media&access_token=' + at
+			var add = ''
 			if(remoteOnlyCk(tlid)){
 				add = '&remote=true'
 			}var start =
 				wss + '/api/v1/streaming/?stream=public:media&access_token=' + at + add
 		} else if (type == 'local') {
-			var start = wss + '/api/v1/streaming/?stream=public:local&access_token=' + at
+			var start =
 				wss + '/api/v1/streaming/?stream=public:local&access_token=' + at
 		} else if (type == 'local-media') {
 			var start =
-				wss + '/api/v1/streaming/?stream=public:local:media&only_media=true&access_token=' + at
+				wss +
 				'/api/v1/streaming/?stream=public:local:media&only_media=true&access_token=' +
 				at
 		} else if (type == 'tag') {
 			if (type == 'tag') {
 				var tag = localStorage.getItem('tag-range')
@@ -222,28 +282,38 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 					data = data + '&local=true'
 				}
 			}
-			var start = wss + '/api/v1/streaming/?stream=hashtag&tag=' + data + '&access_token=' + at
+			var start =
 				wss +
 				'/api/v1/streaming/?stream=hashtag&tag=' +
 				data +
 				'&access_token=' +
 				at
 		} else if (type == 'noauth') {
 			var start = 'wss://' + acct_id + '/api/v1/streaming/?stream=public:local'
 		} else if (type == 'list') {
-			var start = wss + '/api/v1/streaming/?stream=list&list=' + data + '&access_token=' + at
+			var start =
 				wss +
 				'/api/v1/streaming/?stream=list&list=' +
 				data +
 				'&access_token=' +
 				at
 		} else if (type == 'dm') {
 			var start = wss + '/api/v1/streaming/?stream=direct&access_token=' + at
 		}
 		var wsid = websocket.length
 		localStorage.setItem('wss_' + tlid, wsid)
 		websocket[wsid] = new WebSocket(start)
-		websocket[wsid].onopen = function(mess) {
+		websocket[wsid].onopen = function (mess) {
 			console.table({
 				tlid: tlid,
 				type: 'Connect Streaming API' + type,
 				domain: domain,
-				message: [mess]
+				message: [mess],
 			})
 			errorct = 0
 			$('#notice_icon_' + tlid).removeClass('red-text')
 		}
-		websocket[wsid].onmessage = function(mess) {
+		websocket[wsid].onmessage = function (mess) {
 			console.log([tlid + ':Receive Streaming API:', JSON.parse(mess.data)])
 			if (misskey) {
 				if (JSON.parse(mess.data).type == 'note') {
@@ -254,7 +324,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 					websocketNotf[acct_id].send(
 						JSON.stringify({
 							type: 'capture',
-							id: obj.id
+							id: obj.id,
 						})
 					)
 					var templete = misskeyParse([obj], type, acct_id, tlid, '', mute)
@@ -273,26 +343,40 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 				if (typeA == 'delete') {
 					var obj = JSON.parse(mess.data).payload
 					if (delc == 'true') {
-						$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
+						$(
-							'emphasized'
+							'#timeline_' +
-						)
+								tlid +
-						$('#timeline_' + tlid + ' [toot-id=' + JSON.parse(mess.data).payload + ']').addClass(
+								' [unique-id=' +
-							'by_delcatch'
+								JSON.parse(mess.data).payload +
-						)
+								']'
 						).addClass('emphasized')
 						$(
 							'#timeline_' +
 								tlid +
 								' [unique-id=' +
 								JSON.parse(mess.data).payload +
 								']'
 						).addClass('by_delcatch')
 					} else {
-						$('[toot-id=' + JSON.parse(mess.data).payload + ']').hide()
+						$('[unique-id=' + JSON.parse(mess.data).payload + ']').hide()
-						$('[toot-id=' + JSON.parse(mess.data).payload + ']').remove()
+						$('[unique-id=' + JSON.parse(mess.data).payload + ']').remove()
 					}
 				} else if (typeA == 'update' || typeA == 'conversation') {
-					if (!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')) {
+					if (
 						!$('#unread_' + tlid + ' .material-icons').hasClass('teal-text')
 					) {
 						//markers show中はダメ
 						var obj = JSON.parse(JSON.parse(mess.data).payload)
-						if ($('#timeline_' + tlid + ' [toot-id=' + obj.id + ']').length < 1) {
+						if (
 							$('#timeline_' + tlid + ' [toot-id=' + obj.id + ']').length < 1
 						) {
 							if (voice) {
 								say(obj.content)
 							}
 							var templete = parse([obj], type, acct_id, tlid, '', mute, type)
-							if ($('timeline_box_' + tlid + '_box .tl-box').scrollTop() === 0) {
+							if (
 								$('timeline_box_' + tlid + '_box .tl-box').scrollTop() === 0
 							) {
 								$('#timeline_' + tlid).prepend(templete)
 							} else {
 								var pool = localStorage.getItem('pool_' + tlid)
@@ -319,7 +403,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 				}
 			}
 		}
-		websocket[wsid].onerror = function(error) {
+		websocket[wsid].onerror = function (error) {
 			console.error('Error closing')
 			console.error(error)
 			if (mode == 'error') {
@@ -334,7 +418,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 			}
 			return false
 		}
-		websocket[wsid].onclose = function() {
+		websocket[wsid].onclose = function () {
 			console.warn('Closing ' + tlid)
 			if (mode == 'error') {
 				$('#notice_icon_' + tlid).addClass('red-text')
@@ -376,13 +460,17 @@ function moreload(type, tlid) {
 	if (sid && !moreloading) {
 		if (
 			type == 'mix' &&
-			localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey'
+			localStorage.getItem(
 				'mode_' + localStorage.getItem('domain_' + acct_id)
 			) != 'misskey'
 		) {
 			mixmore(tlid, 'integrated')
 			return
 		} else if (
 			type == 'plus' &&
-			localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey'
+			localStorage.getItem(
 				'mode_' + localStorage.getItem('domain_' + acct_id)
 			) != 'misskey'
 		) {
 			mixmore(tlid, 'plus')
 			return
@@ -396,6 +484,10 @@ function moreload(type, tlid) {
 		} else if (type == 'bookmark') {
 			getBookmark(acct_id, tlid, true)
 			return
 		} else if (type == 'utl') {
 			var data = obj[tlid].data
 			getUtl(acct_id, tlid, data, true)
 			return
 		}
 		moreloading = true
 		localStorage.setItem('now', type)
@@ -404,19 +496,19 @@ function moreload(type, tlid) {
 			var at = localStorage.getItem('acct_' + acct_id + '_at')
 			var hdr = {
 				'content-type': 'application/json',
-				Authorization: 'Bearer ' + at
+				Authorization: 'Bearer ' + at,
 			}
 			var domain = localStorage.getItem('domain_' + acct_id)
 		} else {
 			var hdr = {
-				'content-type': 'application/json'
+				'content-type': 'application/json',
 			}
 			domain = acct_id
 		}
 		if (localStorage.getItem('mode_' + domain) == 'misskey') {
 			var misskey = true
 			hdr = {
-				'content-type': 'application/json'
+				'content-type': 'application/json',
 			}
 			var url = misskeycom(type, data)
 			var start = 'https://' + domain + '/api/notes/' + url
@@ -439,35 +531,42 @@ function moreload(type, tlid) {
 			var i = {
 				method: method,
 				headers: hdr,
-				body: JSON.stringify(req)
+				body: JSON.stringify(req),
 			}
 		} else {
 			var misskey = false
-			var start = 'https://' + domain + '/api/v1/timelines/' + com(type, data) + 'max_id=' + sid
+			var start =
 				'https://' +
 				domain +
 				'/api/v1/timelines/' +
 				com(type, data, tlid) +
 				'max_id=' +
 				sid
 			if (type == 'dm') {
-				var start = 'https://' + domain + '/api/v1/conversations?' + 'max_id=' + sid
+				var start =
 					'https://' + domain + '/api/v1/conversations?' + 'max_id=' + sid
 			}
 			var method = 'GET'
 			var i = {
 				method: method,
-				headers: hdr
+				headers: hdr,
 			}
 		}
 		fetch(start, i)
-			.then(function(response) {
+			.then(function (response) {
 				if (!response.ok) {
-					response.text().then(function(text) {
+					response.text().then(function (text) {
 						setLog(response.url, response.status, text)
 					})
 				}
 				return response.json()
 			})
-			.catch(function(error) {
+			.catch(function (error) {
 				todo(error)
 				setLog(start, 'JSON', error)
 				console.error(error)
 			})
-			.then(function(json) {
+			.then(function (json) {
 				var mute = getFilterTypeByAcct(acct_id, type)
 				if (misskey) {
 					var templete = misskeyParse(json, '', acct_id, tlid, '', mute)
@@ -508,12 +607,16 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
 	if (sid && !moreloading) {
 		if (
 			type == 'mix' &&
-			localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey'
+			localStorage.getItem(
 				'mode_' + localStorage.getItem('domain_' + acct_id)
 			) != 'misskey'
 		) {
 			return
 		} else if (
 			type == 'plus' &&
-			localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) != 'misskey'
+			localStorage.getItem(
 				'mode_' + localStorage.getItem('domain_' + acct_id)
 			) != 'misskey'
 		) {
 			return
 		} else if (type == 'notf') {
@@ -526,19 +629,19 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
 			var at = localStorage.getItem('acct_' + acct_id + '_at')
 			var hdr = {
 				'content-type': 'application/json',
-				Authorization: 'Bearer ' + at
+				Authorization: 'Bearer ' + at,
 			}
 			var domain = localStorage.getItem('domain_' + acct_id)
 		} else {
 			var hdr = {
-				'content-type': 'application/json'
+				'content-type': 'application/json',
 			}
 			domain = acct_id
 		}
 		if (localStorage.getItem('mode_' + domain) == 'misskey') {
 			var misskey = true
 			hdr = {
-				'content-type': 'application/json'
+				'content-type': 'application/json',
 			}
 			var url = misskeycom(type, data)
 			var start = 'https://' + domain + '/api/notes/' + url
@@ -561,36 +664,43 @@ function tlDiff(type, data, acct_id, tlid, delc, voice, mode) {
 			var i = {
 				method: method,
 				headers: hdr,
-				body: JSON.stringify(req)
+				body: JSON.stringify(req),
 			}
 		} else {
 			var misskey = false
-			var start = 'https://' + domain + '/api/v1/timelines/' + com(type, data) + 'since_id=' + sid
+			var start =
 				'https://' +
 				domain +
 				'/api/v1/timelines/' +
 				com(type, data, tlid) +
 				'since_id=' +
 				sid
 			if (type == 'dm') {
-				var start = 'https://' + domain + '/api/v1/conversations?' + 'since_id=' + sid
+				var start =
 					'https://' + domain + '/api/v1/conversations?' + 'since_id=' + sid
 			}
 			var method = 'GET'
 			var i = {
 				method: method,
-				headers: hdr
+				headers: hdr,
 			}
 		}
 		fetch(start, i)
-			.then(function(response) {
+			.then(function (response) {
 				if (!response.ok) {
-					response.text().then(function(text) {
+					response.text().then(function (text) {
 						setLog(response.url, response.status, text)
 					})
 				}
 				return response.json()
 			})
-			.catch(function(error) {
+			.catch(function (error) {
 				todo(error)
 				setLog(start, 'JSON', error)
 				console.error(error)
 			})
-			.then(function(json) {
+			.then(function (json) {
 				console.log(['Result diff of TL' + tlid, json])
 				if (misskey) {
 					var templete = misskeyParse(json, '', acct_id, tlid, '', mute)
@@ -612,7 +722,7 @@ function reloadTL(type, data, acct_id, key, delc, voice) {
 //WebSocket切断
 function tlCloser() {
-	Object.keys(websocket).forEach(function(tlid) {
+	Object.keys(websocket).forEach(function (tlid) {
 		if (websocketOld[tlid]) {
 			websocketOld[tlid].close()
 			console.log('%c Close Streaming API: Old' + tlid, 'color:blue')
@@ -624,27 +734,30 @@ function tlCloser() {
 		}
 	})
 	websocket = []
-	Object.keys(wsHome).forEach(function(tlid) {
+	Object.keys(wsHome).forEach(function (tlid) {
 		if (wsHome[tlid]) {
 			wsHome[tlid].close()
 			console.log('%c Close Streaming API:Integrated Home' + tlid, 'color:blue')
 		}
 	})
 	wsHome = []
-	Object.keys(wsLocal).forEach(function(tlid) {
+	Object.keys(wsLocal).forEach(function (tlid) {
 		if (wsLocal[tlid]) {
 			wsLocal[tlid].close()
-			console.log('%c Close Streaming API:Integrated Local' + tlid, 'color:blue')
+			console.log(
 				'%c Close Streaming API:Integrated Local' + tlid,
 				'color:blue'
 			)
 		}
 	})
 	wsLocal = []
-	Object.keys(websocketNotf).forEach(function(tlid) {
+	Object.keys(websocketNotf).forEach(function (tlid) {
 		if (websocketNotf[tlid]) {
 			websocketNotf[tlid].close()
 			console.log('%c Close Streaming API:Notf' + tlid, 'color:blue')
 		}
 	})
-	Object.keys(misskeyws).forEach(function(tlid) {
+	Object.keys(misskeyws).forEach(function (tlid) {
 		if (misskeyws[tlid]) {
 			misskeyws[tlid].close()
 			console.log('%c Close Streaming API:Misskey' + tlid, 'color:blue')
@@ -674,7 +787,11 @@ function cap(type, data, acct_id) {
 		}
 	} else if (type == 'local-media') {
 		if (localStorage.getItem('local_' + acct_id) && !locale) {
-			var response = localStorage.getItem('local_' + acct_id) + '(' + lang.lang_tl_media + ')'
+			var response =
 				localStorage.getItem('local_' + acct_id) +
 				'(' +
 				lang.lang_tl_media +
 				')'
 		} else {
 			var response = 'Local TL(Media)'
 		}
@@ -686,12 +803,22 @@ function cap(type, data, acct_id) {
 		}
 	} else if (type == 'pub-media') {
 		if (localStorage.getItem('public_' + acct_id) && !locale) {
-			var response = localStorage.getItem('public_' + acct_id) + '(' + lang.lang_tl_media + ')'
+			var response =
 				localStorage.getItem('public_' + acct_id) +
 				'(' +
 				lang.lang_tl_media +
 				')'
 		} else {
 			var response = 'Federated TL(Media)'
 		}
 	} else if (type == 'tag') {
-		var response = '#' + escapeHTML(data)
+		if (data) {
 			if (data.name) {
 				var response = '#' + escapeHTML(data.name)
 			} else {
 				var response = '#' + escapeHTML(data)
 			}
 		}
 	} else if (type == 'list') {
 		var ltitle = localStorage.getItem('list_' + data + '_' + acct_id)
 		var response = 'List(' + ltitle + ')'
@@ -706,7 +833,11 @@ function cap(type, data, acct_id) {
 	} else if (type == 'dm') {
 		var response = 'DM'
 	} else if (type == 'mix') {
-		if (localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct_id)) == 'misskey') {
+		if (
 			localStorage.getItem(
 				'mode_' + localStorage.getItem('domain_' + acct_id)
 			) == 'misskey'
 		) {
 			var response = 'Social TL'
 		} else {
 			var response = 'Integrated'
@@ -719,12 +850,14 @@ function cap(type, data, acct_id) {
 		var response = 'tootsearch(' + escapeHTML(data) + ')'
 	} else if (type == 'bookmark') {
 		var response = 'Bookmarks'
 	} else if (type == 'utl') {
 		var response = 'User TL(' + data.acct + ')'
 	}
 	return response
 }
 //TLのURL
-function com(type, data) {
+function com(type, data, tlid) {
 	if (type == 'home') {
 		return 'home?'
 	} else if (type == 'local' || type == 'noauth') {
@@ -732,11 +865,33 @@ function com(type, data) {
 	} else if (type == 'local-media') {
 		return 'public?local=true&only_media=true&'
 	} else if (type == 'pub') {
-		return 'public?'
+		var add = ''
 		if(remoteOnlyCk(tlid)){
 			add = 'remote=true&'
 		}
 		return 'public?' + add
 	} else if (type == 'pub-media') {
-		return 'public?only_media=true&'
+		var add = ''
 		if(remoteOnlyCk(tlid)){
 			add = 'remote=true&'
 		}
 		return 'public?only_media=true&' + add
 	} else if (type == 'tag') {
-		return 'tag/' + data + '?'
+		if (data.name) {
 			var name = data.name
 			var all = data.all
 			var any = data.any
 			var none = data.none
 		} else {
 			var name = data
 			var all = ''
 			var any = ''
 			var none = ''
 		}
 		return `tag/${name}?${buildQuery('all', all)}${buildQuery(
 			'any',
 			any
 		)}${buildQuery('none', none)}`.slice(0, -1)
 	} else if (type == 'list') {
 		return 'list/' + data + '?'
 	} else if (type == 'dm') {
@@ -897,37 +1052,50 @@ function getMarker(tlid, type, acct_id) {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			Authorization: 'Bearer ' + at,
-		}
+		},
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
-			$('#unread_' + tlid).attr('title', lang.lang_layout_unread + ':' + lang.lang_nothing)
+			$('#unread_' + tlid).attr(
 				'title',
 				lang.lang_layout_unread + ':' + lang.lang_nothing
 			)
 			$('#unread_' + tlid).attr('data-id', '')
 			return false
 		})
-		.then(function(json) {
+		.then(function (json) {
 			if (json) {
 				if (json[add]) {
 					json = json[add]
 					$('#unread_' + tlid).attr(
 						'title',
-						lang.lang_layout_unread + ':' + json.updated_at + ' v' + json.version
+						lang.lang_layout_unread +
 							':' +
 							json.updated_at +
 							' v' +
 							json.version
 					)
 					$('#unread_' + tlid).attr('data-id', json.last_read_id)
 				} else {
-					$('#unread_' + tlid).attr('title', lang.lang_layout_unread + ':' + lang.lang_nothing)
+					$('#unread_' + tlid).attr(
 						'title',
 						lang.lang_layout_unread + ':' + lang.lang_nothing
 					)
 					$('#unread_' + tlid).attr('data-id', '')
 				}
 			} else {
-				$('#unread_' + tlid).attr('title', lang.lang_layout_unread + ':' + lang.lang_nothing)
+				$('#unread_' + tlid).attr(
 					'title',
 					lang.lang_layout_unread + ':' + lang.lang_nothing
 				)
 				$('#unread_' + tlid).attr('data-id', '')
 			}
 		})
@@ -951,23 +1119,23 @@ function showUnread(tlid, type, acct_id) {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			Authorization: 'Bearer ' + at,
-		}
+		},
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			if (!json || !json.length) {
 				columnReload(tlid, type)
 			}
@@ -1007,23 +1175,23 @@ function ueload(tlid) {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
+			Authorization: 'Bearer ' + at,
-		}
+		},
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(json) {
+		.then(function (json) {
 			if (!json) {
 				columnReload(tlid, type)
 			}
@@ -1062,15 +1230,15 @@ function asRead(callback) {
 					var id = $('#timeline_' + i + ' .cvo:eq(0)').attr('unique-id')
 					var poster = {
 						home: {
-							last_read_id: id
+							last_read_id: id,
-						}
+						},
 					}
 				} else {
 					var id = $('#timeline_' + i + ' .cvo:eq(0)').attr('data-notf')
 					var poster = {
 						notifications: {
-							last_read_id: id
+							last_read_id: id,
-						}
+						},
 					}
 				}
@@ -1083,7 +1251,7 @@ function asRead(callback) {
 				httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 				httpreq.responseType = 'json'
 				httpreq.send(JSON.stringify(poster))
-				httpreq.onreadystatechange = function() {
+				httpreq.onreadystatechange = function () {
 					if (httpreq.readyState === 4) {
 						var json = httpreq.response
 						if (this.status !== 200) {
@@ -1117,8 +1285,8 @@ function asReadEnd() {
 			onBeforeOpen: () => {
 				Swal.showLoading()
 			},
-			onClose: () => {}
+			onClose: () => {},
-		}).then(result => {})
+		}).then((result) => {})
 	} else {
 		postMessage(['asReadComp', ''], '*')
 	}
@@ -1144,7 +1312,7 @@ function getBookmark(acct_id, tlid, more) {
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 	httpreq.responseType = 'json'
 	httpreq.send()
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -1159,7 +1327,52 @@ function getBookmark(acct_id, tlid, more) {
 				}
 			}
 			var templete = parse(json, 'bookmark', acct_id, tlid, -1, null)
-			templete = templete + '<div class="hide notif-marker" data-maxid="' + max_id + '"></div>'
+			templete =
 				templete +
 				'<div class="hide notif-marker" data-maxid="' +
 				max_id +
 				'"></div>'
 			if (more) {
 				$('#timeline_' + tlid).append(templete)
 			} else {
 				$('#timeline_' + tlid).html(templete)
 			}
 			$('#landing_' + tlid).hide()
 			jQuery('time.timeago').timeago()
 			moreloading = false
 			todc()
 		}
 	}
 }
 function getUtl(acct_id, tlid, data, more) {
 	moreloading = true
 	if (more) {
 		var sid = $('#timeline_' + tlid + ' .cvo')
 		.last()
 		.attr('unique-id')
 		var ad = '?max_id=' + sid
 	} else {
 		var ad = ''
 	}
 	var at = localStorage.getItem('acct_' + acct_id + '_at')
 	var domain = localStorage.getItem('domain_' + acct_id)
 	var start = "https://" + domain + "/api/v1/accounts/" + data.id + "/statuses" + ad
 	var httpreq = new XMLHttpRequest()
 	httpreq.open('GET', start, true)
 	httpreq.setRequestHeader('Content-Type', 'application/json')
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 	httpreq.responseType = 'json'
 	httpreq.send()
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
 				setLog(start, this.status, this.response)
 			}
 			var templete = parse(json, 'bookmark', acct_id, tlid, -1, null)
 			templete =
 				templete
 			if (more) {
 				$('#timeline_' + tlid).append(templete)
 			} else {
@@ -1183,7 +1396,7 @@ function announ(acct_id, tlid) {
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
 	httpreq.responseType = 'json'
 	httpreq.send()
-	httpreq.onreadystatechange = function() {
+	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response
 			if (this.status !== 200) {
@@ -1198,7 +1411,7 @@ function announ(acct_id, tlid) {
 					}
 					ct++
 				}
-				if(ct > 0) {
+				if (ct > 0) {
 					$('.notf-announ_' + acct_id + '_ct').text(ct)
 				}
 			} else {
@@ -1210,4 +1423,14 @@ function announ(acct_id, tlid) {
 			todc()
 		}
 	}
-}
+}
 //buildQuery
 function buildQuery(name, data) {
 	if(!data || data == '') return ''
 	var arr = data.split(',')
 	var str = ''
 	for (var i = 0; i < arr.length; i++) {
 		str = str + `${name}[]=${arr[i]}&`
 	}
 	return str
 }
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -8,13 +8,13 @@ var websocketNotf = []
 //カラム追加ボックストグル
 function addColumnMenu() {
-	$('#left-menu div').removeClass('active')
+	$('#left-menu a').removeClass('active')
 	$('#addColumnMenu').addClass('active')
 	$('.menu-content').addClass('hide')
 	$('#add-box').removeClass('hide')
 	addselCk()
 }
-$('.type').click(function() {
+$('.type').click(function () {
 	$('.type').removeClass('active')
 	$(this).addClass('active')
 	$('#type-sel').val($(this).attr('data-type'))
@@ -44,7 +44,7 @@ function parseColumn(target, dontclose) {
 		var obj = JSON.parse(multi)
 		var templete
-		Object.keys(obj).forEach(function(key) {
+		Object.keys(obj).forEach(function (key) {
 			var acct = obj[key]
 			localStorage.setItem('name_' + key, acct.name)
@@ -76,8 +76,8 @@ function parseColumn(target, dontclose) {
 		var obj = [
 			{
 				domain: 0,
-				type: 'local'
+				type: 'local',
-			}
+			},
 		]
 		var json = JSON.stringify(obj)
 		localStorage.setItem('column', json)
@@ -122,10 +122,7 @@ function parseColumn(target, dontclose) {
 			var if_notf = ''
 		}
 		if (localStorage.getItem('notification_' + acct.domain)) {
-			var unique_notf = lang.lang_layout_thisacct.replace(
+			var unique_notf = lang.lang_layout_thisacct.replace('{{notf}}', localStorage.getItem('notification_' + acct.domain))
 				'{{notf}}',
 				localStorage.getItem('notification_' + acct.domain)
 			)
 		} else {
 			if (lang.language == 'ja') {
 				var notflocale = '通知'
@@ -191,17 +188,7 @@ function parseColumn(target, dontclose) {
 			} else {
 				var animecss = ''
 			}
-			unstreamingTL(
+			unstreamingTL(acct.type, key, basekey, insert, icnsert, acct.left_fold, css, animecss, acct.data)
 				acct.type,
 				key,
 				basekey,
 				insert,
 				icnsert,
 				acct.left_fold,
 				css,
 				animecss,
 				acct.data
 			)
 		} else if (acct.type == 'bookmark') {
 			if (!acct.left_fold) {
 				basekey = key
@@ -213,17 +200,19 @@ function parseColumn(target, dontclose) {
 			} else {
 				var animecss = ''
 			}
-			unstreamingTL(
+			unstreamingTL(acct.type, key, basekey, insert, icnsert, acct.left_fold, css, animecss, acct.domain)
-				acct.type,
+		} else if (acct.type == 'utl') {
-				key,
+			if (!acct.left_fold) {
-				basekey,
+				basekey = key
-				insert,
+			}
-				icnsert,
+
-				acct.left_fold,
+			var anime = localStorage.getItem('animation')
-				css,
+			if (anime == 'yes' || !anime) {
-				animecss,
+				var animecss = 'box-anime'
-				acct.domain
+			} else {
-			)
+				var animecss = ''
 			}
 			unstreamingTL(acct.type, key, basekey, insert, icnsert, acct.left_fold, css, animecss, { acct: acct.domain, data: acct.data })
 		} else {
 			var anime = localStorage.getItem('animation')
 			if (anime == 'yes' || !anime) {
@@ -292,16 +281,33 @@ function parseColumn(target, dontclose) {
 					${lang.lang_layout_excludingbt}
 					<br>`
 			} else if (acct.type == 'tag') {
 				if (acct.data.name) {
 					var name = acct.data.name
 					var all = acct.data.all
 					var any = acct.data.any
 					var none = acct.data.none
 				} else {
 					var name = acct.data
 					var all = ''
 					var any = ''
 					var none = ''
 				}
 				if_tag = `<div class="column-hide notf-indv-box" id="tag-box_${key}" style="padding:5px;">
-					Base: ${acct.data}<br>
+					Base: ${name}<br>
-					<div id="tagManager-${key}"></div>
+					<div id="tagManager-${key}">
-					<button onclick="addTag('${key}')" class="btn waves-effect" style="width: 100%">Add</button>
+						all: <input type="text" id="all_tm-${key}"" value="${all}">
 						any: <input type="text" id="any_tm-${key}" value="${any}">
 						none: <input type="text" id="none_tm-${key}"" value="${none}">
 					</div>
 					<button onclick="addTag('${key}')" class="btn waves-effect" style="width: 100%">Refresh</button>
 				</div>`
 				if_tag_btn = `<a onclick="setToggleTag('${key}')" class="setting nex" 
 				title="${lang.lang_layout_tagManager}" style="width:30px">
 				<i class="material-icons waves-effect nex">note_add</i>
 				</a>`
 				unread = ''
 				var exclude = ''
 				var if_notf = 'hide'
 			} else {
 				var exclude = ''
 				unread = ''
@@ -335,9 +341,7 @@ function parseColumn(target, dontclose) {
 			if (key === 0) {
 				left_hold = ''
 			}
-			if (
+			if (localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct.domain)) == 'misskey') {
 				localStorage.getItem('mode_' + localStorage.getItem('domain_' + acct.domain)) == 'misskey'
 			) {
 				var isMisRed = ''
 				exclude = ''
 				var if_misskey_hide = 'hide'
@@ -350,6 +354,18 @@ function parseColumn(target, dontclose) {
 			} else {
 				var addHeight = ''
 			}
 			if (acct.type != 'pub' && acct.type != 'pub-media') {
 				console.log(acct.type, key)
 				var mediaFil = `<a onclick="mediaToggle('${key}')" class="setting nex">
 					<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>
 					<span id="sta-media-${key}">On</span>
 				</a>${lang.lang_layout_mediafil}`
 			} else {
 				var mediaFil = `<a onclick="remoteOnly('${key}','${acct.type}')" class="setting nex">
 					<i class="material-icons waves-effect nex" title="${lang.lang_layout_remoteOnly}">perm_media</i>
 					<span id="sta-remote-${key}">Off</span>
 				</a>${lang.lang_layout_remoteOnly}`
 			}
 			var html = `
 				<div class="boxIn" id="timeline_box_${key}_box" tlid="${key}" data-acct="${acct.domain}" style="${addHeight}">
 					<div class="notice-box z-depth-2" id="menu_${key}" style="${insert}">
@@ -357,7 +373,7 @@ function parseColumn(target, dontclose) {
 							<i class="material-icons waves-effect ${isMisRed}" id="notice_icon_${key}" ${notf_attr}
 								 style="font-size:40px; padding-top:25%;" 
 								 onclick="checkStr('${acct.type}','${data}','${acct.domain}', '${key}', '${delc}','${voice}',null)"
-							 	 title="${lang.lang_layout_gotop}">
+							 	 title="${lang.lang_layout_gotop}" aria-hidden="true">
 							</i>
 						</div>
 					<div class="area-notice_name">
@@ -366,29 +382,33 @@ function parseColumn(target, dontclose) {
 					<div class="area-a1">
 						<a onclick="notfToggle('${acct.domain}','${key}')" class="setting nex ${if_notf}" 
 							title="${unique_notf}" ${icnsert}>
-							<i class="material-icons waves-effect nex notf-icon_${acct.domain}">notifications</i>
+							<i class="material-icons waves-effect nex notf-icon_${acct.domain}" aria-hidden="true">notifications</i>
 							<span class="voice">${unique_notf}</span>
 						</a>
 						<span class="cbadge hide notf-announ_${acct.domain}" style="margin-right:0" 
 							onclick="notfToggle('${acct.domain}','${key}')" title="${lang.lang_layout_announ}">
 							<i class="fas fa-bullhorn"></i>
 							<span class="notf-announ_${acct.domain}_ct"></span>
 							<span class="voice">${lang.lang_layout_announ}</span>
 						</span>
 						${if_tag_btn}
 					</div>
 					<div class="area-sta">
-						<span class="new badge teal notf-reply_${acct.domain} hide" data-badge-caption="Reply">0</span>
+						<span class="new badge teal notf-reply_${acct.domain} hide" data-badge-caption="Reply" aria-hidden="true">0</span>
-						<span class="new badge yellow black-text notf-fav_${acct.domain} hide" data-badge-caption="Fav">0</span>
+						<span class="new badge yellow black-text notf-fav_${acct.domain} hide" data-badge-caption="Fav" aria-hidden="true">0</span>
-						<span class="new badge blue notf-bt_${acct.domain} hide" data-badge-caption="BT">0</span>
+						<span class="new badge blue notf-bt_${acct.domain} hide" data-badge-caption="BT" aria-hidden="true">0</span>
-						<span class="new badge orange notf-follow_${acct.domain} hide" data-badge-caption="Follow">0</span>
+						<span class="new badge orange notf-follow_${acct.domain} hide" data-badge-caption="Follow" aria-hidden="true">0</span>
 					</div>
 					<div class="area-a2">
 						<a onclick="removeColumn('${key}')" class="setting nex">
-							<i class="material-icons waves-effect nex" title="${lang.lang_layout_delthis}" ${icnsert}>cancel</i>
+							<i class="material-icons waves-effect nex" title="${lang.lang_layout_delthis}" ${icnsert} aria-hidden="true">cancel</i>
 							<span class="voice">${lang.lang_layout_delthis}</span>
 						</a>
 					</div>
 					<div class="area-a3">
 						<a onclick="setToggle('${key}')" class="setting nex" title="${lang.lang_layout_setthis}" ${icnsert}>
-							<i class="material-icons waves-effect nex">settings</i>
+							<i class="material-icons waves-effect nex" aria-hidden="true">settings</i>
 							<span class="voice">${lang.lang_layout_setthis}</span>
 						</a>
 					</div>
 				</div>
@@ -400,11 +420,7 @@ function parseColumn(target, dontclose) {
 				<div class="column-hide notf-indv-box" id="util-box_${key}" style="padding:5px;">
 					${unread}
 					${exclude}${left_hold}
-					<a onclick="mediaToggle('${key}')" class="setting nex">
+					${mediaFil}<br>
 						<i class="material-icons waves-effect nex" title="${lang.lang_layout_mediafil}">perm_media</i>
 						<span id="sta-media-${key}">On</span>
 					</a>
 					${lang.lang_layout_mediafil}<br>
 					<a onclick="cardToggle('${key}')" class="setting nex">
 						<i class="material-icons waves-effect nex" title="${lang.lang_layout_linkanades}">link</i>
 						<span id="sta-card-${key}">On</span>
@@ -496,13 +512,13 @@ function parseColumn(target, dontclose) {
 		minHeight: 50,
 		minWidth: 50,
 		grid: 50,
-		resize: function(event, ui) {
+		resize: function (event, ui) {
 			$(this).css('min-width', ui.size.width + 'px')
 			$(this).css('max-width', ui.size.width + 'px')
 			$(this).css('min-height', ui.size.height + 'px')
 			$(this).css('max-height', ui.size.height + 'px')
 		},
-		stop: function(event, ui) {
+		stop: function (event, ui) {
 			var col = localStorage.getItem('column')
 			var o = JSON.parse(col)
 			var width = ui.size.width
@@ -517,16 +533,14 @@ function parseColumn(target, dontclose) {
 			} else {
 				//横幅。その縦幅を持つカラムのidは
 				console.log('yoko')
-				var key = $(this)
+				var key = $(this).find('.boxIn').attr('tlid')
 					.find('.boxIn')
 					.attr('tlid')
 				var obj = o[key]
 				obj.width = width
 				o[key] = obj
 			}
 			var json = JSON.stringify(o)
 			localStorage.setItem('column', json)
-		}
+		},
 	})
 }
 function checkStr(type, data, acct_id, key, delc, voice) {
@@ -576,7 +590,7 @@ function addColumn() {
 	}
 	var add = {
 		domain: acct,
-		type: type
+		type: type,
 	}
 	var multi = localStorage.getItem('column')
 	var obj = JSON.parse(multi)
@@ -610,9 +624,7 @@ function addselCk() {
 		$('#webview-add').addClass('hide')
 	}
 	if (domain == 'knzk.me' || domain == 'mstdn.y-zu.org') {
-		$('#type-sel').append(
+		$('#type-sel').append('<option value="dm" data-trans="dm" id="direct-add">' + lang.layout_dm + '</option>')
 			'<option value="dm" data-trans="dm" id="direct-add">' + lang.layout_dm + '</option>'
 		)
 	} else {
 		$('#direct-add').remove()
 	}
@@ -629,8 +641,8 @@ function removeColumn(tlid) {
 		confirmButtonColor: '#3085d6',
 		cancelButtonColor: '#d33',
 		confirmButtonText: lang.lang_yesno,
-		cancelButtonText: lang.lang_no
+		cancelButtonText: lang.lang_no,
-	}).then(result => {
+	}).then((result) => {
 		if (result.value) {
 			var multi = localStorage.getItem('column')
 			var obj = JSON.parse(multi)
@@ -652,28 +664,28 @@ function setToggle(tlid) {
 		$('#util-box_' + tlid).css('display', 'block')
 		$('#util-box_' + tlid).animate(
 			{
-				height: '200px'
+				height: '200px',
 			},
 			{
 				duration: 300,
-				complete: function() {
+				complete: function () {
 					$('#util-box_' + tlid).css('overflow-y', 'scroll')
 					$('#util-box_' + tlid).removeClass('column-hide')
-				}
+				},
 			}
 		)
 	} else {
 		$('#util-box_' + tlid).css('overflow-y', 'hidden')
 		$('#util-box_' + tlid).animate(
 			{
-				height: '0'
+				height: '0',
 			},
 			{
 				duration: 300,
-				complete: function() {
+				complete: function () {
 					$('#util-box_' + tlid).addClass('column-hide')
 					$('#util-box_' + tlid).css('display', 'none')
-				}
+				},
 			}
 		)
 	}
@@ -685,28 +697,28 @@ function setToggleTag(tlid) {
 		$('#tag-box_' + tlid).css('display', 'block')
 		$('#tag-box_' + tlid).animate(
 			{
-				height: '200px'
+				height: '200px',
 			},
 			{
 				duration: 300,
-				complete: function() {
+				complete: function () {
 					$('#tag-box_' + tlid).css('overflow-y', 'scroll')
 					$('#tag-box_' + tlid).removeClass('column-hide')
-				}
+				},
 			}
 		)
 	} else {
 		$('#tag-box_' + tlid).css('overflow-y', 'hidden')
 		$('#tag-box_' + tlid).animate(
 			{
-				height: '0'
+				height: '0',
 			},
 			{
 				duration: 300,
-				complete: function() {
+				complete: function () {
 					$('#tag-box_' + tlid).addClass('column-hide')
 					$('#tag-box_' + tlid).css('display', 'none')
-				}
+				},
 			}
 		)
 	}
@@ -813,11 +825,16 @@ function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, anim
 			${lang.lang_layout_leftUnfold}
 			</span><br>`
 	}
 	if(type == 'utl') {
 		var dataHtml = false
 	} else {
 		var dataHtml = data
 	}
 	var html = `<div class="boxIn" id="timeline_box_${key}_box" tlid="${key}">
 			<div class="notice-box z-depth-2" id="menu_${key}" style="${insert} ">
 				<div class="area-notice">
 					<i class="material-icons waves-effect" id="notice_icon_${key}" style="font-size:40px; padding-top:25%;" 
-						onclick="${type}('${key}','${data}');" title="${lang.lang_layout_gotop}"></i>
+						onclick="${type}('${key}','${dataHtml}');" title="${lang.lang_layout_gotop}"></i>
 				</div>
 				<div class="area-notice_name">
 					<span id="notice_${key}" class="tl-title"></span>
@@ -858,6 +875,8 @@ function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, anim
 	} else if (type == 'bookmark') {
 		console.log(key, data)
 		bookmark(key, data)
 	} else if (type == 'utl') {
 		utl(key, data.acct, data.data)
 	}
 	cardCheck(key)
 	ebtCheck(key)
@@ -875,6 +894,22 @@ function bookmark(key, data) {
 	}
 	tl('bookmark', '', data, key, 'false', voice, '')
 }
 function utl(key, acct_id, data) {
 	if(!data) {
 		var multi = localStorage.getItem('column')
 		var obj = JSON.parse(multi)
 		data = obj[key].data
 		acct_id = obj[key].domain
 	}
 	console.log(key, data)
 	if (localStorage.getItem('voice_' + key)) {
 		var voice = true
 	} else {
 		var voice = false
 	}
 	tl('utl', data, acct_id, key, 'false', voice, '')
 }
 function leftFoldSet(key) {
 	var multi = localStorage.getItem('column')
 	var obj = JSON.parse(multi)
--- a/app/js/ui/menu.js
+++ b/app/js/ui/menu.js
@@ -33,6 +33,7 @@ function menu() {
    $("#add-box").removeClass("hide");
    $("#left-menu div").removeClass("active");
    $("#addColumnMenu").addClass("active");
    $("#addColumnMenu").click();
  } else {
    $('#menu').fadeOut()
    $("#menu").removeClass("appear")
@@ -69,7 +70,7 @@ $(function () {
  });
 });
 function help() {
-  $("#left-menu div").removeClass("active");
+  $("#left-menu a").removeClass("active");
 	$("#helpMenu").addClass("active");
 	$(".menu-content").addClass("hide");
 	$("#help-box").removeClass("hide");
--- a/app/js/ui/post-box.js
+++ b/app/js/ui/post-box.js
@@ -58,10 +58,10 @@ function show() {
 	mdCheck()
 }
-$(function() {
+$(function () {
 	$('#post-box').draggable({
 		handle: '#post-bar',
-		stop: function() {
+		stop: function () {
 			var left = $('#post-box').offset().left
 			if (left > $('body').width() - $('#post-box').width()) {
 				left = $('body').width() - $('#post-box').width()
@@ -76,15 +76,15 @@ $(function() {
 			}
 			localStorage.setItem('postbox-left', left)
 			localStorage.setItem('postbox-top', top)
-		}
+		},
 	})
 	$('#post-box').resizable({
 		minHeight: 150,
 		minWidth: 100,
-		stop: function(event, ui) {
+		stop: function (event, ui) {
 			$('#textarea').blur()
 			localStorage.setItem('postbox-width', ui.size.width)
-		}
+		},
 	})
 })
@@ -101,41 +101,44 @@ if (location.search) {
 		$('.mini-btn').text('expand_less')
 	}
 }
-$('#posttgl').click(function(e) {
+window.onload = initPostbox
-	if (!$('#post-box').hasClass('appear')) {
+function initPostbox() {
-		show()
+	$('#posttgl').click(function (e) {
-	} else {
+		if (!$('#post-box').hasClass('appear')) {
-		hide()
+			show()
-	}
+		} else {
 	$('.cvo').removeClass('selectedToot')
 	selectedColumn = 0
 	selectedToot = 0
 })
 $('#timeline-container,#group').click(function(e) {
 	if (localStorage.getItem('box') != 'absolute') {
 		if ($('#post-box').hasClass('appear') && !localStorage.getItem('nohide')) {
 			hide()
 		}
-	}
+		$('.cvo').removeClass('selectedToot')
-	$('.cvo').removeClass('selectedToot')
+		selectedColumn = 0
-	selectedColumn = 0
+		selectedToot = 0
-	selectedToot = 0
+	})
-	localStorage.removeItem('nohide')
+
-	srcBox('close')
+	$('#timeline-container,#group').click(function (e) {
-})
+		if (localStorage.getItem('box') != 'absolute') {
-$('#contextWrap').click(function(e) {
+			if ($('#post-box').hasClass('appear') && !localStorage.getItem('nohide')) {
-	$('#contextWrap').addClass('hide')
+				hide()
-	$('.contextMenu').addClass('hide')
+			}
-	$('.act-icon').text('expand_more')
+		}
-})
+		$('.cvo').removeClass('selectedToot')
-$('#textarea,#cw-text').focusout(function(e) {
+		selectedColumn = 0
-	localStorage.setItem('nohide', true)
+		selectedToot = 0
 	var countup = function() {
 		localStorage.removeItem('nohide')
-	}
+		srcBox('close')
-	//setTimeout(remove, 100);
+	})
-	$('.cvo').removeClass('selectedToot')
+	$('#contextWrap').click(function (e) {
-	selectedColumn = 0
+		$('#contextWrap').addClass('hide')
-	selectedToot = 0
+		$('.contextMenu').addClass('hide')
-})
+		$('.act-icon').text('expand_more')
 	})
 	$('#textarea,#cw-text').focusout(function (e) {
 		localStorage.setItem('nohide', true)
 		var countup = function () {
 			localStorage.removeItem('nohide')
 		}
 		//setTimeout(remove, 100);
 		$('.cvo').removeClass('selectedToot')
 		selectedColumn = 0
 		selectedToot = 0
 	})
 }
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
@@ -3,7 +3,7 @@ var envView = new Vue({
 	el: '#envView',
 	data: { config: envConstruction },
 	methods: {
-		complete: function(i, val) {
+		complete: function (i, val) {
 			var ls = envView.config[i].storage
 			M.toast({ html: 'Complete', displayLength: 3000 })
 			if (!val) {
@@ -21,14 +21,14 @@ var envView = new Vue({
 				frameSet(val)
 			}
 			return true
-		}
+		},
-	}
+	},
 })
 var tlView = new Vue({
 	el: '#tlView',
 	data: { config: tlConstruction },
 	methods: {
-		complete: function(i, val) {
+		complete: function (i, val) {
 			var ls = tlView.config[i]
 			if (val) {
 				localStorage.setItem(ls.storage, val)
@@ -46,18 +46,18 @@ var tlView = new Vue({
 				}
 			}
 			return true
-		}
+		},
-	}
+	},
 })
 var postView = new Vue({
 	el: '#postView',
 	data: {
 		config: postConstruction,
 		kirishima: localStorage.getItem('kirishima'),
-		quoters: localStorage.getItem('quoters')
+		quoters: localStorage.getItem('quoters'),
 	},
 	methods: {
-		complete: function(i, val) {
+		complete: function (i, val) {
 			var ls = postView.config[i]
 			if (val) {
 				localStorage.setItem(ls.storage, val)
@@ -75,8 +75,8 @@ var postView = new Vue({
 				}
 			}
 			return true
-		}
+		},
-	}
+	},
 })
 //設定ボタン押した。
 function settings() {
@@ -177,6 +177,7 @@ function load() {
 		$('#soundVolVal').text(cvol * 100)
 	}
 	//$("#log").val(localStorage.getItem("errors"))
 	$('#lastFmUser').val(localStorage.getItem('lastFmUser'))
 }
 function customVol() {
 	var cvol = $('#soundvol').val()
@@ -215,7 +216,7 @@ function climute() {
 			return
 		}
 		var templete
-		Object.keys(obj).forEach(function(key) {
+		Object.keys(obj).forEach(function (key) {
 			var cli = obj[key]
 			var list = key * 1 + 1
 			templete =
@@ -250,7 +251,7 @@ function wordmute() {
 		obj = []
 	}
 	$('#wordmute').chips({
-		data: obj
+		data: obj,
 	})
 }
 function wordmuteSave() {
@@ -266,7 +267,7 @@ function wordemp() {
 		obj = []
 	}
 	$('#wordemp').chips({
-		data: obj
+		data: obj,
 	})
 }
 function wordempSave() {
@@ -278,7 +279,7 @@ function notftest() {
 	var os = localStorage.getItem('platform')
 	var options = {
 		body: lang.lang_setting_notftest + '(' + lang.lang_setting_notftestprof + ')',
-		icon: localStorage.getItem('prof_0')
+		icon: localStorage.getItem('prof_0'),
 	}
 	var n = new Notification('TheDesk' + lang.lang_setting_notftest, options)
 }
@@ -303,7 +304,7 @@ function changelang(lang) {
 }
 function exportSettings() {
 	var exp = exportSettingsCore()
-	$("#imp-exp").val(JSON5.stringify(exp))
+	$('#imp-exp').val(JSON5.stringify(exp))
 	Swal.fire({
 		title: lang.lang_setting_exportwarn,
 		type: 'warning',
@@ -311,8 +312,8 @@ function exportSettings() {
 		confirmButtonColor: '#3085d6',
 		cancelButtonColor: '#d33',
 		confirmButtonText: lang.lang_yesno,
-		cancelButtonText: lang.lang_no
+		cancelButtonText: lang.lang_no,
-	}).then(result => {
+	}).then((result) => {
 		if (result.value) {
 			postMessage(['exportSettings', ''], '*')
 		}
@@ -351,11 +352,7 @@ function exportSettingsCore() {
 	config.font = localStorage.getItem('font')
 	exp.config = config
 	//keysc
-	exp.ksc = [
+	exp.ksc = [localStorage.getItem('oks-1'), localStorage.getItem('oks-2'), localStorage.getItem('oks-3')]
 		localStorage.getItem('oks-1'),
 		localStorage.getItem('oks-2'),
 		localStorage.getItem('oks-3')
 	]
 	//climu
 	var cli = localStorage.getItem('client_mute')
 	var climu = JSON.parse(cli)
@@ -384,8 +381,8 @@ function exportSettingsCore() {
 	return exp
 }
 function importSettings() {
-	if($("#imp-exp").val()) {
+	if ($('#imp-exp').val()) {
-		importSettingsCore(JSON5.parse($("#imp-exp").val()))
+		importSettingsCore(JSON5.parse($('#imp-exp').val()))
 		return false
 	}
 	Swal.fire({
@@ -395,8 +392,8 @@ function importSettings() {
 		confirmButtonColor: '#3085d6',
 		cancelButtonColor: '#d33',
 		confirmButtonText: lang.lang_yesno,
-		cancelButtonText: lang.lang_no
+		cancelButtonText: lang.lang_no,
-	}).then(result => {
+	}).then((result) => {
 		if (result.value) {
 			postMessage(['importSettings', ''], '*')
 		}
@@ -490,7 +487,7 @@ function importSettingsCore(obj) {
 	} else {
 		Swal.fire({
 			type: 'error',
-			title: 'Error'
+			title: 'Error',
 		})
 	}
 }
@@ -505,21 +502,13 @@ function fontList(arg) {
 	$('#fonts').removeClass('hide')
 	for (var i = 0; i < arg.length; i++) {
 		var font = arg[i]
-		$('#fonts').append(
+		$('#fonts').append('<div class="font pointer" style="font-family:' + font + '" onclick="insertFont(\'' + font + '\')">' + font + '</div>')
 			'<div class="font pointer" style="font-family:' +
 				font +
 				'" onclick="insertFont(\'' +
 				font +
 				'\')">' +
 				font +
 				'</div>'
 		)
 	}
 }
 function insertFont(name) {
 	$('#font').val(name)
 }
-$('.color-picker').each(function(i, elem) {
+$('.color-picker').each(function (i, elem) {
 	pickerDefine(i, 'fff')
 })
 function pickerDefine(i, color) {
@@ -536,17 +525,16 @@ function pickerDefine(i, color) {
 			hue: true, // Hue slider
 			interaction: {
 				rgba: false, // rgba option (red green blue and alpha)
-				input: true // input / output element
+				input: true, // input / output element
-			}
+			},
 		},
 		strings: {
 			save: 'Save', // Default for save button
-			clear: 'Clear' // Default for clear button
+			clear: 'Clear', // Default for clear button
-		}
+		},
 	})
 	pickr.on('change', (...args) => {
-		var rgb =
+		var rgb = 'rgb(' + args[0].toRGBA()[0] + ',' + args[0].toRGBA()[1] + ',' + args[0].toRGBA()[2] + ')'
 			'rgb(' + args[0].toRGBA()[0] + ',' + args[0].toRGBA()[1] + ',' + args[0].toRGBA()[2] + ')'
 		$('#color-picker' + i + '_value').val(rgb)
 	})
 }
@@ -600,7 +588,7 @@ function customComp() {
 			TheDeskModal: modalC,
 			TheDeskBottom: bottomC,
 			TheDeskPostbox: postboxC,
-			TheDeskSubcolor: subcolorC
+			TheDeskSubcolor: subcolorC,
 		}
 	} else {
 		var advanceTheme = {}
@@ -620,10 +608,10 @@ function customComp() {
 		vars: {
 			primary: primaryC,
 			secondary: secondaryC,
-			text: textC
+			text: textC,
 		},
 		props: advanceTheme,
-		id: id
+		id: id,
 	}
 	$('#custom_json').val(JSON.stringify(json))
 	themes('custom')
@@ -633,9 +621,7 @@ function customComp() {
 	$('#dark').prop('checked', true)
 	$('#custom_json').val('')
 	for (var i = 0; i <= 8; i++) {
-		$('#color-picker' + i + '-wrap').html(
+		$('#color-picker' + i + '-wrap').html('<div class="color-picker" id="color-picker' + i + '"></div>')
 			'<div class="color-picker" id="color-picker' + i + '"></div>'
 		)
 		$('#color-picker' + i + '_value').val('')
 		pickerDefine(i, 'fff')
 	}
@@ -648,9 +634,7 @@ function deleteIt() {
 	$('#dark').prop('checked', true)
 	$('#custom_json').val('')
 	for (var i = 0; i <= 8; i++) {
-		$('#color-picker' + i + '-wrap').html(
+		$('#color-picker' + i + '-wrap').html('<div class="color-picker" id="color-picker' + i + '"></div>')
 			'<div class="color-picker" id="color-picker' + i + '"></div>'
 		)
 		$('#color-picker' + i + '_value').val('')
 		pickerDefine(i, 'fff')
 	}
@@ -661,7 +645,7 @@ function ctLoad() {
 }
 function ctLoadCore(args) {
 	var templete = ''
-	Object.keys(args).forEach(function(key) {
+	Object.keys(args).forEach(function (key) {
 		var theme = args[key]
 		var themeid = theme.id
 		templete = templete + '<option value="' + themeid + '">' + theme.name + '</option>'
@@ -670,8 +654,7 @@ function ctLoadCore(args) {
 		localStorage.setItem('customtheme-id', args[0].id)
 	}
 	$('#custom-sel-sel').html(templete)
-	templete =
+	templete = '<option value="add_new">' + $('#edit-selector').attr('data-add') + '</option>' + templete
 		'<option value="add_new">' + $('#edit-selector').attr('data-add') + '</option>' + templete
 	$('#custom-edit-sel').html(templete)
 	$('select').formSelect()
 }
@@ -687,9 +670,7 @@ function custom() {
 		$('#dark').prop('checked', true)
 		$('#custom_json').val('')
 		for (var i = 0; i <= 8; i++) {
-			$('#color-picker' + i + '-wrap').html(
+			$('#color-picker' + i + '-wrap').html('<div class="color-picker" id="color-picker' + i + '"></div>')
 				'<div class="color-picker" id="color-picker' + i + '"></div>'
 			)
 			$('#color-picker' + i + '_value').val('')
 			pickerDefine(i, 'fff')
 		}
@@ -737,9 +718,7 @@ function advancedConncet(args, tar, sub, i) {
 	} else {
 		var color = args.vars[sub]
 	}
-	$('#color-picker' + i + '-wrap').html(
+	$('#color-picker' + i + '-wrap').html('<div class="color-picker" id="color-picker' + i + '"></div>')
 		'<div class="color-picker" id="color-picker' + i + '"></div>'
 	)
 	$('#color-picker' + i + '_value').val(color)
 	pickerDefine(i, rgbToHex(color))
 }
@@ -750,7 +729,7 @@ function customImp() {
 	} else {
 		Swal.fire({
 			type: 'error',
-			title: 'Error'
+			title: 'Error',
 		})
 	}
 }
@@ -777,7 +756,7 @@ function customSoundSave(key, file) {
 	localStorage.setItem('custom' + key, file)
 	$('#c1-file').text(file)
 }
-window.onload = function() {
+window.onload = function () {
 	//最初に読む
 	load()
 	climute()
@@ -787,17 +766,14 @@ window.onload = function() {
 	voiceSettingLoad()
 	oksload()
 	ctLoad()
 	$('body').addClass(localStorage.getItem('platform'))
 }
 //設定画面で未読マーカーは要らない
 function asReadEnd() {
 	postMessage(['asReadComp', ''], '*')
 }
 function checkupd() {
-	if (
+	if (localStorage.getItem('winstore') == 'brewcask' || localStorage.getItem('winstore') == 'snapcraft' || localStorage.getItem('winstore') == 'winstore') {
 		localStorage.getItem('winstore') == 'brewcask' ||
 		localStorage.getItem('winstore') == 'snapcraft' ||
 		localStorage.getItem('winstore') == 'winstore'
 	) {
 		var winstore = true
 	} else {
 		var winstore = false
@@ -805,22 +781,22 @@ function checkupd() {
 	var ver = localStorage.getItem('ver')
 	var start = 'https://thedesk.top/ver.json'
 	fetch(start, {
-		method: 'GET'
+		method: 'GET',
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text)
 				})
 			}
 			return response.json()
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error)
 			setLog(start, 'JSON', error)
 			console.error(error)
 		})
-		.then(function(mess) {
+		.then(function (mess) {
 			console.table(mess)
 			if (mess) {
 				var platform = localStorage.getItem('platform')
@@ -833,13 +809,13 @@ function checkupd() {
 					Swal.fire({
 						type: 'info',
 						title: lang.lang_setting_noupd,
-						html: ver
+						html: ver,
 					})
 				} else if (ver.indexOf('beta') != -1 || winstore) {
 					Swal.fire({
 						type: 'info',
 						title: lang.lang_setting_thisisbeta,
-						html: ver
+						html: ver,
 					})
 				} else {
 					localStorage.removeItem('new-ver-skip')
@@ -848,3 +824,11 @@ function checkupd() {
 			}
 		})
 }
 function lastFmSet() {
 	if ($('#lastFmUser').val()) {
 		localStorage.setItem('lastFmUser', $('#lastFmUser').val())
 	} else {
 		localStorage.removeItem('lastFmUser')
 	}
 	M.toast({ html: 'Complete: last.fm', displayLength: 3000 })
 }
--- a/app/js/ui/sort.js
+++ b/app/js/ui/sort.js
@@ -111,7 +111,7 @@ function sort() {
 }
 //ソートボタントグル
 function sortMenu() {
-	$("#left-menu div").removeClass("active");
+	$("#left-menu a").removeClass("active");
 	$("#sortMenu").addClass("active");
 	$(".menu-content").addClass("hide");
 	$("#sort-box").removeClass("hide");
--- a/app/js/ui/spotify.js
+++ b/app/js/ui/spotify.js
@@ -1,216 +1,294 @@
 function spotifyConnect() {
-	var auth = "https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing";
+	var auth = 'https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing'
-	var platform = localStorage.getItem("platform");
+	var platform = localStorage.getItem('platform')
-	if (platform == "win32") {
+	if (platform == 'win32') {
-		postMessage(["openUrl", auth], "*");
+		postMessage(['openUrl', auth], '*')
-		postMessage(["sendSinmpleIpc", "quit"], "*");
+		postMessage(['sendSinmpleIpc', 'quit'], '*')
 	} else {
-		auth = auth + "&state=code";
+		auth = auth + '&state=code'
-		$("#spotify-code-show").removeClass("hide");
+		$('#spotify-code-show').removeClass('hide')
-		postMessage(["openUrl", auth], "*");
+		postMessage(['openUrl', auth], '*')
 	}
 }
 function spotifyAuth() {
-	var code = $("#spotify-code").val();
+	var code = $('#spotify-code').val()
-	localStorage.setItem("spotify", "code");
+	localStorage.setItem('spotify', 'code')
-	localStorage.setItem("spotify-refresh", code);
+	localStorage.setItem('spotify-refresh', code)
-	$("#spotify-code-show").addClass("hide");
+	$('#spotify-code-show').addClass('hide')
-	$("#spotify-enable").addClass("disabled");
+	$('#spotify-enable').addClass('disabled')
-	$("#spotify-disable").removeClass("disabled");
+	$('#spotify-disable').removeClass('disabled')
 }
 function spotifyDisconnect() {
-	localStorage.removeItem("spotify");
+	localStorage.removeItem('spotify')
-	localStorage.removeItem("spotify-refresh");
+	localStorage.removeItem('spotify-refresh')
-	checkSpotify();
+	checkSpotify()
 }
 function checkSpotify() {
-	if (localStorage.getItem("spotify")) {
+	if (localStorage.getItem('spotify')) {
-		$("#spotify-enable").addClass("disabled");
+		$('#spotify-enable').addClass('disabled')
-		$("#spotify-disable").removeClass("disabled");
+		$('#spotify-disable').removeClass('disabled')
 	} else {
-		$("#spotify-enable").removeClass("disabled");
+		$('#spotify-enable').removeClass('disabled')
-		$("#spotify-disable").addClass("disabled");
+		$('#spotify-disable').addClass('disabled')
 	}
-	var content = localStorage.getItem("np-temp");
+	var content = localStorage.getItem('np-temp')
-	if (!content || content == "" || content == "null") {
+	if (!content || content == '' || content == 'null') {
-		var content = "#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk";
+		var content = '#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk'
 	}
-	$("#np-temp").val(content);
+	$('#np-temp').val(content)
-	var flag = localStorage.getItem("artwork");
+	var flag = localStorage.getItem('artwork')
 	if (flag) {
-		$("#awk_yes").prop("checked", true);
+		$('#awk_yes').prop('checked', true)
 	} else {
-		$("#awk_no").prop("checked", true);
+		$('#awk_no').prop('checked', true)
 	}
-	var flag2 = localStorage.getItem("complete-artwork");
+	var flag2 = localStorage.getItem('complete-artwork')
 	if (flag2) {
-		$("#amw_yes").prop("checked", true);
+		$('#amw_yes').prop('checked', true)
 	} else {
-		$("#amw_no").prop("checked", true);
+		$('#amw_no').prop('checked', true)
 	}
 }
 function spotifyFlagSave() {
-	var awk = $("[name=awk]:checked").val();
+	var awk = $('[name=awk]:checked').val()
-	if (awk == "yes") {
+	if (awk == 'yes') {
-		localStorage.setItem("artwork", "yes");
+		localStorage.setItem('artwork', 'yes')
-		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 });
+		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
 	} else {
-		localStorage.removeItem("artwork");
+		localStorage.removeItem('artwork')
-		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 });
+		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
 	}
 }
 function aMusicFlagSave() {
-	var awk = $("[name=amw]:checked").val();
+	var awk = $('[name=amw]:checked').val()
-	if (awk == "yes") {
+	if (awk == 'yes') {
-		localStorage.setItem("complete-artwork", "yes");
+		localStorage.setItem('complete-artwork', 'yes')
-		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 });
+		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
 	} else {
-		localStorage.removeItem("complete-artwork");
+		localStorage.removeItem('complete-artwork')
-		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 });
+		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
 	}
 }
 function nowplaying(mode) {
-	if (mode == "spotify") {
+	if (mode == 'spotify') {
-		var start = "https://thedesk.top/now-playing?at=" + localStorage.getItem("spotify") + "&rt=" + localStorage.getItem("spotify-refresh");
+		var start = 'https://thedesk.top/now-playing?at=' + localStorage.getItem('spotify') + '&rt=' + localStorage.getItem('spotify-refresh')
-		var at = localStorage.getItem("spotify");
+		var at = localStorage.getItem('spotify')
 		if (at) {
 			fetch(start, {
-				method: "GET",
+				method: 'GET',
 				headers: {
-					"content-type": "application/json"
+					'content-type': 'application/json',
-				}
+				},
 			})
-				.then(function(response) {
+				.then(function (response) {
 					if (!response.ok) {
-						response.text().then(function(text) {
+						response.text().then(function (text) {
-							setLog(response.url, response.status, text);
+							setLog(response.url, response.status, text)
-						});
+						})
 					}
-					return response.json();
+					return response.json()
 				})
-				.catch(function(error) {
+				.catch(function (error) {
-					todo(error);
+					todo(error)
-					setLog(start, "JSON", error);
+					setLog(start, 'JSON', error)
-					console.error(error);
+					console.error(error)
 				})
-				.then(function(json) {
+				.then(function (json) {
-					console.table(json);
+					console.table(json)
 					if (json.length < 1) {
-						return false;
+						return false
 					}
-					var item = json.item;
+					var item = json.item
-					var img = item.album.images[0].url;
+					var img = item.album.images[0].url
-					var flag = localStorage.getItem("artwork");
+					var flag = localStorage.getItem('artwork')
 					if (flag) {
-						postMessage(["bmpImage", [img, 0]], "*");
+						postMessage(['bmpImage', [img, 0]], '*')
 					}
-					var content = localStorage.getItem("np-temp");
+					var content = localStorage.getItem('np-temp')
-					if (!content || content == "" || content == "null") {
+					if (!content || content == '' || content == 'null') {
-						var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
+						var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
 					}
-					var regExp = new RegExp("{song}", "g");
+					var regExp = new RegExp('{song}', 'g')
-					content = content.replace(regExp, item.name);
+					content = content.replace(regExp, item.name)
-					var regExp = new RegExp("{album}", "g");
+					var regExp = new RegExp('{album}', 'g')
-					content = content.replace(regExp, item.album.name);
+					content = content.replace(regExp, item.album.name)
-					var regExp = new RegExp("{artist}", "g");
+					var regExp = new RegExp('{artist}', 'g')
-					content = content.replace(regExp, item.artists[0].name);
+					content = content.replace(regExp, item.artists[0].name)
-					var regExp = new RegExp("{url}", "g");
+					var regExp = new RegExp('{url}', 'g')
-					content = content.replace(regExp, item.external_urls.spotify);
+					content = content.replace(regExp, item.external_urls.spotify)
-					var regExp = new RegExp("{composer}", "g");
+					var regExp = new RegExp('{composer}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					var regExp = new RegExp("{hz}", "g");
+					var regExp = new RegExp('{hz}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					var regExp = new RegExp("{bitRate}", "g");
+					var regExp = new RegExp('{bitRate}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					var regExp = new RegExp("{lyricist}", "g");
+					var regExp = new RegExp('{lyricist}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					var regExp = new RegExp("{bpm}", "g");
+					var regExp = new RegExp('{bpm}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					var regExp = new RegExp("{genre}", "g");
+					var regExp = new RegExp('{genre}', 'g')
-					content = content.replace(regExp, "");
+					content = content.replace(regExp, '')
-					$("#textarea").val(content);
+					$('#textarea').val(content)
-				});
+				})
 		} else {
 			Swal.fire({
-				type: "info",
+				type: 'info',
-				title: lang.lang_spotify_acct
+				title: lang.lang_spotify_acct,
-			});
+			})
 		}
 	} else if (mode == 'itunes') {
 		postMessage(['itunes', ''], '*')
 	} else if (mode == 'lastFm') {
 		var user = localStorage.getItem('lastFmUser')
 		var start = 'https://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=' + user + '&limit=1&api_key=8f113803bfea951b6dde9e56d32458b2&format=json'
 		if (user) {
 			fetch(start, {
 				method: 'GET',
 				headers: {
 					'content-type': 'application/json',
 				},
 			})
 				.then(function (response) {
 					if (!response.ok) {
 						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) {
 					console.table(json)
 					if (!json || !json.recenttracks) {
 						console.error('no data')
 						return false
 					}
 					var item = json.recenttracks.track[0]
 					if(!item['@attr']) return false
 					var img = item.image[3]['#text']
 					var isImg = item.streamable*1
 					var flag = localStorage.getItem('artwork')
 					if (flag && isImg && img) {
 						postMessage(['bmpImage', [img, 0]], '*')
 					}
 					var content = localStorage.getItem('np-temp')
 					if (!content || content == '' || content == 'null') {
 						var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
 					}
 					var regExp = new RegExp('{song}', 'g')
 					content = content.replace(regExp, item.name)
 					var regExp = new RegExp('{album}', 'g')
 					content = content.replace(regExp, item.album['#text'])
 					var regExp = new RegExp('{artist}', 'g')
 					content = content.replace(regExp, item.artist['#text'])
 					var regExp = new RegExp('{url}', 'g')
 					content = content.replace(regExp,'')
 					var regExp = new RegExp('{composer}', 'g')
 					content = content.replace(regExp, '')
 					var regExp = new RegExp('{hz}', 'g')
 					content = content.replace(regExp, '')
 					var regExp = new RegExp('{bitRate}', 'g')
 					content = content.replace(regExp, '')
 					var regExp = new RegExp('{lyricist}', 'g')
 					content = content.replace(regExp, '')
 					var regExp = new RegExp('{bpm}', 'g')
 					content = content.replace(regExp, '')
 					var regExp = new RegExp('{genre}', 'g')
 					content = content.replace(regExp, '')
 					$('#textarea').val(content)
 				})
 		} else {
 			Swal.fire({
 				type: 'info',
 				title: lang.lang_spotify_acct,
 			})
 		}
 	} else if (mode == "itunes") {
 		postMessage(["itunes", ""], "*");
 	}
 }
 async function npCore(arg) {
-	console.table(arg);
+	console.table(arg)
-	var content = localStorage.getItem("np-temp");
+	var content = localStorage.getItem('np-temp')
-	if (!content || content == "" || content == "null") {
+	if (!content || content == '' || content == 'null') {
-		var content = "#NowPlaying {song} / {album} / {artist}\n{url}";
+		var content = '#NowPlaying {song} / {album} / {artist}\n{url}'
 	}
-	var flag = localStorage.getItem("artwork");
+	var flag = localStorage.getItem('artwork')
-	var platform = localStorage.getItem("platform");
+	var platform = localStorage.getItem('platform')
-	if (platform == "win32") {
+	var aaw = { aaw: '', album: '' }
 	if (platform == 'win32') {
 		if (flag && arg.path) {
-			media(arg.path, "image/png", "new");
+			media(arg.path, 'image/png', 'new')
 		}
-	} else if (platform == "darwin") {
+	} else if (platform == 'darwin') {
 		if (flag && arg.artwork) {
-			media(arg.artwork, "image/png", "new");
+			media(arg.artwork, 'image/png', 'new')
 		} else if (flag && localStorage.getItem('complete-artwork')) {
-			var q = arg.artist + ' ' + arg.album.name + ' ' + arg.name;
+			var q = arg.artist + ' ' + arg.album.name + ' ' + arg.name
-			postMessage(["bmpImage", [await getUnknownAA(q), 0]], "*");
+			aaw = await getUnknownAA(q)
 			postMessage(['bmpImage', [aaw.aaw, 0]], '*')
 		}
 	}
-	var regExp = new RegExp("{song}", "g");
+	var regExp = new RegExp('{song}', 'g')
-	content = content.replace(regExp, arg.name);
+	content = content.replace(regExp, arg.name)
-	var regExp = new RegExp("{album}", "g");
+	var regExp = new RegExp('{album}', 'g')
 	if (arg.album) {
 		if (arg.album.name) {
-			content = content.replace(regExp, arg.album.name);
+			content = content.replace(regExp, arg.album.name)
 		} else {
 			if (aaw.album) content = content.replace(regExp, aaw.album)
 			content = content.replace(regExp, '-')
 		}
 	} else {
 		if (aaw.album) content = content.replace(regExp, aaw.album)
 		content = content.replace(regExp, '-')
 	}
-	var regExp = new RegExp("{artist}", "g");
+	var regExp = new RegExp('{artist}', 'g')
-	content = content.replace(regExp, arg.artist);
+	content = content.replace(regExp, arg.artist)
-	var regExp = new RegExp("{url}", "g");
+	var regExp = new RegExp('{url}', 'g')
-	content = content.replace(regExp, "");
+	content = content.replace(regExp, '')
-	var regExp = new RegExp("{composer}", "g");
+	var regExp = new RegExp('{composer}', 'g')
-	content = content.replace(regExp, arg.composer);
+	content = content.replace(regExp, arg.composer)
-	var regExp = new RegExp("{hz}", "g");
+	var regExp = new RegExp('{hz}', 'g')
-	content = content.replace(regExp, arg.sampleRate / 1000 + "kHz");
+	content = content.replace(regExp, arg.sampleRate / 1000 + 'kHz')
-	var regExp = new RegExp("{lyricist}", "g");
+	var regExp = new RegExp('{lyricist}', 'g')
-	content = content.replace(regExp, "");
+	content = content.replace(regExp, '')
-	var regExp = new RegExp("{bpm}", "g");
+	var regExp = new RegExp('{bpm}', 'g')
-	content = content.replace(regExp, "");
+	content = content.replace(regExp, '')
-	var regExp = new RegExp("{bitRate}", "g");
+	var regExp = new RegExp('{bitRate}', 'g')
-	content = content.replace(regExp, arg.bitRate + "kbps");
+	content = content.replace(regExp, arg.bitRate + 'kbps')
-	var regExp = new RegExp("{genre}", "g");
+	var regExp = new RegExp('{genre}', 'g')
-	content = content.replace(regExp, arg.genre);
+	content = content.replace(regExp, arg.genre)
-	$("#textarea").val(content);
+	$('#textarea').val(content)
 }
 function spotifySave() {
-	var temp = $("#np-temp").val();
+	var temp = $('#np-temp').val()
-	localStorage.setItem("np-temp", temp);
+	localStorage.setItem('np-temp', temp)
-	M.toast({ html: lang.lang_spotify_np, displayLength: 3000 });
+	M.toast({ html: lang.lang_spotify_np, displayLength: 3000 })
 }
 if (location.search) {
-	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
+	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
-	var mode = m[1];
+	var mode = m[1]
-	var codex = m[2];
+	var codex = m[2]
-	if (mode == "spotify") {
+	if (mode == 'spotify') {
-		var coder = codex.split(":");
+		var coder = codex.split(':')
-		localStorage.setItem("spotify", coder[0]);
+		localStorage.setItem('spotify', coder[0])
-		localStorage.setItem("spotify-refresh", coder[1]);
+		localStorage.setItem('spotify-refresh', coder[1])
 	} else {
 	}
 }
 async function getUnknownAA(q) {
 	const start = 'https://itunes.apple.com/search?term=' + q + '&country=JP&entity=song'
 	let promise = await fetch(start, {
-		method: 'GET'
+		method: 'GET',
 	})
 	const json = await promise.json()
-	if(!json.resultCount) {
+	if (!json.resultCount) {
 		return []
 	}
 	const data = json.results[0].artworkUrl100
-	return data.replace(/100x100/, '512x512')
+	return { aaw: data.replace(/100x100/, '512x512'), album: json.results[0].collectionName }
-}
+}
--- a/app/js/ui/tips.js
+++ b/app/js/ui/tips.js
@@ -30,7 +30,7 @@ function tips(mode) {
 				localStorage.getItem('ver') +
 				' git: ' +
 				gitHash +
-				'\')">TheDesk ' +
+				'\')"> ' +
 				localStorage.getItem('ver') +
 				' {' +
 				gitHash.slice(0, 7) +
@@ -159,6 +159,10 @@ function spotifytips() {
 			})
 			.then(function(json) {
 				var ms = json.progress_ms
 				if(!ms) {
 					tips('ver')
 					return false
 				}
 				var last = 1000 - (ms % 1000)
 				var item = json.item
 				var img = item.album.images[0].url
@@ -218,6 +222,8 @@ function spotifytips() {
 			type: 'info',
 			title: lang.lang_spotify_acct
 		})
 		tips('ver')
 		return false
 	}
 }
 function spotStart() {
@@ -288,6 +294,4 @@ function tipsToggle() {
 	$('#tips').toggleClass('hide')
 	$('#tips-menu').toggleClass('hide')
 }
-if (localStorage.getItem('tips')) {
+
 	tips(localStorage.getItem('tips'))
 }
--- a/app/js/userdata/his-data.js
+++ b/app/js/userdata/his-data.js
@@ -1,6 +1,6 @@
 //ユーザーデータ表示
 //タイムライン
-function utl(user, more, acct_id) {
+function utlShow(user, more, acct_id) {
 	if (!acct_id) {
 		var acct_id = $("#his-data").attr("use-acct");
 	}
@@ -79,6 +79,26 @@ function utl(user, more, acct_id) {
 			jQuery("time.timeago").timeago();
 		});
 }
 function utlAdd() {
 	var acct_id = $("#his-data").attr("use-acct");
 	var user = $("#his-data").attr("user-id");
 	var add = {
 		domain: acct_id,
 		type: 'utl',
 		data: {
 			id: user,
 			acct: $("#his-acct").attr('fullname')
 		}
 	}
 	var multi = localStorage.getItem('column')
 	var obj = JSON.parse(multi)
 	localStorage.setItem('card_' + obj.length, 'true')
 	obj.push(add)
 	var json = JSON.stringify(obj)
 	localStorage.setItem('column', json)
 	parseColumn('add')
 	hisclose()
 }
 //ピン留めTL
 function pinutl(before, user, acct_id) {
 	if (!acct_id) {
@@ -719,46 +739,3 @@ function udAdd(acct_id, id, start) {
 			}
 		});
 }
 //ユーザーマッチングリスト
 function showMat() {
 	$("#his-matching-list-contents").html(lang.lang_hisdata_taketime);
 	var full = $("#his-acct").attr("fullname");
 	var acct_id = $("#his-data").attr("use-acct");
 	full = full.split("@");
 	var start = "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-filtered-api.cgi?" + full[1] + "+" + full[0];
 	fetch(start, {
 		method: "GET",
 		headers: {
 			"content-type": "application/json"
 		}
 		//body: JSON.stringify({})
 	})
 		.then(function(response) {
 			if (!response.ok) {
 				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) {
 			var templete = "";
 			Object.keys(json).forEach(function(key) {
 				var user = json[key];
 				if (user.avatar) {
 					var avatar = user.avatar;
 				} else {
 					var avatar = "../../img/loading.svg";
 				}
 				templete = templete + '<div class="" style="padding-top:5px;">' + '<div style="padding:0; margin:0; width:400px; max-width:100%; display:flex; align-items:flex-end;">' + '<div style="flex-basis:40px;"><a onclick="udgEx(\'' + user.user + "'," + acct_id + ');" user="' + user.user + '" class="udg">' + '<img src="' + avatar + '" width="40" class="prof-img" user="' + user.user + '"></a></div>' + '<div style="flex-grow:3; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"><big>' + escapeHTML(user.screen_name) + "</big></div>" + '<div class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"> @' + user.user + "@" + user.host + "</div>" + "</div>" + '<div class="divider"></div>' + "</div>" + "</div>";
 			});
 			$("#his-matching-list").css("height", $("#his-float-data").height() - $("#his-basic-prof").height() - $("#his-des").height() - $("#his-plus-action").height() + "px");
 			$("#his-matching-list-contents").html(templete);
 		});
 }
--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@@ -115,7 +115,7 @@ function udg(user, acct_id) {
 				$("#his-data").attr("remote", "false");
 				var fullname = json.acct + "@" + domain;
 			}
-			utl(json.id, "", acct_id);
+			utlShow(json.id, "", acct_id);
 			flw(json.id, "", acct_id);
 			fer(json.id, "", acct_id);
 			var dis_name = escapeHTML(json.display_name);
@@ -298,7 +298,7 @@ function misskeyUdg(user, acct_id) {
 				$("#his-data").attr("remote", "false");
 				var fullname = json.acct + "@" + domain;
 			}
-			utl(json.id, "", acct_id);
+			utlShow(json.id, "", acct_id);
 			flw(json.id, "", acct_id);
 			fer(json.id, "", acct_id);
 			if (json.name) {
--- a/app/main.js
+++ b/app/main.js
@@ -3,6 +3,10 @@ var dir = 'file://' + __dirname
 var base = dir + '/view/'
 // Electronのモジュール
 const electron = require('electron')
 // アプリケーションをコントロールするモジュール
 const app = electron.app
 // Electronの初期化完了後に実行
 app.on('ready', createWindow)
 const fs = require('fs')
 const language = require('./main/language.js')
 const css = require('./main/css.js')
@@ -12,9 +16,6 @@ const np = require('./main/np.js')
 const systemFunc = require('./main/system.js')
 const Menu = electron.Menu
 const join = require('path').join
 // アプリケーションをコントロールするモジュール
 const app = electron.app
 // ウィンドウを作成するモジュール
 const BrowserWindow = electron.BrowserWindow
 // メインウィンドウはGCされないようにグローバル宣言
@@ -36,60 +37,11 @@ if (!gotTheLock) {
 	})
 }
-if (process.argv.indexOf('--dev') === -1) {
+// 全てのウィンドウが閉じたら終了
-	var packaged = true
+app.on('window-all-closed', function () {
-} else {
+	electron.session.defaultSession.clearCache(() => {})
-	var packaged = false
+	app.quit()
-	console.log(
+})
 		'||\\\\\\ \n' +
 			'||||  \\\\\\\\ \n' +
 			'||||     \\\\\\\\ \n' +
 			'|||| Am I a \\\\\\\\ \n' +
 			'|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n' +
 			'||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n' +
 			"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
 			'|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/__ \\   < \n' +
 			'||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n' +
 			'||||          /////         \n' +
 			'||||       /////\n' +
 			'||||     /////\n' +
 			'||||//////'
 	)
 	console.log('If it does not show the window, you might forget `npm run construct`.')
 }
 var info_path = join(app.getPath('userData'), 'window-size.json')
 var max_info_path = join(app.getPath('userData'), 'max-window-size.json')
 var lang_path = join(app.getPath('userData'), 'language')
 var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
 var ua_path = join(app.getPath('userData'), 'useragent')
 var frame_path = join(app.getPath('userData'), 'frame')
 try {
 	fs.readFileSync(ha_path, 'utf8')
 	app.disableHardwareAcceleration()
 	if (!packaged) console.log('disabled: Hardware Acceleration')
 } catch {
 	if (!packaged) console.log('enabled: Hardware Acceleration')
 }
 var window_size
 try {
 	window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'))
 } catch (e) {
 	window_size = {
 		width: 1000,
 		height: 750
 	} // デフォルトバリュー
 }
 var max_window_size
 try {
 	max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'))
 } catch (e) {
 	max_window_size = {
 		width: 'string',
 		height: 'string',
 		x: 'string',
 		y: 'string'
 	} // デフォルトバリュー
 }
 function isFile(file) {
 	try {
 		fs.statSync(file)
@@ -98,24 +50,8 @@ function isFile(file) {
 		if (err.code === 'ENOENT') return false
 	}
 }
 try {
 	var frameRaw = fs.readFileSync(frame_path, 'utf8')
 	if(frameRaw == 'false') {
 		var frame = false
 		var frameTitle = 'hidden'
 	} else {
 		var frame = true
 		var frameTitle = 'default'
 	}
 } catch {
 	var frame = true
 }
 // 全てのウィンドウが閉じたら終了
 app.on('window-all-closed', function() {
 	electron.session.defaultSession.clearCache(() => {})
 	app.quit()
 })
 function createWindow() {
 	var lang_path = join(app.getPath('userData'), 'language')
 	if (isFile(lang_path)) {
 		var lang = fs.readFileSync(lang_path, 'utf8')
 	} else {
@@ -132,69 +68,130 @@ function createWindow() {
 		} else {
 			lang = 'en'
 		}
-		fs.mkdir(app.getPath('userData'), function(err) {
+		fs.mkdir(app.getPath('userData'), function (err) {
 			fs.writeFileSync(lang_path, lang)
 		})
 	}
 	if (!packaged) console.log('your lang:' + app.getLocale())
 	if (!packaged) console.log('launch:' + lang)
 	//Opening
 	const package = fs.readFileSync(__dirname + '/package.json')
 	if(lang == 'ja') {
 		const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json'))
 		var show = maxims[Math.floor(Math.random() * maxims.length)]
 	} else {
 		var show = 'TheDesk 2018'
 	}
 	const data = JSON.parse(package)
 	const version = data.version
 	const codename = data.codename
 	var openingWindow = new BrowserWindow({
 		width: 300,
 		height: 400,
 		transparent: false,
 		frame: false,
 		resizable: false,
 	})
 	openingWindow.loadURL(`${__dirname}/opening.html?ver=${version}&codename=${codename}&maxim=${encodeURI(show)}`)
 	if (process.argv.indexOf('--dev') === -1) {
 		var packaged = true
 	} else {
 		var packaged = false
 		console.log(
 			'||\\\\\\ \n' +
 				'||||  \\\\\\\\ \n' +
 				'||||     \\\\\\\\ \n' +
 				'|||| Am I a \\\\\\\\ \n' +
 				'|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n' +
 				'||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n' +
 				"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
 				'|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/__ \\   < \n' +
 				'||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n' +
 				'||||          /////         \n' +
 				'||||       /////\n' +
 				'||||     /////\n' +
 				'||||//////'
 		)
 		console.log('If it does not show the window, you might forget `npm run construct`.')
 	}
 	var info_path = join(app.getPath('userData'), 'window-size.json')
 	var max_info_path = join(app.getPath('userData'), 'max-window-size.json')
 	var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
 	var ua_path = join(app.getPath('userData'), 'useragent')
 	var frame_path = join(app.getPath('userData'), 'frame')
 	try {
 		fs.readFileSync(ha_path, 'utf8')
 		app.disableHardwareAcceleration()
 		if (!packaged) console.log('disabled: Hardware Acceleration')
 	} catch {
 		if (!packaged) console.log('enabled: Hardware Acceleration')
 	}
 	var window_size
 	try {
 		window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'))
 	} catch (e) {
 		window_size = {
 			width: 1000,
 			height: 750,
 		} // デフォルトバリュー
 	}
 	var max_window_size
 	try {
 		max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'))
 	} catch (e) {
 		max_window_size = {
 			width: 'string',
 			height: 'string',
 			x: 'string',
 			y: 'string',
 		} // デフォルトバリュー
 	}
 	try {
 		var frameRaw = fs.readFileSync(frame_path, 'utf8')
 		if (frameRaw == 'false') {
 			var frame = false
 			var frameTitle = 'hidden'
 		} else {
 			var frame = true
 			var frameTitle = 'default'
 		}
 	} catch {
 		var frame = true
 	}
 	// メイン画面の表示。ウィンドウの幅、高さを指定できる
 	var platform = process.platform
 	var bit = process.arch
 	var arg = {
 		webPreferences: {
 			webviewTag: true,
 			nodeIntegration: false,
 			contextIsolation: true,
 			preload: join(__dirname, 'js', 'platform', 'preload.js'),
 		},
 		width: window_size.width,
 		height: window_size.height,
 		x: window_size.x,
 		y: window_size.y,
 		show: false,
 		frame: frame,
 	}
 	if (platform == 'linux') {
-		var arg = {
+		arg.resizable = true
-			webPreferences: {
+		arg.icon = __dirname + '/desk.png'
 				webviewTag: true,
 				nodeIntegration: false,
 				contextIsolation: true,
 				preload: join(__dirname, 'js', 'platform', 'preload.js')
 			},
 			width: window_size.width,
 			height: window_size.height,
 			x: window_size.x,
 			y: window_size.y,
 			icon: __dirname + '/desk.png',
 			show: false,
 			frame: frame,
 			resizable: true
 		}
 	} else if (platform == 'win32') {
-		var arg = {
+		arg.simpleFullscreen = true
 			webPreferences: {
 				webviewTag: true,
 				nodeIntegration: false,
 				contextIsolation: true,
 				preload: join(__dirname, 'js', 'platform', 'preload.js')
 			},
 			width: window_size.width,
 			height: window_size.height,
 			x: window_size.x,
 			y: window_size.y,
 			simpleFullscreen: true,
 			show: false,
 			frame: frame
 		}
 	} else if (platform == 'darwin') {
-		var arg = {
+		arg.simpleFullscreen = true
-			webPreferences: {
+		arg.titleBarStyle = frameTitle
 				webviewTag: true,
 				nodeIntegration: false,
 				contextIsolation: true,
 				preload: join(__dirname, 'js', 'platform', 'preload.js')
 			},
 			width: window_size.width,
 			height: window_size.height,
 			x: window_size.x,
 			y: window_size.y,
 			simpleFullscreen: true,
 			show: false,
 			titleBarStyle: frameTitle,
 			frame: frame,
 		}
 	}
 	mainWindow = new BrowserWindow(arg)
 	mainWindow.once('page-title-updated', () => {
 		openingWindow.close()
 		mainWindow.show()
 		console.log('Accessibility: ' + app.accessibilitySupportEnabled)
 		if (window_size.max) {
 			mainWindow.maximize()
 		}
@@ -225,40 +222,35 @@ function createWindow() {
 		// Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) thedesk/18.11.3 Chrome/76.0.3809.146 Electron/6.0.12 Safari/537.36
 		const crypto = require('crypto')
 		const N = 100
-		var ua =
+		var ua = 'Mastodon client: ' + crypto.randomBytes(N).toString('base64').substring(0, N)
 			'Mastodon client: ' +
 			crypto
 				.randomBytes(N)
 				.toString('base64')
 				.substring(0, N)
 	}
 	mainWindow.loadURL(base + lang + '/index.html' + plus, { userAgent: ua })
 	if (!window_size.x && !window_size.y) {
 		mainWindow.center()
 	}
 	// ウィンドウが閉じられたらアプリも終了
-	mainWindow.on('closed', function() {
+	mainWindow.on('closed', function () {
 		electron.ipcMain.removeAllListeners()
 		mainWindow = null
 	})
 	closeArg = false
-	mainWindow.on('close', function(e, arg) {
+	mainWindow.on('close', function (e, arg) {
 		writePos(mainWindow)
 		if (!closeArg) {
 			e.preventDefault()
 		}
-		const promise = new Promise(function(resolve) {
+		const promise = new Promise(function (resolve) {
 			mainWindow.webContents.send('asReadEnd', '')
-			setTimeout(function() {
+			setTimeout(function () {
 				resolve()
 			}, 3000)
 		})
-		promise.then(function(response) {
+		promise.then(function (response) {
 			closeArg = true
 			mainWindow.close()
 		})
 	})
-	electron.ipcMain.on('sendMarkersComplete', function(e, arg) {
+	electron.ipcMain.on('sendMarkersComplete', function (e, arg) {
 		closeArg = true
 		mainWindow.close()
 	})
@@ -274,33 +266,31 @@ function createWindow() {
 				height: mainWindow.getBounds().height,
 				x: mainWindow.getBounds().x,
 				y: mainWindow.getBounds().y,
-				max: true
+				max: true,
 			}
 		} else {
 			var size = {
 				width: mainWindow.getBounds().width,
 				height: mainWindow.getBounds().height,
 				x: mainWindow.getBounds().x,
-				y: mainWindow.getBounds().y
+				y: mainWindow.getBounds().y,
 			}
 		}
 		fs.writeFileSync(info_path, JSON.stringify(size))
 	}
-	mainWindow.on('maximize', function() {
+	mainWindow.on('maximize', function () {
 		writePos(mainWindow)
 		fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()))
 	})
-	mainWindow.on('minimize', function() {
+	mainWindow.on('minimize', function () {
 		writePos(mainWindow)
 		mainWindow.webContents.send('asRead', '')
 	})
 	var platform = process.platform
 	var bit = process.arch
-	Menu.setApplicationMenu(
+	Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname, frame)))
-		Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir, dirname, frame))
+	if (!frame) {
 	)
 	if(!frame) {
 		mainWindow.setMenu(null)
 	}
 	//CSS
@@ -313,7 +303,7 @@ function createWindow() {
 	np.TheDeskNowPlaying(mainWindow)
 	//その他system
 	systemFunc.system(mainWindow, dir, lang, dirname)
-	setInterval(function() {
+	setInterval(function () {
 		mouseTrack(mainWindow)
 	}, 1000)
 }
@@ -339,10 +329,5 @@ function mouseTrack(mainWindow) {
 	x = xNow
 	y = yNow
 }
 // Electronの初期化完了後に実行
 app.on('ready', createWindow)
 var onError = function(err, response) {
 	console.error(err, response)
 }
 app.setAsDefaultProtocolClient('thedesk')
--- a/app/main/dl.js
+++ b/app/main/dl.js
@@ -24,10 +24,14 @@ function dl(mainWindow, lang_path, base, dirname) {
 				height: 400,
 				transparent: false, // ウィンドウの背景を透過
 				frame: false, // 枠の無いウィンドウ
-				resizable: false
+				resizable: false,
 				show: false
 			})
 			var lang = fs.readFileSync(lang_path, 'utf8')
 			updatewin.loadURL(base + lang + '/update.html')
 			updatewin.webContents.once('dom-ready', () => {
 				updatewin.show()
 			 })
 			return 'true'
 		} else {
 			return false
@@ -36,13 +40,13 @@ function dl(mainWindow, lang_path, base, dirname) {
 	//アプデDL
 	ipc.on('download-btn', async (e, args) => {
 		function dl(url, file, dir, e) {
-			e.sender.webContents.send('mess', 'ダウンロードを開始します。')
+			e.sender.webContents.send('mess', 'Start...')
 			const opts = {
 				directory: dir,
 				filename: file,
 				openFolderWhenDone: true,
 				onProgress: function(event) {
-					e.sender.webContents.send('prog', event)
+					e.sender.webContents.send('prog', [event, args[2]])
 				},
 				saveAs: false
 			}
@@ -91,6 +95,7 @@ function dl(mainWindow, lang_path, base, dirname) {
 		var name = ''
 		var platform = process.platform
 		var bit = process.arch
 		const filename = args[0].match(/https:\/\/.+\/(.+\..+)$/)
 		if (args[1] == '') {
 			if (platform == 'win32') {
 				var dir = app.getPath('home') + '\\Pictures\\TheDesk'
@@ -111,11 +116,21 @@ function dl(mainWindow, lang_path, base, dirname) {
 		}
 		download(BrowserWindow.getFocusedWindow(), args[0], opts)
 			.then(dl => {
-				event.sender.webContents.send('general-dl-message', dir)
+				if(filename[1]) {
 					if (platform == 'win32') {
 						var name = dir + '\\' + filename[1]
 					} else if (platform == 'linux' || platform == 'darwin') {
 						var name = dir + '/' + filename[1]
 					}
 				} else {
 					var name = dir
 				}
 				event.sender.webContents.send('general-dl-message', name)
 			})
 			.catch(console.error)
 	})
-	ipc.on('open-finder', (e, folder) => {
+	ipc.on('openFinder', (e, folder) => {
 		console.log(folder)
 		shell.showItemInFolder(folder)
 	})
 }
--- a/app/main/img.js
+++ b/app/main/img.js
@@ -6,38 +6,33 @@ function img(mainWindow, dir) {
 	var ipc = electron.ipcMain
 	const BrowserWindow = electron.BrowserWindow
 	ipc.on('file-select', (e, args) => {
-		dialog.showOpenDialog(
+		let fileNames = dialog.showOpenDialogSync(mainWindow, {
-			null,
+			properties: ['openFile', 'multiSelections'],
-			{
+			title: '添付ファイルを選択',
-				properties: ['openFile', 'multiSelections'],
+			defaultPath: '.',
-				title: '添付ファイルを選択',
+			filters: [
-				defaultPath: '.',
+				{
-				filters: [
+					name: 'メディアファイル',
-					{
+					extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm'],
-						name: 'メディアファイル',
+				},
-						extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm']
+				{ name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
-					},
+				{ name: '動画', extensions: ['mp4', 'webm'] },
-					{ name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
+				{ name: '全てのファイル', extensions: ['*'] },
-					{ name: '動画', extensions: ['mp4', 'webm'] },
+			],
-					{ name: '全てのファイル', extensions: ['*'] }
+		})
-				]
+		if (!fileNames) {
-			},
+			return false
-			fileNames => {
+		}
-				if (!fileNames) {
+		for (var i = 0; i < fileNames.length; i++) {
-					return false
+			var path = fileNames[i]
-				}
+			var bin = fs.readFileSync(path, 'base64')
-				for (var i = 0; i < fileNames.length; i++) {
+			e.sender.webContents.send('resizeJudgement', [bin, 'new'])
-					var path = fileNames[i]
+		}
 					var bin = fs.readFileSync(path, 'base64')
 					e.sender.webContents.send('resizeJudgement', [bin, 'new'])
 				}
 			}
 		)
 	})
 	ipc.on('bmp-image', (e, args) => {
-		Jimp.read(args[0], function(err, lenna) {
+		Jimp.read(args[0], function (err, lenna) {
 			if (err) throw err
-			lenna.getBase64(Jimp.MIME_PNG, function(err, src) {
+			lenna.getBase64(Jimp.MIME_PNG, function (err, src) {
 				e.sender.webContents.send('bmp-img-comp', [src, args[1]])
 			})
 		})
@@ -51,9 +46,9 @@ function img(mainWindow, dir) {
 		}
 		var b64 = args[0].replace(/^data:\w+\/\w+;base64,/, '')
 		var decodedFile = new Buffer(b64, 'base64')
-		Jimp.read(decodedFile, function(err, lenna) {
+		Jimp.read(decodedFile, function (err, lenna) {
 			if (err) throw err
-			lenna.scaleToFit(args[1], args[1]).getBase64(Jimp[use], function(err, src) {
+			lenna.scaleToFit(args[1], args[1]).getBase64(Jimp[use], function (err, src) {
 				e.sender.webContents.send('bmp-img-comp', [src, args[1]])
 			})
 		})
@@ -63,24 +58,24 @@ function img(mainWindow, dir) {
 		var b64 = args[0].replace(/^data:\w+\/\w+;base64,/, '')
 		var decodedFile = new Buffer(b64, 'base64')
 		console.log(text)
-		Jimp.read(decodedFile, function(err, image) {
+		Jimp.read(decodedFile, function (err, image) {
 			if (err) throw err
-			Jimp.loadFont(Jimp.FONT_SANS_16_BLACK).then(font => {
+			Jimp.loadFont(Jimp.FONT_SANS_16_BLACK).then((font) => {
 				var evWidth = Jimp.measureText(font, text)
 				var width = image.bitmap.width
 				var height = image.bitmap.height
 				var left = width - evWidth - 10
 				var top = height - 30
-                var color = Jimp.intToRGBA(image.getPixelColor(left, top))
+				var color = Jimp.intToRGBA(image.getPixelColor(left, top))
-                console.log(left, top, color)
+				console.log(left, top, color)
 				var ave = (color.r + color.g + color.b) / 3
 				if (ave > 128) {
-					image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function(err, src) {
+					image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function (err, src) {
 						e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
 					})
 				} else {
-					Jimp.loadFont(Jimp.FONT_SANS_16_WHITE).then(font => {
+					Jimp.loadFont(Jimp.FONT_SANS_16_WHITE).then((font) => {
-						image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function(err, src) {
+						image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function (err, src) {
 							e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
 						})
 					})
--- a/app/main/system.js
+++ b/app/main/system.js
@@ -1,309 +1,303 @@
 function system(mainWindow, dir, lang, dirname) {
-	const electron = require("electron");
+	const electron = require('electron')
-	const app = electron.app;
+	const app = electron.app
-	const join = require("path").join;
+	const join = require('path').join
-	var Jimp = require("jimp");
+	var Jimp = require('jimp')
-	const fs = require("fs");
+	const fs = require('fs')
-	var JSON5 = require("json5");
+	var JSON5 = require('json5')
-	var ipc = electron.ipcMain;
+	var ipc = electron.ipcMain
-	const clipboard = electron.clipboard;
+	const clipboard = electron.clipboard
-	var tmp_img = join(app.getPath("userData"), "tmp.png");
+	var tmp_img = join(app.getPath('userData'), 'tmp.png')
-	var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
+	var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
-	var ua_path = join(app.getPath("userData"), "useragent");
+	var ua_path = join(app.getPath('userData'), 'useragent')
-	var lang_path = join(app.getPath("userData"), "language");
+	var lang_path = join(app.getPath('userData'), 'language')
-	var log_dir_path = join(app.getPath("userData"), "logs");
+	var log_dir_path = join(app.getPath('userData'), 'logs')
-	var frame_path = join(app.getPath("userData"), "frame");
+	var frame_path = join(app.getPath('userData'), 'frame')
 	//ログ
-	var today = new Date();
+	var today = new Date()
 	//今日のやつ
-	var todayStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
+	var todayStr = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate() + '.log'
 	//昨日のやつ
-	today.setDate(today.getDate() - 1);
+	today.setDate(today.getDate() - 1)
-	var yestStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
+	var yestStr = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate() + '.log'
 	//一昨日のやつ
-	today.setDate(today.getDate() - 1);
+	today.setDate(today.getDate() - 1)
-	var yest2Str = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
+	var yest2Str = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate() + '.log'
-	const BrowserWindow = electron.BrowserWindow;
+	const BrowserWindow = electron.BrowserWindow
-	const dialog = electron.dialog;
+	const dialog = electron.dialog
-	const os = require("os");
+	const os = require('os')
-	const language = require("../main/language.js");
+	const language = require('../main/language.js')
 	//プラットフォーム
-	ipc.on("getPlatform", function(e, arg) {
+	ipc.on('getPlatform', function (e, arg) {
 		try {
-			var gitHash = fs.readFileSync("git", "utf8");
+			var gitHash = fs.readFileSync('git', 'utf8')
 		} catch {
-			var gitHash = null;
+			var gitHash = null
 		}
-		e.sender.webContents.send("platform", [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron, gitHash]);
+		e.sender.webContents.send('platform', [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron, gitHash])
-	});
+	})
 	//言語
-	ipc.on("lang", function(e, arg) {
+	ipc.on('lang', function (e, arg) {
-		console.log("set:" + arg);
+		console.log('set:' + arg)
-		fs.writeFileSync(lang_path, arg);
+		fs.writeFileSync(lang_path, arg)
-		e.sender.webContents.send("langres", arg);
+		e.sender.webContents.send('langres', arg)
-	});
+	})
 	//エクスポートのダイアログ
-	ipc.on("exportSettings", function(e, args) {
+	ipc.on('exportSettings', function (e, args) {
-		dialog.showSaveDialog(
+		let savedFiles = dialog.showSaveDialogSync(mainWindow, {
-			mainWindow,
+			title: 'Export',
-			{
+			properties: ['openFile', 'createDirectory'],
-				title: "Export",
+			defaultPath: 'export.thedeskconfig.json5',
-				properties: ["openFile", "createDirectory"],
+		})
-				defaultPath: "export.thedeskconfig.json5"
+		if (!savedFiles) {
-			},
+			return false
-			savedFiles => {
+		}
-				if (!savedFiles) {
+		e.sender.webContents.send('exportSettingsFile', savedFiles)
-					return false;
+	})
 				}
 				e.sender.webContents.send("exportSettingsFile", savedFiles);
 			}
 		);
 	});
 	//インポートのダイアログ
-	ipc.on("importSettings", function(e, args) {
+	ipc.on('importSettings', function (e, args) {
-		dialog.showOpenDialog(
+		let fileNames = dialog.showOpenDialogSync(mainWindow, {
-			mainWindow,
+			title: 'Import',
-			{
+			properties: ['openFile'],
-				title: "Import",
+			filters: [{ name: 'TheDesk Config', extensions: ['thedeskconfig', 'thedeskconfigv2', 'json5'] }],
-				properties: ["openFile"],
+		})
-				filters: [{ name: "TheDesk Config", extensions: ["thedeskconfig", "thedeskconfigv2", "json5"] }]
+		console.log('imported from: ', fileNames)
-			},
+		if (!fileNames) {
-			fileNames => {
+			return false
-				console.log("imported from: ", fileNames)
+		}
-				if (!fileNames) {
+		e.sender.webContents.send('config', JSON5.parse(fs.readFileSync(fileNames[0], 'utf8')))
-					return false;
+	})
 				}
 				e.sender.webContents.send("config", JSON5.parse(fs.readFileSync(fileNames[0], "utf8")));
 			}
 		);
 	});
 	//保存フォルダのダイアログ
-	ipc.on("savefolder", function(e, args) {
+	ipc.on('savefolder', function (e, args) {
-		dialog.showOpenDialog(
+		let fileNames = dialog.showOpenDialogSync(
 			mainWindow,
 			{
-				title: "Save folder",
+				title: 'Save folder',
-				properties: ["openDirectory"]
+				properties: ['openDirectory'],
 			},
 			fileNames => {
 				e.sender.webContents.send("savefolder", fileNames[0]);
 			}
-		);
+		)
-	});
+		e.sender.webContents.send('savefolder', fileNames[0])
 	})
 	//カスタムサウンドのダイアログ
-	ipc.on("customSound", function(e, arg) {
+	ipc.on('customSound', function (e, arg) {
-		dialog.showOpenDialog(
+		let fileNames = dialog.showOpenDialogSync(
 			mainWindow,
 			{
-				title: "Custom sound",
+				title: 'Custom sound',
-				properties: ["openFile"],
+				properties: ['openFile'],
-				filters: [{ name: "Audio", extensions: ["mp3", "aac", "wav", "flac", "m4a"] }, { name: "All", extensions: ["*"] }]
+				filters: [
-			},
+					{ name: 'Audio', extensions: ['mp3', 'aac', 'wav', 'flac', 'm4a'] },
-			fileNames => {
+					{ name: 'All', extensions: ['*'] },
-				e.sender.webContents.send("customSoundRender", [arg, fileNames[0]]);
+				],
 			}
-		);
+		)
-	});
+		e.sender.webContents.send('customSoundRender', [arg, fileNames[0]])
 	})
 	//ハードウェアアクセラレーションの無効化
-	ipc.on("ha", function(e, arg) {
+	ipc.on('ha', function (e, arg) {
-		if (arg == "true") {
+		if (arg == 'true') {
-			fs.writeFileSync(ha_path, arg);
+			fs.writeFileSync(ha_path, arg)
 		} else {
-			fs.unlink(ha_path, function(err) {});
+			fs.unlink(ha_path, function (err) {})
 		}
-		app.relaunch();
+		app.relaunch()
-		app.exit();
+		app.exit()
-	});
+	})
 	//ユーザーエージェント
-	ipc.on("ua", function(e, arg) {
+	ipc.on('ua', function (e, arg) {
-		if (arg == "") {
+		if (arg == '') {
-			fs.unlink(ua_path, function(err) {});
+			fs.unlink(ua_path, function (err) {})
 		} else {
-			fs.writeFileSync(ua_path, arg);
+			fs.writeFileSync(ua_path, arg)
 		}
-		app.relaunch();
+		app.relaunch()
-		app.exit();
+		app.exit()
-	});
+	})
 	//フレームのありなし
-	ipc.on("frameSet", function(e, arg) {
+	ipc.on('frameSet', function (e, arg) {
-		fs.writeFileSync(frame_path, arg);
+		fs.writeFileSync(frame_path, arg)
-		app.relaunch();
+		app.relaunch()
-		app.exit();
+		app.exit()
-	});
+	})
-
+	//スクリーンリーダー
-	ipc.on("quit", (e, args) => {
+	ipc.on('acsCheck', function (e, arg) {
-		app.quit();
+		if (app.accessibilitySupportEnabled) {
-	});
+			mainWindow.webContents.send('accessibility', 'true')
-	ipc.on("about", (e, args) => {
+		}
-		about();
+	})
-	});
+	ipc.on('quit', (e, args) => {
 		app.quit()
 	})
 	ipc.on('about', (e, args) => {
 		about()
 	})
 	function about() {
-		var ver = app.getVersion();
+		var ver = app.getVersion()
 		var window = new BrowserWindow({
 			webPreferences: {
 				webviewTag: false,
 				nodeIntegration: false,
 				contextIsolation: true,
-				preload: join(dirname, "js", "platform", "preload.js")
+				preload: join(dirname, 'js', 'platform', 'preload.js'),
 			},
 			width: 300,
 			height: 500,
 			transparent: false, // ウィンドウの背景を透過
 			frame: false, // 枠の無いウィンドウ
-			resizable: false
+			resizable: false,
-		});
+		})
-		window.loadURL(dir + "/about.html?ver=" + ver);
+		window.loadURL(dir + '/about.html?ver=' + ver)
-		return "true";
+		return 'true'
 	}
-	ipc.on("nano", function(e, x, y) {
+	ipc.on('nano', function (e, x, y) {
-		var nano_info_path = join(app.getPath("userData"), "nano-window-position.json");
+		var nano_info_path = join(app.getPath('userData'), 'nano-window-position.json')
-		var window_pos;
+		var window_pos
 		try {
-			window_pos = JSON.parse(fs.readFileSync(nano_info_path, "utf8"));
+			window_pos = JSON.parse(fs.readFileSync(nano_info_path, 'utf8'))
 		} catch (e) {
-			window_pos = [0, 0]; // デフォルトバリュー
+			window_pos = [0, 0] // デフォルトバリュー
 		}
 		var nanowindow = new BrowserWindow({
 			webPreferences: {
 				webviewTag: false,
 				nodeIntegration: false,
 				contextIsolation: true,
-				preload: join(dirname, "js", "platform", "preload.js")
+				preload: join(dirname, 'js', 'platform', 'preload.js'),
 			},
 			width: 350,
 			height: 140,
 			transparent: false, // ウィンドウの背景を透過
 			frame: false, // 枠の無いウィンドウ
-			resizable: false
+			resizable: false,
-		});
+		})
-		nanowindow.loadURL(dir + "/nano.html");
+		nanowindow.loadURL(dir + '/nano.html')
-		nanowindow.setAlwaysOnTop(true);
+		nanowindow.setAlwaysOnTop(true)
 		//nanowindow.toggleDevTools()
-		nanowindow.setPosition(window_pos[0], window_pos[1]);
+		nanowindow.setPosition(window_pos[0], window_pos[1])
-		nanowindow.on("close", function() {
+		nanowindow.on('close', function () {
-			fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()));
+			fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()))
-		});
+		})
-		return true;
+		return true
-	});
+	})
-	var cbTimer1;
+	var cbTimer1
-	ipc.on("startmem", (e, arg) => {
+	ipc.on('startmem', (e, arg) => {
-		event = e.sender;
+		event = e.sender
-		cbTimer1 = setInterval(mems, 1000);
+		cbTimer1 = setInterval(mems, 1000)
-	});
+	})
 	function mems() {
-		var mem = os.totalmem() - os.freemem();
+		var mem = os.totalmem() - os.freemem()
 		if (mainWindow) {
-			event.webContents.send("memory", [mem, os.cpus()[0].model, os.totalmem()]);
+			event.webContents.send('memory', [mem, os.cpus()[0].model, os.totalmem()])
 		}
 	}
-	ipc.on("endmem", (e, arg) => {
+	ipc.on('endmem', (e, arg) => {
 		if (cbTimer1) {
-			clearInterval(cbTimer1);
+			clearInterval(cbTimer1)
 		}
-	});
+	})
-	ipc.on("export", (e, args) => {
+	ipc.on('export', (e, args) => {
-		fs.writeFileSync(args[0], JSON5.stringify(args[1]));
+		fs.writeFileSync(args[0], JSON5.stringify(args[1]))
-		e.sender.webContents.send("exportAllComplete", "");
+		e.sender.webContents.send('exportAllComplete', '')
-	});
+	})
 	//フォント
 	function object_array_sort(data, key, order, fn) {
 		//デフォは降順(DESC)
-		var num_a = -1;
+		var num_a = -1
-		var num_b = 1;
+		var num_b = 1
-		if (order === "asc") {
+		if (order === 'asc') {
 			//指定があれば昇順(ASC)
-			num_a = 1;
+			num_a = 1
-			num_b = -1;
+			num_b = -1
 		}
-		data = data.sort(function(a, b) {
+		data = data.sort(function (a, b) {
-			var x = a[key];
+			var x = a[key]
-			var y = b[key];
+			var y = b[key]
-			if (x > y) return num_a;
+			if (x > y) return num_a
-			if (x < y) return num_b;
+			if (x < y) return num_b
-			return 0;
+			return 0
-		});
+		})
 		//重複排除
-		var arrObj = {};
+		var arrObj = {}
 		for (var i = 0; i < data.length; i++) {
-			arrObj[data[i]["family"]] = data[i];
+			arrObj[data[i]['family']] = data[i]
 		}
-		data = [];
+		data = []
 		for (var key in arrObj) {
-			data.push(arrObj[key]);
+			data.push(arrObj[key])
 		}
-		fn(data); // ソート後の配列を返す
+		fn(data) // ソート後の配列を返す
 	}
-	ipc.on("fonts", (e, arg) => {
+	ipc.on('fonts', (e, arg) => {
-		var SystemFonts = require('system-font-families').default;
+		var SystemFonts = require('system-font-families').default
-		var fm = new SystemFonts();
+		var fm = new SystemFonts()
-		const fontList = fm.getFontsSync();
+		const fontList = fm.getFontsSync()
-		e.sender.webContents.send("font-list", fontList);
+		e.sender.webContents.send('font-list', fontList)
-	});
+	})
 	//コピー
-	ipc.on("copy", (e, arg) => {
+	ipc.on('copy', (e, arg) => {
-		clipboard.writeText(arg);
+		clipboard.writeText(arg)
-	});
+	})
 	//ログ
-	ipc.on("log", (e, arg) => {
+	ipc.on('log', (e, arg) => {
-		var today = new Date();
+		var today = new Date()
-		var todayStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate();
+		var todayStr = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate()
-		var log_path = join(log_dir_path, todayStr + ".log");
+		var log_path = join(log_dir_path, todayStr + '.log')
-		fs.appendFile(log_path, "\n" + arg, function(err) {
+		fs.appendFile(log_path, '\n' + arg, function (err) {
 			if (err) {
-				throw err;
+				throw err
 			}
-		});
+		})
-	});
+	})
-	ipc.on("getLogs", (e, arg) => {
+	ipc.on('getLogs', (e, arg) => {
-		var logs=""
+		var logs = ''
-		var todayLog=""
+		var todayLog = ''
-		var yestLog=""
+		var yestLog = ''
-		var yest2Log=""
+		var yest2Log = ''
-		fs.readdir(log_dir_path, function(err, files) {
+		fs.readdir(log_dir_path, function (err, files) {
-			if (err) throw err;
+			if (err) throw err
-			files.filter(function(file) {
+			files.filter(function (file) {
 				if (file == todayStr) {
-					todayLog=fs.readFileSync(join(log_dir_path, file), "utf8")
+					todayLog = fs.readFileSync(join(log_dir_path, file), 'utf8')
 				}
 				if (file == yestStr) {
-					yestLog=logs+fs.readFileSync(join(log_dir_path, file), "utf8")
+					yestLog = logs + fs.readFileSync(join(log_dir_path, file), 'utf8')
 				}
 				if (file == yest2Str) {
-					yest2Log=fs.readFileSync(join(log_dir_path, file), "utf8")
+					yest2Log = fs.readFileSync(join(log_dir_path, file), 'utf8')
 				}
-				logs = todayLog + yestLog + yest2Log;
+				logs = todayLog + yestLog + yest2Log
-			});
+			})
-			logs = yest2Log + yestLog + todayLog;
+			logs = yest2Log + yestLog + todayLog
-			e.sender.webContents.send("logData", logs);
+			e.sender.webContents.send('logData', logs)
-		});
+		})
-	});
+	})
-	
+
 	//起動時ログディレクトリ存在確認と作成、古ログ削除
-	fs.access(log_dir_path, fs.constants.R_OK | fs.constants.W_OK, error => {
+	fs.access(log_dir_path, fs.constants.R_OK | fs.constants.W_OK, (error) => {
 		if (error) {
-			if (error.code === "ENOENT") {
+			if (error.code === 'ENOENT') {
-				fs.mkdirSync(log_dir_path);
+				fs.mkdirSync(log_dir_path)
 			} else {
-				return;
+				return
 			}
 		} else {
-			fs.readdir(log_dir_path, function(err, files) {
+			fs.readdir(log_dir_path, function (err, files) {
-				if (err) throw err;
+				if (err) throw err
-				files.filter(function(file) {
+				files.filter(function (file) {
 					if (file != todayStr && file != yestStr && file != yest2Str) {
-						fs.unlinkSync(join(log_dir_path, file));
+						fs.unlinkSync(join(log_dir_path, file))
 					}
-				});
+				})
-			});
+			})
 		}
-	});
+	})
 }
-exports.system = system;
+exports.system = system
--- a/app/maxim.ja.json
+++ b/app/maxim.ja.json
@@ -0,0 +1,48 @@
 [
    "TheDeskは自称ステイホームの必須アイテム",
    "あと数秒でPCのファンが全力で回り始める",
    "カラムの数だけ夢があるがネットワークは逼迫する",
    "朝起きたらストリーミングが止まっていた…",
    "誰も使ってない機能1: 未読管理",
    "誰も使ってない機能2: スタンプ機能",
    "誰も使ってない機能3: コードセットアップをオフにしたログイン",
    "誰も使ってない機能4: TheDesk上でのプロフィール更新",
    "誰も使ってない機能5: フォローレコメンデーション",
    "TheDeskは重い(ダブルミーニング)",
    "今日も生茶が美味しい(4ケース96本の在庫)",
    "jQueryは死すべき(流れ弾)",
    "なんでTheDeskのバージョン19は無いの？",
    "デレマス要素なくない？",
    "今日も「TheDesk」でエゴサが捗る",
    "開発者はTheDeskのヘビーユーザではない",
    "アイコンは猫だが開発者は犬派",
    "#TheDeskのアイコンは猫虐待",
    "上のアニメーションからしてこの猫は完全に仮想化されている",
    "TheDeskの歴史は2016年まで遡ることができる",
    "WIP: Croudia, ネコ型SNS",
    "リリース間隔は平均1桁日(昔1日に6回アプデを提供したせい)",
    "node_modulesをignoreせずに上げてしまったせいでCode Frequencyが破壊された",
    "TheDesk XSS Hunt をしなければならない()",
    "毎月出る支援お願いしますダイアログで月初めを知る人 #いろいろな人",
    "Integrated TLは目玉機能なので消せないが消せるものなら消したいくらい内部構造がヤバい",
    "「アンケート」か「投票」か。「時間指定投稿」か「予約投稿」か",
    "実装当初は言語を「関西弁」にするとお問い合わせフォームまで関西弁だった",
    "Ctrl+Kでメニューが出ます",
    "検索ボックスは入力後Enterで確定できる",
    "開発者の推しカラーテーマはPolar Night",
    "TheDeskのユーザーエージェントは毎回起動時に変わります。TheDeskと確定させることはできません",
    "AppData/Roaming/TheDesk(Windows)の中にcutsom.cssを入れるとカスタムCSSを導入できます",
    "環境設定の「ウィンドウフレーム」は「オフ」がおすすめ",
    "各トゥートの右上の時刻表示を押すとトゥートのリンクがコピーされます",
    "各トゥートの左下の公開範囲のアイコンを押すとそのトゥートの本文がコピーされますが挙動にバグがあります",
    "TheDeskをMisskeyクライアントだと思って使ってはいけません",
    "この迷文を追加したい場合はapp/maxim.ja.jsonを編集",
    "本当はTheDesk 21.0.0(Mayu)専用のアイコンを用意していた",
    "TheDesk 20.x.xと21.x.xではアイコンがちょっと違う",
    "三大見てはいけないもの: TheDeskのコード、TheDeskのDevTool console、あと一つは？",
    "この画面がずっと出続けているのは多分yarn construct忘れてる",
    "たまにここに何も出ないことがあるけど、なんでかはわからない",
    "Kawaii->Mayu(今ここ)->Koume->Chieri->Anastasia->Aiko",
    "言語設定を日本語以外にするとこの表示はどうなると思う？",
    "今日も使ってくれてありがとう。利用者カウンターがキリ番ならご報告を"
 ]
--- a/app/nano.html
+++ b/app/nano.html
@@ -128,7 +128,7 @@
 			</select>
 		</div>
 		<button onclick="set()" id="setting">Setting</button>
-		<textarea id="textarea" style="width:55%; background-color:transparent" placeholder="Post someyhing new"></textarea>
+		<textarea id="textarea" style="width:55%; background-color:transparent" placeholder="Post something new"></textarea>
 		<button class="btn" onclick="post()">Post</button>
 		<button onclick="window.close()">x</button><br />
 		<div id="timeline_nano">Click "settings" to show TL</div>
--- a/app/opening.html
+++ b/app/opening.html
@@ -0,0 +1,96 @@
 <!DOCTYPE html>
 <html lang="ja">
 	<head>
 		<title>TheDesk</title>
 		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
 		<meta charset="utf-8" />
 		<style>
 			@font-face {
 				font-family: 'Open Sans';
 				font-style: normal;
 				font-weight: 300;
 				src: local('Open Sans Light'), local('OpenSans-Light'), url('./fonts/OpenSans-Light.ttf') format('truetype');
 			}
 			body {
 				font-family: 'Open Sans';
 				-webkit-app-region: drag;
 				cursor: move;
 				padding: 5px;
 				padding-top: 15px;
 				background-color: #222222;
 				color: white;
 				text-align: center;
 			}
 			.loading {
 				animation: throbber-loader 1000ms 300ms infinite ease-out;
 				background: #3d3d3d;
 				display: inline-block;
 				position: relative;
 				text-indent: -9999px;
 				width: 0.9em;
 				height: 0.9em;
 				margin: 0 .9em;
 			}
 			.loading:before,
 			.loading:after {
 				background: #3d3d3d;
 				content: '\x200B';
 				display: inline-block;
 				width: 0.9em;
 				height: 0.9em;
 				position: absolute;
 				top: 0;
 			}
 			.loading:before {
 				animation: throbber-loader 1000ms 150ms infinite ease-out;
 				left: -1.9em;
 			}
 			.loading:after {
 				animation: throbber-loader 1000ms 450ms infinite ease-out;
 				right: -1.9em;
 			}
 			@keyframes throbber-loader {
 				0% {
 					background: #3d3d3d;
 				}
 				10% {
 					background: #6b9dc8;
 				}
 				40% {
 					background: #3d3d3d;
 				}
 			}
 			a,
 			button {
 				-webkit-app-region: no-drag;
 			}
 			h1 {
 				margin: 0;
            }
            #maxim {
                font-size: 0.7rem;
            }
 		</style>
 	</head>
 	<body class="center" style="overflow: hidden;">
 		<img src="./img/desk-animation.svg" style="max-width: 62%;" />
 		<h1>TheDesk</h1>
 		<span id="ver"></span><br />
 		<span class="loading"></span><br />
 		<div class="cp">
 			<span id="maxim"></span><br />
 			<script>
 				if (location.search) {
 					var m = location.search.match(/\?ver=([0-9.]+)&codename=([a-zA-Z]+)&maxim=(.+)/)
 					var ver = m[1]
 					var code = m[2]
 					var maxim = m[3]
 					document.getElementById('ver').innerText = `${ver}(${code})`
 					document.getElementById('maxim').innerText = `${decodeURI(maxim)}`
 				}
 			</script>
 		</div>
 	</body>
 </html>
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,7 @@
 {
  "name": "thedesk",
-  "version": "20.3.0",
+  "version": "21.0.1",
  "codename": "Mayu",
  "description": "TheDesk is a Mastodon client for PC.",
  "repository": "https://github.com/cutls/TheDesk",
  "main": "main.js",
@@ -54,24 +55,24 @@
    "@fortawesome/fontawesome-free": "^5.13.0",
    "custom-electron-titlebar": "^3.2.2-hotfix62",
    "electron-dl": "^3.0.0",
-    "jimp": "^0.10.1",
+    "jimp": "^0.10.3",
-    "jquery": "^3.4.1",
+    "jquery": "^3.5.0",
    "jquery-ui-dist": "^1.12.1",
    "json5": "^2.1.3",
    "lodash": "^4.17.15",
    "materialize-css": "git://github.com/cutls/materialize#v1-dev",
    "sumchecker": "^3.0.1",
-    "sweetalert2": "^9.10.9",
+    "sweetalert2": "^9.10.12",
    "system-font-families": "^0.4.1",
    "vue": "^2.6.11"
  },
  "optionalDependencies": {
-    "itunes-nowplaying-mac": "git://github.com/cutls/itunes-nowplaying-mac"
+    "itunes-nowplaying-mac": "0.3.1"
  },
  "devDependencies": {
    "chokidar": "^3.3.1",
-    "electron": "^8.0.0",
+    "electron": "^8.2.3",
-    "electron-builder": "^22.4.1",
+    "electron-builder": "^22.5.1",
    "electron-rebuild": "^1.10.1",
    "readline-sync": "1.4.10"
  },
@@ -123,8 +124,8 @@
      ]
    },
    "electronDownload": {
-      "version": "6.0.0"
+      "version": "8.0.0"
    },
-    "electronVersion": "6.0.0"
+    "electronVersion": "8.0.0"
  }
 }
--- a/app/source/version.json
+++ b/app/source/version.json
@@ -1,5 +1,15 @@
 {
  "latest":[],
  "3.1.3": [],
  "3.1.2": [],
  "3.1.1": [],
  "3.1.0": [
    "ブックマーク機能",
    "お知らせ機能",
    "プロフィールをワードフィルターする",
    "フォローリクエストが通知に表示される"
  ],
  "3.0.1": [],
  "3.0.0": [
    "プロフィールディレクトリの表示",
    "ホワイトリスト式のトレンドタグ(3.0の機能)",
--- a/app/view/make/acct.sample.html
+++ b/app/view/make/acct.sample.html
@@ -29,7 +29,7 @@
 		@@pwa@@
 	</head>
-	<body id="mainView">
+	<body id="mainView" class="@@pwaClass@@">
 		<script type="text/javascript" src="../../@@node_base@@/jquery/dist/jquery.js"></script>
 		<script type="text/javascript" src="../../js/platform/first.js"></script>
 		<script
@@ -59,21 +59,24 @@
 			<div id="add">
 				<div class="row">
 					<div class="col s8">
 						@@addAcct@@<br />
 						<input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp" />
 						<div id="ins-suggest"></div>
-						@@codesetupwarn@@<br />
+						<button class="btn waves-effect" onclick="instance()">Login</button><br />
-						<label>
+						<div class="pwa">
-							<input type="checkbox" class="filled-in" id="linux" />
+							@@codesetupwarn@@<br />
-							<span>@@codesetup@@</span>
+							<label>
-						</label>
+								<input type="checkbox" class="filled-in" id="linux" />
-						<br />
+								<span>@@codesetup@@</span>
 							</label>
 							<br />
 						</div>
 						<label>
 							<input type="checkbox" class="filled-in" id="misskey" />
 							<span>@@thisismisskey@@</span> </label
 						><br />
 						<button class="btn waves-effect" onclick="instance()">Login</button><br />
 					</div>
-					<div class="col s4">
+					<div class="col s4 scr" aria-hidden="true">
 						<span style="font-family:Open Sans;">Supports</span>
 						<div id="support" class="collection transparent"></div>
 					</div>
@@ -85,7 +88,7 @@
 				<button class="btn waves-effect" onclick="code()">Auth</button><br />
 				<br />
 				<a onclick="atSetup()" class="pointer">@@accessTokenSetup@@</a>
-				<div id="compt" style="display:none">
+				<div id="compt" style="display:none" class="scr">
 					<h5>ログイン前に必ずご確認ください</h5>
 					<span id="compt-instance"></span>はバージョンが<span id="compt-ver"></span
 					>のため以下の機能がご利用いただけません。
@@ -143,5 +146,6 @@
 		<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>
 	</body>
 </html>
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -34,7 +34,7 @@
 		@@comment-end@@ @@pwa@@
 	</head>
-	<body>
+	<body class="@@pwaClass@@">
 		<script>
 			var ver = '@@versionLetter@@'
 			var gitHash = '@@gitHash@@'
@@ -62,7 +62,7 @@
 		<div id="tl">
 			<!--TL-->
 			<!--スターター-->
-			<div id="start">
+			<div id="start" class="scr">
 				<div id="start-content">
 					<h3 class="center">@@demoBottomBtns@@</h3>
 					@@lookAtBottom@@
@@ -356,7 +356,7 @@
 							<a class="waves-effect gray" id="cw" onclick="cw()" title="@@cwDes@@">CW</a>
 							<span
 								><span id="imgup"></span
-								><span id="imgsel"
+								><span id="imgsel" class="pwa"
 									><i
 										class="waves-effect material-icons gray"
 										onclick="fileselect()"
@@ -389,7 +389,7 @@
 							<span class=" sml mize"
 								><span>@@replyMode@@</span>: <span id="rec">@@no@@</span>/<span>@@temp@@</span>:
 								<span id="mec">@@nothing@@</span>
-								<a onclick="stamp()" class="pointer" title="@@stampWarn@@"
+								<a onclick="stamp()" class="pointer pwa" title="@@stampWarn@@"
 									>@@stamp@@: <span id="stamp">Off</span></a
 								>
 								/@@poll@@:<span id="pollsta">@@no@@</span>
@@ -442,10 +442,13 @@
 					<!-- その他 Dropdown Structure -->
 					<ul id="dropdown2" class="dropdown-content">
 						<li>
-							<a onclick="nowplaying('spotify');">@@NPSpotify@@</a>
+							<a onclick="nowplaying('spotify');">NowPlaying (Spotify)</a>
 						</li>
 						<li class="mac">
 							<a onclick="nowplaying('itunes');">NowPlaying (iTunes macOS)</a>
 						</li>
 						<li>
-							<a onclick="nowplaying('itunes');">@@NPiTunes@@</a>
+							<a onclick="nowplaying('lastFm');">NowPlaying (Last.fm)</a>
 						</li>
 						<li>
 							<a onclick="schedule();">@@schedule@@</a>
@@ -889,19 +892,21 @@
 											><i class="material-icons">account_box</i>@@operateOtherAcct@@</a
 										>
 									</li>
 									<li class="anc-link" go="#his-matching-list">
 										<a href="#" title="@@likeUserDes@@"
 											><i class="material-icons">group_work</i>User Matching</a
 										>
 									</li>
 								</ul>
 							</div>
 							<div id="his-tl" class="his-var-content">
 								<button
 									class="btn waves-effect grey"
 									style="width:100%; padding:0;"
 									onclick="utlAdd()"
 								>
 									@@utlColumn@@
 								</button>
 								<div id="his-tl-contents" class="cont-series"></div>
 								<button
 									class="btn waves-effect "
 									style="width:100%; padding:0;"
-									onclick="utl('--now','more')"
+									onclick="utlShow('--now','more')"
 								>
 									@@more@@
 								</button>
@@ -1037,19 +1042,6 @@
 							<div id="his-follow-recom-list" class="his-var-content">
 								<div id="his-follow-recom-contents" class="cont-series"></div>
 							</div>
 							<div id="his-matching-list" class="his-var-content">
 								@@likeUserDes@@<br />
 								Powered by <a href="https://distsn.org/" target="_blank">Mastodon User Matching</a
 								><br />
 								<div id="his-matching-list-contents" class="cont-series"></div>
 								<button
 									class="btn waves-effect "
 									onclick="showMat()"
 									style="width:100%; padding:0;"
 								>
 									@@get@@
 								</button>
 							</div>
 							<div id="his-float-blocked">
 								<div>@@blocked@@</div>
 							</div>
@@ -1183,26 +1175,35 @@
 			<button onclick="$('#askjp_jp_ua').addClass('hide')" class="btn waves-effect">閉じる</button>
 		</div>
 		<!-- Modal Structure Release Note-->
-		<div id="releasenote" class="modal modal-fixed-footer">
+		<div id="releasenote" class="modal modal-fixed-footer scr">
 			<div class="modal-content">
 				<h3>TheDesk</h3>
 				<a href="https://thedesk.top" target="_blank">HP</a><br />
 				<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br />
 				<br />
-				<div id="release-20-3-0_Kawaii" class="release-do" style="display:none; ">
+				<div id="release-21-0-1_Mayu" class="release-do" style="display:none; ">
 					<br />
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br />
 					Pixiv
 					FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br />
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note 20.3.0 (Kawaii)</h5>
+					<h5>Release Note 21.0.1 (Mayu)</h5>
-					・フレームレスの時、タイトルバーがmacOSで表示されてなかった  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://camo.githubusercontent.com/b1d23096a6a73ac5a67cdc4bbd00568d4f2641ce/68747470733a2f2f6d656469612e7468656465736b2e746f702f6163636f756e74732f617661746172732f3030302f3030302f3030312f6f726967696e616c2f643334656638626234396435653031312e706e67">cutls</a><br>
+					・画像がアップロードできない  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a> <a onclick="udgEx('popn_ja@popon.pptdn.jp','main')" class="contributor"><img src="https://avatars3.githubusercontent.com/u/24523508?s=88&v=4">kaias1jp</a><br>
-					・CWのトグル  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://camo.githubusercontent.com/b1d23096a6a73ac5a67cdc4bbd00568d4f2641ce/68747470733a2f2f6d656469612e7468656465736b2e746f702f6163636f756e74732f617661746172732f3030302f3030302f3030312f6f726967696e616c2f643334656638626234396435653031312e706e67">cutls</a> <a onclick="udgEx('dekisugi@mstdn.maud.io','main')" class="contributor"><img src="https://user-images.githubusercontent.com/17561618/78639574-2f082f00-78e9-11ea-9606-8886176b83cc.png">dekisugi</a><br>
+・画像のリサイズに失敗する  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a> <a onclick="udgEx('popn_ja@popon.pptdn.jp','main')" class="contributor"><img src="https://avatars3.githubusercontent.com/u/24523508?s=88&v=4">kaias1jp</a><br>
-					・フォントリストが不安定な不具合を修正  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://camo.githubusercontent.com/b1d23096a6a73ac5a67cdc4bbd00568d4f2641ce/68747470733a2f2f6d656469612e7468656465736b2e746f702f6163636f756e74732f617661746172732f3030302f3030302f3030312f6f726967696e616c2f643334656638626234396435653031312e706e67">cutls</a> <a onclick="udgEx('gralos_5177@mstdn.jp','main')" class="contributor"><img src="https://user-images.githubusercontent.com/17561618/78639293-a5586180-78e8-11ea-84b2-1859d113cd7c.png">gralos_5177</a><br>
+・画像をダウンロードした後、ボタンを押しても保存先フォルダが表示されない  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-					・iTunes NowPlayingで、アートワークが無い時自動で取りに行く機能をつけた  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://camo.githubusercontent.com/b1d23096a6a73ac5a67cdc4bbd00568d4f2641ce/68747470733a2f2f6d656469612e7468656465736b2e746f702f6163636f756e74732f617661746172732f3030302f3030302f3030312f6f726967696e616c2f643334656638626234396435653031312e706e67">cutls</a> <a onclick="udgEx('toneji@minohdon.jp','main')" class="contributor"><img src="https://user-images.githubusercontent.com/17561618/66582029-162df380-ebbc-11e9-8a6f-1832b3a35d89.png">toneji</a><br>
+・ユーザーマッチングを削除  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-					・WIndows版ダウンローダでバージョニングオプションを付けた。パーセンテージがNaNになるやつも修正  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://camo.githubusercontent.com/b1d23096a6a73ac5a67cdc4bbd00568d4f2641ce/68747470733a2f2f6d656469612e7468656465736b2e746f702f6163636f756e74732f617661746172732f3030302f3030302f3030312f6f726967696e616c2f643334656638626234396435653031312e706e67">cutls</a> <a onclick="udgEx('marugen@kirishima.cloud','main')" class="contributor"><img src="https://user-images.githubusercontent.com/17561618/78640052-07659680-78ea-11ea-8953-8f8bfcb2bcda.png">marugen</a><br>
+
-					・Mastodon 3.1.3からの新しいメディアアップローダに対応  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://camo.githubusercontent.com/b1d23096a6a73ac5a67cdc4bbd00568d4f2641ce/68747470733a2f2f6d656469612e7468656465736b2e746f702f6163636f756e74732f617661746172732f3030302f3030302f3030312f6f726967696e616c2f643334656638626234396435653031312e706e67">cutls</a><br>
+					<h5>Release Note 21.0.0 (Mayu)</h5>
-					
+					・フォロリクをストリーミングで受け取ったときにNo status hereになる  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
 ・Apple MusicのNowPlayingでアルバム情報がないときの挙動を改善  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
 ・Last.fm NowPlaying  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
 ・テーマCSSに関するバグ  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
 ・プラットフォームやPWAか否か等で表示を切り替える  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
 ・ユーザータイムラインをカラム化  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a> <img src="">anonymous user<br>
 ・スプラッシュスクリーンを追加  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
 ・アイコンの微調整  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
 ・FTLのRemote only  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
 				</div>
 				<div id="release-en" style="display:none">
 					<h5>Let's make it native!</h5>
@@ -1269,30 +1270,30 @@
 			</span>
 			<div id="menu-wrapper">
 				<div id="left-menu">
-					<div class="waves-effect active" onclick="addColumnMenu()" id="addColumnMenu">
+					<a class="waves-effect active" onclick="addColumnMenu()" id="addColumnMenu">
-						<i class="material-icons">add</i><span>@@addColumn@@</span>
+						<i class="material-icons" aria-hidden="true">add</i><span>@@addColumn@@</span>
-					</div>
+					</a>
-					<div class="waves-effect" onclick="sortMenu()" id="sortMenu">
+					<a class="waves-effect" onclick="sortMenu()" id="sortMenu">
-						<i class="material-icons">sort</i><span>@@sortColumns@@</span>
+						<i class="material-icons" aria-hidden="true">sort</i><span>@@sortColumns@@</span>
-					</div>
+					</a>
-					<div class="waves-effect" onclick="searchMenu()" id="searchMenu">
+					<a class="waves-effect" onclick="searchMenu()" id="searchMenu">
-						<i class="material-icons">search</i><span>@@search@@</span>
+						<i class="material-icons" aria-hidden="true">search</i><span>@@search@@</span>
-					</div>
+					</a>
-					<div class="waves-effect" onclick="listMenu()" id="listMenu">
+					<a class="waves-effect" onclick="listMenu()" id="listMenu">
-						<i class="material-icons">view_headline</i><span>@@list@@</span>
+						<i class="material-icons" aria-hidden="true">view_headline</i><span>@@list@@</span>
-					</div>
+					</a>
-					<div class="waves-effect" onclick="dirMenu()" id="dirMenu">
+					<a class="waves-effect" onclick="dirMenu()" id="dirMenu">
-						<i class="material-icons">recent_actors</i><span>@@directory@@</span>
+						<i class="material-icons" aria-hidden="true">recent_actors</i><span>@@directory@@</span>
-					</div>
+					</a>
-					<div class="waves-effect" onclick="filterMenu()" id="filterMenu">
+					<a class="waves-effect" onclick="filterMenu()" id="filterMenu">
-						<i class="material-icons">filter_list</i><span>@@filter@@</span>
+						<i class="material-icons" aria-hidden="true">filter_list</i><span>@@filter@@</span>
-					</div>
+					</a>
-					<div class="waves-effect" onclick="help()" id="helpMenu">
+					<a class="waves-effect" onclick="help()" id="helpMenu">
-						<i class="material-icons">help_outline</i><span>@@helpAndLogs@@</span>
+						<i class="material-icons" aria-hidden="true">help_outline</i><span>@@helpAndLogs@@</span>
-					</div>
+					</a>
-					<div class="waves-effect" onclick="location.href='index.html'">
+					<a class="waves-effect" onclick="location.href='index.html'">
-						<i class="material-icons">refresh</i><span>@@f5@@</span>
+						<i class="material-icons" aria-hidden="true">refresh</i><span>@@f5@@</span>
-					</div>
+					</a>
 				</div>
 				<div id="right-menu">
 					<!--カラム追加-->
@@ -1313,46 +1314,46 @@
 								<input type="hidden" value="local" id="type-sel" />
 								@@showThisTL@@
 								<div id="tltype">
-									<div class="type waves-effect active" data-type="local">
+									<a class="type waves-effect active" data-type="local">
-										<div><i class="material-icons">people_outline</i></div>
+										<div><i class="material-icons" aria-hidden="true">people_outline</i></div>
 										<span>@@local@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="local-media">
+									<a class="type waves-effect" data-type="local-media">
-										<div><i class="material-icons">perm_media</i></div>
+										<div><i class="material-icons" aria-hidden="true">perm_media</i></div>
 										<span>@@localMedia@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="home">
+									<a class="type waves-effect" data-type="home">
-										<div><i class="material-icons">home</i></div>
+										<div><i class="material-icons" aria-hidden="true">home</i></div>
 										<span>@@home@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="pub">
+									<a class="type waves-effect" data-type="pub">
-										<div><i class="material-icons">language</i></div>
+										<div><i class="material-icons" aria-hidden="true">language</i></div>
 										<span>@@fed@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="pub-media">
+									<a class="type waves-effect" data-type="pub-media">
-										<div><i class="material-icons">perm_media</i></div>
+										<div><i class="material-icons" aria-hidden="true">perm_media</i></div>
 										<span>@@fedMedia@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="dm">
+									<a class="type waves-effect" data-type="dm">
-										<div><i class="material-icons">mail_outline</i></div>
+										<div><i class="material-icons" aria-hidden="true">mail_outline</i></div>
 										<span>@@dm@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="mix">
+									<a class="type waves-effect" data-type="mix">
-										<div><i class="material-icons">merge_type</i></div>
+										<div><i class="material-icons" aria-hidden="true">merge_type</i></div>
 										<span>@@integratedTLDes@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="plus">
+									<a class="type waves-effect" data-type="plus">
-										<div><i class="material-icons">reply</i></div>
+										<div><i class="material-icons" aria-hidden="true">reply</i></div>
 										<span>@@localPlusDes@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="notf">
+									<a class="type waves-effect" data-type="notf">
-										<div><i class="material-icons">notifications</i></div>
+										<div><i class="material-icons" aria-hidden="true">notifications</i></div>
 										<span>@@notf@@</span>
-									</div>
+									</a>
-									<div class="type waves-effect" data-type="bookmark">
+									<a class="type waves-effect" data-type="bookmark">
-										<div><i class="material-icons">bookmark</i></div>
+										<div><i class="material-icons" aria-hidden="true">bookmark</i></div>
 										<span>@@bookmark@@</span>
-									</div>
+									</a>
 								</div>
 							</div>
 							<div id="noauth" class="hide">
@@ -1536,6 +1537,10 @@
 							<input type="checkbox" class="filled-in" id="conv_filter" value="thread" />
 							<span>@@conver@@</span>
 						</label>
 						<label>
 							<input type="checkbox" class="filled-in" id="prof_filter" value="profiles" />
 							<span>@@prof@@</span>
 						</label><br />
 						@@option@@<br />
 						<label>
 							<input type="checkbox" class="filled-in" id="wholeword_filter" value="1" />
@@ -1599,7 +1604,7 @@
 					</div>
 				</div>
 			</div>
-			<a onclick="about()" class="nex waves-effect">
+			<a onclick="about()" class="nex waves-effect pwa">
 				<i class="material-icons" style="font-size: 1rem;">info</i>@@about@@ </a
 			>&nbsp;|&nbsp;
 			<a onclick="bottomReverse()" class="nex waves-effect">
@@ -1648,7 +1653,7 @@
 						<a href="setting.html" class="nex waves-effect">
 							<i class="material-icons nex" title="@@setting@@(Ctrl+Shift+S)">settings</i>
 						</a>
-						<a onclick="nano()" class="nex waves-effect">
+						<a onclick="nano()" class="nex waves-effect pwa">
 							<i class="material-icons" title="@@nanoDes@@TheDesk Nano" data-trans-title="nano_desp"
 								>remove_from_queue</i
 							>
@@ -1681,7 +1686,7 @@
 								>access_time</i
 							>
 						</a>
-						<a onclick="tips('memory')" class="nex waves-effect">
+						<a onclick="tips('memory')" class="nex waves-effect pwa">
 							<i class="material-icons nex" title="@@ramTips@@" data-trans-title="memory">memory</i>
 						</a>
 						<a onclick="tips('trend')" class="nex waves-effect imasonly" style="display:none;">
@@ -1708,7 +1713,7 @@
 			</div>
 		</div>
 		<!--Support me-->
-		<div id="support-btm" class="z-depth-4 hide">
+		<div id="support-btm" class="z-depth-4 hide scr">
 			<div id="support-btm-ja">
 				<h5>ご支援いただけませんか？</h5>
 				(これは支援の有無に関わらず定期的に出ます。過去のバージョン等で何度も表示される等のバグを確認しております。)<br />
--- a/app/view/make/language/af-ZA/acct.json
+++ b/app/view/make/language/af-ZA/acct.json
@@ -2,6 +2,7 @@
    "list": "List of accounts",
    "back": "Back",
    "add": "Add an account",
    "addAcct": "Fill the instance domain (like mastodon.social)",
    "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
    "codesetup": "Code setup",
    "mainacct": "Main an account",
--- a/app/view/make/language/af-ZA/index.json
+++ b/app/view/make/language/af-ZA/index.json
@@ -140,6 +140,7 @@
    "filterWord": "Filtering words",
    "degree": "Filter contexts",
    "conver": "Conversations",
    "prof": "Profiles",
    "option": "Options",
    "matchWord": "Whole word",
    "warnMatchWord": "Nice for Latin language",
--- a/app/view/make/language/af-ZA/main.json
+++ b/app/view/make/language/af-ZA/main.json
@@ -60,6 +60,8 @@
    "lang_postimg_delete": "Click to add description, right-click to delete this",
    "lang_postimg_desc": "Description",
    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
    "lang_post_syncDetail": "Upload media synchronously",
    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
    "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
    "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
    "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
    "lang_post_btn1": "Cancel (will not post)",
    "lang_post_btn2": "Make text hidden automatically",
    "lang_post_btn3": "Continue to post",
    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
    "lang_post_retry": "Retry",
    "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
    "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
    "lang_status_follow": "Follow",
@@ -168,6 +172,7 @@
    "lang_parse_polled": "'s poll",
    "lang_parse_notftime": "Actioned at",
    "lang_parse_cwshow": "Show",
    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
    "lang_parse_fulltext": "Full size text:",
    "lang_parse_autofold": "Auto folded",
    "lang_parse_more": "More",
--- a/app/view/make/language/af-ZA/setting.json
+++ b/app/view/make/language/af-ZA/setting.json
@@ -173,6 +173,8 @@
  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
  "template3": "",
  "postartwork": "Attach an Artwork of Spotify",
  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
  "tts": "TTS(text to speech) Preferences",
  "bouyomi": "BouyomiChan connect",
  "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",
--- a/app/view/make/language/ar-SA/acct.json
+++ b/app/view/make/language/ar-SA/acct.json
@@ -2,6 +2,7 @@
    "list": "List of accounts",
    "back": "Back",
    "add": "Add an account",
    "addAcct": "Fill the instance domain (like mastodon.social)",
    "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
    "codesetup": "Code setup",
    "mainacct": "Main an account",
--- a/app/view/make/language/ar-SA/index.json
+++ b/app/view/make/language/ar-SA/index.json
@@ -140,6 +140,7 @@
    "filterWord": "Filtering words",
    "degree": "Filter contexts",
    "conver": "Conversations",
    "prof": "Profiles",
    "option": "Options",
    "matchWord": "Whole word",
    "warnMatchWord": "Nice for Latin language",
--- a/app/view/make/language/ar-SA/main.json
+++ b/app/view/make/language/ar-SA/main.json
@@ -60,6 +60,8 @@
    "lang_postimg_delete": "Click to add description, right-click to delete this",
    "lang_postimg_desc": "Description",
    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
    "lang_post_syncDetail": "Upload media synchronously",
    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
    "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
    "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
    "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
    "lang_post_btn1": "Cancel (will not post)",
    "lang_post_btn2": "Make text hidden automatically",
    "lang_post_btn3": "Continue to post",
    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
    "lang_post_retry": "Retry",
    "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
    "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
    "lang_status_follow": "Follow",
@@ -168,6 +172,7 @@
    "lang_parse_polled": "'s poll",
    "lang_parse_notftime": "Actioned at",
    "lang_parse_cwshow": "Show",
    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
    "lang_parse_fulltext": "Full size text:",
    "lang_parse_autofold": "Auto folded",
    "lang_parse_more": "More",
--- a/app/view/make/language/ar-SA/setting.json
+++ b/app/view/make/language/ar-SA/setting.json
@@ -173,6 +173,8 @@
  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
  "template3": "",
  "postartwork": "Attach an Artwork of Spotify",
  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
  "tts": "TTS(text to speech) Preferences",
  "bouyomi": "BouyomiChan connect",
  "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",
--- a/app/view/make/language/bg-BG/acct.json
+++ b/app/view/make/language/bg-BG/acct.json
@@ -2,6 +2,7 @@
    "list": "Списък на профилите",
    "back": "Назад",
    "add": "Добавяне на профил",
    "addAcct": "Fill the instance domain (like mastodon.social)",
    "codesetupwarn": "Премахнете отметката за да пропуснете влизането с код. (Вход в Mastodon от Windows или macOS) (Препоръчително: pcheck)",
    "codesetup": "Настройка на код",
    "mainacct": "Основен профил",
--- a/app/view/make/language/bg-BG/index.json
+++ b/app/view/make/language/bg-BG/index.json
@@ -140,6 +140,7 @@
    "filterWord": "Филтриране на думи",
    "degree": "Контекстно филтриране",
    "conver": "Разговори",
    "prof": "Profiles",
    "option": "Настройки",
    "matchWord": "Цяла дума",
    "warnMatchWord": "Ница на латински език",
--- a/app/view/make/language/bg-BG/main.json
+++ b/app/view/make/language/bg-BG/main.json
@@ -60,6 +60,8 @@
    "lang_postimg_delete": "Кликнете за да добавите описание, щракнете с десния бутон за да го изтриете",
    "lang_postimg_desc": "Описание",
    "lang_postimg_leadContext": "щракнете с десния бутон върху миниатюрата за да изтриете това",
    "lang_post_syncDetail": "Upload media synchronously",
    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
    "lang_post_tagTL": "Тази раздумка не съдържа маркер по подразбиране. Тази раздумка няма да се показва в локалния TL. Продължавате?",
    "lang_post_tagVis": "Тази раздумка (не е \"публична\") не е показана с този етикет в ТЛ.",
    "lang_post_cwtitle": "Авто CW Сигнал",
@@ -67,6 +69,8 @@
    "lang_post_btn1": "Отказ (няма да се публикува)",
    "lang_post_btn2": "Текстът да се скрива автоматично",
    "lang_post_btn3": "Продължете към публикуването",
    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
    "lang_post_retry": "Retry",
    "lang_status_favWarn": "Ще отнеме минута раздумката отдалечено да стане любима.",
    "lang_status_btWarn": "Ще отнеме минута раздумката отдалечено да бъде подсилена.",
    "lang_status_follow": "Следване",
@@ -168,6 +172,7 @@
    "lang_parse_polled": "'s poll",
    "lang_parse_notftime": "Actioned at",
    "lang_parse_cwshow": "Покажи",
    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
    "lang_parse_fulltext": "Full size text:",
    "lang_parse_autofold": "Auto folded",
    "lang_parse_more": "Още",
--- a/app/view/make/language/bg-BG/setting.json
+++ b/app/view/make/language/bg-BG/setting.json
@@ -173,6 +173,8 @@
  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
  "template3": "",
  "postartwork": "Attach an Artwork of Spotify",
  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
  "tts": "TTS(text to speech) Preferences",
  "bouyomi": "BouyomiChan connect",
  "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",
--- a/app/view/make/language/ca-ES/acct.json
+++ b/app/view/make/language/ca-ES/acct.json
@@ -2,6 +2,7 @@
    "list": "List of accounts",
    "back": "Back",
    "add": "Add an account",
    "addAcct": "Fill the instance domain (like mastodon.social)",
    "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
    "codesetup": "Code setup",
    "mainacct": "Main an account",
--- a/app/view/make/language/ca-ES/index.json
+++ b/app/view/make/language/ca-ES/index.json
@@ -140,6 +140,7 @@
    "filterWord": "Filtering words",
    "degree": "Filter contexts",
    "conver": "Conversations",
    "prof": "Profiles",
    "option": "Options",
    "matchWord": "Whole word",
    "warnMatchWord": "Nice for Latin language",
--- a/app/view/make/language/ca-ES/main.json
+++ b/app/view/make/language/ca-ES/main.json
@@ -60,6 +60,8 @@
    "lang_postimg_delete": "Click to add description, right-click to delete this",
    "lang_postimg_desc": "Description",
    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
    "lang_post_syncDetail": "Upload media synchronously",
    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
    "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
    "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
    "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
    "lang_post_btn1": "Cancel (will not post)",
    "lang_post_btn2": "Make text hidden automatically",
    "lang_post_btn3": "Continue to post",
    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
    "lang_post_retry": "Retry",
    "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
    "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
    "lang_status_follow": "Follow",
@@ -168,6 +172,7 @@
    "lang_parse_polled": "'s poll",
    "lang_parse_notftime": "Actioned at",
    "lang_parse_cwshow": "Show",
    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
    "lang_parse_fulltext": "Full size text:",
    "lang_parse_autofold": "Auto folded",
    "lang_parse_more": "More",
--- a/app/view/make/language/ca-ES/setting.json
+++ b/app/view/make/language/ca-ES/setting.json
@@ -173,6 +173,8 @@
  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
  "template3": "",
  "postartwork": "Attach an Artwork of Spotify",
  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
  "tts": "TTS(text to speech) Preferences",
  "bouyomi": "BouyomiChan connect",
  "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",
--- a/app/view/make/language/cs-CZ/acct.json
+++ b/app/view/make/language/cs-CZ/acct.json
@@ -2,6 +2,7 @@
    "list": "Seznam účtů",
    "back": "Zpět",
    "add": "Přidat účet",
    "addAcct": "Fill the instance domain (like mastodon.social)",
    "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
    "codesetup": "Nastavení kódu",
    "mainacct": "Hlavní účet",
--- a/app/view/make/language/cs-CZ/index.json
+++ b/app/view/make/language/cs-CZ/index.json
@@ -140,6 +140,7 @@
    "filterWord": "Filtrované slova",
    "degree": "Filter contexts",
    "conver": "Konverzace",
    "prof": "Profiles",
    "option": "Možnosti",
    "matchWord": "Celé slovo",
    "warnMatchWord": "Dobré pro jazyky v latince",
--- a/app/view/make/language/cs-CZ/main.json
+++ b/app/view/make/language/cs-CZ/main.json
@@ -60,6 +60,8 @@
    "lang_postimg_delete": "Click to add description, right-click to delete this",
    "lang_postimg_desc": "Popis",
    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
    "lang_post_syncDetail": "Upload media synchronously",
    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
    "lang_post_tagTL": "Tento toot neobsahuje výchozí hashtag. Tento toot nebude zobrazen na výchozí časové ose. Pokračovat?",
    "lang_post_tagVis": "Tento toot (ne „veřejný“ toot) není zobrazen na časové ose tohoto hashtagu.",
    "lang_post_cwtitle": "Automatické varování o obsahu",
@@ -67,6 +69,8 @@
    "lang_post_btn1": "Zrušit (příspěvek nebude publikován)",
    "lang_post_btn2": "Skrýt text automaticky",
    "lang_post_btn3": "Pokračovat k přispívání",
    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
    "lang_post_retry": "Retry",
    "lang_status_favWarn": "Oblíbení vzdáleného tootu bude chvíli trvat.",
    "lang_status_btWarn": "Boostnutí vzdáleného tootu bude chvíli trvat.",
    "lang_status_follow": "Sledovat",
@@ -168,6 +172,7 @@
    "lang_parse_polled": "'s poll",
    "lang_parse_notftime": "Provedeno",
    "lang_parse_cwshow": "Zobrazit",
    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
    "lang_parse_fulltext": "Celý text:",
    "lang_parse_autofold": "Auto folded",
    "lang_parse_more": "Více",
--- a/app/view/make/language/cs-CZ/setting.json
+++ b/app/view/make/language/cs-CZ/setting.json
@@ -173,6 +173,8 @@
  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
  "template3": "",
  "postartwork": "Attach an Artwork of Spotify",
  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
  "tts": "TTS(text to speech) Preferences",
  "bouyomi": "BouyomiChan connect",
  "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",
--- a/app/view/make/language/da-DK/acct.json
+++ b/app/view/make/language/da-DK/acct.json
@@ -2,6 +2,7 @@
    "list": "List of accounts",
    "back": "Back",
    "add": "Add an account",
    "addAcct": "Fill the instance domain (like mastodon.social)",
    "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
    "codesetup": "Code setup",
    "mainacct": "Main an account",
--- a/app/view/make/language/da-DK/index.json
+++ b/app/view/make/language/da-DK/index.json
@@ -140,6 +140,7 @@
    "filterWord": "Filtering words",
    "degree": "Filter contexts",
    "conver": "Conversations",
    "prof": "Profiles",
    "option": "Options",
    "matchWord": "Whole word",
    "warnMatchWord": "Nice for Latin language",
--- a/app/view/make/language/da-DK/main.json
+++ b/app/view/make/language/da-DK/main.json
@@ -60,6 +60,8 @@
    "lang_postimg_delete": "Click to add description, right-click to delete this",
    "lang_postimg_desc": "Description",
    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
    "lang_post_syncDetail": "Upload media synchronously",
    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
    "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
    "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
    "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
    "lang_post_btn1": "Cancel (will not post)",
    "lang_post_btn2": "Make text hidden automatically",
    "lang_post_btn3": "Continue to post",
    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
    "lang_post_retry": "Retry",
    "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
    "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
    "lang_status_follow": "Follow",
@@ -168,6 +172,7 @@
    "lang_parse_polled": "'s poll",
    "lang_parse_notftime": "Actioned at",
    "lang_parse_cwshow": "Show",
    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
    "lang_parse_fulltext": "Full size text:",
    "lang_parse_autofold": "Auto folded",
    "lang_parse_more": "More",
--- a/app/view/make/language/da-DK/setting.json
+++ b/app/view/make/language/da-DK/setting.json
@@ -173,6 +173,8 @@
  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
  "template3": "",
  "postartwork": "Attach an Artwork of Spotify",
  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
  "tts": "TTS(text to speech) Preferences",
  "bouyomi": "BouyomiChan connect",
  "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",
--- a/app/view/make/language/de-DE/acct.json
+++ b/app/view/make/language/de-DE/acct.json
@@ -2,6 +2,7 @@
    "list": "Accountliste",
    "back": "Zurück",
    "add": "Konto hinzufügen",
    "addAcct": "Fill the instance domain (like mastodon.social)",
    "codesetupwarn": "Check if TheDesk is not working on Windows, you want to login Pleroma servers, you cannot login when it checked.",
    "codesetup": "Code-Setup",
    "mainacct": "Hauptkonto",
--- a/app/view/make/language/de-DE/index.json
+++ b/app/view/make/language/de-DE/index.json
@@ -140,6 +140,7 @@
    "filterWord": "Filterwörter",
    "degree": "Kontexte filtern",
    "conver": "Gespräche",
    "prof": "Profiles",
    "option": "Einstellungen",
    "matchWord": "Ganze Wörter",
    "warnMatchWord": "Schön für lateinische Sprachen",
--- a/app/view/make/language/de-DE/main.json
+++ b/app/view/make/language/de-DE/main.json
@@ -60,6 +60,8 @@
    "lang_postimg_delete": "Klicken, um Beschreibung hinzuzufügen, Rechtsklick zum Löschen",
    "lang_postimg_desc": "Beschreibung",
    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
    "lang_post_syncDetail": "Upload media synchronously",
    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
    "lang_post_tagTL": "Dieses Tröt enthält keinen Standard-Tag. Er wird in dem lokalen Verlauf nicht angezeigt. Fortfahren?",
    "lang_post_tagVis": "Dieser Tröt (nicht 'öffentlicher' Tröt) wird nicht in diesem Tag-Verlauf angezeigt.",
    "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
    "lang_post_btn1": "Abbrechen (wird nicht gesendet)",
    "lang_post_btn2": "Text automatisch ausblenden",
    "lang_post_btn3": "Weiter mit Senden",
    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
    "lang_post_retry": "Retry",
    "lang_status_favWarn": "Es braucht einen Moment, um ein entferntes Tröt zu favorisieren.",
    "lang_status_btWarn": "Es braucht einen Moment, um ein entferntes Tröt zu verstärken.",
    "lang_status_follow": "Folgen",
@@ -168,6 +172,7 @@
    "lang_parse_polled": "'s Umfrage",
    "lang_parse_notftime": "Bearbeitet am",
    "lang_parse_cwshow": "Anzeigen",
    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
    "lang_parse_fulltext": "Full size text:",
    "lang_parse_autofold": "Automatisches Zusammenfalten",
    "lang_parse_more": "Mehr",
--- a/app/view/make/language/de-DE/setting.json
+++ b/app/view/make/language/de-DE/setting.json
@@ -173,6 +173,8 @@
  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
  "template3": "",
  "postartwork": "Das Artwork von Spotify anhängen",
  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
  "tts": "Einstellungen Vorlesefunktion",
  "bouyomi": "BouyomiChan connect",
  "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",
--- a/app/view/make/language/el-GR/acct.json
+++ b/app/view/make/language/el-GR/acct.json
@@ -2,6 +2,7 @@
    "list": "List of accounts",
    "back": "Back",
    "add": "Add an account",
    "addAcct": "Fill the instance domain (like mastodon.social)",
    "codesetupwarn": "Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
    "codesetup": "Code setup",
    "mainacct": "Main an account",
--- a/app/view/make/language/el-GR/index.json
+++ b/app/view/make/language/el-GR/index.json
@@ -140,6 +140,7 @@
    "filterWord": "Filtering words",
    "degree": "Filter contexts",
    "conver": "Conversations",
    "prof": "Profiles",
    "option": "Options",
    "matchWord": "Whole word",
    "warnMatchWord": "Nice for Latin language",
--- a/app/view/make/language/el-GR/main.json
+++ b/app/view/make/language/el-GR/main.json
@@ -60,6 +60,8 @@
    "lang_postimg_delete": "Click to add description, right-click to delete this",
    "lang_postimg_desc": "Description",
    "lang_postimg_leadContext": "right-click the thumbnail to delete this",
    "lang_post_syncDetail": "Upload media synchronously",
    "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
    "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",
    "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.",
    "lang_post_cwtitle": "Auto CW Alert",
@@ -67,6 +69,8 @@
    "lang_post_btn1": "Cancel (will not post)",
    "lang_post_btn2": "Make text hidden automatically",
    "lang_post_btn3": "Continue to post",
    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
    "lang_post_retry": "Retry",
    "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
    "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
    "lang_status_follow": "Follow",
@@ -168,6 +172,7 @@
    "lang_parse_polled": "'s poll",
    "lang_parse_notftime": "Actioned at",
    "lang_parse_cwshow": "Show",
    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
    "lang_parse_fulltext": "Full size text:",
    "lang_parse_autofold": "Auto folded",
    "lang_parse_more": "More",
--- a/app/view/make/language/el-GR/setting.json
+++ b/app/view/make/language/el-GR/setting.json
@@ -173,6 +173,8 @@
  "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
  "template3": "",
  "postartwork": "Attach an Artwork of Spotify",
  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
  "tts": "TTS(text to speech) Preferences",
  "bouyomi": "BouyomiChan connect",
  "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",
--- a/app/view/make/language/en-US/acct.json
+++ b/app/view/make/language/en-US/acct.json
@@ -2,6 +2,7 @@
    "list": "crwdns3018:0crwdne3018:0",
    "back": "crwdns3020:0crwdne3020:0",
    "add": "crwdns3022:0crwdne3022:0",
    "addAcct": "crwdns4484:0crwdne4484:0",
    "codesetupwarn": "crwdns3024:0crwdne3024:0",
    "codesetup": "crwdns3026:0crwdne3026:0",
    "mainacct": "crwdns3028:0crwdne3028:0",
--- a/app/view/make/language/en-US/index.json
+++ b/app/view/make/language/en-US/index.json
@@ -140,6 +140,7 @@
    "filterWord": "crwdns3322:0crwdne3322:0",
    "degree": "crwdns3324:0crwdne3324:0",
    "conver": "crwdns3326:0crwdne3326:0",
    "prof": "crwdns4488:0crwdne4488:0",
    "option": "crwdns3328:0crwdne3328:0",
    "matchWord": "crwdns3330:0crwdne3330:0",
    "warnMatchWord": "crwdns3332:0crwdne3332:0",
--- a/app/view/make/language/en-US/main.json
+++ b/app/view/make/language/en-US/main.json
@@ -60,6 +60,8 @@
    "lang_postimg_delete": "crwdns4350:0crwdne4350:0",
    "lang_postimg_desc": "crwdns4352:0crwdne4352:0",
    "lang_postimg_leadContext": "crwdns4354:0crwdne4354:0",
    "lang_post_syncDetail": "crwdns4476:0crwdne4476:0",
    "lang_post_syncDetailText": "crwdns4478:0crwdne4478:0",
    "lang_post_tagTL": "crwdns3526:0crwdne3526:0",
    "lang_post_tagVis": "crwdns3528:0crwdne3528:0",
    "lang_post_cwtitle": "crwdns3530:0crwdne3530:0",
@@ -67,6 +69,8 @@
    "lang_post_btn1": "crwdns3534:0crwdne3534:0",
    "lang_post_btn2": "crwdns3536:0crwdne3536:0",
    "lang_post_btn3": "crwdns3538:0crwdne3538:0",
    "lang_post_unfinishedMedia": "crwdns4480:0crwdne4480:0",
    "lang_post_retry": "crwdns4482:0crwdne4482:0",
    "lang_status_favWarn": "crwdns3540:0crwdne3540:0",
    "lang_status_btWarn": "crwdns3542:0crwdne3542:0",
    "lang_status_follow": "crwdns3544:0crwdne3544:0",
@@ -168,6 +172,7 @@
    "lang_parse_polled": "crwdns3724:0crwdne3724:0",
    "lang_parse_notftime": "crwdns3726:0crwdne3726:0",
    "lang_parse_cwshow": "crwdns3728:0crwdne3728:0",
    "lang_parse_cwshow_acc": "crwdns4486:0crwdne4486:0",
    "lang_parse_fulltext": "crwdns3730:0crwdne3730:0",
    "lang_parse_autofold": "crwdns3732:0crwdne3732:0",
    "lang_parse_more": "crwdns3734:0crwdne3734:0",
--- a/app/view/make/language/en-US/setting.json
+++ b/app/view/make/language/en-US/setting.json
@@ -173,6 +173,8 @@
  "template2": "crwdns4346:0{song}crwdnd4346:0{album}crwdnd4346:0{artist}crwdnd4346:0{composer}crwdnd4346:0{hz}crwdnd4346:0{bitRate}crwdnd4346:0{genre}crwdne4346:0",
  "template3": "crwdns4348:0crwdne4348:0",
  "postartwork": "crwdns4210:0crwdne4210:0",
  "searchArtwork": "crwdns4472:0crwdne4472:0",
  "searchArtworkWarn": "crwdns4474:0crwdne4474:0",
  "tts": "crwdns4212:0crwdne4212:0",
  "bouyomi": "crwdns4214:0crwdne4214:0",
  "bouyomiWarn": "crwdns4216:0crwdne4216:0",
--- a/app/view/make/language/en/acct.json
+++ b/app/view/make/language/en/acct.json
@@ -2,6 +2,7 @@
    "list":"List of accounts",
    "back":"Back",
    "add":"Add an account",
    "addAcct": "Fill the instance domain (like mastodon.social)",
    "codesetupwarn":"Uncheck it to skip pasiting code.(login to Mastodon on Windows or macOS) (Recommended: pcheck)",
    "codesetup":"Code setup",
    "mainacct":"Main an account",
--- a/app/view/make/language/en/index.json
+++ b/app/view/make/language/en/index.json
@@ -11,8 +11,6 @@
    "cwDes":"Hide text behind warning",
    "selfile":"Attach..",
    "insertEmoji":"Emojis",
    "NPSpotify":"NowPlaying(Spotify)",
    "NPiTunes":"NowPlaying(macOS)",
    "schedule":"Scheduled toot",
    "postat":"Post at",
    "scheduleWarn":"2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
    "toots":"Toots",
    "follow":"Follow",
    "follower":"Follower",
    "utlColumn":"Show as a column",
    "timeline":"Timeline",
    "operateOtherAcct":"Cross-account",
    "list":"List",
@@ -140,6 +139,7 @@
    "filterWord":"Filtering words",
    "degree":"Filter contexts",
    "conver":"Conversations",
    "prof":"Profiles",
    "option":"Options",
    "matchWord":"Whole word",
    "warnMatchWord":"Nice for Latin language",
--- a/app/view/make/language/en/main.json
+++ b/app/view/make/language/en/main.json
@@ -127,6 +127,7 @@
    "lang_layout_delthis": "Remove this column",
    "lang_layout_setthis": "Preferences of this column",
    "lang_layout_mediafil": "Media filtering",
    "lang_layout_remoteOnly": "Remote only",
    "lang_layout_linkana": "Auto Link Analyzer",
    "lang_layout_linkanades": "Auto link analyzer",
    "lang_layout_tts": "Text to speech ",
@@ -172,6 +173,7 @@
    "lang_parse_polled": "'s poll",
    "lang_parse_notftime": "Actioned at",
    "lang_parse_cwshow": "Show",
    "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
    "lang_parse_fulltext": "Full size text:",
    "lang_parse_autofold": "Auto folded",
    "lang_parse_more": "More",
--- a/app/view/make/language/en/setting.json
+++ b/app/view/make/language/en/setting.json
@@ -167,6 +167,7 @@
  "linkwarn": "TheDesk save your data on thedesk.top server.",
  "connect": "Connect",
  "disconnect": "Disconnect",
  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
  "templateedit": "Edit a template",
  "templateeditwarn": "",
  "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
cutls	bc616ba118	TheDesk 21.0.1 (Mayu)	2020-05-11 19:03:55 +09:00
cutls	ea26648619	delete user matching	2020-05-11 18:59:28 +09:00
cutls	c2f1aec8b6	Fix: cannot show when dled imga	2020-05-11 18:42:52 +09:00
cutls	c005b546ba	Fix: cannot upload	2020-05-11 18:42:43 +09:00
cutls	783ceec8de	typo	2020-05-10 22:02:51 +09:00
cutls	b1ccfa85ba	TheDesk 21.0.0(Mayu)	2020-05-10 21:59:25 +09:00
cutls	7e6d03fd53	fix: utl loading	2020-05-10 21:52:01 +09:00
cutls	dd0e1279c4	icon, en-splash, add remote-only pub	2020-05-10 19:39:49 +09:00
cutls	1b3e676b30	Add splash screen	2020-05-10 17:32:49 +09:00
cutls	a4582bb18a	splash animation	2020-05-10 13:26:07 +09:00
cutls	25e99725d2	Add: show utl as a column	2020-05-07 00:31:11 +09:00
cutls	da011cd302	pwa compat	2020-05-06 18:09:00 +09:00
cutls	53010751ee	pwa compat	2020-05-06 18:06:05 +09:00
cutls	19401b61cb	del asterte-compat	2020-05-06 18:03:33 +09:00
cutls	82271f1c17	platform compat	2020-05-06 18:02:14 +09:00
cutls	a74d0ecf8d	Bug wo mitsuketa	2020-05-05 23:37:58 +09:00
cutls	7ee4205f8a	Add: Last.fm	2020-05-05 23:36:31 +09:00
cutls	9aef043344	cors	2020-05-03 22:46:55 +09:00
cutls	4dbc673719	fix	2020-05-03 22:32:41 +09:00
cutls	d44cecf21f	show	2020-05-03 22:27:11 +09:00
cutls	3c0ea8f40d	test	2020-05-03 22:23:59 +09:00
cutls	06b806532e	test fin	2020-05-03 22:20:28 +09:00
cutls	1983864294	mv	2020-05-03 22:16:36 +09:00
cutls	c523a274e1	headers	2020-05-03 22:14:39 +09:00
cutls	03563eb1f2	mv	2020-05-03 22:11:23 +09:00
cutls	2f14d18126	toml	2020-05-03 22:06:41 +09:00
cutls	d1309a82ec	np	2020-05-03 22:05:55 +09:00
cutls	2a2607eb4b	follow request	2020-05-03 22:05:45 +09:00
cutls	e9b5221f05	TheDesk 20.3.3	2020-05-03 00:30:41 +09:00
cutls	bb71a28375	Add filesize	2020-05-02 23:32:46 +09:00
cutls	af3e87b0e3	Merge branch 'master' of github.com:cutls/TheDesk	2020-04-29 15:08:57 +09:00
cutls	4728a59c33	Accessibility (Screen Reader Optimized mode)	2020-04-29 15:08:42 +09:00
Cutls	f9a9c13dc5	Merge pull request #272 from cutls/dependabot/npm_and_yarn/app/electron-8.2.3 Bump electron from 8.0.0 to 8.2.3 in /app	2020-04-27 17:48:21 +09:00
Cutls	1fa6abccf7	Merge branch 'master' into dependabot/npm_and_yarn/app/electron-8.2.3	2020-04-27 17:48:12 +09:00
dependabot-preview[bot]	9aa68b8ee6	Bump electron from 8.0.0 to 8.2.3 in /app Bumps [electron](https://github.com/electron/electron) from 8.0.0 to 8.2.3. - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/master/docs/breaking-changes.md) - [Commits](https://github.com/electron/electron/compare/v8.0.0...v8.2.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-04-27 08:47:46 +00:00
Cutls	f90cfe221f	Merge pull request #273 from cutls/dependabot/npm_and_yarn/app/jimp-0.10.3 Bump jimp from 0.10.1 to 0.10.3 in /app	2020-04-27 17:47:40 +09:00
Cutls	b70a5d0053	Merge branch 'master' into dependabot/npm_and_yarn/app/jimp-0.10.3	2020-04-27 17:47:27 +09:00
Cutls	9c4ba4da80	Merge pull request #271 from cutls/dependabot/npm_and_yarn/app/electron-builder-22.5.1 Bump electron-builder from 22.4.1 to 22.5.1 in /app	2020-04-27 17:46:36 +09:00
Cutls	591dc1ba3c	Merge pull request #270 from cutls/dependabot/npm_and_yarn/app/sweetalert2-9.10.12 Bump sweetalert2 from 9.10.9 to 9.10.12 in /app	2020-04-27 17:46:18 +09:00
Cutls	841afc5a33	Merge pull request #267 from cutls/dependabot/npm_and_yarn/app/jquery-3.5.0 Bump jquery from 3.4.1 to 3.5.0 in /app	2020-04-27 17:46:01 +09:00
Cutls	3a2e3c7895	New Crowdin translations (#263 ) * New translations setting.json (Russian) * New translations setting.json (Portuguese) * New translations setting.json (Romanian) * New translations setting.json (Portuguese, Brazilian) * New translations setting.json (Polish) * New translations setting.json (Norwegian) * New translations setting.json (Italian) * New translations setting.json (Serbian (Cyrillic)) * New translations setting.json (Vietnamese) * New translations setting.json (Ukrainian) * New translations setting.json (Turkish) * New translations setting.json (Swedish) * New translations setting.json (Spanish, Argentina) * New translations setting.json (Spanish) * New translations setting.json (Hungarian) * New translations setting.json (Chinese Traditional) * New translations setting.json (Chinese Simplified) * New translations setting.json (Catalan) * New translations setting.json (Bulgarian) * New translations setting.json (Arabic) * New translations setting.json (Afrikaans) * New translations setting.json (Czech) * New translations setting.json (Hebrew) * New translations setting.json (Greek) * New translations setting.json (German) * New translations setting.json (French) * New translations setting.json (Finnish) * New translations setting.json (Dutch) * New translations setting.json (Danish) * New translations setting.json (English) * New translations main.json (Russian) * New translations main.json (Romanian) * New translations main.json (Portuguese, Brazilian) * New translations main.json (Portuguese) * New translations main.json (Serbian (Cyrillic)) * New translations main.json (Polish) * New translations main.json (Norwegian) * New translations main.json (Italian) * New translations main.json (Turkish) * New translations main.json (English) * New translations main.json (Vietnamese) * New translations main.json (Ukrainian) * New translations main.json (Swedish) * New translations main.json (Spanish, Argentina) * New translations main.json (Spanish) * New translations main.json (Catalan) * New translations main.json (Czech) * New translations main.json (Chinese Traditional) * New translations main.json (Chinese Simplified) * New translations main.json (Bulgarian) * New translations main.json (Arabic) * New translations main.json (Afrikaans) * New translations main.json (Hungarian) * New translations main.json (Hebrew) * New translations main.json (Greek) * New translations main.json (German) * New translations main.json (Danish) * New translations main.json (French) * New translations main.json (Finnish) * New translations main.json (Dutch) * New translations acct.json (Serbian (Cyrillic)) * New translations main.json (Russian) * New translations acct.json (Russian) * New translations main.json (Romanian) * New translations acct.json (Romanian) * New translations main.json (Portuguese, Brazilian) * New translations acct.json (Portuguese, Brazilian) * New translations main.json (Portuguese) * New translations main.json (Serbian (Cyrillic)) * New translations acct.json (Portuguese) * New translations main.json (Polish) * New translations acct.json (Polish) * New translations main.json (Norwegian) * New translations acct.json (Norwegian) * New translations main.json (Italian) * New translations acct.json (Italian) * New translations main.json (Turkish) * New translations main.json (English) * New translations acct.json (English) * New translations main.json (Vietnamese) * New translations acct.json (Vietnamese) * New translations main.json (Ukrainian) * New translations acct.json (Ukrainian) * New translations acct.json (Spanish) * New translations acct.json (Turkish) * New translations main.json (Swedish) * New translations acct.json (Swedish) * New translations main.json (Spanish, Argentina) * New translations acct.json (Spanish, Argentina) * New translations main.json (Spanish) * New translations acct.json (Afrikaans) * New translations main.json (Catalan) * New translations main.json (Czech) * New translations acct.json (Czech) * New translations main.json (Chinese Traditional) * New translations acct.json (Chinese Traditional) * New translations main.json (Chinese Simplified) * New translations acct.json (Chinese Simplified) * New translations acct.json (Danish) * New translations acct.json (Catalan) * New translations main.json (Bulgarian) * New translations acct.json (Bulgarian) * New translations main.json (Arabic) * New translations acct.json (Arabic) * New translations main.json (Afrikaans) * New translations main.json (Hungarian) * New translations acct.json (Hungarian) * New translations main.json (Hebrew) * New translations acct.json (Hebrew) * New translations main.json (Greek) * New translations acct.json (Greek) * New translations main.json (German) * New translations acct.json (German) * New translations main.json (Danish) * New translations main.json (French) * New translations acct.json (French) * New translations main.json (Finnish) * New translations acct.json (Finnish) * New translations main.json (Dutch) * New translations acct.json (Dutch) * New translations index.json (Italian) * New translations index.json (Hungarian) * New translations index.json (Hebrew) * New translations index.json (Finnish) * New translations index.json (Romanian) * New translations index.json (Russian) * New translations index.json (Portuguese) * New translations index.json (Polish) * New translations index.json (Dutch) * New translations index.json (Norwegian) * New translations index.json (Greek) * New translations index.json (Spanish) * New translations index.json (Arabic) * New translations index.json (Afrikaans) * New translations index.json (French) * New translations index.json (German) * New translations index.json (Bulgarian) * New translations index.json (Danish) * New translations index.json (Czech) * New translations index.json (Catalan) * New translations index.json (Vietnamese) * New translations index.json (Chinese Traditional) * New translations index.json (Portuguese, Brazilian) * New translations index.json (English) * New translations index.json (Spanish, Argentina) * New translations index.json (Serbian (Cyrillic)) * New translations index.json (Swedish) * New translations index.json (Chinese Simplified) * New translations index.json (Turkish) * New translations index.json (Ukrainian)	2020-04-27 17:45:32 +09:00
cutls	5e035dc239	tag add all/none/any	2020-04-26 17:55:03 +09:00
cutls	2761cc23b0	css of announcement	2020-04-26 16:34:58 +09:00
cutls	cf00fefa6b	Accessibility	2020-04-21 23:56:04 +09:00
cutls	039799083d	depend	2020-04-21 22:18:40 +09:00
dependabot-preview[bot]	f6f53f9729	Bump jimp from 0.10.1 to 0.10.3 in /app Bumps [jimp](https://github.com/oliver-moran/jimp) from 0.10.1 to 0.10.3. - [Release notes](https://github.com/oliver-moran/jimp/releases) - [Changelog](https://github.com/oliver-moran/jimp/blob/master/CHANGELOG.md) - [Commits](https://github.com/oliver-moran/jimp/compare/v0.10.1...v0.10.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-04-20 21:05:16 +00:00
cutls	219695f9ae	TheDesk 20.3.2 (Kawaii)	2020-04-18 11:00:56 +09:00
dependabot-preview[bot]	34c189b3ed	Bump electron-builder from 22.4.1 to 22.5.1 in /app Bumps [electron-builder](https://github.com/electron-userland/electron-builder) from 22.4.1 to 22.5.1. - [Release notes](https://github.com/electron-userland/electron-builder/releases) - [Changelog](https://github.com/electron-userland/electron-builder/blob/master/CHANGELOG.md) - [Commits](https://github.com/electron-userland/electron-builder/commits/v22.5.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-04-16 20:14:21 +00:00
dependabot-preview[bot]	4a704bc257	Bump sweetalert2 from 9.10.9 to 9.10.12 in /app Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 9.10.9 to 9.10.12. - [Release notes](https://github.com/sweetalert2/sweetalert2/releases) - [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md) - [Commits](https://github.com/sweetalert2/sweetalert2/compare/v9.10.9...v9.10.12) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-04-14 20:16:52 +00:00
cutls	2dc3ca51a3	Mastodon 3.1.3	2020-04-11 16:09:46 +09:00
cutls	b2564cfabb	Fix: Pleroma image upload	2020-04-11 10:41:04 +09:00
dependabot-preview[bot]	d0734ed5fe	Bump jquery from 3.4.1 to 3.5.0 in /app Bumps [jquery](https://github.com/jquery/jquery) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/jquery/jquery/releases) - [Commits](https://github.com/jquery/jquery/compare/3.4.1...3.5.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-04-10 20:16:32 +00:00
cutls	6ddc613b5a	fix	2020-04-08 18:12:58 +09:00
cutls	3373ff417f	TheDesk 20.3.1 (Kawaii)	2020-04-08 17:58:37 +09:00
cutls	9bee8afe95	misc	2020-04-08 15:30:20 +09:00
cutls	f79da2b692	tips versioning and Spotify player bug	2020-04-08 15:28:04 +09:00
cutls	fedb1ee858	misskey login	2020-04-08 15:27:47 +09:00
cutls	50e11ec035	v1 media bug	2020-04-08 14:54:25 +09:00
cutls	233442936a	Fix: delete when unreblog	2020-04-08 14:54:14 +09:00